From d641d286d077fe6cc8ee9a78d509fc51ec6e87a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E5=A4=A9=E5=BC=80=E6=BA=90?=
 <14124580+TTopen@user.noreply.gitee.com>
Date: Mon, 14 Jul 2025 02:28:17 +0000
Subject: [PATCH 1/7] update README.md.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 天天开源 <14124580+TTopen@user.noreply.gitee.com>
---
 README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 721e52eb..cdf75d04 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,50 @@
-# OpenHis-ITAII
+# 平台介绍
+
+## 🏠【关于我们】
+
+![天天开源](https://open.tntlinking.com/assets/logo-b-BzFUYaRU.png) 
+
+天天开源致⼒于打造中国应⽤管理软件开源⽣态，⾯向医疗、企业、教育三⼤⾏业信息化需求，提供优质的开源软件产品与解决⽅案。平台现已发布OpenHIS、OpenCOM、OpenEDU系列开源产品，并持续招募⽣态合作伙伴，期待共同构建开源创新的⾏业协作模式，加速⾏业的数字化进程。
+
+天天开源的前⾝是新致开源，最早于2022年6⽉发布开源医疗软件平台OpenHIS.org.cn，于2023年6⽉发布开源企业软件平台OpenCOM.com.cn。2025年7⽉，新致开源品牌更新为天天开源，我们始终秉持开源、专业、协作的理念，致⼒于为医疗、教育、中⼩企业等⾏业提供优质的开源解决⽅案。
+
+了解我们：https://open.tntlinking.com/about?site=gitee
+
+## 💾【部署包下载】
+
+请访问官网产品中心下载部署包：https://open.tntlinking.com/resource/productCenter?site=gitee
+
+## 📚【支持文档】
+
+技术支持资源：https://open.tntlinking.com/resource/technicalSupport?site=gitee
+（含演示环境、操作手册、部署手册、开发手册、常见问题等）
+
+产品介绍：https://open.tntlinking.com/resource/industryKnowledge?site=gitee
+
+操作教程：https://open.tntlinking.com/resource/operationTutorial?site=gitee
+
+沙龙回顾：https://open.tntlinking.com/resource/openSourceSalon#23?site=gitee
+
+## 🤝【合作方式】
+
+产品服务价格：https://open.tntlinking.com/cost?site=gitee
+
+加入生态伙伴：https://open.tntlinking.com/ecology/becomePartner?site=gitee
+
+## 🤗【技术社区】
+
+请访问官网扫码加入技术社区交流：https://open.tntlinking.com/ecology/joinCommunity?site=gitee
+
+请关注公众号【天天开源软件】以便获得最新产品更新信息。
+
+
+
+# 项目介绍
+
+OpenHIS医院系统（信创版）集十大核心模块于一体，涵盖目录管理、基础数据配置、个性化设置、门诊/住院全流程管理、药房药库智能管控、精细化耗材管理、财务核算体系、医保合规对接及多维报表分析等功能模块，共计372项标准化功能。
+
+系统深度适配民营及公立一二级医院业务场景，支持单体医院、集团化运营及区域医疗协同等多种部署模式，并通过国家信创认证体系，确保全栈技术自主可控。如有项目需求，可联系官方平台合作。
 
-    OpenHis 信创版
 
 
 ## 运行环境
-- 
Gitee


From 2c907e49f43b87828253c97ad2eaf03202af5a32 Mon Sep 17 00:00:00 2001
From: mohaijiang <mohaijiang110@163.com>
Date: Tue, 22 Jul 2025 07:41:17 +0000
Subject: [PATCH 2/7] update LICENSE.

Signed-off-by: mohaijiang <mohaijiang110@163.com>
---
 LICENSE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0227962c..7ad5243b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright 2022-2024 武汉新致数字科技有限公司
+    Copyright 2022-2025 湖北天天数链技术有限公司
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    OpenHis  Copyright (C) 2022-2024  武汉新致数字科技有限公司
+    OpenHis  Copyright (C) 2022-2025 湖北天天数链技术有限公司
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
-- 
Gitee


From 7d972e2d174a934bed1076b69124085dbf66f884 Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Tue, 2 Sep 2025 19:15:07 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.gitignore                                |     0
 .../LICENSE                                   |     0
 .../README.md                                 |     0
 .../core-admin/pom.xml                        |     0
 .../controller/common/CaptchaController.java  |     0
 .../controller/common/CommonController.java   |     0
 .../common/FileUploadController.java          |     0
 .../controller/monitor/CacheController.java   |     0
 .../controller/monitor/ServerController.java  |     0
 .../monitor/SysLogininforController.java      |     0
 .../monitor/SysOperlogController.java         |     0
 .../monitor/SysUserOnlineController.java      |     0
 .../system/SysConfigController.java           |     0
 .../controller/system/SysDeptController.java  |     0
 .../system/SysDictDataController.java         |     0
 .../system/SysDictTypeController.java         |     0
 .../controller/system/SysIndexController.java |     0
 .../controller/system/SysLoginController.java |     8 +-
 .../controller/system/SysMenuController.java  |     0
 .../system/SysNoticeController.java           |     0
 .../controller/system/SysPostController.java  |     0
 .../system/SysProfileController.java          |     0
 .../system/SysRegisterController.java         |     0
 .../controller/system/SysRoleController.java  |     0
 .../system/SysTenantController.java           |     0
 .../system/SysTenantOptionController.java     |    60 +
 .../controller/system/SysUserController.java  |     0
 .../web/controller/tool/TestController.java   |     0
 .../core/web/core/config/SwaggerConfig.java   |     0
 .../com/core/web/util/TenantOptionUtil.java   |    36 +
 .../core-common/pom.xml                       |     0
 .../com/core/common/annotation/Anonymous.java |     0
 .../com/core/common/annotation/DataScope.java |     0
 .../core/common/annotation/DataSource.java    |     0
 .../com/core/common/annotation/Excel.java     |     0
 .../com/core/common/annotation/Excels.java    |     0
 .../java/com/core/common/annotation/Log.java  |     0
 .../core/common/annotation/RateLimiter.java   |     0
 .../core/common/annotation/RepeatSubmit.java  |     0
 .../com/core/common/annotation/Sensitive.java |     0
 .../com/core/common/config/CoreConfig.java    |     0
 .../serializer/SensitiveJsonSerializer.java   |     0
 .../core/common/constant/CacheConstants.java  |     0
 .../com/core/common/constant/Constants.java   |     0
 .../core/common/constant/GenConstants.java    |     0
 .../com/core/common/constant/HttpStatus.java  |     0
 .../common/constant/ScheduleConstants.java    |     0
 .../core/common/constant/UserConstants.java   |     0
 .../core/controller/BaseController.java       |     0
 .../core/common/core/domain/AjaxResult.java   |     0
 .../core/common/core/domain/BaseEntity.java   |     0
 .../common/core/domain/HisBaseEntity.java     |     0
 .../java/com/core/common/core/domain/R.java   |     0
 .../core/common/core/domain/TreeEntity.java   |     0
 .../core/common/core/domain/TreeSelect.java   |     0
 .../common/core/domain/entity/SysDept.java    |     0
 .../core/domain/entity/SysDictData.java       |     0
 .../core/domain/entity/SysDictType.java       |     0
 .../common/core/domain/entity/SysMenu.java    |     0
 .../common/core/domain/entity/SysRole.java    |     0
 .../common/core/domain/entity/SysUser.java    |     0
 .../common/core/domain/model/LoginBody.java   |     0
 .../common/core/domain/model/LoginUser.java   |    13 +
 .../core/domain/model/LoginUserExtend.java    |     0
 .../core/domain/model/RegisterBody.java       |     0
 .../com/core/common/core/page/PageDomain.java |     0
 .../core/common/core/page/TableDataInfo.java  |     0
 .../core/common/core/page/TableSupport.java   |     0
 .../core/common/core/redis/RedisCache.java    |     0
 .../com/core/common/core/text/CharsetKit.java |     0
 .../com/core/common/core/text/Convert.java    |     0
 .../core/common/core/text/StrFormatter.java   |     0
 .../com/core/common/enums/BusinessStatus.java |     0
 .../com/core/common/enums/BusinessType.java   |     0
 .../com/core/common/enums/DataSourceType.java |     0
 .../com/core/common/enums/DeleteFlag.java     |     0
 .../core/common/enums/DesensitizedType.java   |     0
 .../com/core/common/enums/HttpMethod.java     |     0
 .../java/com/core/common/enums/LimitType.java |     0
 .../com/core/common/enums/OperatorType.java   |     0
 .../core/common/enums/TenantOptionDict.java   |   124 +-
 .../com/core/common/enums/TenantStatus.java   |     0
 .../com/core/common/enums/UserStatus.java     |     0
 .../common/exception/CustomException.java     |     0
 .../common/exception/DemoModeException.java   |     0
 .../common/exception/GlobalException.java     |     0
 .../common/exception/NonCaptureException.java |     0
 .../common/exception/ServiceException.java    |     0
 .../core/common/exception/UtilException.java  |     0
 .../common/exception/base/BaseException.java  |     0
 .../common/exception/file/FileException.java  |     0
 .../FileNameLengthLimitExceededException.java |     0
 .../file/FileSizeLimitExceededException.java  |     0
 .../exception/file/FileUploadException.java   |     0
 .../file/InvalidExtensionException.java       |     0
 .../common/exception/job/TaskException.java   |     0
 .../exception/user/BlackListException.java    |     0
 .../exception/user/CaptchaException.java      |     0
 .../user/CaptchaExpireException.java          |     0
 .../common/exception/user/UserException.java  |     0
 .../user/UserNotExistsException.java          |     0
 .../user/UserPasswordNotMatchException.java   |     0
 ...UserPasswordRetryLimitExceedException.java |     0
 .../filter/PropertyPreExcludeFilter.java      |     0
 .../core/common/filter/RepeatableFilter.java  |     0
 .../filter/RepeatedlyRequestWrapper.java      |     0
 .../com/core/common/filter/XssFilter.java     |     0
 .../filter/XssHttpServletRequestWrapper.java  |     0
 .../core/common/utils/AgeCalculatorUtil.java  |    21 +-
 .../java/com/core/common/utils/Arith.java     |     0
 .../com/core/common/utils/AssignSeqUtil.java  |     0
 .../common/utils/ChineseConvertUtils.java     |     0
 .../java/com/core/common/utils/DateUtils.java |     0
 .../core/common/utils/DesensitizedUtil.java   |     0
 .../java/com/core/common/utils/DictUtils.java |     0
 .../com/core/common/utils/ExceptionUtil.java  |     0
 .../java/com/core/common/utils/LogUtils.java  |     0
 .../com/core/common/utils/MessageUtils.java   |     0
 .../java/com/core/common/utils/PageUtils.java |     0
 .../com/core/common/utils/SecurityUtils.java  |     0
 .../com/core/common/utils/ServletUtils.java   |     0
 .../core/common/utils/SpringContextUtils.java |     0
 .../com/core/common/utils/StringUtils.java    |     0
 .../java/com/core/common/utils/Threads.java   |     0
 .../java/com/core/common/utils/TimeUtils.java |    90 +
 .../com/core/common/utils/bean/BeanUtils.java |    24 +-
 .../common/utils/bean/BeanValidators.java     |     0
 .../core/common/utils/file/FileTypeUtils.java |     0
 .../common/utils/file/FileUploadUtils.java    |     0
 .../com/core/common/utils/file/FileUtils.java |     0
 .../core/common/utils/file/ImageUtils.java    |     0
 .../core/common/utils/file/MimeTypeUtils.java |     0
 .../core/common/utils/html/EscapeUtil.java    |     0
 .../core/common/utils/html/HTMLFilter.java    |     0
 .../core/common/utils/http/HttpHelper.java    |     0
 .../com/core/common/utils/http/HttpUtils.java |     0
 .../core/common/utils/ip/AddressUtils.java    |     0
 .../com/core/common/utils/ip/IpUtils.java     |     0
 .../common/utils/poi/ExcelHandlerAdapter.java |     0
 .../com/core/common/utils/poi/ExcelUtil.java  |     0
 .../common/utils/reflect/ReflectUtils.java    |     0
 .../com/core/common/utils/sign/Base64.java    |     0
 .../com/core/common/utils/sign/Md5Utils.java  |     0
 .../core/common/utils/spring/SpringUtils.java |     0
 .../com/core/common/utils/sql/SqlUtil.java    |     0
 .../com/core/common/utils/uuid/IdUtils.java   |     0
 .../java/com/core/common/utils/uuid/Seq.java  |     0
 .../java/com/core/common/utils/uuid/UUID.java |     0
 .../main/java/com/core/common/xss/Xss.java    |     0
 .../com/core/common/xss/XssValidator.java     |     0
 .../core-flowable/pom.xml                     |     0
 .../common/constant/ProcessConstants.java     |     0
 .../flowable/common/enums/FlowComment.java    |     0
 .../flowable/common/expand/el/BaseEl.java     |     0
 .../flowable/common/expand/el/FlowEl.java     |     0
 .../core/flowable/config/FlowableConfig.java  |     0
 .../controller/FlowDefinitionController.java  |     0
 .../controller/FlowInstanceController.java    |     0
 .../controller/FlowTaskController.java        |     0
 .../controller/SysExpressionController.java   |     0
 .../controller/SysFormController.java         |     0
 .../controller/SysListenerController.java     |     0
 .../flowable/domain/dto/FlowCommentDto.java   |     0
 .../flowable/domain/dto/FlowFromFieldDTO.java |     0
 .../core/flowable/domain/dto/FlowNextDto.java |     0
 .../flowable/domain/dto/FlowSaveXmlVo.java    |     0
 .../core/flowable/domain/dto/FlowTaskDto.java |     0
 .../flowable/domain/dto/FlowViewerDto.java    |     0
 .../core/flowable/domain/vo/FlowQueryVo.java  |     0
 .../core/flowable/domain/vo/FlowTaskVo.java   |     0
 .../flowable/domain/vo/ReturnTaskNodeVo.java  |     0
 .../flowable/factory/FlowServiceFactory.java  |     0
 .../flow/CustomProcessDiagramCanvas.java      |     0
 .../flow/CustomProcessDiagramGenerator.java   |     0
 .../core/flowable/flow/FindNextNodeUtil.java  |     0
 .../com/core/flowable/flow/FlowableUtils.java |     0
 .../listener/FlowExecutionListener.java       |     0
 .../flowable/listener/FlowTaskListener.java   |     0
 .../service/IFlowDefinitionService.java       |     0
 .../service/IFlowInstanceService.java         |     0
 .../flowable/service/IFlowTaskService.java    |     0
 .../service/ISysDeployFormService.java        |     0
 .../flowable/service/ISysFormService.java     |     0
 .../impl/FlowDefinitionServiceImpl.java       |     0
 .../service/impl/FlowInstanceServiceImpl.java |     0
 .../service/impl/FlowTaskServiceImpl.java     |     0
 .../impl/SysDeployFormServiceImpl.java        |     0
 .../service/impl/SysFormServiceImpl.java      |     0
 .../core-framework/pom.xml                    |     0
 .../framework/aspectj/DataScopeAspect.java    |     0
 .../framework/aspectj/DataSourceAspect.java   |     0
 .../com/core/framework/aspectj/LogAspect.java |     0
 .../framework/aspectj/RateLimiterAspect.java  |     0
 .../framework/aspectj/TransactionAspect.java  |     0
 .../framework/config/ApplicationConfig.java   |     0
 .../core/framework/config/CaptchaConfig.java  |     0
 .../core/framework/config/DruidConfig.java    |     0
 .../config/FastJson2JsonRedisSerializer.java  |     0
 .../core/framework/config/FilterConfig.java   |     0
 .../com/core/framework/config/I18nConfig.java |     0
 .../framework/config/KaptchaTextCreator.java  |     0
 .../framework/config/MybatisPlusConfig.java   |     4 +-
 .../core/framework/config/RedisConfig.java    |     0
 .../framework/config/ResourcesConfig.java     |     0
 .../core/framework/config/SecurityConfig.java |     0
 .../core/framework/config/ServerConfig.java   |     0
 .../core/framework/config/TenantContext.java  |     0
 .../framework/config/ThreadPoolConfig.java    |     0
 .../config/properties/DruidProperties.java    |     0
 .../properties/PermitAllUrlProperties.java    |     0
 .../datasource/DynamicDataSource.java         |     0
 .../DynamicDataSourceContextHolder.java       |     0
 .../handler/MybastisColumnsHandler.java       |     0
 .../interceptor/RepeatSubmitInterceptor.java  |     0
 .../impl/SameUrlDataInterceptor.java          |     0
 .../core/framework/manager/AsyncManager.java  |     0
 .../framework/manager/ShutdownManager.java    |     0
 .../manager/factory/AsyncFactory.java         |     0
 .../context/AuthenticationContextHolder.java  |     0
 .../context/PermissionContextHolder.java      |     0
 .../filter/JwtAuthenticationTokenFilter.java  |     0
 .../handle/AuthenticationEntryPointImpl.java  |     0
 .../handle/LogoutSuccessHandlerImpl.java      |     0
 .../com/core/framework/web/domain/Server.java |     0
 .../core/framework/web/domain/server/Cpu.java |     0
 .../core/framework/web/domain/server/Jvm.java |     0
 .../core/framework/web/domain/server/Mem.java |     0
 .../core/framework/web/domain/server/Sys.java |     0
 .../framework/web/domain/server/SysFile.java  |     0
 .../web/exception/GlobalExceptionHandler.java |     0
 .../web/service/PermissionService.java        |     0
 .../web/service/SysLoginService.java          |    15 +
 .../web/service/SysPasswordService.java       |     0
 .../web/service/SysPermissionService.java     |     6 +-
 .../web/service/SysRegisterService.java       |     0
 .../framework/web/service/TokenService.java   |     0
 .../web/service/UserDetailsServiceImpl.java   |     0
 .../core-generator/pom.xml                    |     0
 .../com/core/generator/config/GenConfig.java  |     0
 .../generator/controller/GenController.java   |     0
 .../com/core/generator/domain/GenTable.java   |     0
 .../core/generator/domain/GenTableColumn.java |     0
 .../mapper/GenTableColumnMapper.java          |     0
 .../core/generator/mapper/GenTableMapper.java |     0
 .../service/GenTableColumnServiceImpl.java    |     0
 .../service/GenTableServiceImpl.java          |     0
 .../service/IGenTableColumnService.java       |     0
 .../generator/service/IGenTableService.java   |     0
 .../com/core/generator/util/GenUtils.java     |     0
 .../generator/util/VelocityInitializer.java   |     0
 .../core/generator/util/VelocityUtils.java    |     0
 .../src/main/resources/generator.yml          |     0
 .../mapper/generator/GenTableColumnMapper.xml |     0
 .../mapper/generator/GenTableMapper.xml       |     0
 .../src/main/resources/vm/java/domain.java.vm |     0
 .../src/main/resources/vm/java/mapper.java.vm |     0
 .../main/resources/vm/java/service.java.vm    |     0
 .../resources/vm/java/serviceImpl.java.vm     |     0
 .../src/main/resources/vm/xml/mapper.xml.vm   |     0
 .../core-quartz/pom.xml                       |     0
 .../java/com/core/quartz/domain/SysJob.java   |     0
 .../com/core/quartz/domain/SysJobLog.java     |     0
 .../core/quartz/mapper/SysJobLogMapper.java   |     0
 .../com/core/quartz/mapper/SysJobMapper.java  |     0
 .../java/com/core/quartz/util/CronUtils.java  |     0
 .../com/core/quartz/util/JobInvokeUtil.java   |     0
 .../mapper/quartz/SysJobLogMapper.xml         |     0
 .../resources/mapper/quartz/SysJobMapper.xml  |     0
 .../core-system/pom.xml                       |     0
 .../core/system/domain/FlowProcDefDto.java    |     0
 .../java/com/core/system/domain/SysCache.java |     0
 .../com/core/system/domain/SysConfig.java     |     0
 .../com/core/system/domain/SysDeployForm.java |     0
 .../com/core/system/domain/SysExpression.java |     0
 .../java/com/core/system/domain/SysForm.java  |     0
 .../com/core/system/domain/SysListener.java   |     0
 .../com/core/system/domain/SysLogininfor.java |     0
 .../com/core/system/domain/SysNotice.java     |     0
 .../com/core/system/domain/SysOperLog.java    |     0
 .../java/com/core/system/domain/SysPost.java  |     0
 .../com/core/system/domain/SysRoleDept.java   |     0
 .../com/core/system/domain/SysRoleMenu.java   |     0
 .../com/core/system/domain/SysTaskForm.java   |     0
 .../com/core/system/domain/SysTenant.java     |     0
 .../core/system/domain/SysTenantOption.java   |     8 +-
 .../com/core/system/domain/SysUserOnline.java |     0
 .../com/core/system/domain/SysUserPost.java   |     0
 .../com/core/system/domain/SysUserRole.java   |     0
 .../com/core/system/domain/SysUserTenant.java |     0
 .../domain/dto/SaveTenantOptionDetailDto.java |    29 +
 .../system/domain/dto/TenantOptionDto.java    |     2 +-
 .../com/core/system/domain/vo/MetaVo.java     |     0
 .../com/core/system/domain/vo/RouterVo.java   |     0
 .../core/system/mapper/FlowDeployMapper.java  |     0
 .../core/system/mapper/SysConfigMapper.java   |     0
 .../system/mapper/SysDeployFormMapper.java    |     0
 .../com/core/system/mapper/SysDeptMapper.java |     0
 .../core/system/mapper/SysDictDataMapper.java |     0
 .../core/system/mapper/SysDictTypeMapper.java |     0
 .../system/mapper/SysExpressionMapper.java    |     0
 .../com/core/system/mapper/SysFormMapper.java |     0
 .../core/system/mapper/SysListenerMapper.java |     0
 .../system/mapper/SysLogininforMapper.java    |     0
 .../com/core/system/mapper/SysMenuMapper.java |     0
 .../core/system/mapper/SysNoticeMapper.java   |     0
 .../core/system/mapper/SysOperLogMapper.java  |     0
 .../com/core/system/mapper/SysPostMapper.java |     0
 .../core/system/mapper/SysRoleDeptMapper.java |     0
 .../com/core/system/mapper/SysRoleMapper.java |     0
 .../core/system/mapper/SysRoleMenuMapper.java |     0
 .../core/system/mapper/SysTaskFormMapper.java |     0
 .../core/system/mapper/SysTenantMapper.java   |     0
 .../system/mapper/SysTenantOptionMapper.java  |     0
 .../com/core/system/mapper/SysUserMapper.java |     9 +
 .../core/system/mapper/SysUserPostMapper.java |     0
 .../core/system/mapper/SysUserRoleMapper.java |     0
 .../system/mapper/SysUserTenantMapper.java    |     0
 .../system/service/ISysConfigService.java     |     0
 .../core/system/service/ISysDeptService.java  |     0
 .../system/service/ISysDictDataService.java   |     0
 .../system/service/ISysDictTypeService.java   |     0
 .../system/service/ISysExpressionService.java |     0
 .../system/service/ISysListenerService.java   |     0
 .../system/service/ISysLogininforService.java |     0
 .../core/system/service/ISysMenuService.java  |     0
 .../system/service/ISysNoticeService.java     |     0
 .../system/service/ISysOperLogService.java    |     0
 .../core/system/service/ISysPostService.java  |     0
 .../core/system/service/ISysRoleService.java  |     0
 .../service/ISysTenantOptionService.java      |    51 +-
 .../system/service/ISysTenantService.java     |     0
 .../system/service/ISysUserOnlineService.java |     0
 .../core/system/service/ISysUserService.java  |    11 +-
 .../system/service/ISysUserTenantService.java |     0
 .../service/impl/SysConfigServiceImpl.java    |    20 +-
 .../service/impl/SysDeptServiceImpl.java      |     0
 .../service/impl/SysDictDataServiceImpl.java  |     0
 .../service/impl/SysDictTypeServiceImpl.java  |     0
 .../impl/SysExpressionServiceImpl.java        |     0
 .../service/impl/SysListenerServiceImpl.java  |     0
 .../impl/SysLogininforServiceImpl.java        |     0
 .../service/impl/SysMenuServiceImpl.java      |     0
 .../service/impl/SysNoticeServiceImpl.java    |     0
 .../service/impl/SysOperLogServiceImpl.java   |     0
 .../service/impl/SysPostServiceImpl.java      |     0
 .../service/impl/SysRoleServiceImpl.java      |     0
 .../impl/SysTenantOptionServiceImpl.java      |   132 +
 .../service/impl/SysTenantServiceImpl.java    |     0
 .../impl/SysUserOnlineServiceImpl.java        |     0
 .../service/impl/SysUserServiceImpl.java      |    18 +-
 .../impl/SysUserTenantServiceImpl.java        |     0
 .../mapper/flowable/FlowDeployMapper.xml      |     0
 .../mapper/flowable/SysTaskFormMapper.xml     |     0
 .../mapper/system/SysConfigMapper.xml         |     0
 .../mapper/system/SysDeployFormMapper.xml     |     0
 .../resources/mapper/system/SysDeptMapper.xml |     0
 .../mapper/system/SysDictDataMapper.xml       |     0
 .../mapper/system/SysDictTypeMapper.xml       |     0
 .../mapper/system/SysExpressionMapper.xml     |     0
 .../resources/mapper/system/SysFormMapper.xml |     0
 .../mapper/system/SysListenerMapper.xml       |     0
 .../mapper/system/SysLogininforMapper.xml     |     0
 .../resources/mapper/system/SysMenuMapper.xml |     0
 .../mapper/system/SysNoticeMapper.xml         |     0
 .../mapper/system/SysOperLogMapper.xml        |     0
 .../resources/mapper/system/SysPostMapper.xml |     0
 .../mapper/system/SysRoleDeptMapper.xml       |     0
 .../resources/mapper/system/SysRoleMapper.xml |     0
 .../mapper/system/SysRoleMenuMapper.xml       |     0
 .../mapper/system/SysTenantMapper.xml         |     0
 .../mapper/system/SysTenantOptionMapper.xml   |     0
 .../resources/mapper/system/SysUserMapper.xml |    21 +-
 .../mapper/system/SysUserPostMapper.xml       |     0
 .../mapper/system/SysUserRoleMapper.xml       |     0
 .../mapper/system/SysUserTenantMapper.xml     |     0
 .../openhis-application/pom.xml               |     0
 .../java/com/openhis/OpenHisApplication.java  |     7 +-
 .../java/com/openhis/config/HttpConfig.java   |     0
 .../quartz/controller/SysJobController.java   |     0
 .../controller/SysJobLogController.java       |     0
 .../quartz/service/ISysJobLogService.java     |     0
 .../quartz/service/ISysJobService.java        |     0
 .../service/impl/SysJobLogServiceImpl.java    |     0
 .../service/impl/SysJobServiceImpl.java       |     0
 .../com/openhis/quartz/task/ExampleTask.java  |     0
 .../java/com/openhis/quartz/task/RyTask.java  |     0
 .../quartz/task/StocktakingBatchTask.java     |    54 +
 .../quartz/util/AbstractQuartzJob.java        |     0
 .../QuartzDisallowConcurrentExecution.java    |     0
 .../quartz/util/QuartzJobExecution.java       |     0
 .../openhis/quartz/util/ScheduleUtils.java    |     0
 .../java/com/openhis/rule/component/ACmp.java |     0
 .../java/com/openhis/rule/component/BCmp.java |     0
 .../java/com/openhis/rule/component/CCmp.java |     0
 .../appservice/IBodyStructureAppService.java  |    64 +
 .../appservice/ILocationAppService.java       |    24 +-
 .../appservice/IOrganizationAppService.java   |     0
 .../IOrganizationLocationAppService.java      |     0
 .../appservice/IPractitionerAppService.java   |     0
 .../IPractitionerRoleAppService.java          |     0
 .../impl/BodyStructureAppServiceImpl.java     |   196 +
 .../impl/LocationAppServiceImpl.java          |   119 +-
 .../impl/OrganizationAppServiceImpl.java      |     0
 .../OrganizationLocationAppServiceImpl.java   |     0
 .../impl/PractitionerAppServiceImpl.java      |     0
 .../impl/PractitionerRoleAppServiceImpl.java  |     0
 .../controller/BodyStructureController.java   |   107 +
 .../controller/FrequencyController.java       |    79 +
 .../controller/LocationController.java        |    34 +-
 .../controller/OrganizationController.java    |     0
 .../OrganizationLocationController.java       |     0
 .../controller/PractitionerController.java    |     0
 .../PractitionerRoleController.java           |     0
 .../basedatamanage/dto/BodyStructureDto.java  |    45 +
 .../web/basedatamanage/dto/FrequencyDto.java  |    90 +
 .../dto/LocationAddOrEditDto.java             |     0
 .../web/basedatamanage/dto/LocationDto.java   |     0
 .../basedatamanage/dto/LocationInfoDto.java   |     0
 .../basedatamanage/dto/LocationInitDto.java   |     0
 .../basedatamanage/dto/LocationPageParam.java |     0
 .../web/basedatamanage/dto/OrgLocInitDto.java |     0
 .../basedatamanage/dto/OrgLocQueryDto.java    |     9 +-
 .../basedatamanage/dto/OrgLocQueryParam.java  |     0
 .../basedatamanage/dto/OrganizationDto.java   |     0
 .../dto/OrganizationInitDto.java              |     0
 .../dto/PractRoleSearchParam.java             |     0
 .../basedatamanage/dto/PractSearchParam.java  |     0
 .../basedatamanage/dto/PractitionerDto.java   |     0
 .../dto/PractitionerOrgAndLocationDto.java    |     0
 .../dto/PractitionerRoleDto.java              |     0
 .../dto/PractitionerRolesDto.java             |     0
 .../basedatamanage/dto/SelectableOrgDto.java  |     0
 .../dto/UserAndPractitionerDto.java           |     0
 .../mapper/PractitionerAppAppMapper.java      |     0
 .../HealthcareServiceController.java          |     0
 .../dto/ChargeItemDefinitionFormData.java     |     0
 .../HealthcareServiceAddOrUpdateParam.java    |     0
 .../dto/HealthcareServiceDto.java             |     0
 .../dto/HealthcareServiceFormData.java        |     0
 .../dto/HealthcareServiceInitDto.java         |     0
 .../mapper/HealthcareServiceBizMapper.java    |     0
 .../appservice/ICatalogService.java           |     0
 .../appservice/impl/CatalogServiceImpl.java   |     0
 .../controller/CatalogController.java         |    31 +-
 .../catalogmanage/mapper/CatalogMapper.java   |     0
 .../IInpatientChargeAppService.java           |    66 +
 .../IOutpatientChargeAppService.java          |     0
 .../IOutpatientPricingAppService.java         |     0
 .../IOutpatientRefundAppService.java          |     4 +-
 .../IOutpatientRegistrationAppService.java    |     7 -
 .../impl/InpatientChargeAppServiceImpl.java   |   186 +
 .../impl/OutpatientChargeAppServiceImpl.java  |    17 +-
 .../impl/OutpatientPricingAppServiceImpl.java |     4 +-
 .../impl/OutpatientRefundAppServiceImpl.java  |   109 +-
 .../OutpatientRegistrationAppServiceImpl.java |   144 +-
 .../controller/InpatientChargeController.java |    95 +
 .../OutpatientChargeController.java           |     0
 .../OutpatientPricingController.java          |     0
 .../OutpatientRefundController.java           |     7 +-
 .../OutpatientRegistrationController.java     |    19 +-
 .../web/chargemanage/dto/AccountFormData.java |     0
 .../chargemanage/dto/ChargeItemFormData.java  |     0
 .../chargemanage/dto/ContractMetadata.java    |     0
 .../dto/CurrentDayEncounterDto.java           |     0
 .../dto/EncounterDiagnosisFormData.java       |     0
 .../chargemanage/dto/EncounterFormData.java   |     0
 .../dto/EncounterLocationFormData.java        |     0
 .../dto/EncounterParticipantFormData.java     |     0
 .../dto/EncounterPatientPageDto.java          |    12 +-
 .../dto/EncounterPatientPageParam.java        |     5 +
 .../dto/EncounterPatientPaymentDto.java       |     0
 .../dto/EncounterPatientPrescriptionDto.java  |     3 +
 .../dto/EncounterPatientRefundDto.java        |    15 +-
 .../web/chargemanage/dto/OrgMetadata.java     |     0
 .../chargemanage/dto/OutpatientInitDto.java   |     0
 .../dto/OutpatientPricingInventoryDto.java    |     0
 .../dto/OutpatientPricingPriceDto.java        |     0
 .../dto/OutpatientRegistrationAddParam.java   |    19 +-
 .../dto/OutpatientRegistrationInitDto.java    |     0
 .../OutpatientRegistrationSettleParam.java    |    14 +-
 .../web/chargemanage/dto/PatientMetadata.java |     0
 .../dto/PractitionerMetadata.java             |     0
 .../chargemanage/dto/PricingProjectDto.java   |     0
 .../web/chargemanage/dto/RefundItemDto.java   |     0
 .../web/chargemanage/dto/RefundItemParam.java |     0
 .../mapper/InpatientChargeAppMapper.java      |    60 +
 .../mapper/OutpatientChargeAppMapper.java     |     3 +-
 .../mapper/OutpatientPricingAppMapper.java    |     0
 .../mapper/OutpatientRefundAppMapper.java     |     8 +-
 .../OutpatientRegistrationAppMapper.java      |     0
 .../web/common/appservice/ICommonService.java |    60 +-
 .../appservice/impl/CommonServiceImpl.java    |   172 +-
 .../controller/CommonAppController.java       |    63 +-
 .../web/common/dto/InventoryItemDto.java      |     0
 .../web/common/dto/InventoryItemParam.java    |     0
 .../openhis/web/common/dto/LocationDto.java   |     0
 .../web/common/dto/LocationInventoryDto.java  |     0
 .../web/common/dto/PerformInfoDto.java        |    64 +
 .../web/common/dto/PerformRecordDto.java      |    60 +
 .../web/common/dto/SearchTraceNoParam.java    |    38 +
 .../com/openhis/web/common/dto/UnitDto.java   |     0
 .../web/common/dto/UnitQuantityDto.java       |     0
 .../web/common/mapper/CommonAppMapper.java    |     9 +
 .../appservice/IDeviceManageAppService.java   |     0
 .../appservice/IDiagTreatMAppService.java     |     0
 .../appservice/IDiseaseManageAppService.java  |     0
 .../appservice/IItemDefinitionService.java    |     0
 .../IMedicationManageAppService.java          |    23 +-
 .../ISupplierManagementAppService.java        |     0
 .../appservice/ItemDefinitionAppService.java  |     0
 .../impl/DeviceManageAppServiceImpl.java      |     0
 .../impl/DiagTreatMAppServiceImpl.java        |     0
 .../impl/DiseaseManageAppServiceImpl.java     |     0
 .../impl/ItemDefinitionAppServiceImpl.java    |     0
 .../impl/ItemDefinitionServiceImpl.java       |     0
 .../impl/MedicationManageAppServiceImpl.java  |    71 +-
 .../SupplierManagementAppServiceImpl.java     |     0
 .../assembler/ItemDefinitionAssembler.java    |     0
 .../controller/DeviceManageController.java    |     0
 .../DiagnosisTreatmentController.java         |     0
 .../controller/DiseaseManageController.java   |     0
 .../controller/ItemDefinitionController.java  |     0
 .../MedicationManageController.java           |    52 +-
 .../SupplierManagementController.java         |     0
 .../dto/ActivityChildJsonDto.java             |     0
 .../dto/ChargeItemDefPageDto.java             |     0
 .../dto/ChargeItemOptionDto.java              |     0
 .../datadictionary/dto/DeviceManageDto.java   |     9 +
 .../dto/DeviceManageInitDto.java              |     0
 .../dto/DeviceManageSelParam.java             |     0
 .../datadictionary/dto/DeviceManageUpDto.java |     9 +
 .../dto/DiagnosisTreatmentDto.java            |     3 +-
 .../dto/DiagnosisTreatmentInitDto.java        |     0
 .../dto/DiagnosisTreatmentSelParam.java       |     0
 .../dto/DiagnosisTreatmentUpDto.java          |     0
 .../datadictionary/dto/DiseaseManageDto.java  |     0
 .../dto/DiseaseManageInitDto.java             |     0
 .../dto/DiseaseManageSelParam.java            |     0
 .../dto/DiseaseManageUpDto.java               |     0
 .../dto/ItemDefSearchParam.java               |     0
 .../dto/ItemDefinitionDetailDto.java          |     0
 .../datadictionary/dto/ItemDefinitionDto.java |     0
 .../dto/ItemDefinitionInitDto.java            |     0
 .../dto/ItemUpFromDirectoryDto.java           |     0
 .../dto/MedicationImportDto.java              |   195 +
 .../dto/MedicationManageDto.java              |     0
 .../dto/MedicationManageInitDto.java          |     0
 .../dto/MedicationManageUpDto.java            |     0
 .../dto/MedicationSearchParam.java            |     0
 .../web/datadictionary/dto/SupplierDto.java   |     0
 .../datadictionary/dto/SupplierInitDto.java   |     0
 .../dto/SupplierSearchParam.java              |     0
 .../web/datadictionary/dto/SupplierUpDto.java |     0
 .../ActivityDefinitionManageMapper.java       |     0
 .../mapper/ChargeItemDefSearchMapper.java     |     0
 .../mapper/DeviceManageMapper.java            |     0
 .../mapper/ItemDefinitionAppMapper.java       |     0
 .../mapper/MedicationManageSearchMapper.java  |     9 +
 .../appservice/IDepartmentCommonService.java  |    79 +
 .../IDepartmentIssuanceOrderService.java      |    40 +
 .../IDepartmentProfitLossOrderService.java    |    47 +
 .../IDepartmentReceiptApprovalService.java    |    89 +
 .../IDepartmentRequisitionOrderService.java   |    47 +
 ...partmentReturnToWarehouseOrderService.java |    47 +
 .../IDepartmentStockInOrderService.java       |    47 +
 .../IDepartmentStocktakingOrderService.java   |    47 +
 .../IDepartmentTransferInOrderService.java    |    47 +
 .../IDepartmentTransferOutOrderService.java   |    47 +
 .../impl/DepartmentCommonServiceImpl.java     |   224 +
 .../DepartmentIssuanceOrderServiceImpl.java   |   179 +
 .../DepartmentProfitLossOrderServiceImpl.java |   174 +
 .../DepartmentReceiptApprovalServiceImpl.java |   933 ++
 ...DepartmentRequisitionOrderServiceImpl.java |   163 +
 ...mentReturnToWarehouseOrderServiceImpl.java |   165 +
 .../DepartmentStockInOrderServiceImpl.java    |   172 +
 ...DepartmentStocktakingOrderServiceImpl.java |   167 +
 .../DepartmentTransferInOrderServiceImpl.java |   165 +
 ...DepartmentTransferOutOrderServiceImpl.java |   165 +
 .../DepartmentIssuanceOrderController.java    |    82 +
 .../DepartmentProfitLossOrderController.java  |   137 +
 .../DepartmentRequisitionOrderController.java |   139 +
 ...tmentReturnToWarehouseOrderController.java |   137 +
 .../DepartmentStockInOrderController.java     |   137 +
 .../DepartmentStocktakingOrderController.java |   137 +
 .../DepartmentTransferInOrderController.java  |   139 +
 .../DepartmentTransferOutOrderController.java |   139 +
 .../dto/DepartmentDetailDto.java              |   214 +
 .../dto/DepartmentDeviceInfoDto.java          |   120 +
 .../departmentmanage/dto/DepartmentDto.java   |    72 +
 .../dto/DepartmentInitDto.java                |   148 +
 .../dto/DepartmentSearchParam.java            |    57 +
 .../mapper/DepartmentCommonMapper.java        |    58 +
 .../mapper/DepartmentIssuanceOrderMapper.java |    26 +
 .../DepartmentProfitLossOrderMapper.java      |    14 +
 .../DepartmentRequisitionOrderMapper.java     |    14 +
 ...epartmentReturnToWarehouseOrderMapper.java |    14 +
 .../mapper/DepartmentStockInOrderMapper.java  |    14 +
 .../DepartmentStocktakingOrderMapper.java     |    14 +
 .../DepartmentTransferInOrderMapper.java      |    14 +
 .../DepartmentTransferOutOrderMapper.java     |    14 +
 .../IDoctorStationAdviceAppService.java       |     3 +-
 .../IDoctorStationAllergyIntolAppService.java |     0
 ...DoctorStationChineseMedicalAppService.java |    25 +
 .../IDoctorStationDiagnosisAppService.java    |     5 +-
 ...IDoctorStationElepPrescriptionService.java |    10 +
 .../IDoctorStationEmrAppService.java          |     0
 .../IDoctorStationMainAppService.java         |    29 +-
 .../IDoctorStationPtDetailsAppService.java    |     0
 .../IReservationRecordAppService.java         |    51 +
 .../DoctorStationAdviceAppServiceImpl.java    |   572 +-
 ...ctorStationAllergyIntolAppServiceImpl.java |     0
 ...orStationChineseMedicalAppServiceImpl.java |   288 +-
 .../DoctorStationDiagnosisAppServiceImpl.java |    51 +-
 ...torStationElepPrescriptionServiceImpl.java |   323 +-
 .../impl/DoctorStationEmrAppServiceImpl.java  |     0
 .../impl/DoctorStationMainAppServiceImpl.java |    87 +-
 .../DoctorStationPtDetailsAppServiceImpl.java |     0
 .../impl/ReservationRecordAppServiceImpl.java |   130 +
 .../DoctorStationAdviceController.java        |     4 +-
 .../DoctorStationAllergyIntolController.java  |     0
 ...DoctorStationChineseMedicalController.java |    63 +-
 .../DoctorStationDiagnosisController.java     |     7 +-
 ...ctorStationElepPrescriptionController.java |    14 +
 .../DoctorStationEmrController.java           |     0
 .../DoctorStationMainController.java          |    30 +
 .../DoctorStationPtDetailsController.java     |     0
 .../ReservationRecordController.java          |    80 +
 .../dto/ActivityChildrenJsonParams.java       |    39 +
 .../web/doctorstation/dto/AdviceBaseDto.java  |     6 +
 .../doctorstation/dto/AdviceInventoryDto.java |     0
 .../web/doctorstation/dto/AdvicePriceDto.java |     0
 .../web/doctorstation/dto/AdviceSaveDto.java  |    13 +-
 .../doctorstation/dto/AdviceSaveParam.java    |     0
 .../doctorstation/dto/AllergyIntoInfoDto.java |     0
 .../doctorstation/dto/AllergyIntoInitDto.java |     0
 .../dto/ConditionDefinitionBusinessClass.java |     0
 .../dto/ConditionDefinitionMetadata.java      |     4 +
 .../dto/DeletePrescriptionInfoParam.java      |     2 +-
 .../dto/DiagnosisBelongBindingDto.java        |     0
 .../dto/DiagnosisBelongBindingInitDto.java    |     0
 .../doctorstation/dto/DiagnosisQueryDto.java  |     7 +-
 .../dto/DoctorStationInitDto.java             |     0
 .../dto/ElepMedicationInfoDto.java            |    10 +
 .../dto/ElepPrescriptionInfoDto.java          |     0
 .../dto/ElepPrescriptionInfoParam.java        |    17 +-
 .../dto/ElepPrescriptionInitConditionDto.java |    26 +
 .../dto/ElepPrescriptionInitDto.java          |    16 +
 .../web/doctorstation/dto/EmrTemplateDto.java |     0
 .../dto/EncounterContractDto.java             |     0
 .../doctorstation/dto/PatientDetailsDto.java  |     0
 .../web/doctorstation/dto/PatientEmrDto.java  |     0
 .../web/doctorstation/dto/PatientInfoDto.java |    12 +
 .../dto/PrescriptionInfoBaseDto.java          |    93 +
 .../dto/PrescriptionInfoDetailDto.java        |   132 +
 .../web/doctorstation/dto/RequestBaseDto.java |    18 +
 .../dto/ReservationRecordDto.java             |    67 +
 .../dto/SaveDiagnosisChildParam.java          |    26 +-
 .../doctorstation/dto/SaveDiagnosisParam.java |     0
 .../web/doctorstation/dto/UpdateGroupDto.java |     0
 .../doctorstation/dto/UpdateGroupIdParam.java |     0
 .../mapper/DoctorStationAdviceAppMapper.java  |     8 +-
 .../DoctorStationChineseMedicalAppMapper.java |    77 +
 .../DoctorStationDiagnosisAppMapper.java      |     8 +
 .../DoctorStationElepPrescriptionMapper.java  |    40 +-
 .../mapper/DoctorStationEmrAppMapper.java     |     0
 .../mapper/DoctorStationMainAppMapper.java    |    34 +-
 .../DoctorStationPtDetailsAppMapper.java      |     0
 .../mapper/ReservationRecordAppMapper.java    |    31 +
 .../web/doctorstation/utils/AdviceUtils.java  |   495 +
 .../utils/DoctorStationSendApplyUtil.java     |   156 +
 .../utils/PrescriptionUtils.java              |     0
 .../appservice/IDocDefinitionAppService.java  |    40 +
 .../IDocDefinitionOrganizationAppService.java |    41 +
 .../appservice/IDocRecordAppService.java      |    53 +
 .../appservice/IDocStatisticsAppService.java  |    23 +
 .../IDocStatisticsDefinitionAppService.java   |    74 +
 ...cStatisticsDefinitionOptionAppService.java |    36 +
 .../appservice/IDocTemplateAppService.java    |    25 +
 .../impl/DocDefinitionAppServiceImpl.java     |   292 +
 ...cDefinitionOrganizationAppServiceImpl.java |   173 +
 .../impl/DocRecordAppServiceImpl.java         |   456 +
 .../impl/DocStatisticsAppServiceImpl.java     |    71 +
 ...DocStatisticsDefinitionAppServiceImpl.java |   337 +
 ...tisticsDefinitionOptionAppServiceImpl.java |   229 +
 .../impl/DocTemplateAppServiceImpl.java       |   189 +
 .../controller/DocDefinitionController.java   |    97 +
 .../DocDefinitionOrganizationController.java  |    59 +
 .../controller/DocRecordController.java       |   140 +
 .../controller/DocStatisticsController.java   |    24 +
 .../DocStatisticsDefinitionController.java    |   129 +
 .../DocStatisticsOptionController.java        |    25 +
 .../controller/DocTemplateController.java     |    82 +
 .../web/document/dto/DirectoryNode.java       |    17 +
 .../web/document/dto/DocDefinitionDto.java    |    85 +
 .../dto/DocDefinitionOrganizationDto.java     |    24 +
 .../web/document/dto/DocDefinitonParam.java   |    24 +
 .../web/document/dto/DocRecordDto.java        |    56 +
 .../web/document/dto/DocRecordPatientDto.java |    74 +
 .../dto/DocRecordPatientQueryParam.java       |    38 +
 .../web/document/dto/DocRecordQueryParam.java |    24 +
 .../dto/DocStatisticsDefinitionDto.java       |    56 +
 .../dto/DocStatisticsDefinitionOptionDto.java |    21 +
 .../DocStatisticsDefinitionOptionList.java    |    23 +
 .../web/document/dto/DocStatisticsDto.java    |    54 +
 .../web/document/dto/DocTemplateDto.java      |    49 +
 .../document/dto/DocTemplateQueryParam.java   |    24 +
 .../openhis/web/document/dto/OptionDto.java   |    50 +
 .../mapper/DocDefinitionAppMapper.java        |    27 +
 .../document/mapper/DocRecordAppMapper.java   |    26 +
 .../DocStatisticsDefinitionAppMapper.java     |    35 +
 .../util/DocumentDirectoryProcessor.java      |   156 +
 .../openhis/web/document/util/EnumUtil.java   |   130 +
 .../document/util/PermissionProcessor.java    |    36 +
 .../IAdvancePaymentManageAppService.java      |    55 +
 .../IInHospitalRegisterAppService.java        |    86 +
 .../AdvancePaymentManageAppServiceImpl.java   |   203 +
 .../InHospitalRegisterAppServiceImpl.java     |   453 +
 .../AdvancePaymentManageController.java       |    81 +
 .../InHospitalRegisterController.java         |   126 +
 .../dto/AdvancePaymentFlowRecordDto.java      |    44 +
 .../dto/AdvancePaymentInAndOutDto.java        |    41 +
 .../dto/AdvancePaymentInfoDto.java            |    98 +
 .../dto/InHospitalInfoDto.java                |   162 +
 .../dto/InHospitalPatientInfoDto.java         |    83 +
 .../dto/InHospitalRegisterDto.java            |    76 +
 .../dto/InHospitalRegisterQueryDto.java       |    82 +
 .../dto/NoFilesRegisterDto.java               |    25 +
 .../dto/PatientUpdateDto.java                 |    37 +
 .../mapper/AdvancePaymentManageAppMapper.java |    51 +
 .../mapper/InHospitalRegisterAppMapper.java   |    80 +
 .../appservice/IATDManageAppService.java      |    65 +
 .../appservice/IAdviceProcessAppService.java  |    85 +
 ...InpatientMedicineCollectionAppService.java |    72 +
 .../impl/ATDManageAppServiceImpl.java         |   332 +
 .../impl/AdviceProcessAppServiceImpl.java     |   375 +
 ...tientMedicineCollectionAppServiceImpl.java |   342 +
 .../controller/ATDManageController.java       |    98 +
 .../controller/AdviceProcessController.java   |   124 +
 ...InpatientMedicineCollectionController.java |    91 +
 .../dto/ATDManageInitDto.java                 |    80 +
 .../dto/AdmissionBedPageDto.java              |    96 +
 .../dto/AdmissionPageParam.java               |    42 +
 .../dto/AdmissionPatientInfoDto.java          |   181 +
 .../dto/AdmissionPatientPageDto.java          |   149 +-
 .../dto/InpatientAdviceDto.java               |   229 +
 .../dto/InpatientAdviceParam.java             |    36 +
 .../InpatientMedicineEncounterInfoDto.java    |    49 +-
 .../dto/InpatientMedicineInitDto.java         |    44 +-
 .../InpatientMedicinePrescriptionInfoDto.java |   115 +
 .../dto/InpatientMedicineSearchParam.java     |    50 +
 .../mapper/ATDManageAppMapper.java            |    85 +
 .../mapper/AdviceProcessAppMapper.java        |    71 +
 .../InpatientMedicineCollectionMapper.java    |    62 +
 .../appservice/IAdmissionAppService.java      |     0
 .../appservice/IDepositAppService.java        |     2 +-
 .../appservice/INursingRecordAppService.java  |   104 +
 .../appservice/IPatientHomeAppService.java    |    64 +
 .../appservice/IVitalSignsAppService.java     |    49 +
 .../impl/AdmissionAppServiceImpl.java         |    23 +-
 .../impl/DepositAppServiceImpl.java           |    38 +-
 .../impl/NursingRecordAppServiceImpl.java     |   394 +
 .../impl/PatientHomeAppServiceImpl.java       |   288 +
 .../impl/VitalSignsAppServiceImpl.java        |   472 +
 .../assembler/AdmissionAssembler.java         |     0
 .../controller/AdmissionController.java       |     0
 .../controller/DepositController.java         |     2 +-
 .../controller/NursingRecordController.java   |   149 +
 .../controller/PatientHomeController.java     |   100 +
 .../controller/VitalSignsController.java      |    77 +
 .../web/inpatientmanage/dto/AdmissionDto.java |     0
 .../dto/AdmissionInitPageDto.java             |     0
 .../dto/AdmissionSearchParam.java             |     0
 .../inpatientmanage/dto/AdmissionUpDto.java   |     0
 .../inpatientmanage/dto/DepositDetailDto.java |     0
 .../dto/DepositInitPageDto.java               |     0
 .../dto/DepositPaymentDto.java                |    42 +-
 .../dto/DepositSearchParam.java               |     0
 .../inpatientmanage/dto/NursingDetailDto.java |    83 +
 .../dto/NursingEmrTemplateDto.java            |    51 +
 .../inpatientmanage/dto/NursingPageDto.java   |    72 +-
 .../inpatientmanage/dto/NursingRecordDto.java |    55 +
 .../dto/NursingSearchParam.java               |    26 +
 .../dto/NursingVitalSignsDto.java             |    58 +
 .../inpatientmanage/dto/PatientHomeDto.java   |   320 +
 .../dto/PatientHomeEmptyBedDto.java           |    28 +
 .../dto/PatientHomeSearchParam.java           |    22 +
 .../dto/VitalSignSearchRecordDto.java         |   149 +
 .../dto/VitalSignsChartSmallDto.java          |    49 +
 .../dto/VitalSignsDeleteDto.java              |    37 +
 .../inpatientmanage/dto/VitalSignsDto.java    |   162 +
 .../inpatientmanage/dto/VitalSignsField.java  |    16 +
 .../dto/VitalSignsMedicalRecordDto.java       |    53 +
 .../dto/VitalSignsSaveDto.java                |   196 +
 .../dto/VitalSignsSearchParam.java            |    19 +
 .../dto/VitalSignsTemperaturePulsesDto.java   |    37 +
 .../mapper/AdmissionMapper.java               |     0
 .../inpatientmanage/mapper/DepositMapper.java |     0
 .../mapper/NursingRecordAppMapper.java        |    64 +
 .../mapper/PatientHomeAppMapper.java          |    44 +
 .../mapper/VitalSignsAppMapper.java           |    57 +
 .../IInventoryDetailsAppService.java          |     0
 .../appservice/ILossReportFormAppService.java |    11 +
 .../appservice/IProductDetailsAppService.java |    21 +
 .../IProductStocktakingAppService.java        |    33 +-
 .../IProductTransferAppService.java           |    13 +
 .../IPurchaseInventoryAppService.java         |    13 +
 .../appservice/IPurchaseReturnAppService.java |    12 +
 .../IReceiptApprovalAppService.java           |     0
 .../IRequisitionIssueAppService.java          |    11 +
 .../appservice/IReturnIssueAppService.java    |    13 +
 .../appservice/ITraceNoAppService.java        |    69 +
 .../impl/InventoryDetailsAppServiceImpl.java  |     0
 .../impl/LossReportFormAppServiceImpl.java    |    23 +-
 .../impl/ProductDetailsAppServiceImpl.java    |   184 +-
 .../ProductStocktakingAppServiceImpl.java     |   105 +-
 .../impl/ProductTransferAppServiceImpl.java   |    52 +-
 .../impl/PurchaseInventoryAppServiceImpl.java |    64 +-
 .../impl/PurchaseReturnAppServiceImpl.java    |    26 +-
 .../impl/ReceiptApprovalAppServiceImpl.java   |   396 +-
 .../impl/RequisitionIssueAppServiceImpl.java  |    25 +-
 .../impl/ReturnIssueAppServiceImpl.java       |    25 +-
 .../impl/TraceNoAppServiceImpl.java           |   298 +
 .../assembler/InventoryManageAssembler.java   |    10 +-
 .../InventoryDetailsController.java           |   109 +
 .../controller/LossReportFormController.java  |    16 +
 .../controller/ProductDetailsController.java  |    33 +-
 .../ProductStocktakingController.java         |    32 +
 .../controller/ProductTransferController.java |    19 +
 .../PurchaseInventoryController.java          |    16 +
 .../controller/PurchaseReturnController.java  |    16 +
 .../controller/ReceiptApprovalController.java |     0
 .../RequisitionIssueController.java           |    17 +
 .../controller/ReturnIssueController.java     |    18 +
 .../controller/TraceNoManageController.java   |    74 +
 .../dto/BatchTransferSearchParam.java         |     0
 .../dto/InventoryDetailsPageDto.java          |     0
 .../dto/InventoryDetailsSearchParam.java      |     0
 .../dto/InventorySearchParam.java             |     0
 .../dto/InventoryStockTakeDetailDto.java      |     0
 .../dto/InventoryTransferDetailDto.java       |     0
 .../dto/IssueDepartmentDto.java               |     0
 .../inventorymanage/dto/IssueDetailDto.java   |     5 +-
 .../web/inventorymanage/dto/IssueDto.java     |     0
 .../web/inventorymanage/dto/IssueInitDto.java |     0
 .../web/inventorymanage/dto/IssuePageDto.java |     0
 .../inventorymanage/dto/IssueSearchParam.java |     0
 .../dto/ItemChargeDetailDto.java              |     0
 .../inventorymanage/dto/LocationQueryDto.java |     0
 .../dto/LossReportFormDto.java                |     4 +
 .../dto/LossReportFormInitDto.java            |     0
 .../dto/LossReportFormPageDto.java            |     0
 .../dto/LossReportSearchParam.java            |     0
 .../dto/ProductDetailsInitDto.java            |     0
 .../dto/ProductDetailsPageDto.java            |    46 +-
 .../dto/ProductDetailsSearchParam.java        |    13 +
 .../dto/ProductDetailsTotalDto.java           |    26 +
 .../dto/ProductStocktakingDto.java            |     4 +
 .../dto/ProductStocktakingInitDto.java        |     0
 .../dto/ProductStocktakingSearchParam.java    |     0
 .../dto/ProductTransferDetailDto.java         |     0
 .../dto/ProductTransferDto.java               |     0
 .../dto/ProductTransferInitDto.java           |     0
 .../dto/ProductTransferPageDto.java           |     0
 .../dto/PurchaseInventoryDto.java             |     0
 .../dto/PurchaseInventoryInitDto.java         |     0
 .../dto/PurchaseReturnDetailDto.java          |     5 +
 .../dto/PurchaseReturnInitDto.java            |     0
 .../dto/PurchaseReturnPageDto.java            |     0
 .../dto/PurchaseReturnSearchParam.java        |     0
 .../dto/ReceiptApprovalSearchParam.java       |     0
 .../inventorymanage/dto/ReceiptDetailDto.java |     2 +-
 .../inventorymanage/dto/ReceiptInitDto.java   |     0
 .../inventorymanage/dto/ReceiptPageDto.java   |     0
 .../dto/RequisitionOutDetailDto.java          |     0
 .../dto/RequisitionOutSearchParam.java        |     0
 .../dto/StocktakingBatchSearchParam.java      |     0
 .../dto/SupplyItemDetailDto.java              |    12 +
 .../dto/SupplySearchParam.java                |     0
 .../dto/TraceNoDetailsPageDto.java            |    94 +-
 .../inventorymanage/dto/TraceNoInfoParam.java |    48 +
 .../inventorymanage/dto/TraceNoInitDto.java   |    65 +
 .../dto/TraceNoSearchParam.java               |    47 +
 .../mapper/InventoryDetailsMapper.java        |     0
 .../mapper/LossReportFormMapper.java          |    23 +
 .../mapper/ProductDetailsMapper.java          |    21 +
 .../mapper/ProductStocktakingMapper.java      |    33 +
 .../mapper/ProductTransferMapper.java         |    22 +
 .../mapper/PurchaseInventoryMapper.java       |    22 +
 .../mapper/PurchaseReturnMapper.java          |    21 +
 .../mapper/ReceiptApprovalMapper.java         |     0
 .../mapper/RequisitionIssueMapper.java        |    21 +
 .../mapper/ReturnIssueMapper.java             |    21 +
 .../mapper/TraceNoAppMapper.java              |    33 +
 .../appservice/IMaterialCommonService.java    |    56 +
 .../IMaterialProfitLossOrderService.java      |    47 +
 .../IMaterialPurchaseOrderService.java        |    47 +
 .../IMaterialReceiptApprovalService.java      |   106 +
 .../IMaterialReturnOrderService.java          |    47 +
 ...MaterialReturnToWarehouseOrderService.java |    47 +
 .../IMaterialStockInOrderService.java         |    47 +
 .../IMaterialStockOutOrderService.java        |    47 +
 .../IMaterialStocktakingOrderService.java     |    47 +
 .../IMaterialTransferInOrderService.java      |    47 +
 .../IMaterialTransferOutOrderService.java     |    47 +
 .../impl/MaterialCommonServiceImpl.java       |   223 +
 .../MaterialProfitLossOrderServiceImpl.java   |   169 +
 .../MaterialPurchaseOrderServiceImpl.java     |   163 +
 .../MaterialReceiptApprovalServiceImpl.java   |  1136 ++
 .../impl/MaterialReturnOrderServiceImpl.java  |   173 +
 ...rialReturnToWarehouseOrderServiceImpl.java |   178 +
 .../impl/MaterialStockInOrderServiceImpl.java |   185 +
 .../MaterialStockOutOrderServiceImpl.java     |   181 +
 .../MaterialStocktakingOrderServiceImpl.java  |   167 +
 .../MaterialTransferInOrderServiceImpl.java   |   165 +
 .../MaterialTransferOutOrderServiceImpl.java  |   165 +
 .../MaterialProfitLossOrderController.java    |   138 +
 .../MaterialPurchaseOrderController.java      |   140 +
 .../MaterialReturnOrderController.java        |   140 +
 ...erialReturnToWarehouseOrderController.java |   138 +
 .../MaterialStockInOrderController.java       |   138 +
 .../MaterialStockOutOrderController.java      |   138 +
 .../MaterialStocktakingOrderController.java   |   138 +
 .../MaterialTransferInOrderController.java    |   140 +
 .../MaterialTransferOutOrderController.java   |   140 +
 .../materialmanage/dto/MaterialDetailDto.java |   212 +
 .../dto/MaterialDeviceInfoDto.java            |   120 +
 .../web/materialmanage/dto/MaterialDto.java   |    72 +
 .../materialmanage/dto/MaterialInitDto.java   |   147 +
 .../dto/MaterialSearchParam.java              |    59 +
 .../mapper/MaterialCommonMapper.java          |    57 +
 .../mapper/MaterialProfitLossOrderMapper.java |    14 +
 .../mapper/MaterialPurchaseOrderMapper.java   |    14 +
 .../mapper/MaterialReturnOrderMapper.java     |    14 +
 .../MaterialReturnToWarehouseOrderMapper.java |    14 +
 .../mapper/MaterialStockInOrderMapper.java    |    14 +
 .../mapper/MaterialStockOutOrderMapper.java   |    14 +
 .../MaterialStocktakingOrderMapper.java       |    14 +
 .../mapper/MaterialTransferInOrderMapper.java |    14 +
 .../MaterialTransferOutOrderMapper.java       |    14 +
 .../IOutpatientInfusionAppService.java        |     0
 .../IOutpatientSkinTestRecordService.java     |     0
 .../IOutpatientTreatmentAppService.java       |    58 +-
 .../OutpatientInfusionAppServiceImpl.java     |    23 +-
 .../OutpatientSkinTestRecordServiceImpl.java  |     0
 .../OutpatientTreatmentAppServiceImpl.java    |   591 +
 .../OutpatientInfusionController.java         |     0
 .../OutpatientSkinTestRecordController.java   |     0
 .../OutpatientTreatmentController.java        |    95 +-
 .../dto/OutpatientInfusionPatientDto.java     |     0
 .../dto/OutpatientInfusionRecordDto.java      |     0
 .../dto/OutpatientSkinTestInitDto.java        |     0
 .../dto/OutpatientSkinTestRecordDto.java      |     0
 .../OutpatientSkinTestRecordSearchParam.java  |     0
 .../dto/OutpatientStationInitDto.java         |     6 +-
 .../dto/OutpatientTreatmentEncounterDto.java  |    31 +-
 .../dto/OutpatientTreatmentInfoDto.java       |   141 +-
 .../mapper/OutpatientInfusionAppMapper.java   |     0
 .../mapper/OutpatientTreatmentAppMapper.java  |    59 +
 .../appservice/IOutpatientRecordService.java  |     0
 .../IPatientInformationService.java           |     0
 .../impl/OutpatientRecordServiceImpl.java     |     0
 .../impl/PatientInformationServiceImpl.java   |    64 +-
 .../OutpatientRecordController.java           |     0
 .../PatientInformationController.java         |     5 +-
 .../dto/OutpatientRecordDto.java              |     0
 .../dto/OutpatientRecordSearchParam.java      |     0
 .../patientmanage/dto/PatientInfoInitDto.java |     0
 .../dto/PatientInfoSearchParam.java           |     0
 .../dto/PatientInformationDto.java            |    16 +-
 .../mapper/PatientManageMapper.java           |     0
 .../appservice/IChargeBillService.java        |    29 +-
 .../appservice/IEleInvoiceService.java        |     0
 .../appservice/IPaymentRecService.java        |    52 +-
 .../impl/EleInvoiceServiceImpl.java           |   144 +-
 .../impl/IChargeBillServiceImpl.java          |  1880 +++
 .../impl/PaymentRecServiceImpl.java           |  1091 +-
 .../controller/ChargeBillController.java      |    52 +-
 .../controller/EleInvoiceController.java      |    10 +-
 .../controller/PaymentContractController.java |    97 +
 .../PaymentReconciliationController.java      |   116 +-
 .../paymentmanage/dto/CancelPaymentDto.java   |    26 +-
 .../dto/CancelPaymentInpatientDto.java        |    24 +
 .../dto/CancelRegPaymentDto.java              |    22 +-
 .../paymentmanage/dto/ChargeItemDetailVO.java |     0
 .../web/paymentmanage/dto/ChargeItemDto.java  |     0
 .../dto/ChargeItemExtendInfoDto.java          |    13 +
 .../paymentmanage/dto/ChargeItemGroupDto.java |     0
 .../paymentmanage/dto/ChargeSummaryDto.java   |    14 +
 .../dto/Clinic2206OrderResultDto.java         |     0
 .../dto/Clinic2207OrderResultDto.java         |     0
 .../dto/Clinic2207OrderResultInfoDto.java     |     0
 .../dto/DispenseQuantityDto.java              |     0
 .../paymentmanage/dto/EleInvioceBillDto.java  |    18 +
 .../dto/EleInvoiceChargeDetailDto.java        |     0
 .../dto/EleInvoiceListDetailDto.java          |     0
 .../dto/EleInvoicePatientInfoDto.java         |     0
 .../dto/EleInvoicePaymentInfoDto.java         |     0
 .../dto/EleInvoiceResultDto.java              |     0
 .../dto/InpatientPreSettleDto.java            |   313 +
 .../dto/InpatientPreSettleResultDto.java      |    49 +
 .../paymentmanage/dto/InvoiceBaseInfoDto.java |     0
 .../paymentmanage/dto/InvoiceWriteOffDto.java |     9 +
 .../web/paymentmanage/dto/MakeInvoiceDto.java |     0
 .../web/paymentmanage/dto/OrgIncomeDto.java   |    51 +
 .../paymentmanage/dto/PaymentSettleDto.java   |     0
 .../web/paymentmanage/dto/PaymentVO.java      |     4 +
 .../web/paymentmanage/dto/ReportVo.java       |     0
 .../web/paymentmanage/dto/ReturnBillVO.java   |     0
 .../mapper/ChargeBillMapper.java              |     8 +
 .../mapper/EleInvoiceMapper.java              |     0
 .../paymentmanage/mapper/PaymentMapper.java   |     8 +-
 .../web/paymentmanage/util/MD5Util.java       |     0
 .../appservice/IActivityDeviceAppService.java |     0
 .../appservice/IOrderGroupAppService.java     |     0
 .../impl/ActivityDeviceAppServiceImpl.java    |     0
 .../impl/IOrderGroupAppServiceImpl.java       |     0
 .../controller/ActivityDeviceController.java  |     0
 .../controller/OrderGroupController.java      |     0
 .../dto/ActivityDeviceDto.java                |     0
 .../dto/ActivityDeviceInitDto.java            |     0
 .../personalization/dto/OrderGroupDto.java    |     0
 .../dto/OrderGroupInitDto.java                |     0
 .../mapper/ActivityDeviceAppMapper.java       |     0
 .../mapper/OrderGroupAppMapper.java           |     0
 .../IPharmacyDispensaryCommonService.java     |    79 +
 ...rmacyDispensaryDispensingOrderService.java |    40 +
 ...rmacyDispensaryProfitLossOrderService.java |    47 +
 ...rmacyDispensaryReceiptApprovalService.java |    90 +
 ...macyDispensaryRequisitionOrderService.java |    47 +
 ...spensaryReturnToWarehouseOrderService.java |    47 +
 ...PharmacyDispensaryStockInOrderService.java |    47 +
 ...macyDispensaryStocktakingOrderService.java |    47 +
 ...rmacyDispensaryTransferInOrderService.java |    47 +
 ...macyDispensaryTransferOutOrderService.java |    47 +
 .../PharmacyDispensaryCommonServiceImpl.java  |   228 +
 ...yDispensaryDispensingOrderServiceImpl.java |   185 +
 ...yDispensaryProfitLossOrderServiceImpl.java |   174 +
 ...yDispensaryReceiptApprovalServiceImpl.java |   933 ++
 ...DispensaryRequisitionOrderServiceImpl.java |   164 +
 ...saryReturnToWarehouseOrderServiceImpl.java |   169 +
 ...macyDispensaryStockInOrderServiceImpl.java |   173 +
 ...DispensaryStocktakingOrderServiceImpl.java |   168 +
 ...yDispensaryTransferInOrderServiceImpl.java |   166 +
 ...DispensaryTransferOutOrderServiceImpl.java |   165 +
 ...cyDispensaryDispensingOrderController.java |    82 +
 ...cyDispensaryProfitLossOrderController.java |   138 +
 ...yDispensaryRequisitionOrderController.java |   140 +
 ...nsaryReturnToWarehouseOrderController.java |   139 +
 ...rmacyDispensaryStockInOrderController.java |   138 +
 ...yDispensaryStocktakingOrderController.java |   138 +
 ...cyDispensaryTransferInOrderController.java |   140 +
 ...yDispensaryTransferOutOrderController.java |   140 +
 .../dto/PharmacyDispensaryDetailDto.java      |   216 +
 .../dto/PharmacyDispensaryDto.java            |    72 +
 .../dto/PharmacyDispensaryInitDto.java        |   146 +
 .../PharmacyDispensaryMedicationInfoDto.java  |   120 +
 .../dto/PharmacyDispensarySearchParam.java    |    57 +
 .../PharmacyDispensaryCommonMapper.java       |    58 +
 ...armacyDispensaryDispensingOrderMapper.java |    29 +
 ...armacyDispensaryProfitLossOrderMapper.java |    14 +
 ...rmacyDispensaryRequisitionOrderMapper.java |    14 +
 ...ispensaryReturnToWarehouseOrderMapper.java |    14 +
 .../PharmacyDispensaryStockInOrderMapper.java |    14 +
 ...rmacyDispensaryStocktakingOrderMapper.java |    14 +
 ...armacyDispensaryTransferInOrderMapper.java |    14 +
 ...rmacyDispensaryTransferOutOrderMapper.java |    14 +
 .../IPharmacyWarehouseCommonService.java      |    83 +
 ...acyWarehouseDocumentManagementService.java |    22 +
 ...armacyWarehouseProfitLossOrderService.java |    47 +
 ...PharmacyWarehousePurchaseOrderService.java |    49 +
 ...armacyWarehouseReceiptApprovalService.java |   114 +
 .../IPharmacyWarehouseReturnOrderService.java |    50 +
 ...arehouseReturnToWarehouseOrderService.java |    47 +
 ...IPharmacyWarehouseStockInOrderService.java |    50 +
 ...PharmacyWarehouseStockOutOrderService.java |    47 +
 ...rmacyWarehouseStocktakingOrderService.java |    47 +
 .../PharmacyWarehouseCommonServiceImpl.java   |   273 +
 ...arehouseDocumentManagementServiceImpl.java |   184 +
 ...cyWarehouseProfitLossOrderServiceImpl.java |   170 +
 ...macyWarehousePurchaseOrderServiceImpl.java |   170 +
 ...cyWarehouseReceiptApprovalServiceImpl.java |   984 ++
 ...armacyWarehouseReturnOrderServiceImpl.java |   173 +
 ...ouseReturnToWarehouseOrderServiceImpl.java |   176 +
 ...rmacyWarehouseStockInOrderServiceImpl.java |   202 +
 ...macyWarehouseStockOutOrderServiceImpl.java |   181 +
 ...yWarehouseStocktakingOrderServiceImpl.java |   167 +
 ...WarehouseDocumentManagementController.java |    68 +
 ...acyWarehouseProfitLossOrderController.java |   138 +
 ...rmacyWarehousePurchaseOrderController.java |   159 +
 ...harmacyWarehouseReturnOrderController.java |   140 +
 ...houseReturnToWarehouseOrderController.java |   138 +
 ...armacyWarehouseStockInOrderController.java |   139 +
 ...rmacyWarehouseStockOutOrderController.java |   138 +
 ...cyWarehouseStocktakingOrderController.java |   138 +
 .../dto/PharmacyWarehouseDetailDto.java       |   212 +
 .../dto/PharmacyWarehouseDto.java             |    72 +
 .../dto/PharmacyWarehouseInitDto.java         |   140 +
 .../PharmacyWarehouseMedicationInfoDto.java   |   121 +
 .../dto/PharmacyWarehouseSearchParam.java     |    58 +
 .../mapper/PharmacyWarehouseCommonMapper.java |    58 +
 ...macyWarehouseDocumentManagementMapper.java |    14 +
 ...harmacyWarehouseProfitLossOrderMapper.java |    14 +
 .../PharmacyWarehousePurchaseOrderMapper.java |    22 +
 .../PharmacyWarehouseReturnOrderMapper.java   |    23 +
 ...WarehouseReturnToWarehouseOrderMapper.java |    14 +
 .../PharmacyWarehouseStockInOrderMapper.java  |    23 +
 .../PharmacyWarehouseStockOutOrderMapper.java |    14 +
 ...armacyWarehouseStocktakingOrderMapper.java |    14 +
 .../IChineseMedicineDispenseAppService.java   |     0
 .../appservice/IDeviceDispenseAppService.java |    65 +
 .../IInpatientMedicineDispenseAppService.java |    31 +
 ...ientMedicineSummaryDispenseAppService.java |    54 +
 ...IMedicalConsumablesDispenseAppService.java |    22 +
 .../IMedicationDetailsAppService.java         |     0
 .../IPendingMedicationDetailsAppService.java  |     0
 .../appservice/IReturnMedicineAppService.java |     2 +-
 .../IWesternMedicineDispenseAppService.java   |    29 +-
 .../impl/DeviceDispenseAppServiceImpl.java    |   443 +
 ...ChineseMedicineDispenseAppServiceImpl.java |     0
 ...icalConsumablesDispenseAppServiceImpl.java |   226 +
 .../impl/IReturnMedicineAppServiceImpl.java   |   235 +-
 ...WesternMedicineDispenseAppServiceImpl.java |   342 +-
 ...patientMedicineDispenseAppServiceImpl.java |    99 +
 ...MedicineSummaryDispenseAppServiceImpl.java |   532 +
 .../impl/MedicationDetailsAppServiceImpl.java |     4 +-
 ...endingMedicationDetailsAppServiceImpl.java |     2 +-
 .../ChineseMedicineDispenseController.java    |     0
 .../controller/DeviceDispenseController.java  |    99 +
 .../InpatientMedicineDispenseController.java  |   112 +
 ...ientMedicineSummaryDispenseController.java |    84 +
 .../MedicalConsumablesDispenseController.java |    46 +
 .../MedicationDetailsController.java          |     0
 .../PendingMedicationDetailsController.java   |     0
 .../controller/ReturnMedicineController.java  |     4 +-
 .../WesternMedicineDispenseController.java    |    31 +-
 .../pharmacymanage/dto/DispenseDeviceDto.java |    42 +
 .../pharmacymanage/dto/DispenseInitDto.java   |     0
 .../dto/DispenseInventoryDto.java             |    17 +-
 .../dto/DispenseMedicineDto.java              |     9 +-
 .../dto/EncounterInfoPageDto.java             |     3 +
 .../dto/EncounterInfoSearchParam.java         |     8 +-
 .../dto/InpatientMedicineInitDto.java         |    58 +
 .../dto/InpatientMedicineMapInfoDto.java      |    45 +
 .../dto/InpatientMedicineSearchParam.java     |    44 +
 ...entMedicineSummaryPrescriptionInfoDto.java |   126 +
 .../web/pharmacymanage/dto/InventoryDto.java  |     7 +
 .../dto/MedDetailedAccountPageDto.java        |     3 +
 .../pharmacymanage/dto/MedDetailsInitDto.java |     0
 .../dto/MedDetailsSearchParam.java            |     0
 .../dto/MedRunningAccountPageDto.java         |     0
 .../dto/PendingMedicationPageDto.java         |     0
 .../dto/PendingMedicationSearchParam.java     |     0
 .../dto/PrescriptionDeviceInfoDto.java        |   230 +
 .../dto/PrescriptionInfoDto.java              |     3 +
 .../dto/PrescriptionMedicineInfoDto.java      |    50 +
 .../dto/PrescriptionPatientInfoDto.java       |    25 +
 .../pharmacymanage/dto/ReturnMedicineDto.java |     0
 .../dto/ReturnMedicineInfoDto.java            |     3 +
 .../dto/ReturnMedicineInitDto.java            |     0
 .../mapper/ChineseMedicineDispenseMapper.java |     0
 .../mapper/IDeviceDispenseMapper.java         |    76 +
 .../InpatientMedicineDispenseMapper.java      |    10 +
 ...npatientMedicineSummaryDispenseMapper.java |    35 +
 .../MedicalConsumablesDispenseAppMapper.java  |     2 +-
 .../mapper/MedicationDetailsMapper.java       |     0
 .../PendingMedicationDetailsMapper.java       |     0
 .../mapper/ReturnMedicineMapper.java          |     3 +-
 .../mapper/WesternMedicineDispenseMapper.java |    31 +-
 .../appservice/IAdviceManageAppService.java   |    73 +
 .../IRequestFormManageAppService.java         |    32 +
 .../appservice/ISpecialAdviceAppService.java  |    36 +
 .../impl/AdviceManageAppServiceImpl.java      |   701 +
 .../impl/RequestFormManageAppServiceImpl.java |   187 +
 .../impl/SpecialAdviceAppServiceImpl.java     |   283 +
 .../controller/AdviceManageController.java    |   153 +
 .../RequestFormManageController.java          |   117 +
 .../controller/SpecialAdviceController.java   |    58 +
 .../regdoctorstation/dto/ActivitySaveDto.java |    82 +
 .../dto/AdviceBatchOpParam.java               |    25 +
 .../dto/NursingOrdersDetailDto.java           |    35 +
 .../dto/NursingOrdersDto.java                 |    50 +
 .../dto/NursingOrdersEncounterDetailDto.java  |    25 +
 .../dto/NursingOrdersEncounterDto.java        |    48 +
 .../dto/NursingOrdersSaveDetailDto.java       |    27 +
 .../dto/NursingOrdersSaveDto.java             |    60 +
 .../dto/RegAdviceSaveDto.java                 |    18 +
 .../dto/RegAdviceSaveParam.java               |    47 +
 .../dto/RegDoctorStationInitDto.java          |    50 +
 .../dto/RegPatientMainInfoDto.java            |   135 +
 .../dto/RegRequestBaseDto.java                |    54 +
 .../dto/RequestFormDetailQueryDto.java        |    33 +
 .../dto/RequestFormQueryDto.java              |    65 +
 .../dto/RequestFormSaveDto.java               |    59 +
 .../mapper/AdviceManageAppMapper.java         |    64 +
 .../mapper/RequestFormManageAppMapper.java    |    34 +
 .../mapper/SpecialAdviceAppMapper.java        |    39 +
 .../utils/RegPrescriptionUtils.java           |    79 +
 .../appservice/IChargeReportAppService.java   |     0
 .../appservice/IInboundReportAppService.java  |    13 +
 .../IInventoryProductReportAppService.java    |    14 +
 .../appservice/ILossReportAppService.java     |    14 +
 .../IMedicationDeviceReportAppService.java    |    37 +
 .../IMonthlySettlementReportAppService.java   |    33 +
 .../appservice/IOutboundReportAppService.java |    13 +
 .../appservice/IPrintReportAppService.java    |     0
 .../appservice/IRegisterReportAppService.java |     0
 .../IReturnIssueReportAppService.java         |    13 +
 .../IStocktakingReportAppService.java         |    14 +
 .../appservice/ITransferReportAppService.java |    14 +
 ...calRecordHomePageCollectionAppService.java |    30 +
 .../PurchaseReturnReportAppService.java       |    18 +-
 .../impl/ChargeReportAppServiceImpl.java      |     3 +-
 .../impl/IPrintReportAppServiceImpl.java      |     0
 .../impl/InboundReportAppServiceImpl.java     |   116 +-
 ...ecordHomePageCollectionAppServiceImpl.java |   360 +
 .../InventoryProductReportAppServiceImpl.java |   125 +-
 .../impl/LossReportAppServiceImpl.java        |   109 +-
 .../MedicationDeviceReportAppServiceImpl.java |    71 +
 ...MonthlySettlementReportAppServiceImpl.java |   146 +
 .../impl/OutboundReportAppServiceImpl.java    |   200 +
 .../PurchaseReturnReportAppServiceImpl.java   |   197 +
 .../impl/RegisterReportAppServiceImpl.java    |     1 +
 .../impl/ReturnIssueReportAppServiceImpl.java |   129 +-
 .../impl/StocktakingReportAppServiceImpl.java |    95 +-
 .../impl/TransferReportAppServiceImpl.java    |   121 +-
 .../controller/ChargeReportController.java    |     0
 .../controller/InboundReportController.java   |    19 +
 ...calRecordHomePageCollectionController.java |    44 +
 .../InventoryProductReportController.java     |    20 +
 .../controller/LossReportController.java      |    25 +-
 .../MedicationDeviceReportController.java     |    64 +
 .../MonthlySettlementController.java          |    55 +
 .../controller/OutboundReportController.java  |    19 +
 .../controller/PrintReportController.java     |     0
 .../PurchaseReturnReportController.java       |    29 +-
 .../controller/RegisterReportController.java  |     0
 .../ReturnIssueReportController.java          |    20 +
 .../StocktakingReportController.java          |    20 +
 .../controller/TransferReportController.java  |    19 +
 .../web/reportmanage/dto/AmountNumberDto.java |    27 +-
 .../web/reportmanage/dto/BottleLabelDto.java  |     0
 .../reportmanage/dto/ChargeReportInitDto.java |     0
 .../reportmanage/dto/ChargeReportPageDto.java |     0
 .../dto/ChargeReportSearchParam.java          |     0
 .../web/reportmanage/dto/CkInspAppDto.java    |     0
 .../web/reportmanage/dto/DisposalDto.java     |     0
 .../dto/InboundReportInitDto.java             |     0
 .../dto/InboundReportPageDto.java             |     0
 .../dto/InboundReportSearchParam.java         |     0
 ...entMedicalRecordHomePageCollectionDto.java |  1642 ++
 ...InpatientMedicalRecordHomePageMakeDto.java |   212 +
 .../dto/InventoryProductReportPageDto.java    |     5 +
 .../InventoryProductReportSearchParam.java    |     0
 .../reportmanage/dto/LossReportPageDto.java   |     0
 .../dto/LossReportSearchParam.java            |     0
 .../reportmanage/dto/MedDevUseReportDto.java  |    34 +
 .../reportmanage/dto/MedUseReportInfoDto.java |    63 +
 .../dto/MonthlySettlementDto.java             |    86 +
 .../dto/MonthlySettlementInitDto.java         |    31 +-
 .../dto/OutboundReportInitDto.java            |     0
 .../dto/OutboundReportPageDto.java            |     0
 .../dto/OutboundReportSearchParam.java        |     0
 .../dto/OutpatientSettlementDto.java          |     0
 .../dto/PrescriptionPrintDto.java             |     2 +-
 .../dto/PurchaseReturnReportInitDto.java      |     0
 .../dto/PurchaseReturnReportPageDto.java      |     0
 .../dto/PurchaseReturnReportSearchParam.java  |     0
 .../dto/RegisterReportInitDto.java            |     0
 .../dto/RegisterReportPageDto.java            |     0
 .../dto/RegisterReportSearchParam.java        |     0
 .../dto/ReturnIssueReportInitDto.java         |     0
 .../dto/ReturnIssueReportPageDto.java         |     0
 .../dto/ReturnIssueReportSearchParam.java     |     0
 .../dto/StocktakingReportPageDto.java         |     0
 .../dto/StocktakingReportSearchParam.java     |     0
 .../dto/TransferReportPageDto.java            |     0
 .../dto/TransferReportSearchParam.java        |     0
 .../mapper/ChargeReportMapper.java            |     0
 .../mapper/InboundReportMapper.java           |     0
 ...MedicalRecordHomePageCollectionMapper.java |    32 +
 .../mapper/InventoryProductReportMapper.java  |     0
 .../reportmanage/mapper/LossReportMapper.java |     0
 .../mapper/MedicationDeviceReportMapper.java  |    69 +
 .../mapper/MonthlySettlementReportMapper.java |   119 +
 .../mapper/OutboundReportMapper.java          |     0
 .../mapper/PrintReportMapper.java             |     0
 .../mapper/PurchaseReturnReportMapper.java    |     0
 .../mapper/RegisterReportMapper.java          |     0
 .../mapper/ReturnIssueReportMapper.java       |     0
 .../mapper/StocktakingReportMapper.java       |     0
 .../mapper/TransferReportMapper.java          |     0
 .../web/reportmanage/utils/CsvFillerUtil.java |   201 +
 .../reportmanage/utils/ExcelFillerUtil.java   |   263 +
 .../web/ybmanage/config/YbServiceConfig.java  |     0
 .../web/ybmanage/controller/YbController.java |   388 +-
 .../ybmanage/controller/YbElepController.java |   113 +-
 .../web/ybmanage/dto/Catalogue1312Output.java |     0
 .../ybmanage/dto/Clearing3205AWebParam.java   |     2 +-
 .../ybmanage/dto/Clinic2207OrderOutput.java   |     0
 .../dto/Clinic2208UnSetlInfoOutput.java       |     0
 .../web/ybmanage/dto/ClinicReg2201Output.java |     0
 .../ybmanage/dto/Financial13203WebParam.java  |     0
 .../ybmanage/dto/Financial3202WebParam.java   |    10 +
 .../ybmanage/dto/Financial3203AWebParam.java  |     0
 .../ybmanage/dto/Financial3203WebParam.java   |     0
 .../dto/FinancialHand3203AWebParam.java       |    33 +
 .../web/ybmanage/dto/Info1101Output.java      |     0
 .../web/ybmanage/dto/PatientInfoDto.java      |     0
 .../com/openhis/web/ybmanage/dto/Result.java  |     0
 .../openhis/web/ybmanage/dto/ResultBody.java  |     0
 .../ybmanage/dto/Settlement3201WebParam.java  |     0
 .../ybmanage/dto/Settlement3202WebParam.java  |     0
 .../ybmanage/dto/Settlement3209AWebParam.java |     0
 .../dto/VeriPrescriptionDetailInfoDto.java    |     0
 .../ybmanage/dto/VeriPrescriptionInfoDto.java |     0
 .../ybmanage/dto/VeriPrescriptionParam.java   |     0
 .../ybmanage/dto/Yb2301FeeDetailParam.java    |   196 +
 .../ybmanage/dto/Yb2301InpatientOutput.java   |   124 +
 .../ybmanage/dto/Yb2302InpatientParam.java    |    31 +
 .../ybmanage/dto/Yb2303InpatientOutput.java   |   258 +
 .../web/ybmanage/dto/Yb2303InpatientPram.java |   119 +
 .../dto/Yb2304InpatientExpContentParam.java   |    31 +
 .../ybmanage/dto/Yb2304InpatientOutput.java   |   279 +
 .../ybmanage/dto/Yb2304InpatientParam.java    |   111 +
 .../ybmanage/dto/Yb2305InpatientOutput.java   |   221 +
 .../ybmanage/dto/Yb2305InpatientParam.java    |    31 +
 .../web/ybmanage/mapper/YbElepMapper.java     |     0
 .../openhis/web/ybmanage/mapper/YbMapper.java |    72 +
 .../ybmanage/service/IYbEleBaseService.java   |     2 +
 .../ybmanage/service/IYbEleHttpService.java   |    13 +-
 .../web/ybmanage/service/IYbService.java      |    38 +
 .../service/impl/YbEleHttpServiceImpl.java    |    62 +-
 .../service/impl/YbElepBaseServiceImpl.java   |   146 +-
 .../ybmanage/service/impl/YbServiceImpl.java  |   407 +
 .../ybmanage/util/YbEleParamBuilderUtil.java  |    92 +-
 .../web/ybmanage/vo/Financial3203VO.java      |     0
 .../ybmanage/vo/Settlement3201DetailVO.java   |     0
 .../web/ybmanage/vo/Settlement3201VO.java     |     0
 .../web/ybmanage/vo/Settlement3202VO.java     |     0
 .../META-INF/spring-devtools.properties       |     0
 .../src/main/resources/application-cd.yml     |    86 +
 .../src/main/resources/application-cloud.yml  |     0
 .../src/main/resources/application-local.yml  |     0
 .../src/main/resources/application-nd.yml     |     2 +-
 .../src/main/resources/application-prod.yml   |     1 -
 .../src/main/resources/application-test.yml   |    10 +-
 .../src/main/resources/application.yml        |     4 +-
 .../src/main/resources/banner.txt             |     0
 .../src/main/resources/config/flow.el.xml     |     0
 .../src/main/resources/http.yml               |     0
 .../main/resources/i18n/messages.properties   |     4 +-
 .../src/main/resources/logback.xml            |    22 +
 .../InventoryDetailsMapper.xml                |     0
 .../Inventorymanage/LossReportFormMapper.xml  |   129 +
 .../Inventorymanage/ProductDetailsMapper.xml  |   523 +
 .../ProductStocktakingMapper.xml              |   235 +-
 .../Inventorymanage/ProductTransferMapper.xml |   389 +-
 .../PurchaseInventoryMapper.xml               |   105 +
 .../Inventorymanage/PurchaseReturnMapper.xml  |   196 +
 .../Inventorymanage/ReceiptApprovalMapper.xml |    14 +-
 .../RequisitionIssueMapper.xml                |   160 +
 .../Inventorymanage/ReturnIssueMapper.xml     |   155 +
 .../Inventorymanage/TraceNoAppMapper.xml      |    68 +
 .../PharmacyDispensaryCommonMapper.xml        |   307 +
 ...harmacyDispensaryDispensingOrderMapper.xml |    50 +
 ...harmacyDispensaryProfitLossOrderMapper.xml |     5 +
 ...armacyDispensaryRequisitionOrderMapper.xml |     5 +
 ...DispensaryReturnToWarehouseOrderMapper.xml |     5 +
 .../PharmacyDispensaryStockInOrderMapper.xml  |     5 +
 ...armacyDispensaryStocktakingOrderMapper.xml |     5 +
 ...harmacyDispensaryTransferInOrderMapper.xml |     5 +
 ...armacyDispensaryTransferOutOrderMapper.xml |     5 +
 .../PharmacyWarehouseCommonMapper.xml         |   312 +
 ...rmacyWarehouseDocumentManagementMapper.xml |     5 +
 ...PharmacyWarehouseProfitLossOrderMapper.xml |     5 +
 .../PharmacyWarehousePurchaseOrderMapper.xml  |     5 +
 .../PharmacyWarehouseReturnOrderMapper.xml    |     5 +
 ...yWarehouseReturnToWarehouseOrderMapper.xml |     5 +
 .../PharmacyWarehouseStockInOrderMapper.xml   |     5 +
 .../PharmacyWarehouseStockOutOrderMapper.xml  |     5 +
 ...harmacyWarehouseStocktakingOrderMapper.xml |     5 +
 .../basedatamanage/PractitionerAppMapper.xml  |     0
 .../HealthcareServiceBizMapper.xml            |    63 +
 .../mapper/catalogmanage/CatalogMapper.xml    |     0
 .../chargemanage/InpatientChargeAppMapper.xml |   139 +
 .../OutpatientChargeAppMapper.xml             |     1 +
 .../OutpatientPricingAppMapper.xml            |     0
 .../OutpatientRefundAppMapper.xml             |   472 +-
 .../OutpatientRegistrationAppMapper.xml       |     0
 .../mapper/common/CommonAppMapper.xml         |   266 +
 .../ActivityDefinitionManageMapper.xml        |     0
 .../ChargeItemDefSearchMapper.xml             |     0
 .../datadictionary/DeviceManageMapper.xml     |     5 +
 .../ItemDefinitionAppMapper.xml               |     0
 .../MedicationManageSearchMapper.xml          |    39 +-
 .../DepartmentCommonMapper.xml                |   304 +
 .../DepartmentIssuanceOrderMapper.xml         |    50 +
 .../DepartmentProfitLossOrderMapper.xml       |     5 +
 .../DepartmentRequisitionOrderMapper.xml      |     5 +
 ...DepartmentReturnToWarehouseOrderMapper.xml |     5 +
 .../DepartmentStockInOrderMapper.xml          |     5 +
 .../DepartmentStocktakingOrderMapper.xml      |     5 +
 .../DepartmentTransferInOrderMapper.xml       |     5 +
 .../DepartmentTransferOutOrderMapper.xml      |     5 +
 .../DoctorStationAdviceAppMapper.xml          |   353 +-
 .../DoctorStationChineseMedicalAppMapper.xml  |   158 +
 .../DoctorStationDiagnosisAppMapper.xml       |    74 +-
 .../DoctorStationElepPrescriptionMapper.xml   |   383 +-
 .../DoctorStationEmrAppMapper.xml             |     0
 .../DoctorStationMainAppMapper.xml            |   111 +-
 .../DoctorStationPtDetailsAppMapper.xml       |     0
 .../ReservationRecordAppMapper.xml            |    41 +
 .../document/DocDefinitionAppMapper.xml       |    48 +
 .../mapper/document/DocRecordAppMapper.xml    |    91 +
 .../DocStatisticsDefinitionAppMapper.xml      |    38 +
 .../AdvancePaymentManageAppMapper.xml         |   106 +
 .../InHospitalRegisterAppMapper.xml           |   148 +
 .../ATDManageAppMapper.xml                    |   347 +
 .../AdviceProcessAppMapper.xml                |   396 +
 .../InpatientMedicineCollectionMapper.xml     |   258 +
 .../inpatientmanage/AdmissionMapper.xml       |     0
 .../mapper/inpatientmanage/DepositMapper.xml  |     0
 .../NursingRecordAppMapper.xml                |   165 +
 .../inpatientmanage/PatientHomeAppMapper.xml  |   206 +
 .../inpatientmanage/VitalSignsAppMapper.xml   |   106 +
 .../materialmanage/MaterialCommonMapper.xml   |   304 +
 .../MaterialProfitLossOrderMapper.xml         |     5 +
 .../MaterialPurchaseOrderMapper.xml           |     5 +
 .../MaterialReturnOrderMapper.xml             |     2 +-
 .../MaterialReturnToWarehouseOrderMapper.xml  |     5 +
 .../MaterialStockInOrderMapper.xml            |     5 +
 .../MaterialStockOutOrderMapper.xml           |     5 +
 .../MaterialStocktakingOrderMapper.xml        |     5 +
 .../MaterialTransferInOrderMapper.xml         |     5 +
 .../MaterialTransferOutOrderMapper.xml        |     5 +
 .../OutpatientInfusionAppMapper.xml           |     6 +-
 .../OutpatientTreatmentAppMapper.xml          |   233 +
 .../patientmanage/PatientManageMapper.xml     |     7 +-
 .../mapper/paymentmanage/ChargeBillMapper.xml |    45 +
 .../mapper/paymentmanage/EleInvoiceMapper.xml |     0
 .../mapper/paymentmanage/PaymentMapper.xml    |   344 +-
 .../ActivityDeviceAppMapper.xml               |     0
 .../personalization/OrderGroupAppMapper.xml   |     0
 .../ChineseMedicineDispenseMapper.xml         |     0
 .../pharmacymanage/IDeviceDispenseMapper.xml  |   252 +-
 .../InpatientMedicineDispenseMapper.xml       |     4 +
 ...InpatientMedicineSummaryDispenseMapper.xml |   439 +
 .../MedicalConsumablesDispenseAppMapper.xml   |     2 +-
 .../MedicationDetailsMapper.xml               |     2 +
 .../PendingMedicationDetailsMapper.xml        |     2 +
 .../pharmacymanage/ReturnMedicineMapper.xml   |   169 +-
 .../WesternMedicineDispenseMapper.xml         |   527 +
 .../AdviceManageAppMapper.xml                 |   244 +
 .../RequestFormManageAppMapper.xml            |    39 +
 .../SpecialAdviceAppMapper.xml                |    57 +
 .../reportmanage/ChargeReportMapper.xml       |     4 +-
 .../reportmanage/InboundReportMapper.xml      |     0
 ...tMedicalRecordHomePageCollectionMapper.xml |   146 +
 .../InventoryProductReportMapper.xml          |     0
 .../mapper/reportmanage/LossReportMapper.xml  |     0
 .../MedicationDeviceReportMapper.xml          |   300 +
 .../MonthlySettlementReportMapper.xml         |   151 +
 .../reportmanage/OutboundReportMapper.xml     |     0
 .../mapper/reportmanage/PrintReportMapper.xml |    13 +-
 .../PurchaseReturnReportMapper.xml            |     0
 .../reportmanage/RegisterReportMapper.xml     |     0
 .../reportmanage/ReturnIssueReportMapper.xml  |     0
 .../reportmanage/StocktakingReportMapper.xml  |     0
 .../reportmanage/TransferReportMapper.xml     |     0
 .../ybmanage/MedicalInsuranceMapper.xml       |     0
 .../mapper/ybmanage/YbElepMapper.xml          |    39 +-
 .../resources/mapper/ybmanage/YbMapper.xml    |   188 +
 .../main/resources/mybatis/mybatis-config.xml |     0
 .../main/resources/properties/yb.properties   |     0
 .../openhis/MedicationApplicationTests.java   |     0
 .../openhis-common/pom.xml                    |     0
 .../com/openhis/common/annotation/Dict.java   |     0
 .../openhis/common/aspectj/DictAspect.java    |     0
 .../common/constant/CommonConstants.java      |    73 +-
 .../common/constant/PromptMsgConstant.java    |    13 +
 .../common/constant/YbCommonConstants.java    |     0
 .../common/enums/AcceptanceResult.java        |    23 +-
 .../common/enums/AccountBillingStatus.java    |     0
 .../openhis/common/enums/AccountStatus.java   |     0
 .../com/openhis/common/enums/AccountType.java |     0
 .../com/openhis/common/enums/ActPriority.java |     0
 .../common/enums/ActivityDefCategory.java     |     0
 .../openhis/common/enums/ActivityType.java    |     0
 .../common/enums/AdministrativeGender.java    |     0
 .../openhis/common/enums/AdmissionMethod.java |     0
 .../openhis/common/enums/AdmissionType.java   |     0
 .../openhis/common/enums/AdviceOpType.java    |     0
 .../openhis/common/enums/ApplicableScope.java |     0
 .../openhis/common/enums/AssignSeqEnum.java   |   134 +-
 .../com/openhis/common/enums/BindingType.java |     0
 .../openhis/common/enums/BloodTypeABO.java    |     0
 .../com/openhis/common/enums/BloodTypeRH.java |     0
 .../com/openhis/common/enums/CatalogType.java |     0
 .../com/openhis/common/enums/Category.java    |     0
 .../openhis/common/enums/CategoryType.java    |     0
 .../common/enums/ChargeItemContext.java       |     0
 .../openhis/common/enums/ChargeItemEnum.java  |     0
 .../enums/ChargeItemGenerateSource.java       |     0
 .../common/enums/ChargeItemStatus.java        |     7 +-
 .../com/openhis/common/enums/ClaimType.java   |     0
 .../com/openhis/common/enums/ClaimUse.java    |     0
 .../openhis/common/enums/ClinicalStatus.java  |     0
 .../common/enums/ConditionCategory.java       |     0
 .../common/enums/ConditionClinicalStatus.java |     0
 .../openhis/common/enums/ConditionCode.java   |     9 +-
 .../enums/ConditionDefinitionSource.java      |     0
 .../common/enums/ConditionSeverity.java       |     0
 .../enums/ConditionVerificationStatus.java    |     0
 .../common/enums/ContractCategory.java        |     0
 .../common/enums/ContrastTypeEnum.java        |     0
 .../com/openhis/common/enums/Criticality.java |     0
 .../com/openhis/common/enums/DbOpType.java    |     0
 .../com/openhis/common/enums/DelFlag.java     |     0
 .../openhis/common/enums/DeviceCategory.java  |     0
 .../openhis/common/enums/DeviceSafety.java    |     0
 .../openhis/common/enums/DeviceStatus.java    |     0
 .../common/enums/DiagnosisCertainty.java      |     0
 .../openhis/common/enums/DispenseStatus.java  |     2 +-
 .../common/enums/DocPermissionEnum.java       |    52 +
 .../DocStatisticsDefinitionTypeEnum.java      |    67 +
 .../openhis/common/enums/DocStatusEnum.java   |    33 +
 .../com/openhis/common/enums/DocTypeEnum.java |    39 +
 .../openhis/common/enums/DocUseRangeEnum.java |    37 +
 .../openhis/common/enums/EncounterClass.java  |     0
 .../common/enums/EncounterLocationStatus.java |     2 +-
 .../openhis/common/enums/EncounterStatus.java |     8 +-
 .../common/enums/EncounterSubjectStatus.java  |     0
 .../openhis/common/enums/EncounterType.java   |     0
 .../common/enums/EncounterYbClass.java        |     0
 .../common/enums/EncounterZyStatus.java       |    44 +
 .../com/openhis/common/enums/EventStatus.java |    21 +-
 .../common/enums/FamilyRelationshipType.java  |     0
 .../openhis/common/enums/FeeTypeClass.java    |    35 +
 .../com/openhis/common/enums/FinCategory.java |     0
 .../common/enums/FinancialResourceStatus.java |     0
 .../common/enums/HisEnumInterface.java        |     0
 .../common/enums/HospitalCodeEnum.java        |    56 +
 .../common/enums/IdentifierStatusEnum.java    |     0
 .../common/enums/IdentityDocumentType.java    |    40 +
 .../openhis/common/enums/InsuranceLevel.java  |     0
 .../openhis/common/enums/InventoryType.java   |     0
 .../openhis/common/enums/InvoiceStatus.java   |     0
 .../com/openhis/common/enums/InvoiceType.java |     0
 .../com/openhis/common/enums/ItemType.java    |     0
 .../common/enums/LocationBedStatus.java       |     0
 .../openhis/common/enums/LocationForm.java    |    37 +-
 .../openhis/common/enums/LocationMode.java    |     0
 .../common/enums/LocationOperational.java     |     0
 .../openhis/common/enums/LocationStatus.java  |    12 +-
 .../openhis/common/enums/MaritalStatus.java   |     0
 .../common/enums/NotPerformedReason.java      |     0
 .../common/enums/NotPerformedReasonEnum.java  |     0
 .../common/enums/NursingOrdersClass.java      |    67 +-
 .../openhis/common/enums/OccupationType.java  |     0
 .../openhis/common/enums/OrderGroupType.java  |     0
 .../common/enums/OrganizationClass.java       |     0
 .../common/enums/OrganizationType.java        |     0
 .../openhis/common/enums/OutpatientClass.java |     0
 .../common/enums/PackagingCondition.java      |    47 +
 .../openhis/common/enums/ParticipantType.java |     6 +-
 .../com/openhis/common/enums/PaymentKind.java |     0
 .../openhis/common/enums/PaymentOutcome.java  |     0
 .../openhis/common/enums/PaymentResult.java   |     0
 .../enums/PaymentStatisticalMethod.java       |    42 +
 .../openhis/common/enums/PaymentStatus.java   |     0
 .../com/openhis/common/enums/PaymentType.java |    12 +-
 .../openhis/common/enums/PermissionLimit.java |     0
 .../common/enums/PractitionerRoles.java       |     0
 .../common/enums/PrescriptionType.java        |     0
 .../openhis/common/enums/PriorityLevel.java   |    10 +-
 .../common/enums/ProcedureCategory.java       |     6 +-
 .../common/enums/PublicationStatus.java       |     0
 .../openhis/common/enums/RequestFormType.java |    54 +
 .../openhis/common/enums/RequestStatus.java   |    33 +-
 .../com/openhis/common/enums/Severity.java    |     0
 .../common/enums/SplitPropertyCode.java       |     0
 .../openhis/common/enums/StatisticsType.java  |     0
 .../openhis/common/enums/SupplierType.java    |     0
 .../openhis/common/enums/SupplyCategory.java  |   140 +
 .../common/enums/SupplyRequestType.java       |     0
 .../openhis/common/enums/SupplyStatus.java    |    11 +-
 .../com/openhis/common/enums/SupplyType.java  |   235 +
 .../enums/TempOrderSplitPropertyCode.java     |     0
 .../openhis/common/enums/TherapyTimeType.java |     0
 .../openhis/common/enums/TraceNoStatus.java   |    31 +
 .../common/enums/VerificationStatus.java      |     0
 .../com/openhis/common/enums/Whether.java     |     0
 .../openhis/common/enums/medCategoryCode.java |     0
 .../common/enums/ybenums/PriorityType.java    |    68 +
 .../common/enums/ybenums/YbChrgitmLv.java     |     0
 .../common/enums/ybenums/YbClrStas.java       |     0
 .../common/enums/ybenums/YbClrType.java       |     0
 .../common/enums/ybenums/YbClrWay.java        |     0
 .../common/enums/ybenums/YbDiagType.java      |     0
 .../common/enums/ybenums/YbDoctorTitle.java   |     0
 .../common/enums/ybenums/YbDrordBhvr.java     |     0
 .../common/enums/ybenums/YbDrordType.java     |    12 +-
 .../common/enums/ybenums/YbDrugDosform.java   |     0
 .../common/enums/ybenums/YbDrugMedWay.java    |     8 +
 .../common/enums/ybenums/YbDspoWay.java       |    40 +
 .../enums/ybenums/YbEncounterClass.java       |     0
 .../common/enums/ybenums/YbGender.java        |     0
 .../common/enums/ybenums/YbHiFeesetlType.java |    47 +
 .../common/enums/ybenums/YbHospApprFlag.java  |     0
 .../enums/ybenums/YbIdDocumentType.java       |     0
 .../common/enums/ybenums/YbInOutDiagType.java |     0
 .../common/enums/ybenums/YbInsuType.java      |     0
 .../common/enums/ybenums/YbInvChgType.java    |     0
 .../common/enums/ybenums/YbInvDataType.java   |     0
 .../enums/ybenums/YbIptDiseTypeCode.java      |    41 +-
 .../common/enums/ybenums/YbListType.java      |     0
 .../common/enums/ybenums/YbMatnStas.java      |     0
 .../common/enums/ybenums/YbMdtrtCertType.java |     0
 .../enums/ybenums/YbMedChrgItmType.java       |    12 +
 .../common/enums/ybenums/YbMedMdtrtType.java  |     0
 .../common/enums/ybenums/YbMedType.java       |    57 +-
 .../common/enums/ybenums/YbMedinsLv.java      |    76 +
 .../common/enums/ybenums/YbMedinsType.java    |     0
 .../common/enums/ybenums/YbPayLoc.java        |     0
 .../common/enums/ybenums/YbPayment.java       |     2 +
 .../enums/ybenums/YbPharmacistTitle.java      |     0
 .../enums/ybenums/YbPrescriptionItemType.java |     0
 .../enums/ybenums/YbPrescriptionStatus.java   |     0
 .../common/enums/ybenums/YbPsnCertType.java   |     0
 .../common/enums/ybenums/YbPsnSetlWay.java    |     0
 .../common/enums/ybenums/YbRxFlag.java        |     0
 .../enums/ybenums/YbRxItemTypeCode.java       |     0
 .../common/enums/ybenums/YbTrigScen.java      |    72 +
 .../common/enums/ybenums/YbUsedFrqu.java      |    50 +-
 .../common/enums/ybenums/YbWarnType.java      |    40 +
 .../com/openhis/common/utils/CommonUtil.java  |     0
 .../com/openhis/common/utils/EnumUtils.java   |     0
 .../openhis/common/utils/HisPageUtils.java    |     0
 .../openhis/common/utils/HisQueryUtils.java   |     0
 .../com/openhis/common/utils/IdCardUtil.java  |   101 +
 .../openhis-domain/pom.xml                    |     0
 .../administration/domain/Account.java        |     0
 .../administration/domain/BizUser.java        |     0
 .../administration/domain/BizUserRole.java    |     0
 .../administration/domain/BodyStructure.java  |    46 +
 .../administration/domain/ChargeItem.java     |     5 +
 .../domain/ChargeItemDefDetail.java           |     0
 .../domain/ChargeItemDefinition.java          |     0
 .../openhis/administration/domain/Device.java |     0
 .../domain/DeviceDefinition.java              |     9 +
 .../administration/domain/Encounter.java      |    15 +
 .../domain/EncounterDiagnosis.java            |     5 +
 .../domain/EncounterLocation.java             |     0
 .../domain/EncounterParticipant.java          |     3 +-
 .../domain/EncounterReason.java               |     0
 .../administration/domain/Frequency.java      |   109 +
 .../domain/HealthcareService.java             |     0
 .../administration/domain/IdentifierUse.java  |     0
 .../administration/domain/Invoice.java        |     0
 .../administration/domain/Location.java       |     2 +
 .../administration/domain/OrgContrast.java    |     0
 .../administration/domain/Organization.java   |     0
 .../domain/OrganizationLocation.java          |     0
 .../administration/domain/Patient.java        |    14 +
 .../domain/PatientIdentifier.java             |     4 +-
 .../administration/domain/Practitioner.java   |     0
 .../domain/PractitionerRole.java              |     3 +
 .../administration/domain/Supplier.java       |     0
 .../administration/domain/TraceNoManage.java  |    61 +
 .../dto/ChargeItemBaseInfoDto.java            |    72 +
 .../administration/dto/ChargeItemDefInfo.java |    64 +
 .../dto/EncounterAccountDto.java              |   164 +
 .../administration/mapper/AccountMapper.java  |     0
 .../administration/mapper/BizUserMapper.java  |     0
 .../mapper/BizUserRoleMapper.java             |     0
 .../mapper/BodyStructureMapper.java           |    10 +-
 .../mapper/ChargeItemDefAppMapper.java        |     0
 .../mapper/ChargeItemDefinitionMapper.java    |     0
 .../mapper/ChargeItemMapper.java              |    37 +
 .../mapper/DeviceDefinitionMapper.java        |     0
 .../administration/mapper/DeviceMapper.java   |     0
 .../mapper/EncounterDiagnosisMapper.java      |     0
 .../mapper/EncounterLocationMapper.java       |     0
 .../mapper/EncounterMapper.java               |    31 +
 .../mapper/EncounterParticipantMapper.java    |     0
 .../mapper/EncounterReasonMapper.java         |     0
 .../mapper/FrequencyMapper.java               |    17 +
 .../mapper/HealthcareServiceMapper.java       |     0
 .../administration/mapper/InvoiceMapper.java  |     0
 .../administration/mapper/LocationMapper.java |     0
 .../mapper/OrgContrastMapper.java             |     0
 .../mapper/OrganizationLocationMapper.java    |     0
 .../mapper/OrganizationMapper.java            |     0
 .../mapper/PatientIdentifierMapper.java       |     0
 .../administration/mapper/PatientMapper.java  |     0
 .../mapper/PractitionerMapper.java            |     0
 .../mapper/PractitionerRoleMapper.java        |     0
 .../administration/mapper/SupplierMapper.java |     0
 .../mapper/TraceNoManageMapper.java           |    31 +
 .../service/IAccountService.java              |    35 +
 .../service/IBizUserRoleService.java          |     0
 .../service/IBizUserService.java              |     0
 .../service/IBodyStructureService.java        |    39 +
 .../service/IChargeItemDefDetailService.java  |     0
 .../service/IChargeItemDefinitionService.java |     0
 .../service/IChargeItemService.java           |    23 +-
 .../service/IDeviceDefinitionService.java     |     0
 .../service/IDeviceService.java               |     0
 .../service/IEncounterDiagnosisService.java   |    32 +-
 .../service/IEncounterLocationService.java    |    80 +
 .../service/IEncounterParticipantService.java |    58 +
 .../service/IEncounterReasonService.java      |     0
 .../service/IEncounterService.java            |    33 +-
 .../service/IFrequencyService.java            |    16 +
 .../service/IHealthcareServiceService.java    |     0
 .../service/IInvoiceService.java              |     0
 .../service/ILocationService.java             |    14 +-
 .../service/IOrgContrastService.java          |     0
 .../service/IOrganizationLocationService.java |     0
 .../service/IOrganizationService.java         |     8 +
 .../service/IPatientIdentifierService.java    |     0
 .../service/IPatientService.java              |     0
 .../service/IPractitionerRoleService.java     |     0
 .../service/IPractitionerService.java         |     7 +
 .../service/ISupplierService.java             |     0
 .../service/ITraceNoManageService.java        |    24 +
 .../service/impl/AccountServiceImpl.java      |    72 +-
 .../service/impl/BizUserRoleServiceImpl.java  |     0
 .../service/impl/BizUserServiceImpl.java      |     0
 .../impl/BodyStructureServiceImpl.java        |    65 +
 .../impl/ChargeItemDefDetailServiceImpl.java  |     0
 .../impl/ChargeItemDefinitionServiceImpl.java |     0
 .../service/impl/ChargeItemServiceImpl.java   |    33 +-
 .../impl/DeviceDefinitionServiceImpl.java     |     0
 .../service/impl/DeviceServiceImpl.java       |     0
 .../impl/EncounterDiagnosisServiceImpl.java   |    39 +-
 .../impl/EncounterLocationServiceImpl.java    |   116 +-
 .../impl/EncounterParticipantServiceImpl.java |   104 +
 .../impl/EncounterReasonServiceImpl.java      |     0
 .../service/impl/EncounterServiceImpl.java    |    59 +-
 .../service/impl/FrequencyServiceImpl.java    |    36 +
 .../impl/HealthcareServiceServiceImpl.java    |     0
 .../service/impl/InvoiceServiceImpl.java      |     0
 .../service/impl/LocationServiceImpl.java     |    94 +-
 .../service/impl/OrgContrastServiceImpl.java  |     0
 .../impl/OrganizationLocationServiceImpl.java |     0
 .../service/impl/OrganizationServiceImpl.java |    14 +
 .../impl/PatientIdentifierServiceImpl.java    |     0
 .../service/impl/PatientServiceImpl.java      |    44 +-
 .../impl/PractitionerRoleServiceImpl.java     |     4 +-
 .../service/impl/PractitionerServiceImpl.java |    13 +
 .../service/impl/SupplierServiceImpl.java     |     2 +-
 .../impl/TraceNoManageServiceImpl.java        |    67 +
 .../clinical/domain/AllergyIntolerance.java   |     0
 .../openhis/clinical/domain/Condition.java    |     0
 .../clinical/domain/ConditionDefinition.java  |     0
 .../domain/DiagnosisBelongBinding.java        |     0
 .../openhis/clinical/domain/Procedure.java    |    31 +-
 .../clinical/domain/ProcedurePerformer.java   |     6 +-
 .../clinical/domain/ReservationRecord.java    |    65 +
 .../mapper/AllergyIntoleranceMapper.java      |     0
 .../mapper/ConditionDefinitionMapper.java     |     0
 .../clinical/mapper/ConditionMapper.java      |     0
 .../mapper/DiagnosisBelongBindingMapper.java  |     0
 .../clinical/mapper/ProcedureMapper.java      |     0
 .../mapper/ProcedurePerformerMapper.java      |     0
 .../mapper/ReservationRecordMapper.java       |     8 +-
 .../service/IAllergyIntoleranceService.java   |     8 +
 .../service/IConditionDefinitionService.java  |    10 +
 .../clinical/service/IConditionService.java   |     8 +
 .../IDiagnosisBelongBindingService.java       |     0
 .../service/IProcedurePerformerService.java   |    11 +
 .../clinical/service/IProcedureService.java   |    55 +
 .../service/IReservationRecordService.java    |     6 +-
 .../impl/AllergyIntoleranceServiceImpl.java   |    38 +-
 .../impl/ConditionDefinitionServiceImpl.java  |    18 +-
 .../service/impl/ConditionServiceImpl.java    |    20 +-
 .../DiagnosisBelongBindingServiceImpl.java    |     0
 .../impl/ProcedurePerformerServiceImpl.java   |    20 +-
 .../service/impl/ProcedureServiceImpl.java    |   149 +
 .../impl/ReservationRecordServiceImpl.java    |    11 +-
 .../openhis/crosssystem/dto/LisApplyDto.java  |   113 +
 .../crosssystem/dto/LisApplyGroupDto.java     |    23 +
 .../openhis/crosssystem/dto/LisGroupInfo.java |    23 +
 .../crosssystem/dto/LisPatientInfo.java       |   105 +
 .../openhis/crosssystem/dto/PacsApplyDto.java |   115 +
 .../crosssystem/dto/PacsGroupInfo.java        |    24 +
 .../crosssystem/dto/PacsPatientInfo.java      |   104 +
 .../openhis/crosssystem/enums/LisAgeUnit.java |    41 +
 .../crosssystem/enums/LisOutsideFlg.java      |    45 +
 .../crosssystem/enums/LisPatientSex.java      |    49 +
 .../crosssystem/enums/LisPatientType.java     |    53 +
 .../crosssystem/enums/PacsAgeUnit.java        |    41 +
 .../crosssystem/enums/PacsPatientSex.java     |    49 +
 .../crosssystem/enums/PacsPatientType.java    |    53 +
 .../utils/CrossSystemSendApplyUtil.java       |   289 +
 .../document/domain/DocDefinition.java        |    95 +
 .../domain/DocDefinitionOrganization.java     |    35 +
 .../openhis/document/domain/DocRecord.java    |    58 +
 .../document/domain/DocStatistics.java        |    53 +
 .../domain/DocStatisticsDefinition.java       |    49 +
 .../domain/DocStatisticsDefinitionOption.java |    29 +
 .../openhis/document/domain/DocTemplate.java  |    53 +
 .../java/com/openhis/document/domain/Emr.java |     8 +
 .../openhis/document/domain/EmrDetail.java    |     0
 .../com/openhis/document/domain/EmrDict.java  |     0
 .../openhis/document/domain/EmrTemplate.java  |     6 +-
 .../openhis/document/domain/OrderProcess.java |    76 +
 .../openhis/document/domain/RequestForm.java  |    63 +
 .../openhis/document/domain/VitalSigns.java   |    63 +
 .../document/mapper/DocDefinitionMapper.java  |    10 +
 .../DocDefinitionOrganizationMapper.java      |    10 +
 .../document/mapper/DocRecordMapper.java      |    11 +
 .../mapper/DocStatisticsDefinitionMapper.java |    10 +
 .../DocStatisticsDefinitionOptionMapper.java  |    10 +
 .../document/mapper/DocStatisticsMapper.java  |    11 +
 .../document/mapper/DocTemplateMapper.java    |    11 +
 .../document/mapper/EmrDetailMapper.java      |     0
 .../document/mapper/EmrDictMapper.java        |     0
 .../openhis/document/mapper/EmrMapper.java    |     0
 .../document/mapper/EmrTemplateMapper.java    |     0
 .../document/mapper/OrderProcessMapper.java   |    18 +
 .../document/mapper/RequestFormMapper.java    |    17 +
 .../document/mapper/VitalSignsMapper.java     |    17 +
 .../IDocDefinitionOrganizationService.java    |    15 +
 .../service/IDocDefinitionService.java        |    15 +
 .../document/service/IDocRecordService.java   |    14 +
 ...IDocStatisticsDefinitionOptionService.java |    15 +
 .../IDocStatisticsDefinitionService.java      |    15 +
 .../service/IDocStatisticsService.java        |    14 +
 .../document/service/IDocTemplateService.java |    14 +
 .../document/service/IEmrDetailService.java   |     0
 .../document/service/IEmrDictService.java     |     0
 .../openhis/document/service/IEmrService.java |     0
 .../document/service/IEmrTemplateService.java |     0
 .../service/IOrderProcessService.java         |    14 +
 .../document/service/IRequestFormService.java |    14 +
 .../document/service/IVitalSignsService.java  |    56 +
 .../DocDefinitionOrganizationServiceImpl.java |    14 +
 .../impl/DocDefinitionServiceImpl.java        |    15 +
 .../service/impl/DocRecordServiceImpl.java    |    14 +
 ...StatisticsDefinitionOptionServiceImpl.java |    14 +
 .../DocStatisticsDefinitionServiceImpl.java   |    14 +
 .../impl/DocStatisticsServiceImpl.java        |    14 +
 .../service/impl/DocTemplateServiceImpl.java  |    11 +
 .../service/impl/EmrDetailServiceImpl.java    |     0
 .../service/impl/EmrDictServiceImpl.java      |     0
 .../document/service/impl/EmrServiceImpl.java |     0
 .../service/impl/EmrTemplateServiceImpl.java  |     0
 .../service/impl/OrderProcessServiceImpl.java |    20 +
 .../service/impl/RequestFormServiceImpl.java  |    19 +
 .../service/impl/VitalSignsServiceImpl.java   |   138 +
 .../com/openhis/financial/domain/Claim.java   |     0
 .../financial/domain/ClaimResponse.java       |     0
 .../openhis/financial/domain/Contract.java    |    37 +
 .../financial/domain/PaymentNotice.java       |     0
 .../financial/domain/PaymentRecDetail.java    |     0
 .../financial/domain/PaymentRecStatic.java    |    65 +
 .../domain/PaymentReconciliation.java         |     0
 .../openhis/financial/mapper/ClaimMapper.java |     0
 .../financial/mapper/ClaimResponseMapper.java |     0
 .../financial/mapper/ContractMapper.java      |     0
 .../financial/mapper/PaymentNoticeMapper.java |     0
 .../mapper/PaymentRecDetailMapper.java        |    11 +
 .../mapper/PaymentRecStaticMapper.java        |    18 +
 .../mapper/PaymentReconciliationMapper.java   |     0
 .../model/PaymentRecDetailAccountResult.java  |   113 +
 .../financial/model/PaymentRecDetailDto.java  |     0
 .../financial/model/PaymentResult.java        |     0
 .../financial/model/PaymentedItemModel.java   |     0
 .../financial/model/PrePaymentResult.java     |     0
 .../model/PrePaymentResultModel.java          |     0
 .../service/IClaimResponseService.java        |     0
 .../financial/service/IClaimService.java      |     0
 .../financial/service/IContractService.java   |   100 +
 .../service/IPaymentNoticeService.java        |     0
 .../service/IPaymentRecDetailService.java     |    17 +-
 .../service/IPaymentRecStaticService.java     |    31 +
 .../IPaymentReconciliationService.java        |    59 +-
 .../impl/ClaimResponseServiceImpl.java        |     0
 .../service/impl/ClaimServiceImpl.java        |     0
 .../service/impl/ContractServiceImpl.java     |   177 +
 .../impl/PaymentNoticeServiceImpl.java        |     0
 .../impl/PaymentRecDetailServiceImpl.java     |    31 +-
 .../impl/PaymentRecStaticServiceImpl.java     |    93 +
 .../PaymentReconciliationServiceImpl.java     |   133 +-
 .../openhis/medication/domain/Medication.java |     0
 .../domain/MedicationDefinition.java          |     0
 .../medication/domain/MedicationDetail.java   |     6 +
 .../medication/domain/MedicationDispense.java |     3 +
 .../medication/domain/MedicationRequest.java  |    15 +
 .../mapper/MedicationDefinitionMapper.java    |     0
 .../mapper/MedicationDispenseMapper.java      |     0
 .../medication/mapper/MedicationMapper.java   |     0
 .../mapper/MedicationRequestMapper.java       |     0
 .../service/IMedicationDefinitionService.java |     0
 .../service/IMedicationDispenseService.java   |    23 +
 .../service/IMedicationRequestService.java    |    19 +-
 .../service/IMedicationService.java           |     0
 .../impl/MedicationDefinitionServiceImpl.java |     0
 .../impl/MedicationDispenseServiceImpl.java   |    52 +-
 .../impl/MedicationRequestServiceImpl.java    |    36 +-
 .../service/impl/MedicationServiceImpl.java   |     2 +-
 .../openhis/sys/domain/OperationRecord.java   |     0
 .../java/com/openhis/sys/domain/Option.java   |     0
 .../sys/mapper/OperationRecordMapper.java     |     0
 .../com/openhis/sys/mapper/OptionMapper.java  |     0
 .../sys/service/IOperationRecordService.java  |     0
 .../openhis/sys/service/IOptionService.java   |     0
 .../impl/OperationRecordServiceImpl.java      |     0
 .../sys/service/impl/OptionServiceImpl.java   |     0
 .../template/domain/ActivityDevice.java       |     0
 .../openhis/template/domain/OrderGroup.java   |     0
 .../template/mapper/ActivityDeviceMapper.java |     0
 .../template/mapper/OrderGroupMapper.java     |     0
 .../service/IActivityDeviceService.java       |     0
 .../template/service/OrderGroupService.java   |     0
 .../impl/ActivityDeviceServiceImpl.java       |     0
 .../service/impl/OrderGroupServiceImpl.java   |     0
 .../workflow/domain/ActivityDefinition.java   |     0
 .../workflow/domain/DeviceDispense.java       |     3 +
 .../workflow/domain/DeviceRequest.java        |     0
 .../domain/ElepMedicationRequest.java         |     7 +-
 .../workflow/domain/InventoryItem.java        |     0
 .../workflow/domain/ServiceRequest.java       |    13 +-
 .../workflow/domain/ServiceRequestDetail.java |     0
 .../workflow/domain/SupplyDelivery.java       |    10 +-
 .../workflow/domain/SupplyRequest.java        |    23 +
 .../workflow/domain/SupplyRequestAuto.java    |   179 +
 .../mapper/ActivityDefinitionMapper.java      |     0
 .../workflow/mapper/DeviceDispenseMapper.java |     0
 .../workflow/mapper/DeviceRequestMapper.java  |     0
 .../mapper/ElepMedicationRequestMapper.java   |     0
 .../workflow/mapper/InventoryItemMapper.java  |     0
 .../mapper/ServiceRequestDetailMapper.java    |     0
 .../workflow/mapper/ServiceRequestMapper.java |     0
 .../workflow/mapper/SupplyDeliveryMapper.java |     0
 .../mapper/SupplyRequestAutoMapper.java       |    18 +
 .../workflow/mapper/SupplyRequestMapper.java  |     0
 .../service/IActivityDefinitionService.java   |     0
 .../service/IDeviceDispenseService.java       |    17 +
 .../service/IDeviceRequestService.java        |     0
 .../IElepMedicationRequestService.java        |     2 +-
 .../service/IInventoryItemService.java        |     7 +-
 .../service/IServiceRequestDetailService.java |     0
 .../service/IServiceRequestService.java       |    34 +-
 .../service/ISupplyDeliveryService.java       |    17 +
 .../service/ISupplyRequestAutoService.java    |    18 +
 .../service/ISupplyRequestService.java        |    64 +-
 .../impl/ActivityDefinitionServiceImpl.java   |     0
 .../impl/DeviceDispenseServiceImpl.java       |    48 +-
 .../impl/DeviceRequestServiceImpl.java        |     0
 .../ElepMedicationRequestServiceImpl.java     |    26 +-
 .../impl/InventoryItemServiceImpl.java        |    21 +-
 .../impl/ServiceRequestDetailServiceImpl.java |     0
 .../impl/ServiceRequestServiceImpl.java       |    51 +-
 .../impl/SupplyDeliveryServiceImpl.java       |    39 +-
 .../impl/SupplyRequestAutoServiceImpl.java    |    38 +
 .../impl/SupplyRequestServiceImpl.java        |   101 +-
 .../openhis/yb/domain/ClinicPreSettle.java    |     0
 .../java/com/openhis/yb/domain/ClinicReg.java |     0
 .../com/openhis/yb/domain/ClinicSettle.java   |     0
 .../com/openhis/yb/domain/ClinicUnReg.java    |     0
 .../com/openhis/yb/domain/ClinicUnSettle.java |     0
 .../yb/domain/DirectoryCheckRecord.java       |     0
 .../main/java/com/openhis/yb/domain/File.java |     0
 .../yb/domain/FinancialApplyRecord.java       |    17 +-
 .../yb/domain/FinancialReconcileRecord.java   |     0
 .../com/openhis/yb/domain/InfoPerson.java     |     0
 .../openhis/yb/domain/InpatientDischarge.java |   180 +
 .../openhis/yb/domain/InpatientFeeDetail.java |   227 +
 .../openhis/yb/domain/InpatientPreSettle.java |   338 +
 .../com/openhis/yb/domain/InpatientReg.java   |   262 +
 .../domain/InpatientRegInfoUpdateRecorde.java |   241 +
 .../openhis/yb/domain/InpatientSettle.java    |   319 +
 .../yb/domain/InpatientUnDischarge.java       |    53 +
 .../com/openhis/yb/domain/InpatientUnReg.java |    53 +
 .../openhis/yb/domain/InpatientUnSettle.java  |   258 +
 .../yb/domain/InpatientcancelFeeDetail.java   |    66 +
 .../yb/domain/InventoryChangeRecord.java      |     0
 .../yb/domain/InventoryCheckRecord.java       |     0
 .../openhis/yb/domain/InventoryDelRecord.java |     0
 .../yb/domain/InventoryPurchaseRecord.java    |     0
 .../domain/InventoryPurchaseReturnRecord.java |     0
 .../yb/domain/InventorySaleRecord.java        |     0
 .../yb/domain/InventorySaleReturnRecord.java  |     0
 .../main/java/com/openhis/yb/domain/Sign.java |     0
 .../java/com/openhis/yb/dto/BaseInfo.java     |     3 +
 .../java/com/openhis/yb/dto/BaseParam.java    |     0
 .../com/openhis/yb/dto/CancelPaymentDto.java  |     0
 .../openhis/yb/dto/CancelRegPaymentDto.java   |     0
 .../openhis/yb/dto/Catalogue1312Output.java   |     0
 .../yb/dto/Catalogue1312QueryParam.java       |     0
 .../openhis/yb/dto/ChargeItemDetailVO.java    |     0
 .../com/openhis/yb/dto/ChargeItemDto.java     |     0
 .../openhis/yb/dto/ChargeItemGroupDto.java    |     0
 .../openhis/yb/dto/Clearing3204AParam.java    |     0
 .../openhis/yb/dto/Clearing3205AParma.java    |     0
 .../openhis/yb/dto/Clearing3205AResult.java   |     0
 .../openhis/yb/dto/Clearing3205AWebParma.java |     0
 .../openhis/yb/dto/Clearing3206AParam.java    |     0
 .../openhis/yb/dto/Clearing3206AResult.java   |     0
 .../yb/dto/Clinic2203DiseInfoParam.java       |     0
 .../com/openhis/yb/dto/Clinic2203Medical.java |     0
 .../yb/dto/Clinic2203MedicalParam.java        |     0
 .../yb/dto/Clinic2204FeeDetailParam.java      |     0
 .../yb/dto/Clinic2204FeeDetailResult.java     |     0
 .../openhis/yb/dto/Clinic2204OrderParam.java  |     0
 .../openhis/yb/dto/Clinic2204OrderResult.java |     0
 .../openhis/yb/dto/Clinic2205OrderParam.java  |     0
 .../yb/dto/Clinic2206FundPaymentResult.java   |    14 +-
 .../openhis/yb/dto/Clinic2206OrderOutput.java |    34 +-
 .../openhis/yb/dto/Clinic2206OrderParam.java  |     0
 .../openhis/yb/dto/Clinic2206OrderResult.java |     0
 .../yb/dto/Clinic2206OrderResultDto.java      |     0
 .../yb/dto/Clinic2206SetldetaiResult.java     |     0
 .../openhis/yb/dto/Clinic2207OrderResult.java |     0
 .../yb/dto/Clinic2207OrderResultDto.java      |     0
 .../yb/dto/Clinic2207OrderResultInfoDto.java  |     0
 .../yb/dto/Clinic2208UnSetlInfoOutput.java    |     0
 .../yb/dto/Clinic2208UnSetlInfoParam.java     |     0
 .../yb/dto/Clinic2208UnSetlInfoResult.java    |     0
 .../java/com/openhis/yb/dto/ClinicReg.java    |     0
 .../openhis/yb/dto/ClinicReg2201Output.java   |     0
 .../yb/dto/DispenseInventory3505Dto.java      |     0
 .../yb/dto/EleInvoiceChargeDetailDto.java     |     0
 .../yb/dto/EleInvoiceListDetailDto.java       |     0
 .../yb/dto/EleInvoicePatientInfoDto.java      |     0
 .../yb/dto/EleInvoicePaymentInfoDto.java      |     0
 .../openhis/yb/dto/EleInvoiceResultDto.java   |     0
 .../com/openhis/yb/dto/File9101Param.java     |    14 +
 .../java/com/openhis/yb/dto/FileDownload.java |     0
 .../java/com/openhis/yb/dto/FileResult.java   |     0
 .../openhis/yb/dto/Financial13203Param.java   |     0
 .../openhis/yb/dto/Financial13203Result.java  |     0
 .../yb/dto/Financial13203WebParam.java        |     0
 .../openhis/yb/dto/Financial3201Output.java   |     0
 .../openhis/yb/dto/Financial3201Param.java    |     0
 .../yb/dto/Financial3202FileParam.java        |     9 +-
 .../yb/dto/Financial3202FileResult.java       |     0
 .../yb/dto/Financial3202OtherParam.java       |     0
 .../openhis/yb/dto/Financial3203AParam.java   |     0
 .../yb/dto/Financial3203AWebParam.java        |     0
 .../com/openhis/yb/dto/Financial3203Dto.java  |     0
 .../openhis/yb/dto/Financial3203Param.java    |     0
 .../openhis/yb/dto/Financial3203WebParam.java |     0
 .../openhis/yb/dto/Financial3204Param.java    |     0
 .../dto/FinancialClearing3203AWebParam.java   |    19 +
 .../yb/dto/FinancialSettlement3202Param.java  |     0
 .../yb/dto/FinancialSettlement3202Result.java |     0
 .../yb/dto/FinancialSettlement3209AParam.java |     0
 .../dto/FinancialSettlement3209AResult.java   |     0
 .../yb/dto/FsiConsultation3101Param.java      |     0
 .../openhis/yb/dto/FsiDiagnose3101Param.java  |     0
 .../openhis/yb/dto/FsiEncounter3101Param.java |     0
 .../yb/dto/FsiFeedback3103DataParam.java      |     0
 .../yb/dto/FsiFeedback3103WarnsParam.java     |     0
 .../openhis/yb/dto/FsiOperation3101Param.java |     0
 .../com/openhis/yb/dto/FsiOrder3101Param.java |     0
 .../openhis/yb/dto/FsiPatient3101Param.java   |     0
 .../yb/dto/FsiViolation3101Result.java        |     0
 .../yb/dto/FsiViolationDetail3101Result.java  |     0
 .../yb/dto/HospAdm2401DiseInfoParam.java      |     0
 .../yb/dto/HospAdm2401MdtInfoParam.java       |     0
 .../yb/dto/HospAdm2402DiseInfoParam.java      |     0
 .../yb/dto/HospAdm2402DscgInfoParam.java      |     0
 .../yb/dto/HospAdm2403AdmInfoParam.java       |     0
 .../yb/dto/HospAdm2403DiseInfoParam.java      |     0
 .../yb/dto/HospAdm2404AdmCnlParam.java        |     0
 .../yb/dto/HospAdm2406SmAttrUpParam.java      |     0
 .../yb/dto/HospAdm2407SmAttrSelectParam.java  |     0
 .../yb/dto/HospAdm2407SmAttrSelectResult.java |     0
 .../openhis/yb/dto/HospDept3401AParam.java    |     0
 .../com/openhis/yb/dto/HospDept3401Param.java |     0
 .../com/openhis/yb/dto/HospDept3402Param.java |     0
 .../com/openhis/yb/dto/HospDept3403Param.java |     0
 .../yb/dto/HospTrf2501ARefmedinParam.java     |     0
 .../yb/dto/HospTrf2501RefmedinParam.java      |     0
 .../openhis/yb/dto/HospTrfCxl2502Param.java   |     0
 .../com/openhis/yb/dto/Info1101Output.java    |     0
 .../openhis/yb/dto/Info1101PerinfoResult.java |     0
 .../openhis/yb/dto/Info1101ReadcardParam.java |     0
 .../com/openhis/yb/dto/Info5301Param.java     |     0
 .../dto/Info5301SpecialConditionResult.java   |     0
 .../openhis/yb/dto/InvoiceBaseInfoDto.java    |     0
 .../openhis/yb/dto/MatAllowReg25007Param.java |     0
 .../yb/dto/MatAllowReg25007Result.java        |     0
 .../yb/dto/MatAllowRegSel25008Param.java      |     0
 .../com/openhis/yb/dto/Medical3503Param.java  |     0
 .../com/openhis/yb/dto/Medical3505Param.java  |     0
 .../com/openhis/yb/dto/Medical3505Result.java |     0
 .../com/openhis/yb/dto/Medical3506Param.java  |     0
 .../com/openhis/yb/dto/Medical3507Param.java  |     0
 .../com/openhis/yb/dto/Medical3508Param.java  |     0
 .../com/openhis/yb/dto/Medical3508Result.java |     0
 .../yb/dto/MedicalDirectory3301ListParam.java |     0
 .../yb/dto/MedicalDirectory3301Param.java     |     0
 .../yb/dto/MedicalDirectory3302Param.java     |     0
 .../yb/dto/MedicalInventory3501Param.java     |     0
 .../yb/dto/MedicalInventory3502Param.java     |     0
 .../yb/dto/MedicalPurchase3504Param.java      |     0
 .../com/openhis/yb/dto/MedicalTraceNoDto.java |     0
 .../com/openhis/yb/dto/PatientInfoDto.java    |     2 +-
 .../yb/dto/PaymentDecDetailUniAccountDto.java |     0
 .../com/openhis/yb/dto/PaymentDetailDto.java  |    12 +-
 .../java/com/openhis/yb}/dto/PaymentDto.java  |    13 +-
 .../openhis/yb/dto/PaymentInpatientDto.java   |    45 +-
 .../com/openhis/yb/dto/PaymentSettleDto.java  |     0
 .../dto/PersBirthApprovalCnl25004Param.java   |     0
 .../dto/PersBirthApprovalSel25005Param.java   |     0
 .../yb/dto/PersBirthRecord25003Param.java     |     0
 .../openhis/yb/dto/PersChrDis2503Param.java   |     0
 .../yb/dto/PersChrDisCxl2504Param.java        |     0
 .../openhis/yb/dto/PersDesigPt2505Param.java  |     0
 .../yb/dto/PersDesigPtCxl2506Param.java       |     0
 .../yb/dto/PersMedApprovalCnl25006Param.java  |     0
 .../yb/dto/PersMedRecord25001Param.java       |     0
 .../yb/dto/PersMedSelect25002Param.java       |     0
 .../yb/dto/PersMedSelect25002Result.java      |     0
 .../openhis/yb/dto/PersUnintInj2507Param.java |     0
 .../com/openhis/yb/dto/PrePaymentDto.java     |    16 +-
 .../main/java/com/openhis/yb/dto/Result.java  |     0
 .../java/com/openhis/yb/dto/ResultBody.java   |     0
 .../yb/dto/Settlement3201DetailDto.java       |     0
 .../com/openhis/yb/dto/Settlement3201Dto.java |     0
 .../yb/dto/Settlement3201WebParam.java        |     0
 .../com/openhis/yb/dto/Settlement3202Dto.java |     0
 .../yb/dto/Settlement3202WebParam.java        |     0
 .../yb/dto/Settlement3209AWebParam.java       |     0
 .../main/java/com/openhis/yb/dto/Sign.java    |     0
 .../com/openhis/yb/dto/Sign1101Param.java     |     0
 .../com/openhis/yb/dto/Sign9001Result.java    |     0
 .../yb/dto/SupplyItemDetail3503Dto.java       |     0
 .../yb/dto/VeriPrescriptionDetailInfoDto.java |     0
 .../yb/dto/VeriPrescriptionInfoDto.java       |     0
 .../openhis/yb/dto/VeriPrescriptionParam.java |     0
 .../openhis/yb/dto/Yb2301InputFeeDetail.java  |   194 +
 .../yb/dto/Yb2301InputFeeDetailModel.java     |    29 +
 .../openhis/yb/dto/Yb2301OutputResult.java    |   124 +
 .../openhis/yb/dto/Yb2302InputInpatient.java  |    35 +
 .../openhis/yb/dto/Yb2303InputInpatient.java  |   123 +
 .../openhis/yb/dto/Yb2303OutputSetInfo.java   |   292 +
 .../openhis/yb/dto/Yb2304InputExpContent.java |    31 +
 .../openhis/yb/dto/Yb2304InputInpatient.java  |   115 +
 .../openhis/yb/dto/Yb2304OutputSetlInfo.java  |   279 +
 .../openhis/yb/dto/Yb2305InputInpatient.java  |    35 +
 .../openhis/yb/dto/Yb2305OutputSetlInfo.java  |   224 +
 .../yb/dto/Yb2401InputInpatientDiseInfo.java  |    82 +
 .../yb/dto/Yb2401InputInpatientMdtrtInfo.java |   239 +
 .../dto/Yb2401InputInpatientTrumContent.java  |    38 +
 .../yb/dto/Yb2402InputInpatientDiseInfo.java  |    88 +
 .../yb/dto/Yb2402InputInpatientDscgInfo.java  |   164 +
 .../com/openhis/yb/dto/Yb2402InputParam.java  |    26 +
 .../openhis/yb/dto/Yb2403InputAdmInfo.java    |   226 +
 .../openhis/yb/dto/Yb2403InputDiseInfo.java   |    92 +
 .../yb/dto/Yb2403InputMdtrtGrpContent.java    |    20 +
 .../com/openhis/yb/dto/Yb2403InputParam.java  |    30 +
 .../yb/dto/Yb2403InputTrumContent.java        |    30 +
 .../openhis/yb/dto/Yb2404InputInpatient.java  |    36 +
 .../openhis/yb/dto/Yb2405InputInpatient.java  |    39 +
 .../Yb3101AdapterEncounterDiagnoseInfo.java   |    52 +
 .../Yb3101AdapterEncounterPatientInfo.java    |   128 +
 .../yb/dto/Yb3101AdapterOrderInfo.java        |   118 +
 .../com/openhis/yb/dto/Yb3101InputData.java   |    58 +
 .../yb/dto/Yb3101InputFsiDiagnoseDto.java     |    81 +
 .../yb/dto/Yb3101InputFsiEncounterDto.java    |   283 +
 .../yb/dto/Yb3101InputFsiOperationDto.java    |    94 +
 .../yb/dto/Yb3101InputFsiOrderDto.java        |   281 +
 .../openhis/yb/dto/Yb3101InputPatientDto.java |    88 +
 .../dto/Yb3101OutputJudgeResultDetailDto.java |    69 +
 .../openhis/yb/dto/Yb3101OutputResult.java    |   124 +
 .../com/openhis/yb/dto/Yb3103InputData.java   |    39 +
 .../com/openhis/yb/dto/Yb3103InputWarn.java   |    42 +
 .../yb/dto/Yb4101AAdapterSettleInfo.java      |    67 +
 .../openhis/yb/dto/Yb4101AInputBldinfo.java   |    40 +
 .../openhis/yb/dto/Yb4101AInputDiseinfo.java  |    61 +
 .../openhis/yb/dto/Yb4101AInputIcuinfo.java   |    54 +
 .../openhis/yb/dto/Yb4101AInputOprninfo.java  |    98 +
 .../yb/dto/Yb4101AInputOpspdiseinfo.java      |    53 +
 .../openhis/yb/dto/Yb4101AInputSetlinfo.java  |   446 +
 .../com/openhis/yb/dto/Yb4101AOutputData.java |    29 +
 .../main/java/com/openhis/yb/dto/extData.java |     0
 .../yb/mapper/ClinicPreSettleMapper.java      |     0
 .../openhis/yb/mapper/ClinicSettleMapper.java |     0
 .../openhis/yb/mapper/ClinicUnRegMapper.java  |     0
 .../yb/mapper/ClinicUnSettleMapper.java       |     0
 .../yb/mapper/DirectoryCheckRecordMapper.java |     0
 .../yb/mapper/FinancialApplyRecordMapper.java |     0
 .../FinancialReconcileRecordMapper.java       |     0
 .../yb/mapper/InpatientFeeDetailMapper.java   |    10 +
 .../openhis/yb/mapper/InpatientRegMapper.java |    19 +
 .../yb/mapper/InpatientSettleMapper.java      |    10 +
 .../mapper/InventoryChangeRecordMapper.java   |     0
 .../yb/mapper/InventoryCheckRecordMapper.java |     0
 .../yb/mapper/InventoryDelRecordMapper.java   |     0
 .../mapper/InventoryPurchaseRecordMapper.java |     0
 .../InventoryPurchaseReturnRecordMapper.java  |     0
 .../yb/mapper/InventorySaleRecordMapper.java  |     0
 .../InventorySaleReturnRecordMapper.java      |     0
 .../yb/mapper/MedicalInsuranceMapper.java     |     2 +-
 .../com/openhis/yb/mapper/PerinfoMapper.java  |     0
 .../java/com/openhis/yb/mapper/RegMapper.java |     0
 .../com/openhis/yb/mapper/SignMapper.java     |     0
 .../yb/model/CancelRegPaymentModel.java       |     2 +
 .../yb/model/Clinic2207OrderModel.java        |     0
 .../yb/model/Clinic2207OrderParam.java        |     0
 .../yb/model/OutpatientRegistrationModel.java |     2 +
 .../yb/service/IClinicPreSettleService.java   |     0
 .../yb/service/IClinicSettleService.java      |     0
 .../yb/service/IClinicUnRegService.java       |     0
 .../yb/service/IClinicUnSettleService.java    |     9 +
 .../service/IDirectoryCheckRecordService.java |     0
 .../service/IFinancialApplyRecordService.java |     0
 .../IFinancialReconcileRecordService.java     |     0
 .../service/IInpatientFeeDetailService.java   |    11 +-
 .../yb/service/IInpatientRegService.java      |    25 +
 .../yb/service/IInpatientSettleService.java   |    14 +
 .../IInventoryChangeRecordService.java        |     0
 .../service/IInventoryCheckRecordService.java |     0
 .../service/IInventoryDelRecordService.java   |     0
 .../IInventoryPurchaseRecordService.java      |     0
 ...IInventoryPurchaseReturnRecordService.java |     0
 .../service/IInventorySaleRecordService.java  |     0
 .../IInventorySaleReturnRecordService.java    |     0
 .../openhis/yb/service/IPerinfoService.java   |    44 +
 .../com/openhis/yb/service/IRegService.java   |     0
 .../com/openhis/yb/service/ISignService.java  |     0
 .../java/com/openhis/yb/service/YbDao.java    |  1654 +-
 .../com/openhis/yb/service/YbHttpUtils.java   |   516 +-
 .../com/openhis/yb/service/YbManager.java     |   368 +-
 .../impl/ClinicPreSettleServiceImpl.java      |     0
 .../service/impl/ClinicSettleServiceImpl.java |     0
 .../service/impl/ClinicUnRegServiceImpl.java  |     0
 .../impl/ClinicUnSettleServiceImpl.java       |    24 +-
 .../impl/DirectoryCheckRecordServiceImpl.java |     0
 .../impl/FinancialApplyRecordServiceImpl.java |     0
 .../FinancialReconcileRecordServiceImpl.java  |     0
 .../impl/InpatientFeeDetailServiceImpl.java   |    11 +
 .../service/impl/InpatientRegServiceImpl.java |    29 +
 .../impl/InpatientSettleServiceImpl.java      |    18 +
 .../InventoryChangeRecordServiceImpl.java     |     0
 .../impl/InventoryCheckRecordServiceImpl.java |     0
 .../impl/InventoryDelRecordServiceImpl.java   |     0
 .../InventoryPurchaseRecordServiceImpl.java   |     0
 ...entoryPurchaseReturnRecordServiceImpl.java |     0
 .../impl/InventorySaleRecordServiceImpl.java  |     0
 .../InventorySaleReturnRecordServiceImpl.java |     0
 .../yb/service/impl/PerinfoServiceImpl.java   |    39 +
 .../yb/service/impl/RegServiceImpl.java       |     0
 .../yb/service/impl/SignServiceImpl.java      |     0
 .../com/openhis/yb/util/CommonConstant.java   |     0
 .../openhis/yb/util/YbParamBuilderUtil.java   |   178 +-
 .../ybcatalog/domain/CatalogDrugInfo.java     |     0
 .../domain/CatalogDrugInfoUsual.java          |   319 +
 .../domain/CatalogMedicalConsumables.java     |     0
 .../domain/CatalogMedicalHerbInfo.java        |     0
 .../domain/CatalogMedicalService.java         |     0
 .../domain/CatalogSpecialDisease.java         |     0
 .../CatalogSpecialInsuranceDisease.java       |     0
 .../CatalogSurgeryStandardDirectory.java      |     0
 .../domain/CatalogWesternDisease.java         |     0
 .../domain/CatalogZyDiseaseDiagnosis.java     |     0
 .../ybcatalog/domain/CatalogZySyndrome.java   |     0
 .../mapper/CatalogDrugInfoMapper.java         |     0
 .../mapper/CatalogDrugInfoUsualMapper.java    |    17 +
 .../CatalogMedicalConsumablesMapper.java      |     0
 .../mapper/CatalogMedicalHerbInfoMapper.java  |     0
 .../mapper/CatalogMedicalServiceMapper.java   |     0
 .../mapper/CatalogSpecialDiseaseMapper.java   |     0
 ...CatalogSurgeryStandardDirectoryMapper.java |     0
 .../mapper/CatalogWesternDiseaseMapper.java   |     0
 .../CatalogZyDiseaseDiagnosisMapper.java      |     0
 .../mapper/CatalogZySyndromeMapper.java       |     0
 .../service/ICatalogDrugInfoService.java      |    16 +-
 .../service/ICatalogDrugInfoUsualService.java |    23 +
 .../ICatalogMedicalConsumablesService.java    |     0
 .../ICatalogMedicalHerbInfoService.java       |     0
 .../ICatalogMedicalServiceService.java        |     0
 .../ICatalogSpecialDiseaseService.java        |     0
 ...atalogSurgeryStandardDirectoryService.java |     0
 .../ICatalogWesternDiseaseService.java        |     0
 .../ICatalogZyDiseaseDiagnosisService.java    |     0
 .../service/ICatalogZySyndromeService.java    |     0
 .../impl/CatalogDrugInfoServiceImpl.java      |    20 +-
 .../impl/CatalogDrugInfoUsualServiceImpl.java |    30 +
 .../CatalogMedicalConsumablesServiceImpl.java |     0
 .../CatalogMedicalHerbInfoServiceImpl.java    |     0
 .../CatalogMedicalServiceServiceImpl.java     |     0
 .../CatalogSpecialDiseaseServiceImpl.java     |     0
 ...ogSurgeryStandardDirectoryServiceImpl.java |     0
 .../CatalogWesternDiseaseServiceImpl.java     |     0
 .../CatalogZyDiseaseDiagnosisServiceImpl.java |     0
 .../impl/CatalogZySyndromeServiceImpl.java    |     0
 .../ybelep/domain/ElepMedresultDetail.java    |     0
 .../ybelep/domain/ElepMedresultInfo.java      |     0
 .../ybelep/domain/ElepMedresultInput.java     |     0
 .../ybelep/domain/ElepQuerDiagnosisInfo.java  |     0
 .../domain/ElepQuerPrescriptionDetail.java    |     0
 .../domain/ElepQuerPrescriptionInfo.java      |     0
 .../domain/ElepQuerPrescriptionInput.java     |     0
 .../ybelep/domain/ElepQuerVisitInfo.java      |     0
 .../ybelep/domain/ElepRevokeInput.java        |     0
 .../ybelep/domain/ElepRevokeOutput.java       |     0
 .../ybelep/domain/ElepSignatureInput.java     |     0
 .../ybelep/domain/ElepSignatureOutput.java    |     0
 .../ybelep/domain/ElepUploadInput.java        |     0
 .../ybelep/domain/ElepUploadOutput.java       |     0
 .../ybelep/domain/ElepVeriDiagnosisInfo.java  |     0
 .../domain/ElepVeriPrescriptionDetail.java    |     0
 .../domain/ElepVeriPrescriptionInfo.java      |     0
 .../domain/ElepVeriPrescriptionOutput.java    |     0
 .../ybelep/domain/ElepVeriVisitInfo.java      |     0
 .../ybelep/domain/InformationInquiry.java     |     0
 .../domain/MedicationResultInquiry.java       |     0
 .../ybelep/domain/PreCheckPrescription.java   |     0
 .../ybelep/domain/QueryPrescription.java      |     0
 .../mapper/ElepMedresultDetailMapper.java     |     0
 .../mapper/ElepMedresultInfoMapper.java       |     0
 .../mapper/ElepMedresultInputMapper.java      |     0
 .../mapper/ElepQuerDiagnosisInfoMapper.java   |     0
 .../ElepQuerPrescriptionDetailMapper.java     |     0
 .../ElepQuerPrescriptionInfoMapper.java       |     0
 .../ElepQuerPrescriptionInputMapper.java      |     0
 .../mapper/ElepQuerVisitInfoMapper.java       |     0
 .../ybelep/mapper/ElepRevokeInputMapper.java  |     0
 .../ybelep/mapper/ElepRevokeOutputMapper.java |     0
 .../mapper/ElepSignatureInputMapper.java      |     0
 .../mapper/ElepSignatureOutputMapper.java     |     0
 .../ybelep/mapper/ElepUploadInputMapper.java  |     0
 .../ybelep/mapper/ElepUploadOutputMapper.java |     0
 .../mapper/ElepVeriDiagnosisInfoMapper.java   |     0
 .../ElepVeriPrescriptionDetailMapper.java     |     0
 .../ElepVeriPrescriptionInfoMapper.java       |     0
 .../ElepVeriPrescriptionOutputMapper.java     |     0
 .../mapper/ElepVeriVisitInfoMapper.java       |     0
 .../service/IElepMedresultDetailService.java  |     0
 .../service/IElepMedresultInfoService.java    |     0
 .../service/IElepMedresultInputService.java   |     0
 .../IElepQuerDiagnosisInfoService.java        |     0
 .../IElepQuerPrescriptionDetailService.java   |     0
 .../IElepQuerPrescriptionInfoService.java     |     0
 .../IElepQuerPrescriptionInputService.java    |     0
 .../service/IElepQuerVisitInfoService.java    |     0
 .../service/IElepRevokeInputService.java      |     0
 .../service/IElepRevokeOutputService.java     |     0
 .../service/IElepSignatureInputService.java   |     0
 .../service/IElepSignatureOutputService.java  |     0
 .../service/IElepUploadInputService.java      |     0
 .../service/IElepUploadOutputService.java     |     0
 .../IElepVeriDiagnosisInfoService.java        |     0
 .../IElepVeriPrescriptionDetailService.java   |     0
 .../IElepVeriPrescriptionInfoService.java     |     0
 .../IElepVeriPrescriptionOutputService.java   |     0
 .../service/IElepVeriVisitInfoService.java    |     0
 .../impl/ElepMedresultDetailServiceImpl.java  |     0
 .../impl/ElepMedresultInfoServiceImpl.java    |     0
 .../impl/ElepMedresultInputServiceImpl.java   |     0
 .../ElepQuerDiagnosisInfoServiceImpl.java     |     0
 ...ElepQuerPrescriptionDetailServiceImpl.java |     0
 .../ElepQuerPrescriptionInfoServiceImpl.java  |     0
 .../ElepQuerPrescriptionInputServiceImpl.java |     0
 .../impl/ElepQuerVisitInfoServiceImpl.java    |     0
 .../impl/ElepRevokeInputServiceImpl.java      |     0
 .../impl/ElepRevokeOutputServiceImpl.java     |     0
 .../impl/ElepSignatureInputServiceImpl.java   |     0
 .../impl/ElepSignatureOutputServiceImpl.java  |     0
 .../impl/ElepUploadInputServiceImpl.java      |     0
 .../impl/ElepUploadOutputServiceImpl.java     |     0
 .../ElepVeriDiagnosisInfoServiceImpl.java     |     0
 ...ElepVeriPrescriptionDetailServiceImpl.java |     0
 .../ElepVeriPrescriptionInfoServiceImpl.java  |     0
 ...ElepVeriPrescriptionOutputServiceImpl.java |     0
 .../impl/ElepVeriVisitInfoServiceImpl.java    |     0
 .../mapper/administration/AccountMapper.xml   |     0
 .../mapper/administration/BizUserMapper.xml   |     0
 .../administration/BizUserRoleMapper.xml      |     0
 .../administration/ChargeItemDefAppMapper.xml |     0
 .../ChargeItemDefinitionMapper.xml            |     0
 .../administration/ChargeItemMapper.xml       |   175 +
 .../administration/DeviceDefinitionMapper.xml |     0
 .../mapper/administration/DeviceMapper.xml    |     0
 .../EncounterDiagnosisMapper.xml              |     0
 .../EncounterLocationMapper.xml               |     0
 .../mapper/administration/EncounterMapper.xml |    52 +
 .../EncounterParticipantMapper.xml            |     0
 .../administration/EncounterReasonMapper.xml  |     0
 .../mapper/administration/FrequencyMapper.xml |    42 +
 .../HealthcareServiceMapper.xml               |     0
 .../mapper/administration/InvoiceMapper.xml   |     0
 .../mapper/administration/LocationMapper.xml  |     0
 .../administration/OrgContrastMapper.xml      |     0
 .../OrganizationLocationMapper.xml            |     0
 .../administration/OrganizationMapper.xml     |     0
 .../PatientIdentifierMapper.xml               |     0
 .../mapper/administration/PatientMapper.xml   |     0
 .../administration/PractitionerMapper.xml     |     0
 .../administration/PractitionerRoleMapper.xml |     0
 .../mapper/administration/SupplierMapper.xml  |     0
 .../administration/TraceNoManageMapper.xml    |    37 +
 .../clinical/AllergyIntoleranceMapper.xml     |     0
 .../clinical/ConditionDefinitionMapper.xml    |     0
 .../mapper/clinical/ConditionMapper.xml       |     0
 .../clinical/DiagnosisBelongBindingMapper.xml |     0
 .../mapper/clinical/ProcedureMapper.xml       |     0
 .../clinical/ProcedurePerformerMapper.xml     |     0
 .../clinical/ReservationRecordMapper.xml      |     2 +-
 .../mapper/document/DocDefinitionMapper.xml   |     2 +-
 .../DocDefinitionOrganizationMapper.xml       |     7 +
 .../mapper/document/DocRecordMapper.xml       |     2 +-
 .../DocStatisticsDefinitionMapper.xml         |     7 +
 .../DocStatisticsDefinitionOptionMapper.xml   |     7 +
 .../mapper/document/DocStatisticsMapper.xml   |     7 +
 .../mapper/document/DocTemplateMapper.xml     |     7 +
 .../mapper/document/EmrDetailMapper.xml       |     0
 .../mapper/document/EmrDictMapper.xml         |     0
 .../resources/mapper/document/EmrMapper.xml   |     0
 .../mapper/document/EmrTemplateMapper.xml     |     0
 .../mapper/document/OrderProcessMapper.xml    |     7 +
 .../mapper/document/RequestFormMapper.xml     |     7 +
 .../mapper/financial/ClaimMapper.xml          |     0
 .../mapper/financial/ClaimResponseMapper.xml  |     0
 .../mapper/financial/ContractMapper.xml       |     0
 .../mapper/financial/PaymentNoticeMapper.xml  |     0
 .../financial/PaymentRecDetailMapper.xml      |    53 +
 .../financial/PaymentReconciliationMapper.xml |     0
 .../medication/MedicationDefinitionMapper.xml |     0
 .../medication/MedicationDispenseMapper.xml   |     0
 .../mapper/medication/MedicationMapper.xml    |     0
 .../medication/MedicationRequestMapper.xml    |     0
 .../mapper/sys/OperationRecordMapper.xml      |     0
 .../resources/mapper/sys/OptionMapper.xml     |     0
 .../mapper/template/ActivityDeviceMapper.xml  |     0
 .../mapper/template/OrderGroupMapper.xml      |     0
 .../workflow/ActivityDefinitionMapper.xml     |     0
 .../mapper/workflow/DeviceDispenseMapper.xml  |     0
 .../mapper/workflow/DeviceRequestMapper.xml   |     0
 .../workflow/ElepMedicationRequestMapper.xml  |     0
 .../mapper/workflow/InventoryItemMapper.xml   |     0
 .../workflow/ServiceRequestDetailMapper.xml   |     0
 .../mapper/workflow/ServiceRequestMapper.xml  |     0
 .../mapper/workflow/SupplyDeliveryMapper.xml  |     0
 .../workflow/SupplyRequestAutoMapper.xml      |     7 +
 .../mapper/workflow/SupplyRequestMapper.xml   |     0
 .../resources/mapper/yb/ClincSettleMapper.xml |     0
 .../mapper/yb/ClincUnSettleMapper.xml         |     0
 .../mapper/yb/ClinicPreSettleMapper.xml       |     0
 .../resources/mapper/yb/ClinicUnRegMapper.xml |     0
 .../mapper/yb/DirectoryCheckRecordMapper.xml  |     0
 .../mapper/yb/FinancialApplyRecordMapper.xml  |     0
 .../yb/FinancialReconcileRecordMapper.xml     |     0
 .../mapper/yb/InventoryChangeRecordMapper.xml |     0
 .../mapper/yb/InventoryCheckRecordMapper.xml  |     0
 .../mapper/yb/InventoryDelRecordMapper.xml    |     0
 .../yb/InventoryPurchaseRecordMapper.xml      |     0
 .../InventoryPurchaseReturnRecordMapper.xml   |     0
 .../mapper/yb/InventorySaleRecordMapper.xml   |     0
 .../yb/InventorySaleReturnRecordMapper.xml    |     0
 .../mapper/yb/MedicalInsuranceMapper.xml      |   147 +-
 .../resources/mapper/yb/PerinfoMapper.xml     |     0
 .../main/resources/mapper/yb/RegMapper.xml    |     0
 .../main/resources/mapper/yb/SignMapper.xml   |     0
 .../ybcatalog/CatalogDrugInfoMapper.xml       |     0
 .../ybcatalog/CatalogDrugInfoUsualMapper.xml  |     7 +
 .../CatalogMedicalConsumablesMapper.xml       |     0
 .../CatalogMedicalHerbInfoMapper.xml          |     0
 .../ybcatalog/CatalogMedicalServiceMapper.xml |     0
 .../ybcatalog/CatalogSpecialDiseaseMapper.xml |     0
 .../CatalogSurgeryStandardDirectoryMapper.xml |     0
 .../ybcatalog/CatalogWesternDiseaseMapper.xml |     0
 .../CatalogZyDiseaseDiagnosisMapper.xml       |     0
 .../ybcatalog/CatalogZySyndromeMapper.xml     |     0
 .../ybelep/ElepMedresultDetailMapper.xml      |     0
 .../mapper/ybelep/ElepMedresultInfoMapper.xml |     0
 .../ybelep/ElepMedresultInputMapper.xml       |     0
 .../ybelep/ElepQuerDiagnosisInfoMapper.xml    |     0
 .../ElepQuerPrescriptionDetailMapper.xml      |     0
 .../ybelep/ElepQuerPrescriptionInfoMapper.xml |     0
 .../ElepQuerPrescriptionInputMapper.xml       |     0
 .../mapper/ybelep/ElepQuerVisitInfoMapper.xml |     0
 .../mapper/ybelep/ElepRevokeInputMapper.xml   |     0
 .../mapper/ybelep/ElepRevokeOutputMapper.xml  |     0
 .../ybelep/ElepSignatureInputMapper.xml       |     0
 .../ybelep/ElepSignatureOutputMapper.xml      |     0
 .../mapper/ybelep/ElepUploadInputMapper.xml   |     0
 .../mapper/ybelep/ElepUploadOutputMapper.xml  |     0
 .../ybelep/ElepVeriDiagnosisInfoMapper.xml    |     0
 .../ElepVeriPrescriptionDetailMapper.xml      |     0
 .../ybelep/ElepVeriPrescriptionInfoMapper.xml |     0
 .../ElepVeriPrescriptionOutputMapper.xml      |     0
 .../mapper/ybelep/ElepVeriVisitInfoMapper.xml |     0
 .../openhis-einvoiceapp/pom.xml               |   149 +
 .../openhis/OpenHisInvoiceApplication.java    |    23 +-
 .../com/openhis/controller/YbController.java  |   134 +
 .../com/openhis/vo/EleInvioceBillDto.java     |    18 +
 .../src/main/resources/application-druid.yml  |    63 +
 .../src/main/resources/application-prod.yml   |     0
 .../src/main/resources/application.yml        |   159 +
 .../src/main/resources/banner.txt             |     0
 .../src/main/resources/config/flow.el.xml     |     0
 .../config/hospital-config.properties         |     0
 .../resources/config/sys-config.properties    |     0
 .../src/main/resources/logback.xml            |    13 +-
 .../main/resources/mybatis/mybatis-config.xml |     0
 .../openhis-miniapp/pom.xml                   |     0
 .../main/java/com/openhis/OpenHisMiniApp.java |     0
 .../META-INF/spring-devtools.properties       |     0
 .../src/main/resources/application-druid.yml  |     0
 .../src/main/resources/application.yml        |     0
 .../src/main/resources/banner.txt             |     0
 .../main/resources/i18n/messages.properties   |     0
 .../src/main/resources/logback.xml            |     0
 .../main/resources/mybatis/mybatis-config.xml |     0
 .../openhis-ybapp/pom.xml                     |     0
 .../com/openhis/OpenHisYbApplication.java     |    50 +
 .../openhis/annotation/ElepHandlerInt.java    |     0
 .../com/openhis/annotation/HandlerInt.java    |     0
 .../component/ElepHandlerIntDispatcher.java   |     0
 .../component/HandlerIntDispatcher.java       |     0
 .../openhis/config/HospitalInfoConfig.java    |     0
 .../com/openhis/config/InterfaceConfig.java   |     0
 .../main/java/com/openhis/config/Tenant.java  |     0
 .../openhis/constant/ClincStatusConst.java    |     0
 .../com/openhis/constant/CommonConstant.java  |     0
 .../openhis/constant/InputDataTypeConst.java  |     1 +
 .../constant/InterFaceResultConst.java        |     0
 .../context/ElepHandlerServiceContext.java    |     0
 .../context/HandlerServiceContext.java        |     0
 .../com/openhis/controller/YbController.java  |   148 +-
 .../openhis/controller/YbElepController.java  |     0
 .../java/com/openhis/domain/BaseRequest.java  |     0
 .../java/com/openhis/domain/BaseResponse.java |     0
 .../com/openhis/domain/ClinicPreSettle.java   |     0
 .../java/com/openhis/domain/ClinicReg.java    |     0
 .../java/com/openhis/domain/ClinicSettle.java |     0
 .../java/com/openhis/domain/ClinicUnReg.java  |     0
 .../com/openhis/domain/ClinicUnSettle.java    |     0
 .../openhis/domain/DirectoryCheckRecord.java  |     0
 .../openhis/domain/ElepMedresultDetail.java   |     0
 .../com/openhis/domain/ElepMedresultInfo.java |     0
 .../openhis/domain/ElepMedresultInput.java    |     0
 .../openhis/domain/ElepQuerDiagnosisInfo.java |     0
 .../domain/ElepQuerPrescriptionDetail.java    |     0
 .../domain/ElepQuerPrescriptionInfo.java      |     0
 .../domain/ElepQuerPrescriptionInput.java     |     0
 .../com/openhis/domain/ElepQuerVisitInfo.java |     0
 .../com/openhis/domain/ElepRevokeInput.java   |     0
 .../com/openhis/domain/ElepRevokeOutput.java  |     0
 .../openhis/domain/ElepSignatureInput.java    |     0
 .../openhis/domain/ElepSignatureOutput.java   |     0
 .../com/openhis/domain/ElepUploadInput.java   |     0
 .../com/openhis/domain/ElepUploadOutput.java  |     0
 .../openhis/domain/ElepVeriDiagnosisInfo.java |     0
 .../domain/ElepVeriPrescriptionDetail.java    |     0
 .../domain/ElepVeriPrescriptionInfo.java      |     0
 .../domain/ElepVeriPrescriptionOutput.java    |     0
 .../com/openhis/domain/ElepVeriVisitInfo.java |     0
 .../main/java/com/openhis/domain/File.java    |     0
 .../openhis/domain/FinancialApplyRecord.java  |     0
 .../domain/FinancialReconcileRecord.java      |     0
 .../java/com/openhis/domain/InfoPerson.java   |     0
 .../openhis/domain/InformationInquiry.java    |     0
 .../openhis/domain/InventoryChangeRecord.java |     0
 .../openhis/domain/InventoryCheckRecord.java  |     0
 .../openhis/domain/InventoryDelRecord.java    |     0
 .../domain/InventoryPurchaseRecord.java       |     0
 .../domain/InventoryPurchaseReturnRecord.java |     0
 .../openhis/domain/InventorySaleRecord.java   |     0
 .../domain/InventorySaleReturnRecord.java     |     0
 .../domain/MedicationResultInquiry.java       |     0
 .../openhis/domain/PreCheckPrescription.java  |     0
 .../com/openhis/domain/QueryPrescription.java |     0
 .../main/java/com/openhis/domain/Sign.java    |     0
 .../com/openhis/enums/ElepServiceAdrEnum.java |     0
 .../com/openhis/enums/ServiceAdrEnum.java     |     4 +
 .../listener/ElepHandlerServiceListener.java  |     0
 .../listener/HandlerServiceListener.java      |     0
 .../main/java/com/openhis/pojo/InputData.java |     5 +
 .../java/com/openhis/pojo/PDFInputDto.java    |     2 +-
 .../java/com/openhis/pojo/RequestData.java    |     0
 .../java/com/openhis/pojo/ResultBody.java     |     0
 .../main/java/com/openhis/pojo/TransBody.java |     0
 .../java/com/openhis/service/FileService.java |   102 +-
 .../com/openhis/service/HandlerService.java   |     0
 .../openhis/service/IElepHandlerService.java  |     0
 .../com/openhis/service/IYbElepService.java   |     0
 .../java/com/openhis/service/YbService.java   |   118 +-
 .../service/impl/ElepHandlerServiceImpl.java  |    19 +-
 .../service/impl/HandlerServiceImpl.java      |    42 +-
 .../service/impl/YbElepServiceImpl.java       |    33 +-
 .../openhis/service/impl/YbServiceImpl.java   |   296 +-
 .../clinc/ClinicDiagInfoUpServiceImpl.java    |     0
 .../clinc/ClinicFeeDetailDelServiceImpl.java  |     0
 .../clinc/ClinicFeeDetailUpServiceImpl.java   |     0
 .../impl/clinc/ClinicPreSetlServiceImpl.java  |     0
 .../impl/clinc/ClinicReRegServiceImpl.java    |     0
 .../impl/clinc/ClinicReSetlServiceImpl.java   |     0
 .../impl/clinc/ClinicRegServiceImpl.java      |     0
 .../impl/clinc/ClinicSetlServiceImpl.java     |     0
 .../impl/common/MedresultServiceImpl.java     |     0
 .../PreCheckPrescriptionServiceImpl.java      |     0
 .../common/QuerPrescriptionServiceImpl.java   |     0
 .../impl/common/RevokeServiceImpl.java        |     0
 .../impl/common/SignatureServiceImpl.java     |     0
 .../impl/common/UploadServiceImpl.java        |     0
 .../directory/DrugContrastUpServiceImpl.java  |     0
 .../RepealDrugContrastUpServiceImpl.java      |     0
 .../impl/down/DownloadServiceImpl.java        |     0
 .../drugstore/DrugPreSetlServiceImpl.java     |     0
 .../impl/drugstore/DrugReSetlServiceImpl.java |     0
 .../impl/drugstore/DrugSetlServiceImpl.java   |     0
 .../impl/filing/FixmedinsServiceImpl.java     |     0
 .../impl/filing/ReFixmedinsServiceImpl.java   |     0
 .../impl/filing/ReSlowdiseaseServiceImpl.java |     0
 .../impl/filing/SlowdiseServiceImpl.java      |     0
 .../impl/info/CatalogueInfoServiceImpl.java   |     0
 .../impl/info/GetMedicalInfoServiceImpl.java  |     0
 ...GetPatientSpecialConditionServiceImpl.java |     0
 .../impl/info/GetPersonInfoServiceImpl.java   |     0
 .../service/impl/info/SignInServiceImpl.java  |     0
 .../service/impl/info/SignOutServiceImpl.java |     0
 .../inhospital/ChHospitalizedServiceImpl.java |    29 +
 .../inhospital/DischargedServiceImpl.java     |     0
 .../impl/inhospital/FeeDetailServiceImpl.java |     0
 .../impl/inhospital/HaPreSetlServiceImpl.java |     0
 .../impl/inhospital/HaReSetlServiceImpl.java  |     0
 .../impl/inhospital/HaSetlServiceImpl.java    |     0
 .../inhospital/HospitalizedServiceImpl.java   |     0
 .../inhospital/ReDischargedServiceImpl.java   |     0
 .../inhospital/ReFeeDetailServiceImpl.java    |     0
 .../inhospital/ReHospitalizedServiceImpl.java |     0
 .../PhysicalInventoryChangeServiceImpl.java   |     0
 .../PhysicalInventoryServiceImpl.java         |     0
 .../impl/inventory/PurchasingServiceImpl.java |     0
 .../PurgeProductRecordsServiceImpl.java       |     0
 .../StockReplenishmentServiceImpl.java        |     0
 .../StockUnReplenishmentServiceImpl.java      |     0
 .../inventory/UnPurchasingServiceImpl.java    |     0
 .../DayReconciliationServiceImpl.java         |     0
 .../DetailReconciliationServiceImpl.java      |     0
 .../MonthSetlApplyAServiceImpl.java           |     0
 .../MonthSetlApplyServiceImpl.java            |     0
 .../MonthUnSetlApplyAServiceImpl.java         |     0
 .../MonthUnSetlApplyServiceImpl.java          |     0
 .../ReconciliationOrgServiceImpl.java         |     0
 .../ReconciliationServiceImpl.java            |     0
 .../ThreePartReconciliationServiceImpl.java   |     0
 .../TotalReconciliationServiceImpl.java       |     0
 .../main/java/com/openhis/utils/BCUtils.java  |     0
 .../java/com/openhis/utils/BusnessIdUtil.java |     0
 .../openhis/utils/CusAccessObjectUtil.java    |     0
 .../java/com/openhis/utils/EasyGmUtils.java   |     0
 .../com/openhis/utils/HseEncAndDecUtil.java   |     0
 .../com/openhis/utils/HttpClientUtil.java     |     0
 .../openhis/utils/PDFTemplateFillerUtil.java  |    60 +-
 .../java/com/openhis/utils/RedisUtil.java     |     0
 .../main/java/com/openhis/utils/SignUtil.java |     0
 .../java/com/openhis/utils/StringUtil.java    |     0
 .../main/java/com/openhis/vo/BaseInfo.java    |     2 +
 .../main/java/com/openhis/vo/BaseParam.java   |     0
 .../java/com/openhis/vo/CancelPaymentDto.java |     0
 .../com/openhis/vo/CancelRegPaymentDto.java   |     0
 .../com/openhis/vo/Catalogue1312Output.java   |     0
 .../openhis/vo/Catalogue1312QueryParam.java   |     0
 .../com/openhis/vo/ChargeItemDetailVO.java    |     0
 .../java/com/openhis/vo/ChargeItemDto.java    |     0
 .../com/openhis/vo/Clearing3204AParam.java    |     0
 .../com/openhis/vo/Clearing3205AParma.java    |     0
 .../com/openhis/vo/Clearing3205AResult.java   |     0
 .../com/openhis/vo/Clearing3205AWebParma.java |     0
 .../com/openhis/vo/Clearing3206AParam.java    |     0
 .../com/openhis/vo/Clearing3206AResult.java   |     0
 .../openhis/vo/Clinic2203DiseInfoParam.java   |     0
 .../com/openhis/vo/Clinic2203Medical.java     |     0
 .../openhis/vo/Clinic2203MedicalParam.java    |     0
 .../openhis/vo/Clinic2204FeeDetailParam.java  |     0
 .../openhis/vo/Clinic2204FeeDetailResult.java |     0
 .../com/openhis/vo/Clinic2204OrderParam.java  |     0
 .../com/openhis/vo/Clinic2204OrderResult.java |     0
 .../com/openhis/vo/Clinic2205OrderParam.java  |     0
 .../vo/Clinic2206FundPaymentResult.java       |    12 +-
 .../com/openhis/vo/Clinic2206OrderOutput.java |     0
 .../com/openhis/vo/Clinic2206OrderParam.java  |     0
 .../com/openhis/vo/Clinic2206OrderResult.java |     0
 .../openhis/vo/Clinic2206OrderResultDto.java  |     0
 .../openhis/vo/Clinic2206SetldetaiResult.java |     0
 .../com/openhis/vo/Clinic2207OrderResult.java |     0
 .../openhis/vo/Clinic2207OrderResultDto.java  |     0
 .../vo/Clinic2207OrderResultInfoDto.java      |     0
 .../vo/Clinic2208UnSetlInfoOutput.java        |     0
 .../openhis/vo/Clinic2208UnSetlInfoParam.java |     0
 .../vo/Clinic2208UnSetlInfoResult.java        |     0
 .../main/java/com/openhis/vo/ClinicReg.java   |     0
 .../com/openhis/vo/ClinicReg2201Output.java   |     0
 .../openhis/vo/DispenseInventory3505Dto.java  |     0
 .../openhis/vo/EleInvoiceChargeDetailDto.java |     0
 .../openhis/vo/EleInvoiceListDetailDto.java   |     0
 .../openhis/vo/EleInvoicePatientInfoDto.java  |     0
 .../openhis/vo/EleInvoicePaymentInfoDto.java  |     0
 .../com/openhis/vo/EleInvoiceResultDto.java   |     0
 .../java/com/openhis/vo/File9101Param.java    |    14 +
 .../java/com/openhis/vo/FileDownload.java     |     0
 .../main/java/com/openhis/vo/FileResult.java  |     0
 .../com/openhis/vo/Financial13203Param.java   |     0
 .../com/openhis/vo/Financial13203Result.java  |     0
 .../openhis/vo/Financial13203WebParam.java    |     0
 .../com/openhis/vo/Financial3201Output.java   |     0
 .../com/openhis/vo/Financial3201Param.java    |     0
 .../openhis/vo/Financial3202FileParam.java    |     0
 .../openhis/vo/Financial3202FileResult.java   |     0
 .../com/openhis/vo/Financial3203AParam.java   |     0
 .../openhis/vo/Financial3203AWebParam.java    |     0
 .../com/openhis/vo/Financial3203Param.java    |     0
 .../java/com/openhis/vo/Financial3203VO.java  |     0
 .../com/openhis/vo/Financial3203WebParam.java |     0
 .../com/openhis/vo/Financial3204Param.java    |     0
 .../vo/FinancialSettlement3202Param.java      |     0
 .../vo/FinancialSettlement3202Result.java     |     0
 .../vo/FinancialSettlement3209AParam.java     |     0
 .../vo/FinancialSettlement3209AResult.java    |     0
 .../openhis/vo/FsiConsultation3101Param.java  |     0
 .../com/openhis/vo/FsiDiagnose3101Param.java  |     0
 .../com/openhis/vo/FsiEncounter3101Param.java |     0
 .../openhis/vo/FsiFeedback3103DataParam.java  |     0
 .../openhis/vo/FsiFeedback3103WarnsParam.java |     0
 .../com/openhis/vo/FsiOperation3101Param.java |     0
 .../com/openhis/vo/FsiOrder3101Param.java     |     0
 .../com/openhis/vo/FsiPatient3101Param.java   |     0
 .../openhis/vo/FsiViolation3101Result.java    |     0
 .../vo/FsiViolationDetail3101Result.java      |     0
 .../openhis/vo/HospAdm2401DiseInfoParam.java  |     0
 .../openhis/vo/HospAdm2401MdtInfoParam.java   |     0
 .../openhis/vo/HospAdm2402DiseInfoParam.java  |     0
 .../openhis/vo/HospAdm2402DscgInfoParam.java  |     0
 .../openhis/vo/HospAdm2403AdmInfoParam.java   |     0
 .../openhis/vo/HospAdm2403DiseInfoParam.java  |     0
 .../openhis/vo/HospAdm2404AdmCnlParam.java    |     0
 .../openhis/vo/HospAdm2406SmAttrUpParam.java  |     0
 .../vo/HospAdm2407SmAttrSelectParam.java      |     0
 .../vo/HospAdm2407SmAttrSelectResult.java     |     0
 .../com/openhis/vo/HospDept3401AParam.java    |     0
 .../com/openhis/vo/HospDept3401Param.java     |     0
 .../com/openhis/vo/HospDept3402Param.java     |     0
 .../com/openhis/vo/HospDept3403Param.java     |     0
 .../openhis/vo/HospTrf2501ARefmedinParam.java |     0
 .../openhis/vo/HospTrf2501RefmedinParam.java  |     0
 .../com/openhis/vo/HospTrfCxl2502Param.java   |     0
 .../java/com/openhis/vo/Info1101Output.java   |     0
 .../com/openhis/vo/Info1101PerinfoResult.java |     0
 .../com/openhis/vo/Info1101ReadcardParam.java |     0
 .../java/com/openhis/vo/Info5301Param.java    |     0
 .../vo/Info5301SpecialConditionResult.java    |     0
 .../com/openhis/vo/InvoiceBaseInfoDto.java    |     0
 .../main/java/com/openhis/vo/LoginUser.java   |     0
 .../com/openhis/vo/MatAllowReg25007Param.java |     0
 .../openhis/vo/MatAllowReg25007Result.java    |     0
 .../openhis/vo/MatAllowRegSel25008Param.java  |     0
 .../java/com/openhis/vo/Medical3503Param.java |     0
 .../java/com/openhis/vo/Medical3505Model.java |     0
 .../java/com/openhis/vo/Medical3505Param.java |     0
 .../com/openhis/vo/Medical3505Result.java     |     0
 .../java/com/openhis/vo/Medical3506Param.java |     0
 .../java/com/openhis/vo/Medical3507Param.java |     0
 .../java/com/openhis/vo/Medical3508Param.java |     0
 .../com/openhis/vo/Medical3508Result.java     |     0
 .../vo/MedicalDirectory3301ListParam.java     |     0
 .../openhis/vo/MedicalDirectory3301Param.java |     0
 .../openhis/vo/MedicalDirectory3302Param.java |     0
 .../vo/MedicalDirectory3302ParamDto.java      |     0
 .../openhis/vo/MedicalInventory3501Param.java |     0
 .../openhis/vo/MedicalInventory3502Param.java |     0
 .../openhis/vo/MedicalPurchase3504Param.java  |     0
 .../com/openhis/vo/MedicalTraceNoDto.java     |     0
 .../java/com/openhis/vo/PatientInfoDto.java   |     0
 .../java/com/openhis/vo/PaymentDetailDto.java |     0
 .../main/java/com/openhis/vo/PaymentDto.java  |     0
 .../java/com/openhis/vo/PaymentSettleDto.java |     0
 .../main/java/com/openhis/vo/PaymentVO.java   |     0
 .../vo/PersBirthApprovalCnl25004Param.java    |     0
 .../vo/PersBirthApprovalSel25005Param.java    |     0
 .../openhis/vo/PersBirthRecord25003Param.java |     0
 .../com/openhis/vo/PersChrDis2503Param.java   |     0
 .../openhis/vo/PersChrDisCxl2504Param.java    |     0
 .../com/openhis/vo/PersDesigPt2505Param.java  |     0
 .../openhis/vo/PersDesigPtCxl2506Param.java   |     0
 .../vo/PersMedApprovalCnl25006Param.java      |     0
 .../openhis/vo/PersMedRecord25001Param.java   |     0
 .../openhis/vo/PersMedSelect25002Param.java   |     0
 .../openhis/vo/PersMedSelect25002Result.java  |     0
 .../com/openhis/vo/PersUnintInj2507Param.java |     0
 .../java/com/openhis/vo/PrePaymentDto.java    |     0
 .../src/main/java/com/openhis/vo/Result.java  |     0
 .../main/java/com/openhis/vo/ResultBody.java  |     0
 .../openhis/vo/Settlement3201DetailVO.java    |     0
 .../java/com/openhis/vo/Settlement3201VO.java |     0
 .../openhis/vo/Settlement3201WebParam.java    |     0
 .../java/com/openhis/vo/Settlement3202VO.java |     0
 .../openhis/vo/Settlement3202WebParam.java    |     0
 .../openhis/vo/Settlement3209AWebParam.java   |     0
 .../src/main/java/com/openhis/vo/Sign.java    |     0
 .../java/com/openhis/vo/Sign1101Param.java    |     0
 .../java/com/openhis/vo/Sign9001Result.java   |     0
 .../openhis/vo/SupplyItemDetail3503Dto.java   |     0
 .../vo/VeriPrescriptionDetailInfoDto.java     |     0
 .../openhis/vo/VeriPrescriptionInfoDto.java   |     0
 .../com/openhis/vo/VeriPrescriptionParam.java |     0
 .../src/main/java/com/openhis/vo/extData.java |     0
 .../src/main/resources/application-druid.yml  |    64 +
 .../src/main/resources/application-prod.yml   |     1 -
 .../src/main/resources/application.yml        |     3 +-
 .../src/main/resources/banner.txt             |    10 +
 .../src/main/resources/config.properties      |     0
 .../src/main/resources/config/flow.el.xml     |     6 +
 .../config/hospital-config.properties         |     0
 .../resources/config/sys-config.properties    |    21 +
 .../resources/config/tenant-config.properties |     0
 .../src/main/resources/logback.xml            |   133 +
 .../main/resources/mybatis/mybatis-config.xml |    21 +
 .../pom.xml                                   |     0
 .../system/SysTenantOptionController.java     |   139 -
 .../impl/SysTenantOptionServiceImpl.java      |   144 -
 .../DoctorStationChineseMedicalAppMapper.java |    24 -
 .../web/doctorstation/utils/AdviceUtils.java  |   119 -
 .../InventoryDetailsController.java           |   109 -
 .../INurseStationPendAdmAppService.java       |    67 -
 .../NurseStationPendAdmAppServiceImpl.java    |   271 -
 .../NurseStationPendAdmController.java        |   112 -
 .../mapper/NurseStationPendAdmAppMapper.java  |    39 -
 .../impl/OutpatientDisposalServiceImpl.java   |   598 -
 .../dto/OutpatientDisposalDeviceInfoDto.java  |    74 -
 .../dto/OutpatientDisposalExecuteInfoDto.java |    72 -
 .../dto/OutpatientDisposalInfoDto.java        |    29 -
 .../mapper/OutpatientDisposalMapper.java      |   108 -
 .../impl/IChargeBillServiceImpl.java          |   569 -
 ...MedicineConsumablesDispenseAppService.java |    69 -
 ...cineConsumablesDispenseAppServiceImpl.java |   326 -
 ...MedicineConsumablesDispenseController.java |   110 -
 .../impl/OutboundReportAppServiceImpl.java    |    97 -
 .../PurchaseReturnReportAppServiceImpl.java   |    94 -
 .../Inventorymanage/ProductDetailsMapper.xml  |   150 -
 .../HealthcareServiceBizMapper.xml            |    72 -
 .../mapper/common/CommonAppMapper.xml         |   238 -
 .../DoctorStationChineseMedicalAppMapper.xml  |    30 -
 .../NurseStationPendAdmAppMapper.xml          |    63 -
 .../OutpatientDisposalMapper.xml              |   376 -
 .../service/IEncounterLocationService.java    |    28 -
 .../service/IEncounterParticipantService.java |    21 -
 .../impl/EncounterParticipantServiceImpl.java |    30 -
 .../financial/service/IContractService.java   |    20 -
 .../service/impl/ContractServiceImpl.java     |    29 -
 .../main/resources/mapper/yb/YbElepMapper.xml |   140 -
 {vue3 => openhis-ui-vue3}/.env.development    |     2 +-
 {vue3 => openhis-ui-vue3}/.env.production     |     2 +-
 {vue3 => openhis-ui-vue3}/.env.staging        |     0
 {vue3 => openhis-ui-vue3}/.prettierrc.cjs     |     0
 {vue3 => openhis-ui-vue3}/.stylelintrc.cjs    |     0
 {vue3 => openhis-ui-vue3}/LICENSE             |     0
 openhis-ui-vue3/README.md                     |     0
 {vue3 => openhis-ui-vue3}/html/ie.html        |     0
 {vue3 => openhis-ui-vue3}/index.html          |     5 +-
 openhis-ui-vue3/package-lock.json             | 12724 ++++++++++++++++
 {vue3 => openhis-ui-vue3}/package.json        |     3 +-
 {vue3 => openhis-ui-vue3}/public/favicon.ico  |   Bin
 openhis-ui-vue3/public/print-lock.css         |   352 +
 {vue3 => openhis-ui-vue3}/src/App.vue         |     0
 .../temperatureSheet/ViewConfig.js            |     0
 .../nurseStation/temperatureSheet/config.js   |     0
 .../temperatureSheet/dataProcess.js           |     0
 .../nurseStation/temperatureSheet/datas.js    |     0
 .../nurseStation/temperatureSheet/drawfn.js   |     0
 .../nurseStation/temperatureSheet/index.js    |     0
 .../nurseStation/temperatureSheet/line.js     |     0
 .../nurseStation/temperatureSheet/template.js |     0
 .../nurseStation/temperatureSheet/utils.js    |     0
 {vue3 => openhis-ui-vue3}/src/api/login.js    |     0
 {vue3 => openhis-ui-vue3}/src/api/menu.js     |     0
 .../src/api/monitor/cache.js                  |     0
 .../src/api/monitor/job.js                    |     0
 .../src/api/monitor/jobLog.js                 |     0
 .../src/api/monitor/logininfor.js             |     0
 .../src/api/monitor/online.js                 |     0
 .../src/api/monitor/operlog.js                |     0
 .../src/api/monitor/server.js                 |     0
 openhis-ui-vue3/src/api/public.js             |    37 +
 .../src/api/system/config.js                  |     0
 .../src/api/system/dept.js                    |     0
 .../src/api/system/dict/data.js               |     0
 .../src/api/system/dict/type.js               |     0
 .../src/api/system/menu.js                    |     0
 .../src/api/system/notice.js                  |     0
 .../src/api/system/post.js                    |     0
 .../src/api/system/role.js                    |     0
 .../src/api/system/tenant.js                  |    52 +-
 .../src/api/system/user copy.js               |     0
 .../src/api/system/user.js                    |     0
 {vue3 => openhis-ui-vue3}/src/api/tool/gen.js |     0
 .../src/assets/401_images/401.gif             |   Bin
 .../src/assets/404_images/404.png             |   Bin
 .../src/assets/404_images/404_cloud.png       |   Bin
 .../src/assets/fonts/HarmonyOS_Sans_Black.ttf |   Bin
 .../src/assets/fonts/HarmonyOS_Sans_Bold.ttf  |   Bin
 .../src/assets/fonts/HarmonyOS_Sans_Light.ttf |   Bin
 .../assets/fonts/HarmonyOS_Sans_Medium.ttf    |   Bin
 .../assets/fonts/HarmonyOS_Sans_Regular.ttf   |   Bin
 .../src/assets/fonts/HarmonyOS_Sans_Thin.ttf  |   Bin
 .../src/assets/icons/svg/404.svg              |     0
 .../src/assets/icons/svg/bug.svg              |     0
 .../src/assets/icons/svg/build.svg            |     0
 .../src/assets/icons/svg/button.svg           |     0
 .../src/assets/icons/svg/cascader.svg         |     0
 .../src/assets/icons/svg/chart.svg            |     0
 .../src/assets/icons/svg/checkbox.svg         |     0
 .../src/assets/icons/svg/clipboard.svg        |     0
 .../src/assets/icons/svg/code.svg             |     0
 .../src/assets/icons/svg/color.svg            |     0
 .../src/assets/icons/svg/component.svg        |     0
 .../src/assets/icons/svg/dashboard.svg        |     0
 .../src/assets/icons/svg/date-range.svg       |     0
 .../src/assets/icons/svg/date.svg             |     0
 .../src/assets/icons/svg/dict.svg             |     0
 .../src/assets/icons/svg/documentation.svg    |     0
 .../src/assets/icons/svg/download.svg         |     0
 .../src/assets/icons/svg/drag.svg             |     0
 .../src/assets/icons/svg/druid.svg            |     0
 .../src/assets/icons/svg/edit.svg             |     0
 .../src/assets/icons/svg/education.svg        |     0
 .../src/assets/icons/svg/email.svg            |     0
 .../src/assets/icons/svg/example.svg          |     0
 .../src/assets/icons/svg/excel.svg            |     0
 .../src/assets/icons/svg/exit-fullscreen.svg  |     0
 .../src/assets/icons/svg/eye-open.svg         |     0
 .../src/assets/icons/svg/eye.svg              |     0
 .../src/assets/icons/svg/form.svg             |     0
 .../src/assets/icons/svg/fullscreen.svg       |     0
 .../src/assets/icons/svg/github.svg           |     0
 .../src/assets/icons/svg/guide.svg            |     0
 .../src/assets/icons/svg/icon.svg             |     0
 .../src/assets/icons/svg/input.svg            |     0
 .../src/assets/icons/svg/international.svg    |     0
 .../src/assets/icons/svg/job.svg              |     0
 .../src/assets/icons/svg/language.svg         |     0
 .../src/assets/icons/svg/link.svg             |     0
 .../src/assets/icons/svg/list.svg             |     0
 .../src/assets/icons/svg/lock.svg             |     0
 .../src/assets/icons/svg/log.svg              |     0
 .../src/assets/icons/svg/logininfor.svg       |     0
 .../src/assets/icons/svg/message.svg          |     0
 .../src/assets/icons/svg/money.svg            |     0
 .../src/assets/icons/svg/monitor.svg          |     0
 .../src/assets/icons/svg/nested.svg           |     0
 .../src/assets/icons/svg/number.svg           |     0
 .../src/assets/icons/svg/online.svg           |     0
 .../src/assets/icons/svg/password.svg         |     0
 .../src/assets/icons/svg/pdf.svg              |     0
 .../src/assets/icons/svg/people.svg           |     0
 .../src/assets/icons/svg/peoples.svg          |     0
 .../src/assets/icons/svg/phone.svg            |     0
 .../src/assets/icons/svg/post.svg             |     0
 .../src/assets/icons/svg/qq.svg               |     0
 .../src/assets/icons/svg/question.svg         |     0
 .../src/assets/icons/svg/radio.svg            |     0
 .../src/assets/icons/svg/rate.svg             |     0
 .../src/assets/icons/svg/redis-list.svg       |     0
 .../src/assets/icons/svg/redis.svg            |     0
 .../src/assets/icons/svg/row.svg              |     0
 .../src/assets/icons/svg/search.svg           |     0
 .../src/assets/icons/svg/select.svg           |     0
 .../src/assets/icons/svg/server.svg           |     0
 .../src/assets/icons/svg/shopping.svg         |     0
 .../src/assets/icons/svg/size.svg             |     0
 .../src/assets/icons/svg/skill.svg            |     0
 .../src/assets/icons/svg/slider.svg           |     0
 .../src/assets/icons/svg/star.svg             |     0
 .../src/assets/icons/svg/swagger.svg          |     0
 .../src/assets/icons/svg/switch.svg           |     0
 .../src/assets/icons/svg/system.svg           |     0
 .../src/assets/icons/svg/tab.svg              |     0
 .../src/assets/icons/svg/table.svg            |     0
 .../src/assets/icons/svg/textarea.svg         |     0
 .../src/assets/icons/svg/theme.svg            |     0
 .../src/assets/icons/svg/time-range.svg       |     0
 .../src/assets/icons/svg/time.svg             |     0
 .../src/assets/icons/svg/tool.svg             |     0
 .../src/assets/icons/svg/tree-table.svg       |     0
 .../src/assets/icons/svg/tree.svg             |     0
 .../src/assets/icons/svg/upload.svg           |     0
 .../src/assets/icons/svg/user.svg             |     0
 .../src/assets/icons/svg/validCode.svg        |     0
 .../src/assets/icons/svg/wechat.svg           |     0
 .../src/assets/icons/svg/zip.svg              |     0
 .../src/assets/images/ODLS.png                |   Bin
 openhis-ui-vue3/src/assets/images/ccu.png     |   Bin 0 -> 1600 bytes
 openhis-ui-vue3/src/assets/images/cculogo.png |   Bin 0 -> 120447 bytes
 .../src/assets/images/dark.svg                |     0
 .../src/assets/images/jlau.jpg                |   Bin
 .../src/assets/images/light.svg               |     0
 .../src/assets/images/login-background.jpg    |   Bin
 openhis-ui-vue3/src/assets/images/logo.svg    |   295 +
 .../src/assets/images/logo_bg.jpg             |   Bin
 .../src/assets/images/pay.png                 |   Bin
 .../src/assets/images/profile.jpg             |   Bin
 .../src/assets/images/user.png                |   Bin
 .../src/assets/logo/logo.png                  |   Bin
 .../src/assets/logo/logoBlack.png             |   Bin
 .../src/assets/logo/logoNew.png               |   Bin
 .../src/assets/styles/btn.scss                |     0
 .../src/assets/styles/element-ui.scss         |     0
 .../src/assets/styles/font.scss               |     0
 .../src/assets/styles/index.scss              |     0
 .../src/assets/styles/mixin.scss              |     0
 .../src/assets/styles/openhis.scss            |    18 +-
 .../src/assets/styles/sidebar.scss            |     0
 .../src/assets/styles/transition.scss         |     0
 .../src/assets/styles/variables.module.scss   |     0
 .../Auto/PfPatientCardB/PfPatientCard.vue     |     0
 .../components/Auto/PfPatientCardB/index.js   |     0
 .../components/Auto/PfPatientCardB/index.vue  |     0
 .../components/Auto/printBills/bedCard.vue    |     0
 .../Auto/printBills/changeShiftBill.vue       |     0
 .../Auto/printBills/exeOrderSheet.vue         |     0
 .../Auto/printBills/injectLabel.vue           |     0
 .../Auto/printBills/injectOrderSheet.vue      |     0
 .../components/Auto/printBills/labelGroup.vue |     0
 .../components/Auto/printBills/sheetGroup.vue |     0
 .../Auto/printBills/temperatureSheet.vue      |     0
 .../Auto/printBills/triageTicket.vue          |     0
 .../Auto/printBills/triageTicketGroup.vue     |     0
 .../Auto/printBills/triageTicketNew.vue       |     0
 .../components/Auto/printBills/wristBill.vue  |     0
 .../src/components/Breadcrumb/index.vue       |     0
 .../src/components/Crontab/day.vue            |     0
 .../src/components/Crontab/hour.vue           |     0
 .../src/components/Crontab/index.vue          |     0
 .../src/components/Crontab/min.vue            |     0
 .../src/components/Crontab/month.vue          |     0
 .../src/components/Crontab/result.vue         |     0
 .../src/components/Crontab/second.vue         |     0
 .../src/components/Crontab/week.vue           |     0
 .../src/components/Crontab/year.vue           |     0
 .../src/components/DictTag/index.vue          |     0
 .../src/components/Editor/index.vue           |     0
 .../src/components/FileUpload/index.vue       |     0
 .../src/components/Hamburger/index.vue        |     0
 .../src/components/HeaderSearch/index.vue     |     0
 .../src/components/IconSelect/index.vue       |     0
 .../src/components/IconSelect/requireIcons.js |     0
 .../src/components/ImagePreview/index.vue     |     0
 .../src/components/ImageUpload/index.vue      |     0
 .../src/components/OpenHis/Doc/index.vue      |     0
 .../OpenHis/TraceNoDialog/index.vue           |   231 +
 .../components/OpenHis/popoverList/index.vue  |    23 +-
 .../src/components/Pagination/index.vue       |     0
 .../src/components/ParentView/index.vue       |     0
 .../src/components/RightToolbar/index.vue     |     0
 .../src/components/Screenfull/index.vue       |     0
 .../src/components/SizeSelect/index.vue       |     0
 .../src/components/SvgIcon/index.vue          |     0
 .../src/components/SvgIcon/svgicon.js         |     0
 .../src/components/TopNav/index.vue           |     0
 .../src/components/TreeSelect/index.vue       |     0
 .../src/components/iFrame/index.vue           |     0
 .../patientBar/components/BallTag.vue         |     0
 .../patientBar/inPatientBarDoctorFold.vue     |   250 +-
 .../src/directive/common/clickOutsideRow.js   |     0
 .../src/directive/common/copyText.js          |     0
 .../src/directive/common/horizontalScroll.js  |     0
 .../src/directive/index.js                    |     0
 .../src/directive/permission/hasPermi.js      |     0
 .../src/directive/permission/hasRole.js       |     0
 .../src/layout/components/AppMain.vue         |     0
 .../layout/components/IframeToggle/index.vue  |     0
 .../src/layout/components/InnerLink/index.vue |     0
 .../src/layout/components/Navbar.vue          |     0
 .../src/layout/components/Settings/index.vue  |     0
 .../src/layout/components/Sidebar/Link.vue    |     0
 .../src/layout/components/Sidebar/Logo.vue    |     0
 .../layout/components/Sidebar/SidebarItem.vue |     0
 .../src/layout/components/Sidebar/index.vue   |     0
 .../layout/components/TagsView/ScrollPane.vue |     0
 .../src/layout/components/TagsView/index.vue  |     0
 .../src/layout/components/index.js            |     0
 .../src/layout/index.vue                      |     0
 {vue3 => openhis-ui-vue3}/src/main.js         |     0
 {vue3 => openhis-ui-vue3}/src/permission.js   |     0
 {vue3 => openhis-ui-vue3}/src/plugins/auth.js |     0
 .../src/plugins/cache.js                      |     0
 .../src/plugins/download.js                   |     0
 .../src/plugins/index.js                      |     0
 .../src/plugins/modal.js                      |     0
 {vue3 => openhis-ui-vue3}/src/plugins/tab.js  |     0
 {vue3 => openhis-ui-vue3}/src/router/index.js |     8 +-
 {vue3 => openhis-ui-vue3}/src/settings.js     |     0
 {vue3 => openhis-ui-vue3}/src/store/index.js  |     0
 .../src/store/modules/app.js                  |     0
 .../src/store/modules/dict.js                 |     0
 .../src/store/modules/permission.js           |     0
 .../src/store/modules/settings.js             |     0
 .../src/store/modules/tagsView.js             |     0
 .../src/store/modules/user.js                 |     3 +-
 {vue3 => openhis-ui-vue3}/src/store/store.js  |     0
 {vue3 => openhis-ui-vue3}/src/utils/auth.js   |     0
 {vue3 => openhis-ui-vue3}/src/utils/dict.js   |     0
 .../src/utils/dynamicTitle.js                 |     0
 .../src/utils/errorCode.js                    |     0
 {vue3 => openhis-ui-vue3}/src/utils/his.js    |     0
 {vue3 => openhis-ui-vue3}/src/utils/index.js  |     0
 .../src/utils/jsencrypt.js                    |     0
 .../src/utils/openhis.js                      |     0
 .../src/utils/permission.js                   |     0
 .../src/utils/request.js                      |     0
 .../src/utils/scroll-to.js                    |     0
 {vue3 => openhis-ui-vue3}/src/utils/theme.js  |     0
 .../src/utils/validate.js                     |     0
 .../basicmanage/automaticBilling/index.vue    |     0
 .../views/basicmanage/bargainSets/index.vue   |     0
 .../src/views/basicmanage/bedspace/index.vue  |     0
 .../bodyStructure/components/api.js           |    52 +
 .../views/basicmanage/bodyStructure/index.vue |   236 +
 .../views/basicmanage/caseTemplates/index.vue |     0
 .../basicmanage/commonlyDiagnosis/index.vue   |     0
 .../components/activityList.vue               |     0
 .../consumablesBinding/components/api.js      |     0
 .../components/consumablesList.vue            |     0
 .../components/deviceList.vue                 |     0
 .../basicmanage/consumablesBinding/index.vue  |     0
 .../src/views/basicmanage/contract/index.vue  |     0
 .../src/views/basicmanage/customer/index.vue  |     0
 .../src/views/basicmanage/fee/index.vue       |     0
 .../frequency/components/FreForm.vue          |   223 +
 .../frequency/components/frequency.js         |    27 +
 .../src/views/basicmanage/frequency/index.vue |   346 +
 .../components/implementDepartment.js         |     0
 .../basicmanage/implementDepartment/index.vue |    53 +-
 .../src/views/basicmanage/lisMerge/index.vue  |     0
 .../components/adviceBaseList.vue             |     0
 .../ordersCombination/components/api.js       |    11 +
 .../components/prescriptionlist.vue           |     8 +-
 .../basicmanage/ordersCombination/index.vue   |   361 +
 .../organization/components/api.js            |     0
 .../views/basicmanage/organization/index.vue  |     0
 .../components/pharmacyDepartment.js          |     0
 .../basicmanage/pharmacyDepartment/index.vue  |     0
 .../supplier/components/supplier.js           |     0
 .../src/views/basicmanage/supplier/index.vue  |    11 +-
 .../basicmanage/tcmPrescription/index.vue     |     0
 .../views/basicmanage/ward/components/api.js  |    24 +
 .../src/views/basicmanage/ward/index.vue      |   246 +-
 .../warehouseLocation/components/api.js       |    22 +
 .../basicmanage/warehouseLocation/index.vue   |    39 +-
 .../components/registrationfee.js             |     0
 .../basicservices/registrationfee/index.vue   |     2 +-
 .../views/catalog/device/components/device.js |     4 +-
 .../device/components/deviceDialog.vue        |    80 +-
 .../device/components/deviceYbDialog.vue      |     0
 .../src/views/catalog/device/index.vue        |     9 +
 .../components/diagTreYbDialog.vue            |     0
 .../components/diagnosisTreatmentDialog.vue   |    36 +-
 .../components/diagnosistreatment.js          |    11 +-
 .../catalog/diagnosistreatment/index.vue      |     0
 .../catalog/disease/components/disease.js     |     0
 .../src/views/catalog/disease/index.vue       |     0
 .../catalog/medicine/components/medicine.js   |    11 +-
 .../medicine/components/medicineDialog.vue    |    63 +-
 .../medicine/components/medicineYbDialog.vue  |    51 +-
 .../src/views/catalog/medicine/index.vue      |    80 +
 .../src/views/catalog/service/index.vue       |     0
 .../charge/clinicRecord/components/api.js     |     9 +-
 .../src/views/charge/clinicRecord/index.vue   |   104 +-
 .../charge/cliniccharge/components/api.js     |    12 +
 .../cliniccharge/components/chargeDialog.vue  |    24 +-
 .../src/views/charge/cliniccharge/index.vue   |   535 +
 .../charge/clinicrefund/components/api.js     |    38 +-
 .../clinicrefund/components/refundDialog.vue  |   105 +-
 .../src/views/charge/clinicrefund/index.vue   |    48 +-
 .../components/chargeDialog.vue               |     3 +-
 .../components/outpatientregistration.js      |     2 +-
 .../components/patientAddDialog.vue           |   152 +-
 .../components/patientInfoDialog.vue          |     0
 .../components/patientList.vue                |     0
 .../components/refundDialog.vue               |     0
 .../charge/outpatientregistration/index.vue   |   333 +-
 .../views/charge/registerRecords/index.vue    |     0
 .../src/views/charge/schedule/index.vue       |     0
 .../bargain/component/adviceBaseList.vue      |     0
 .../clinicmanagement/bargain/component/api.js |     0
 .../bargain/component/prescriptionlist.vue    |     0
 .../views/clinicmanagement/bargain/index.vue  |     0
 .../clinicmanagement/chargeDetail/index.vue   |     0
 .../consultationCharge/index.vue              |     0
 .../consultationRefund/index.vue              |     0
 .../clinicmanagement/dayEnd/component/api.js  |    54 +-
 .../dayEnd/component/template.json            |  1492 ++
 .../views/clinicmanagement/dayEnd/index.vue   |   542 +-
 .../clinicmanagement/dayEnd/indexccu.vue      |   498 +
 .../disposal/components/api.js                |    30 +-
 .../components/performRecordDialog.vue        |    50 +
 .../views/clinicmanagement/disposal/index.vue |   541 +
 .../ePrescribing/components/api.js            |     0
 .../components/ePrescribingDetailDialog.vue   |     0
 .../components/medicinePickupQueryDialog.vue  |     0
 .../components/prescriptionQueryDialog.vue    |     0
 .../clinicmanagement/ePrescribing/index.vue   |   111 +-
 .../historicalPrescription/component/api.js   |    18 +
 .../component/details.vue                     |   290 +
 .../component/prescription.vue                |   238 +
 .../historicalPrescription/index.vue          |   304 +
 .../incomeStatement/components/api.js         |    20 +
 .../incomeStatement/index.vue                 |   129 +
 .../component/adviceListDialog.vue            |   164 +
 .../infusionrecord/component/api.js           |     9 +
 .../clinicmanagement/infusionrecord/index.vue |   115 +-
 .../clinicmanagement/lisPascResult/index.vue  |     0
 .../clinicmanagement/orderViewPrint/index.vue |     0
 .../clinicmanagement/refundNumber/index.vue   |     0
 .../clinicmanagement/requisition/index.vue    |     0
 .../returnDrug/components/api.js              |     0
 .../clinicmanagement/returnDrug/index.vue     |   102 +-
 .../skinrecord/component/api.js               |     0
 .../clinicmanagement/skinrecord/index.vue     |     0
 .../clinicmanagement/techExecute/index.vue    |     0
 .../techfundApprove/index.vue                 |     0
 .../clinicmanagement/withdrawal/index.vue     |     0
 .../definition/components/definition.js       |     0
 .../definition/components/edit.vue            |     0
 .../views/datadictionary/definition/index.vue |     0
 .../components/adviceBaseList.vue             |    43 +-
 .../src/views/doctorstation/components/api.js |   186 +-
 .../diagnosis/addDiagnosisDialog.vue          |   421 +
 .../components/diagnosis}/diagnosis.vue       |    72 +-
 .../components/diagnosis}/diagnosisdialog.vue |     2 +-
 .../components/diagnosis}/diagnosislist.vue   |     4 +-
 .../doctorstation/components/emr}/emr.vue     |    10 +-
 .../components/emr}/emrhistory.vue            |     4 +-
 .../components/emr}/emrtemplate.vue           |     2 +-
 .../components/eprescriptiondialog.vue        |   171 +-
 .../components/eprescriptionlist.vue          |     9 +-
 .../components/hospitalizationDialog.vue      |   323 +
 .../doctorstation/components/patientList.vue  |     8 +-
 .../prescription}/orderGroupDrawer.vue        |     2 +-
 .../prescription}/prescriptionHistory.vue     |     2 +-
 .../prescription/prescriptionInfo.vue         |   205 +
 .../prescription}/prescriptionlist.vue        |   285 +-
 .../prescriptionmedicineList.vue              |    18 +-
 .../prescription}/refundListDialog.vue        |     5 +-
 .../components/reservationRecord.vue          |   382 +
 .../components/tcm/tcmAdvice.vue              |   563 +-
 .../components/tcm/tcmMedicineList.vue        |     0
 .../components/tcm/tcmdiagnosisDialog.vue     |   223 +-
 .../src/views/doctorstation/index.vue         |    70 +-
 .../src/views/error/401.vue                   |     0
 .../src/views/error/404.vue                   |     0
 .../charge/advanceDeposit/components/api.js   |    25 +-
 .../components/chargeDialog.vue               |    43 +-
 .../advanceDeposit/components/patientList.vue |   177 +-
 .../components/refundDialog.vue               |   259 +
 .../charge/advanceDeposit/index.vue           |   406 +-
 .../charge/feeSettlement/components/api.js    |   100 +
 .../feeSettlement/components/chargeDialog.vue |   536 +
 .../charge/feeSettlement}/index.vue           |    75 +-
 .../components/BasicForm.vue                  |    60 +-
 .../components/InsuranceForm.vue              |    72 +-
 .../components/PatientDetail.vue              |    12 +-
 .../components/PatientList.vue                |    14 +-
 .../components/SearchForm.vue                 |    43 +-
 .../feeTypeConversion/components/TopForm.vue  |     4 +-
 .../charge/feeTypeConversion/index.vue        |    32 +-
 .../register/components/accomplishList.vue    |   111 +-
 .../charge/register/components/api.js         |    83 +-
 .../charge/register/components/awaitList.vue  |   112 +-
 .../charge/register/components/existList.vue  |    22 +-
 .../charge/register/components/index.js       |     0
 .../register/components/patientInfo.vue       |   465 +-
 .../register/components/patientInfoForm.vue   |   392 +
 .../register/components/patientRegister.vue   |   261 +-
 .../register/components/registerForm.vue      |   382 +-
 .../charge/register/index.vue                 |    15 +-
 .../charge/settleAccounts/components/api.js   |    55 +
 .../charge/settleAccounts/index.vue           |   363 +
 .../settlement/components/cancel/index.vue    |    39 +-
 .../components/home/components/derate.vue     |    19 -
 .../components/home/components/index.ts       |     0
 .../components/home/components/index.vue      |    31 +-
 .../home/components/invoiceSkip.vue           |    10 +-
 .../home/components/patientList.vue           |    34 +-
 .../home/components/patientListDialog.vue     |     0
 .../home/components/preSettlement.vue         |     0
 .../components/home/components/receipt.vue    |    37 +-
 .../components/home/components/refund.vue     |     2 +-
 .../settlement/components/home/index.vue      |     0
 .../components/midway/components/index.ts     |     0
 .../midway/components/patientList.vue         |    64 +-
 .../midway/components/selectSettlement.vue    |    10 +-
 .../settlement/components/midway/index.vue    |    70 +-
 .../charge/settlement/index.vue               |     0
 .../inpatientDiagnosis/index.vue              |     0
 .../inpatientRecord/index.vue                 |     0
 .../inHospitalManagement/listFee/index.vue    |     0
 .../medicalRecord/index.vue                   |     0
 .../orderManage/index.vue                     |     0
 .../inHospitalManagement/portal/index.vue     |     0
 .../src/views/inHospitalManagement/readme.md  |     0
 .../surgeryManage/index.vue                   |     0
 {vue3 => openhis-ui-vue3}/src/views/index.vue |    39 +-
 .../home/components/adviceBaseList.vue        |   179 +
 .../inpatientDoctor/home/components/api.js    |   242 +
 .../bloodTtransfusionAapplication.vue         |     5 +
 .../applicationForm/examineApplication.vue    |     5 +
 .../applicationForm/surgeryApplication.vue    |     5 +
 .../applicationForm/testApplication.vue       |     5 +
 .../diagnosis/addDiagnosisDialog.vue          |   421 +
 .../diagnosis}/chineseMedicineDialog.vue      |     7 +-
 .../home/components/diagnosis/diagnosis.vue   |   545 +
 .../components/diagnosis/diagnosisdialog.vue  |   126 +
 .../components/diagnosis/diagnosislist.vue    |    58 +
 .../home/components/diagnosis}/index.vue      |     2 +-
 .../diagnosis}/westernMedicineDialog.vue      |     8 +-
 .../home/components/order/index.vue           |  2111 +++
 .../home/components/order/index1.vue          |     0
 .../home/components/order/useOrder.js         |     0
 .../home/components/patientCard/index.vue     |    79 +-
 .../patientCard/patientChildCard.vue          |     0
 .../patientCard/patientParentCard.vue         |    16 +-
 .../home/components/patientList.vue           |    20 +-
 .../src/views/inpatientDoctor/home/index.js   |    14 +
 .../src/views/inpatientDoctor/home/index.vue  |    71 +-
 .../inpatientDoctor/home/store/patient.js     |     2 +
 .../src/views/inpatientDoctor/readme.md       |     0
 .../components/discharged/index.vue           |     0
 .../components/discharged/patientList.vue     |     2 +-
 .../components/discharged/review.vue          |     0
 .../dischargedManagement/components/index.ts  |     0
 .../components/waitForDischarge/index.vue     |     0
 .../waitForDischarge/medicalOrderList.vue     |     0
 .../waitForDischarge/patientList.vue          |     2 +-
 .../dischargedManagement/index.vue            |     0
 .../drugDistribution/drugDistributionList.vue |     2 +-
 .../inpatientNurse/drugDistribution/index.vue |     0
 .../drugDistribution/patientList.vue          |     2 +-
 .../inpatientNurse/home/components/api.js     |     0
 .../home/components/patientCard.vue           |     0
 .../home/components/patientDetialDialog.vue   |     0
 .../home/components/transferDialog.vue        |     0
 .../home/components/transferToBedDialog.vue   |     0
 .../src/views/inpatientNurse/home/index.vue   |     0
 .../inpatientNurse/inOut/components/api.js    |    87 +
 .../inOut/components/bedAllocation.vue        |   738 +
 .../inOut/components/bedcards.vue             |     2 +-
 .../inpatientNurse/inOut/components/index.ts  |     0
 .../inOut/components/signEntryDialog.vue      |     4 +-
 .../inOut/components/transferInDialog.vue     |   534 +
 .../src/views/inpatientNurse/inOut/index.vue  |    12 +-
 .../medicalOrderExecution/components/api.js   |    34 +
 .../components/patientList.vue                |   148 +
 .../components/prescriptionList.vue           |   298 +
 .../medicalOrderExecution/index.vue           |   137 +
 .../medicalOrderExecution/store/patient.js    |    12 +
 .../check/MedicalOrderManagement.vue          |     9 +-
 .../components/check/patientList.vue          |     4 +-
 .../execute/MedicalOrderManagement.vue        |   342 +-
 .../components/execute/patientList.vue        |     4 +-
 .../medicalOrderManagement/index.vue          |     5 +-
 .../medicalOrderProofread/components/api.js   |    34 +
 .../components/patientList.vue                |   144 +
 .../components/prescriptionList.vue           |   216 +
 .../medicalOrderProofread/index.vue           |    74 +
 .../medicalOrderProofread/store/patient.js    |    12 +
 .../components/addNursingRecordDialog.vue     |     0
 .../nursingRecord/components/api.js           |     0
 .../components/recordTemplate.vue             |     0
 .../inpatientNurse/nursingRecord/index.vue    |     0
 .../tprChart/components/addTprDialog.vue      |     0
 .../inpatientNurse/tprChart/components/api.js |     0
 .../views/inpatientNurse/tprChart/index.vue   |     0
 {vue3 => openhis-ui-vue3}/src/views/login.vue |   167 +-
 .../billapproval/components/api.js            |     0
 .../billapproval/index.vue                    |     0
 .../chkstock/chkstockBatch/components/api.js  |     0
 .../chkstockBatch/components/medicineList.vue |     0
 .../chkstock/chkstockBatch/index.vue          |   240 +-
 .../chkstock/chkstockPart/components/api.js   |    10 +-
 .../chkstockPart/components/medicineList.vue  |     0
 .../chkstock/chkstockPart/index.vue           |   283 +-
 .../chkstock/chkstockRecord/components/api.js |     0
 .../components/medicineList.vue               |     0
 .../chkstock/chkstockRecord/index.vue         |    16 +-
 .../chkstock/components/api.js                |     0
 .../chkstock/components/medicineList.vue      |     0
 .../lossReportingManagement/lossReporting.js  |     0
 .../components/lossReporting.vue              |     0
 .../lossReporting/index.vue                   |  1855 +--
 .../lossReportingList/index.vue               |     2 +-
 .../pharmacyReconciliation/components/api.js  |    17 +
 .../pharmacyReconciliation/index.vue          |   338 +
 .../purchaseDocument/components/api.js        |     0
 .../components/medicineList.vue               |     0
 .../purchaseDocument/index.vue                |   107 +-
 .../components/inventoryReceiptDialog.vue     |     0
 .../components/medicineList.vue               |     0
 .../components/purchaseinventory.js           |     0
 .../purchaseinventory/index.vue               |     2 +-
 .../requisitionManagement/components/api.js   |     0
 .../requisitionManagement/components/list.vue |     0
 .../requisitionInventoryManagement/index.vue  |     2 +-
 .../requisitionManagement/index.vue           |   585 +-
 .../requisitionManagementList/index.vue       |     2 +-
 .../returningInventory/index.vue              |   634 +-
 .../returnedPurchase/components/api.js        |     0
 .../components/transferManagement.vue         |     0
 .../returnedPurchase/index.vue                |    81 +-
 .../awaitingMedicineDetails.vue               |    85 +-
 .../chkstockPartDetails.vue                   |    63 +-
 .../statisticalManagement/earlyWarning.vue    |   304 +
 .../financialClearing.vue                     |   383 +
 .../statisticalManagement/index.vue           |   404 +-
 .../inventoryProductDetails.vue               |    34 +-
 .../liquidationRecords.vue                    |   513 +
 .../lossReportingDetails.vue                  |    36 +-
 .../medicationDetails.vue                     |    35 +-
 .../statisticalManagement/numberOfVisits.vue  |   303 +
 .../outPatientCharge.vue                      |    41 +-
 .../pharmacyMonthlybalance.vue                |   342 +
 .../purchaseDocumentDetsils.vue               |    48 +-
 .../purchaseReturnDetsils.vue                 |    50 +-
 .../statisticalManagement/reconciliation.vue  |    70 +-
 .../reconciliationDetails.vue                 |   237 +-
 .../registrationFeeDetails.vue                |     2 +-
 .../requisitionDetails.vue                    |   103 +-
 .../returnOrutboundDetails.vue                |    28 +-
 .../statisticalManagement/settlementDoc.vue   |   426 +
 .../statisticalManagent.js                    |   109 +-
 .../traceabilityCodeManagement.vue            |   216 +
 .../transferManagentDetails.vue               |     0
 .../transferManagent/batchTransfer/index.vue  |    39 +-
 .../components/transferManagement.js          |     0
 .../components/transferManagement.vue         |     0
 .../transferManagent/index.vue                |    38 +-
 .../transferManagentList/index.vue            |     2 +-
 .../documentManagement/components/api.js      |    17 +
 .../documentManagement/index.vue              |   337 +
 .../profitLossOrder/components/api.js         |    83 +
 .../components/medicineList.vue               |    88 +
 .../components/orderDialog.vue                |   343 +
 .../profitLossOrder/components/orderTable.vue |  1686 ++
 .../medicineStorage/profitLossOrder/index.vue |  1081 ++
 .../purchaseOrder/components/api.js           |    66 +
 .../purchaseOrder/components/medicineList.vue |    79 +
 .../purchaseOrder/components/orderTable.vue   |  1396 ++
 .../medicineStorage/purchaseOrder/index.vue   |  1008 ++
 .../returnOrder/components/api.js             |    83 +
 .../returnOrder/components/medicineList.vue   |    92 +
 .../returnOrder/components/orderDialog.vue    |   350 +
 .../returnOrder/components/orderTable.vue     |  1633 ++
 .../medicineStorage/returnOrder/index.vue     |  1058 ++
 .../returnToWarehouseOrder/components/api.js  |    83 +
 .../components/medicineList.vue               |    87 +
 .../components/orderDialog.vue                |   343 +
 .../components/orderTable.vue                 |  1680 ++
 .../returnToWarehouseOrder/index.vue          |  1058 ++
 .../stockInOrder/components/api.js            |    83 +
 .../stockInOrder/components/medicineList.vue  |    78 +
 .../stockInOrder/components/orderDialog.vue   |   350 +
 .../stockInOrder/components/orderTable.vue    |  1776 +++
 .../medicineStorage/stockInOrder/index.vue    |  1056 ++
 .../stockOutOrder/components/api.js           |    83 +
 .../stockOutOrder/components/medicineList.vue |    87 +
 .../stockOutOrder/components/orderDialog.vue  |   343 +
 .../stockOutOrder/components/orderTable.vue   |  1680 ++
 .../medicineStorage/stockOutOrder/index.vue   |  1058 ++
 .../stocktakingOrder/components/api.js        |    83 +
 .../components/medicineList.vue               |    88 +
 .../components/orderDialog.vue                |   343 +
 .../components/orderTable.vue                 |  1681 ++
 .../stocktakingOrder/index.vue                |  1071 ++
 .../src/views/monitor/cache/index.vue         |     0
 .../src/views/monitor/cache/list.vue          |     0
 .../src/views/monitor/druid/index.vue         |     0
 .../src/views/monitor/job/index.vue           |     0
 .../src/views/monitor/job/log.vue             |     0
 .../src/views/monitor/logininfor/index.vue    |     0
 .../src/views/monitor/online/index.vue        |     0
 .../src/views/monitor/operlog/index.vue       |     0
 .../src/views/monitor/server/index.vue        |     0
 .../outpatienrecords/component/api.js         |     0
 .../outpatienrecords/index.vue                |     0
 .../patientmanagement/component/api.js        |     0
 .../patientmanagement/index.vue               |    48 +-
 .../westernmedicine/components/api.js         |     0
 .../components/templateJson.json              |   533 +
 .../westernmedicine/index.vue                 |   394 +-
 .../src/views/redirect/index.vue              |     0
 .../src/views/register.vue                    |     0
 .../src/views/system/config/index.vue         |     0
 .../src/views/system/dept/index.vue           |     0
 .../src/views/system/dict/data.vue            |     0
 .../src/views/system/dict/index.vue           |     0
 .../src/views/system/menu/index.vue           |     0
 .../src/views/system/notice/index.vue         |     0
 .../src/views/system/post/index.vue           |     0
 .../src/views/system/role/authUser.vue        |     0
 .../src/views/system/role/index.vue           |     0
 .../src/views/system/role/selectUser.vue      |     0
 .../src/views/system/tenant/bindUser.vue      |     0
 .../src/views/system/tenant/index.vue         |   149 +-
 .../src/views/system/tenant/setContract.vue   |   267 +
 .../src/views/system/tenant/setUser.vue       |     0
 .../src/views/system/user copy/authRole.vue   |     0
 .../src/views/system/user copy/index.vue      |     0
 .../views/system/user copy/profile/index.vue  |     0
 .../system/user copy/profile/resetPwd.vue     |     0
 .../system/user copy/profile/userAvatar.vue   |     0
 .../system/user copy/profile/userInfo.vue     |     0
 .../src/views/system/user/authRole.vue        |     0
 .../src/views/system/user/index.vue           |     4 +-
 .../src/views/system/user/profile/index.vue   |     0
 .../views/system/user/profile/resetPwd.vue    |     0
 .../views/system/user/profile/userAvatar.vue  |     0
 .../views/system/user/profile/userInfo.vue    |     0
 .../src/views/tool/gen/basicInfoForm.vue      |     0
 .../src/views/tool/gen/createTable.vue        |     0
 .../src/views/tool/gen/editTable.vue          |     0
 .../src/views/tool/gen/genInfoForm.vue        |     0
 .../src/views/tool/gen/importTable.vue        |     0
 .../src/views/tool/gen/index.vue              |     0
 .../src/views/tool/swagger/index.vue          |     0
 {vue3 => openhis-ui-vue3}/vite.config.js      |     7 +-
 .../vite/plugins/auto-import.js               |     0
 .../vite/plugins/compression.js               |     0
 .../vite/plugins/index.js                     |    42 +-
 .../vite/plugins/setup-extend.js              |     0
 .../vite/plugins/svg-icon.js                  |     0
 .../basicmanage/ordersCombination/index.vue   |   336 -
 .../views/clinicmanagement/disposal/index.vue |   208 -
 vue3/src/views/doctorstation/index1.vue       |   878 --
 .../diagnose/diagnoseFolder copy.vue          |    86 -
 .../components/diagnose/diagnoseFolder.vue    |    95 -
 vue3/src/views/inpatientDoctor/home/index.js  |    10 -
 .../inOut/components/bedAllocation.vue        |   101 -
 .../inOut/components/transferInDialog.vue     |   268 -
 vue3/src/views/system/tenant/setOption.vue    |   223 -
 3538 files changed, 149133 insertions(+), 17686 deletions(-)
 rename {openhis-server => openhis-server-new}/.gitignore (100%)
 rename {openhis-server => openhis-server-new}/LICENSE (100%)
 rename {openhis-server => openhis-server-new}/README.md (100%)
 rename {openhis-server => openhis-server-new}/core-admin/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/common/CommonController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java (97%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java (100%)
 create mode 100644 openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/controller/tool/TestController.java (100%)
 rename {openhis-server => openhis-server-new}/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java (100%)
 create mode 100644 openhis-server-new/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java
 rename {openhis-server => openhis-server-new}/core-common/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/Anonymous.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/DataScope.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/DataSource.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/Excel.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/Excels.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/Log.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/RateLimiter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/RepeatSubmit.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/annotation/Sensitive.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/config/CoreConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/constant/CacheConstants.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/constant/Constants.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/constant/GenConstants.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/constant/HttpStatus.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/constant/ScheduleConstants.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/constant/UserConstants.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/controller/BaseController.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/R.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/TreeEntity.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/model/LoginBody.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java (94%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/domain/model/RegisterBody.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/page/PageDomain.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/page/TableDataInfo.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/page/TableSupport.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/redis/RedisCache.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/text/CharsetKit.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/text/Convert.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/core/text/StrFormatter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/BusinessStatus.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/BusinessType.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/DataSourceType.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/DeleteFlag.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/DesensitizedType.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/HttpMethod.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/LimitType.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/OperatorType.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java (45%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/TenantStatus.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/enums/UserStatus.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/CustomException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/DemoModeException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/GlobalException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/NonCaptureException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/ServiceException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/UtilException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/base/BaseException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/file/FileException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/file/FileNameLengthLimitExceededException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/file/FileSizeLimitExceededException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/file/FileUploadException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/file/InvalidExtensionException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/job/TaskException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/BlackListException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/CaptchaException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/CaptchaExpireException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/UserException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/UserNotExistsException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/UserPasswordNotMatchException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/exception/user/UserPasswordRetryLimitExceedException.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/filter/PropertyPreExcludeFilter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/filter/XssFilter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java (80%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/Arith.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/ChineseConvertUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/DateUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/DesensitizedUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/DictUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/LogUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/MessageUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/PageUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/SecurityUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/ServletUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/StringUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/Threads.java (100%)
 create mode 100644 openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java (91%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/file/FileUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/file/MimeTypeUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/html/EscapeUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/html/HTMLFilter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/poi/ExcelHandlerAdapter.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/sign/Base64.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/sql/SqlUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/uuid/IdUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/uuid/Seq.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/utils/uuid/UUID.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/xss/Xss.java (100%)
 rename {openhis-server => openhis-server-new}/core-common/src/main/java/com/core/common/xss/XssValidator.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/DruidConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/FilterConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/I18nConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java (96%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/RedisConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/ServerConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/TenantContext.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/domain/Server.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java (94%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java (99%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/TokenService.java (100%)
 rename {openhis-server => openhis-server-new}/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/config/GenConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/controller/GenController.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/domain/GenTable.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/service/IGenTableService.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/util/GenUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/generator.yml (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/vm/java/domain.java.vm (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/vm/java/mapper.java.vm (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/vm/java/service.java.vm (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/vm/java/serviceImpl.java.vm (100%)
 rename {openhis-server => openhis-server-new}/core-generator/src/main/resources/vm/xml/mapper.xml.vm (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysCache.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysConfig.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysDeployForm.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysExpression.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysForm.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysListener.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysLogininfor.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysNotice.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysOperLog.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysPost.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysRoleDept.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysRoleMenu.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysTaskForm.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysTenant.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysTenantOption.java (89%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysUserOnline.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysUserPost.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysUserRole.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/SysUserTenant.java (100%)
 create mode 100644 openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java
 rename openhis-server/core-system/src/main/java/com/core/system/domain/dto/SysTenantOptionDto.java => openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/TenantOptionDto.java (92%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/vo/MetaVo.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java (93%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysConfigService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysDeptService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysDictDataService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysExpressionService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysListenerService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysLogininforService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysMenuService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysNoticeService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysOperLogService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysPostService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysRoleService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java (34%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysTenantService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysUserOnlineService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysUserService.java (94%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/ISysUserTenantService.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java (98%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java (100%)
 create mode 100644 openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java (97%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/flowable/SysTaskFormMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysConfigMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysDeployFormMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysDeptMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysDictTypeMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysExpressionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysFormMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysListenerMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysLogininforMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysMenuMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysOperLogMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysPostMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysRoleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysTenantMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysTenantOptionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysUserMapper.xml (95%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysUserPostMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysUserRoleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/core-system/src/main/resources/mapper/system/SysUserTenantMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/OpenHisApplication.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/config/HttpConfig.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/StocktakingBatchTask.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java (66%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java (76%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java (70%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java (94%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java (82%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java (66%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java (79%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java (53%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java (60%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java (62%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java (69%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java (76%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java (92%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java (91%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAllergyIntolAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java (89%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java (62%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java (55%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAllergyIntolAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java (42%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java (51%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAllergyIntolController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java (66%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java (87%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java (70%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java (80%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java (65%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java (85%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java (91%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java (78%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java (94%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java (92%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java (39%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java (48%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionOptionAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionOptionAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsOptionController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IInpatientMedicineCollectionAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/InpatientMedicineCollectionAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/InpatientMedicineCollectionController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/PendingAdmissionDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java (47%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalPatientInfoDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java (38%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionInitDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java (42%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/InpatientMedicineCollectionMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IAdmissionAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java (95%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java (89%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/AdmissionController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java (97%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionUpDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PrePaymentDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java (45%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java (46%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/AdmissionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java (84%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java (59%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java (82%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java (84%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java (83%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java (51%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java (79%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java (91%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java (97%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java (62%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java (87%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java (81%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java (83%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java (68%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java (62%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsTotalDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalActivityInfoDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java (37%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java (56%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java (64%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java (72%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java (59%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java (64%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java (64%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientDisposalService.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java (37%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientDisposalController.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java (33%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordSearchParam.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionInitDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java (79%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalEncounterInfoPageDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java (55%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalTempInfoDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java (33%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java (77%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java (40%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java (63%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java (92%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java (63%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java (41%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java (89%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java (41%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java (67%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java (37%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java (84%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IChineseMedicineDispenseAppService.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IDeviceDispenseAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineDispenseAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineSummaryDispenseAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalConsumablesDispenseAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ReturnMedicineAppService.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java (68%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/DeviceDispenseAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IChineseMedicineDispenseAppServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicalConsumablesDispenseAppServiceImpl.java
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IReturnMedicineAppServiceImpl.java (67%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java (63%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineDispenseAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineSummaryDispenseAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ChineseMedicineDispenseController.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/DeviceDispenseController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineDispenseController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineSummaryDispenseController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalConsumablesDispenseController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java (70%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseDeviceDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java (89%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java (88%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java (69%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineMapInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSearchParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSummaryPrescriptionInfoDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java (88%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedRunningAccountPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionDeviceInfoDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java (84%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java (74%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ChineseMedicineDispenseMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/IDeviceDispenseMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineDispenseMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineSummaryDispenseMapper.java
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicineConsumablesDispenseMapper.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalConsumablesDispenseAppMapper.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java (70%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java (68%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java (62%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java (64%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java (63%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java (64%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java (62%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java (62%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java (58%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java (36%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java (30%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java (33%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java (31%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java (37%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java (30%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java (71%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java (67%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java (58%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java (69%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java (58%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java (69%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java (66%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java (67%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDetailDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java (40%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInitDto.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java (50%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java (56%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java (68%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java (100%)
 rename openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParma.java => openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java (92%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java (80%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java (77%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java (77%)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java (87%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/META-INF/spring-devtools.properties (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/application-cd.yml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/application-cloud.yml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/application-local.yml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/application-nd.yml (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/application-prod.yml (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/application-test.yml (85%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/application.yml (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/banner.txt (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/config/flow.el.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/http.yml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/i18n/messages.properties (94%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/logback.xml (85%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml (54%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml (54%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml (35%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml (56%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml (56%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml (95%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml (52%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml (53%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml (99%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml (46%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml (97%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml (88%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml (57%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml (68%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml (32%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml (39%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/InpatientMedicineCollectionMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/inpatientmanage/AdmissionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
 rename openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml => openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml (65%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml (98%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml (96%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml (35%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/pharmacymanage/ChineseMedicineDispenseMapper.xml (100%)
 rename openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml => openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/IDeviceDispenseMapper.xml (43%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineDispenseMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineSummaryDispenseMapper.xml
 rename openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicineConsumablesDispenseMapper.xml => openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalConsumablesDispenseAppMapper.xml (98%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml (98%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml (70%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml (99%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml (96%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml (80%)
 create mode 100644 openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/mybatis/mybatis-config.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/main/resources/properties/yb.properties (100%)
 rename {openhis-server => openhis-server-new}/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java (84%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java (100%)
 rename openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java => openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java (57%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java (55%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/Category.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java (97%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java (100%)
 rename openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java => openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java (38%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java (88%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java (73%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java (79%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java (92%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java (67%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/Severity.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java (84%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/VerificationStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/Whether.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java (71%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java (88%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java (50%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java (41%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java (42%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java (100%)
 create mode 100644 openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java
 rename {openhis-server => openhis-server-new}/openhis-domain/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java (92%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java (86%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java (100%)
 rename openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java => openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java (46%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java (60%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java (77%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java (57%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java (53%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java (82%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java (57%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java (79%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java (68%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java (30%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java (67%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java (65%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java (81%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java (97%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java (92%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java (100%)
 rename openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java => openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java (45%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java (74%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java (74%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java (71%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java (56%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
 rename openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java => openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java (47%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java (54%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java (79%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java (59%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java (41%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
 rename openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java => openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java (37%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java (89%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java (92%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java (56%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java (49%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java (56%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java (42%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java (46%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java (62%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java (71%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java (48%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java (46%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java (95%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java (93%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java (89%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java (86%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java (85%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java (78%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java (73%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java (71%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java (53%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java (82%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java (78%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java (73%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java (76%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java (71%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java (59%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/File.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java (70%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java (69%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java (89%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java (91%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java (82%)
 rename {openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage => openhis-server-new/openhis-domain/src/main/java/com/openhis/yb}/dto/PaymentDto.java (57%)
 rename openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java => openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java (46%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java (72%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java (87%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java (60%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java (100%)
 rename openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java => openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java (36%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java (47%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java (55%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java (73%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java (44%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java (38%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java (70%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java (58%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml (100%)
 rename openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml => openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml (74%)
 rename openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml => openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml (71%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
 rename openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml => openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml (70%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml (59%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml (100%)
 create mode 100644 openhis-server-new/openhis-einvoiceapp/pom.xml
 rename openhis-server/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java => openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/OpenHisInvoiceApplication.java (55%)
 create mode 100644 openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/controller/YbController.java
 create mode 100644 openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/vo/EleInvioceBillDto.java
 create mode 100644 openhis-server-new/openhis-einvoiceapp/src/main/resources/application-druid.yml
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/application-prod.yml (100%)
 create mode 100644 openhis-server-new/openhis-einvoiceapp/src/main/resources/application.yml
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/banner.txt (100%)
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/config/flow.el.xml (100%)
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/config/hospital-config.properties (100%)
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/config/sys-config.properties (100%)
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/logback.xml (89%)
 rename {openhis-server/openhis-miniapp => openhis-server-new/openhis-einvoiceapp}/src/main/resources/mybatis/mybatis-config.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/pom.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/resources/application-druid.yml (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/resources/application.yml (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/resources/banner.txt (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/resources/i18n/messages.properties (100%)
 rename {openhis-server => openhis-server-new}/openhis-miniapp/src/main/resources/logback.xml (100%)
 rename {openhis-server/openhis-ybapp => openhis-server-new/openhis-miniapp}/src/main/resources/mybatis/mybatis-config.xml (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/pom.xml (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java (94%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java (61%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/File.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java (96%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java (92%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java (98%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/FileService.java (75%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/YbService.java (67%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java (88%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java (80%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java (90%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java (77%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java (83%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java (97%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java (77%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java (100%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/java/com/openhis/vo/extData.java (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml
 rename openhis-server/openhis-ybapp/src/main/resources/application-druid.yml => openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml (93%)
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/resources/application.yml (98%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/banner.txt
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/resources/config.properties (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml
 rename vue3/README.md => openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties
 rename {openhis-server => openhis-server-new}/openhis-ybapp/src/main/resources/config/tenant-config.properties (100%)
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/logback.xml
 create mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml
 rename {openhis-server => openhis-server-new}/pom.xml (100%)
 delete mode 100644 openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java
 delete mode 100644 openhis-server/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/INurseStationPendAdmAppService.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/impl/NurseStationPendAdmAppServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/controller/NurseStationPendAdmController.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/mapper/NurseStationPendAdmAppMapper.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientDisposalServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalDeviceInfoDto.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalExecuteInfoDto.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInfoDto.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientDisposalMapper.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicineConsumablesDispenseAppService.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicineConsumablesDispenseAppServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicineConsumablesDispenseController.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
 delete mode 100644 openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
 delete mode 100644 openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
 delete mode 100644 openhis-server/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
 delete mode 100644 openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
 delete mode 100644 openhis-server/openhis-application/src/main/resources/mapper/nursestation/NurseStationPendAdmAppMapper.xml
 delete mode 100644 openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientDisposalMapper.xml
 delete mode 100644 openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
 delete mode 100644 openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
 delete mode 100644 openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
 delete mode 100644 openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
 delete mode 100644 openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
 delete mode 100644 openhis-server/openhis-domain/src/main/resources/mapper/yb/YbElepMapper.xml
 rename {vue3 => openhis-ui-vue3}/.env.development (68%)
 rename {vue3 => openhis-ui-vue3}/.env.production (80%)
 rename {vue3 => openhis-ui-vue3}/.env.staging (100%)
 rename {vue3 => openhis-ui-vue3}/.prettierrc.cjs (100%)
 rename {vue3 => openhis-ui-vue3}/.stylelintrc.cjs (100%)
 rename {vue3 => openhis-ui-vue3}/LICENSE (100%)
 create mode 100644 openhis-ui-vue3/README.md
 rename {vue3 => openhis-ui-vue3}/html/ie.html (100%)
 rename {vue3 => openhis-ui-vue3}/index.html (92%)
 create mode 100644 openhis-ui-vue3/package-lock.json
 rename {vue3 => openhis-ui-vue3}/package.json (95%)
 rename {vue3 => openhis-ui-vue3}/public/favicon.ico (100%)
 create mode 100644 openhis-ui-vue3/public/print-lock.css
 rename {vue3 => openhis-ui-vue3}/src/App.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/ViewConfig.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/config.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/dataProcess.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/datas.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/drawfn.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/line.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/template.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/action/nurseStation/temperatureSheet/utils.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/login.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/menu.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/cache.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/job.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/jobLog.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/logininfor.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/online.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/operlog.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/monitor/server.js (100%)
 create mode 100644 openhis-ui-vue3/src/api/public.js
 rename {vue3 => openhis-ui-vue3}/src/api/system/config.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/dept.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/dict/data.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/dict/type.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/menu.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/notice.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/post.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/role.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/tenant.js (69%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/user copy.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/system/user.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/api/tool/gen.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/401_images/401.gif (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/404_images/404.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/404_images/404_cloud.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/fonts/HarmonyOS_Sans_Black.ttf (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/fonts/HarmonyOS_Sans_Bold.ttf (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/fonts/HarmonyOS_Sans_Light.ttf (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/fonts/HarmonyOS_Sans_Medium.ttf (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/fonts/HarmonyOS_Sans_Regular.ttf (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/fonts/HarmonyOS_Sans_Thin.ttf (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/404.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/bug.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/build.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/button.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/cascader.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/chart.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/checkbox.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/clipboard.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/code.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/color.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/component.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/dashboard.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/date-range.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/date.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/dict.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/documentation.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/download.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/drag.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/druid.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/edit.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/education.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/email.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/example.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/excel.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/exit-fullscreen.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/eye-open.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/eye.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/form.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/fullscreen.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/github.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/guide.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/icon.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/input.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/international.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/job.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/language.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/link.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/list.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/lock.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/log.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/logininfor.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/message.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/money.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/monitor.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/nested.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/number.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/online.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/password.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/pdf.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/people.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/peoples.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/phone.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/post.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/qq.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/question.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/radio.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/rate.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/redis-list.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/redis.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/row.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/search.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/select.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/server.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/shopping.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/size.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/skill.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/slider.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/star.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/swagger.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/switch.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/system.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/tab.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/table.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/textarea.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/theme.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/time-range.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/time.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/tool.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/tree-table.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/tree.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/upload.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/user.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/validCode.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/wechat.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/icons/svg/zip.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/ODLS.png (100%)
 create mode 100644 openhis-ui-vue3/src/assets/images/ccu.png
 create mode 100644 openhis-ui-vue3/src/assets/images/cculogo.png
 rename {vue3 => openhis-ui-vue3}/src/assets/images/dark.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/jlau.jpg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/light.svg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/login-background.jpg (100%)
 create mode 100644 openhis-ui-vue3/src/assets/images/logo.svg
 rename {vue3 => openhis-ui-vue3}/src/assets/images/logo_bg.jpg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/pay.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/profile.jpg (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/images/user.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/logo/logo.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/logo/logoBlack.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/logo/logoNew.png (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/btn.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/element-ui.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/font.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/index.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/mixin.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/openhis.scss (94%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/sidebar.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/transition.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/assets/styles/variables.module.scss (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/PfPatientCardB/PfPatientCard.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/PfPatientCardB/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/PfPatientCardB/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/bedCard.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/changeShiftBill.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/exeOrderSheet.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/injectLabel.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/injectOrderSheet.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/labelGroup.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/sheetGroup.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/temperatureSheet.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/triageTicket.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/triageTicketGroup.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/triageTicketNew.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Auto/printBills/wristBill.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Breadcrumb/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/day.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/hour.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/min.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/month.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/result.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/second.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/week.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Crontab/year.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/DictTag/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Editor/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/FileUpload/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Hamburger/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/HeaderSearch/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/IconSelect/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/IconSelect/requireIcons.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/ImagePreview/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/ImageUpload/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/OpenHis/Doc/index.vue (100%)
 create mode 100644 openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue
 rename {vue3 => openhis-ui-vue3}/src/components/OpenHis/popoverList/index.vue (78%)
 rename {vue3 => openhis-ui-vue3}/src/components/Pagination/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/ParentView/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/RightToolbar/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/Screenfull/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/SizeSelect/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/SvgIcon/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/SvgIcon/svgicon.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/TopNav/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/TreeSelect/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/iFrame/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/patientBar/components/BallTag.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/components/patientBar/inPatientBarDoctorFold.vue (58%)
 rename {vue3 => openhis-ui-vue3}/src/directive/common/clickOutsideRow.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/directive/common/copyText.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/directive/common/horizontalScroll.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/directive/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/directive/permission/hasPermi.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/directive/permission/hasRole.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/AppMain.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/IframeToggle/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/InnerLink/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/Navbar.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/Settings/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/Sidebar/Link.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/Sidebar/Logo.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/Sidebar/SidebarItem.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/Sidebar/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/TagsView/ScrollPane.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/TagsView/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/components/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/layout/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/main.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/permission.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/plugins/auth.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/plugins/cache.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/plugins/download.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/plugins/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/plugins/modal.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/plugins/tab.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/router/index.js (96%)
 rename {vue3 => openhis-ui-vue3}/src/settings.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/modules/app.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/modules/dict.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/modules/permission.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/modules/settings.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/modules/tagsView.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/store/modules/user.js (95%)
 rename {vue3 => openhis-ui-vue3}/src/store/store.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/auth.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/dict.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/dynamicTitle.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/errorCode.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/his.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/jsencrypt.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/openhis.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/permission.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/request.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/scroll-to.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/theme.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/utils/validate.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/automaticBilling/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/bargainSets/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/bedspace/index.vue (100%)
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/bodyStructure/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/bodyStructure/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/caseTemplates/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/commonlyDiagnosis/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/consumablesBinding/components/activityList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/consumablesBinding/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/consumablesBinding/components/consumablesList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/consumablesBinding/components/deviceList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/consumablesBinding/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/contract/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/customer/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/fee/index.vue (100%)
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/frequency/components/FreForm.vue
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/frequency/components/frequency.js
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/frequency/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/implementDepartment/components/implementDepartment.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/implementDepartment/index.vue (89%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/lisMerge/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/ordersCombination/components/api.js (85%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue (99%)
 create mode 100644 openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/organization/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/organization/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/pharmacyDepartment/components/pharmacyDepartment.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/pharmacyDepartment/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/supplier/components/supplier.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/supplier/index.vue (96%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/tcmPrescription/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/ward/components/api.js (74%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/ward/index.vue (55%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/warehouseLocation/components/api.js (69%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicmanage/warehouseLocation/index.vue (92%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicservices/registrationfee/components/registrationfee.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/basicservices/registrationfee/index.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/device/components/device.js (97%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/device/components/deviceDialog.vue (89%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/device/components/deviceYbDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/device/index.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/diagnosistreatment/components/diagTreYbDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue (95%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js (90%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/diagnosistreatment/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/disease/components/disease.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/disease/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/medicine/components/medicine.js (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/medicine/components/medicineDialog.vue (94%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/medicine/components/medicineYbDialog.vue (65%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/medicine/index.vue (84%)
 rename {vue3 => openhis-ui-vue3}/src/views/catalog/service/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/clinicRecord/components/api.js (83%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/clinicRecord/index.vue (68%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/cliniccharge/components/api.js (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/cliniccharge/components/chargeDialog.vue (96%)
 create mode 100644 openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/charge/clinicrefund/components/api.js (59%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/clinicrefund/components/refundDialog.vue (74%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/clinicrefund/index.vue (90%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/components/chargeDialog.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/components/outpatientregistration.js (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/components/patientAddDialog.vue (85%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/components/patientInfoDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/components/patientList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/components/refundDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/outpatientregistration/index.vue (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/registerRecords/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/charge/schedule/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/bargain/component/adviceBaseList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/bargain/component/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/bargain/component/prescriptionlist.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/bargain/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/chargeDetail/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/consultationCharge/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/consultationRefund/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/dayEnd/component/api.js (32%)
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/dayEnd/index.vue (34%)
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/disposal/components/api.js (50%)
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/ePrescribing/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/ePrescribing/index.vue (84%)
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/api.js
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue
 create mode 100644 openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/infusionrecord/component/api.js (90%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/infusionrecord/index.vue (85%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/lisPascResult/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/orderViewPrint/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/refundNumber/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/requisition/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/returnDrug/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/returnDrug/index.vue (82%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/skinrecord/component/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/skinrecord/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/techExecute/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/techfundApprove/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/clinicmanagement/withdrawal/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/datadictionary/definition/components/definition.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/datadictionary/definition/components/edit.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/datadictionary/definition/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/adviceBaseList.vue (79%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/api.js (72%)
 create mode 100644 openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/diagnosis}/diagnosis.vue (88%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/diagnosis}/diagnosisdialog.vue (99%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/diagnosis}/diagnosislist.vue (87%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/emr}/emr.vue (96%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/emr}/emrhistory.vue (93%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/emr}/emrtemplate.vue (96%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/eprescriptiondialog.vue (84%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/eprescriptionlist.vue (98%)
 create mode 100644 openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
 rename vue3/src/views/doctorstation/components/patientlist.vue => openhis-ui-vue3/src/views/doctorstation/components/patientList.vue (98%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/prescription}/orderGroupDrawer.vue (98%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/prescription}/prescriptionHistory.vue (98%)
 create mode 100644 openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/prescription}/prescriptionlist.vue (89%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/prescription}/prescriptionmedicineList.vue (78%)
 rename {vue3/src/views/doctorstation/components => openhis-ui-vue3/src/views/doctorstation/components/prescription}/refundListDialog.vue (96%)
 create mode 100644 openhis-ui-vue3/src/views/doctorstation/components/reservationRecord.vue
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/tcm/tcmAdvice.vue (81%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/tcm/tcmMedicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue (49%)
 rename {vue3 => openhis-ui-vue3}/src/views/doctorstation/index.vue (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/error/401.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/error/404.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js (50%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue (78%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue (59%)
 create mode 100644 openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/refundDialog.vue
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/advanceDeposit/index.vue (41%)
 create mode 100644 openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/chargeDialog.vue
 rename {vue3/src/views/charge/cliniccharge => openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement}/index.vue (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue (81%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue (81%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue (89%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue (73%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue (96%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue (84%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/accomplishList.vue (52%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/api.js (45%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/awaitList.vue (50%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/existList.vue (87%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/index.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/patientInfo.vue (37%)
 create mode 100644 openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/patientRegister.vue (53%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/components/registerForm.vue (42%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/register/index.vue (69%)
 create mode 100644 openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue (91%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue (71%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/index.ts (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue (96%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue (91%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue (85%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/preSettlement.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue (88%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/home/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/midway/components/index.ts (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue (79%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue (89%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue (95%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/charge/settlement/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/inpatientDiagnosis/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/inpatientRecord/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/listFee/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/medicalRecord/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/orderManage/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/portal/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/readme.md (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inHospitalManagement/surgeryManage/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/index.vue (63%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/bloodTtransfusionAapplication.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/examineApplication.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/surgeryApplication.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/testApplication.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/addDiagnosisDialog.vue
 rename {vue3/src/views/inpatientDoctor/home/components/diagnose => openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis}/chineseMedicineDialog.vue (93%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosisdialog.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosislist.vue
 rename {vue3/src/views/inpatientDoctor/home/components/diagnose => openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis}/index.vue (99%)
 rename {vue3/src/views/inpatientDoctor/home/components/diagnose => openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis}/westernMedicineDialog.vue (96%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
 rename vue3/src/views/inpatientDoctor/home/components/order/index.vue => openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index1.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/components/order/useOrder.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/components/patientCard/index.vue (58%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/components/patientCard/patientChildCard.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue (92%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/components/patientList.vue (95%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/index.vue (44%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/home/store/patient.js (94%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientDoctor/readme.md (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/discharged/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue (96%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/discharged/review.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/index.ts (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue (96%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/dischargedManagement/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/drugDistribution/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/drugDistribution/patientList.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/home/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/home/components/patientCard.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/home/components/patientDetialDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/home/components/transferDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/home/components/transferToBedDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/home/index.vue (100%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/inOut/components/bedcards.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/inOut/components/index.ts (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/inOut/components/signEntryDialog.vue (98%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/inOut/index.vue (77%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/patientList.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/store/patient.js
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue (51%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/medicalOrderManagement/index.vue (94%)
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/patientList.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
 create mode 100644 openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/store/patient.js
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/nursingRecord/components/addNursingRecordDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/nursingRecord/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/nursingRecord/components/recordTemplate.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/nursingRecord/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/tprChart/components/addTprDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/tprChart/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/inpatientNurse/tprChart/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/login.vue (80%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/billapproval/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/billapproval/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockBatch/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue (90%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js (94%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockPart/index.vue (89%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockRecord/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue (97%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/chkstock/components/medicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/lossReportingManagement/lossReporting.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue (40%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue (99%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseDocument/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseDocument/index.vue (95%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseinventory/components/medicineList.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/purchaseinventory/index.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/requisitionManagement/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/requisitionManagement/components/list.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue (75%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue (73%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/returnedPurchase/components/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/returnedPurchase/components/transferManagement.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/returnedPurchase/index.vue (95%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue (72%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue (76%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/financialClearing.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/index.vue (58%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue (90%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/liquidationRecords.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue (86%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue (99%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/numberOfVisits.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue (95%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue (88%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue (89%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/reconciliation.vue (86%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue (63%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue (78%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue (93%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js (75%)
 create mode 100644 openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/statisticalManagement/transferManagentDetails.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/transferManagent/components/transferManagement.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/transferManagent/components/transferManagement.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/transferManagent/transferManagent/index.vue (98%)
 rename {vue3 => openhis-ui-vue3}/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue (99%)
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/documentManagement/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnOrder/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/api.js
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/medicineList.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderDialog.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderTable.vue
 create mode 100644 openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/index.vue
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/cache/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/cache/list.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/druid/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/job/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/job/log.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/logininfor/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/online/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/operlog/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/monitor/server/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/patientmanagement/outpatienrecords/component/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/patientmanagement/outpatienrecords/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/patientmanagement/patientmanagement/component/api.js (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/patientmanagement/patientmanagement/index.vue (93%)
 rename {vue3 => openhis-ui-vue3}/src/views/pharmacymanagement/westernmedicine/components/api.js (100%)
 create mode 100644 openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json
 rename {vue3 => openhis-ui-vue3}/src/views/pharmacymanagement/westernmedicine/index.vue (76%)
 rename {vue3 => openhis-ui-vue3}/src/views/redirect/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/register.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/config/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/dept/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/dict/data.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/dict/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/menu/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/notice/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/post/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/role/authUser.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/role/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/role/selectUser.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/tenant/bindUser.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/tenant/index.vue (70%)
 create mode 100644 openhis-ui-vue3/src/views/system/tenant/setContract.vue
 rename {vue3 => openhis-ui-vue3}/src/views/system/tenant/setUser.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user copy/authRole.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user copy/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user copy/profile/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user copy/profile/resetPwd.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user copy/profile/userAvatar.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user copy/profile/userInfo.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user/authRole.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user/index.vue (99%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user/profile/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user/profile/resetPwd.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user/profile/userAvatar.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/system/user/profile/userInfo.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/gen/basicInfoForm.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/gen/createTable.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/gen/editTable.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/gen/genInfoForm.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/gen/importTable.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/gen/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/src/views/tool/swagger/index.vue (100%)
 rename {vue3 => openhis-ui-vue3}/vite.config.js (91%)
 rename {vue3 => openhis-ui-vue3}/vite/plugins/auto-import.js (100%)
 rename {vue3 => openhis-ui-vue3}/vite/plugins/compression.js (100%)
 rename {vue3 => openhis-ui-vue3}/vite/plugins/index.js (48%)
 rename {vue3 => openhis-ui-vue3}/vite/plugins/setup-extend.js (100%)
 rename {vue3 => openhis-ui-vue3}/vite/plugins/svg-icon.js (100%)
 delete mode 100644 vue3/src/views/basicmanage/ordersCombination/index.vue
 delete mode 100644 vue3/src/views/clinicmanagement/disposal/index.vue
 delete mode 100644 vue3/src/views/doctorstation/index1.vue
 delete mode 100644 vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder copy.vue
 delete mode 100644 vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder.vue
 delete mode 100644 vue3/src/views/inpatientDoctor/home/index.js
 delete mode 100644 vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
 delete mode 100644 vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
 delete mode 100644 vue3/src/views/system/tenant/setOption.vue

diff --git a/openhis-server/.gitignore b/openhis-server-new/.gitignore
similarity index 100%
rename from openhis-server/.gitignore
rename to openhis-server-new/.gitignore
diff --git a/openhis-server/LICENSE b/openhis-server-new/LICENSE
similarity index 100%
rename from openhis-server/LICENSE
rename to openhis-server-new/LICENSE
diff --git a/openhis-server/README.md b/openhis-server-new/README.md
similarity index 100%
rename from openhis-server/README.md
rename to openhis-server-new/README.md
diff --git a/openhis-server/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml
similarity index 100%
rename from openhis-server/core-admin/pom.xml
rename to openhis-server-new/core-admin/pom.xml
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/common/CommonController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/common/CommonController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java
similarity index 97%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java
index c13bed72..978e48f6 100644
--- a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java
+++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java
@@ -21,7 +21,7 @@ import com.core.framework.web.service.SysPermissionService;
 import com.core.framework.web.service.TokenService;
 import com.core.system.service.ISysMenuService;
 
-/**
+/**已评审
  * 登录验证
  * 
  * @author system
@@ -40,9 +40,9 @@ public class SysLoginController {
     @Autowired
     private TokenService tokenService;
 
-    /**
+    /**已评审
      * 登录方法
-     * 
+     *
      * @param loginBody 登录信息
      * @return 结果
      */
@@ -56,7 +56,7 @@ public class SysLoginController {
         return ajax;
     }
 
-    /**
+    /**已评审 整个admin合拼到app层
      * 获取用户信息
      * 
      * @return 用户信息
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java
diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java
new file mode 100644
index 00000000..103f4663
--- /dev/null
+++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java
@@ -0,0 +1,60 @@
+package com.core.web.controller.system;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.controller.BaseController;
+import com.core.common.core.domain.R;
+import com.core.system.domain.dto.SaveTenantOptionDetailDto;
+import com.core.system.domain.dto.TenantOptionDto;
+import com.core.system.service.ISysTenantOptionService;
+
+/**
+ * 租户配置项信息controller
+ * 
+ * @author system
+ */
+@RestController
+@RequestMapping("/system/tenant-option")
+public class SysTenantOptionController extends BaseController {
+    @Autowired
+    private ISysTenantOptionService sysTenantOptionService;
+
+    /**
+     * 查询租户配置项详情列表
+     *
+     * @param tenantId 租户ID
+     * @return 租户配置项详情列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @GetMapping("/detail-list/{tenantId}")
+    public R<List<TenantOptionDto>> getTenantOptionDetailList(@PathVariable Integer tenantId) {
+        return R.ok(sysTenantOptionService.getTenantOptionDetailList(tenantId));
+    }
+
+    /**
+     * 保存租户配置项详情列表
+     *
+     * @param saveTenantOptionDetailDto 参数DTO
+     * @return 结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PostMapping("/detail-list")
+    public R<?> saveTenantOptionDetailList(@RequestBody SaveTenantOptionDetailDto saveTenantOptionDetailDto) {
+        return sysTenantOptionService.saveTenantOptionDetailList(saveTenantOptionDetailDto);
+    }
+
+    /**
+     * 查询租户配置项前端form表单列表
+     *
+     * @return 租户配置项前端form表单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @GetMapping("/form-list")
+    public R<?> getTenantOptionFormList() {
+        return R.ok(sysTenantOptionService.getTenantOptionFormList());
+    }
+}
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/tool/TestController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/controller/tool/TestController.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java b/openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java
similarity index 100%
rename from openhis-server/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java
rename to openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java
diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java b/openhis-server-new/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java
new file mode 100644
index 00000000..46db6d80
--- /dev/null
+++ b/openhis-server-new/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java
@@ -0,0 +1,36 @@
+package com.core.web.util;
+
+import com.core.common.core.domain.model.LoginUser;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.utils.SecurityUtils;
+
+/**
+ * 租户配置工具类
+ * 
+ * @author system
+ */
+public class TenantOptionUtil {
+
+    /**
+     * 获取租户配置项内容
+     * 
+     * @param optionDict 租户配置项字典
+     * @return 租户配置项内容
+     */
+    public static String getOptionContent(TenantOptionDict optionDict) {
+        LoginUser loginUser;
+        try {
+            loginUser = SecurityUtils.getLoginUser();
+        } catch (Exception e) {
+            return null;
+        }
+        if (loginUser == null) {
+            return null;
+        }
+        if (loginUser.getOptionMap() == null || loginUser.getOptionMap().isEmpty()) {
+            return null;
+        }
+        return loginUser.getOptionMap().get(optionDict.getCode());
+    }
+
+}
diff --git a/openhis-server/core-common/pom.xml b/openhis-server-new/core-common/pom.xml
similarity index 100%
rename from openhis-server/core-common/pom.xml
rename to openhis-server-new/core-common/pom.xml
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/Anonymous.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Anonymous.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/Anonymous.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/Anonymous.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/DataScope.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataScope.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/DataScope.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataScope.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/DataSource.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/DataSource.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/Excel.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/Excel.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/Excels.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excels.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/Excels.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excels.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/Log.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/Log.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/RateLimiter.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/RateLimiter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/RepeatSubmit.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/RepeatSubmit.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/RepeatSubmit.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/RepeatSubmit.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/annotation/Sensitive.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/annotation/Sensitive.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/config/CoreConfig.java b/openhis-server-new/core-common/src/main/java/com/core/common/config/CoreConfig.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/config/CoreConfig.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/config/CoreConfig.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java b/openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/constant/CacheConstants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/CacheConstants.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/constant/CacheConstants.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/constant/CacheConstants.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/constant/Constants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/constant/Constants.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/constant/GenConstants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/GenConstants.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/constant/GenConstants.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/constant/GenConstants.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/constant/HttpStatus.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/HttpStatus.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/constant/HttpStatus.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/constant/HttpStatus.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/constant/ScheduleConstants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/ScheduleConstants.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/constant/ScheduleConstants.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/constant/ScheduleConstants.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/constant/UserConstants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/UserConstants.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/constant/UserConstants.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/constant/UserConstants.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/controller/BaseController.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/controller/BaseController.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/R.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/R.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/TreeEntity.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeEntity.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/TreeEntity.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeEntity.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginBody.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginBody.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginBody.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginBody.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
similarity index 94%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
index c3c126b4..fcf65657 100644
--- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
@@ -1,8 +1,11 @@
 package com.core.common.core.domain.model;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import com.core.common.core.domain.entity.SysRole;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -94,6 +97,16 @@ public class LoginUser implements UserDetails {
      */
     private JSONObject optionJson;
 
+    /**
+     * option Map
+     */
+    private Map<String, String> optionMap;
+
+    /**
+     * 当前登录账号角色集合
+     */
+    private List<SysRole> roleList;
+
     /**
      * 用户信息
      */
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/model/RegisterBody.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/RegisterBody.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/domain/model/RegisterBody.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/RegisterBody.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/page/PageDomain.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/page/PageDomain.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/page/PageDomain.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/page/PageDomain.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/page/TableDataInfo.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/page/TableDataInfo.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/page/TableDataInfo.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/page/TableDataInfo.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/page/TableSupport.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/page/TableSupport.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/page/TableSupport.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/page/TableSupport.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/redis/RedisCache.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/redis/RedisCache.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/text/CharsetKit.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/text/CharsetKit.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/text/Convert.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/text/Convert.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/text/StrFormatter.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/StrFormatter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/core/text/StrFormatter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/core/text/StrFormatter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/BusinessStatus.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/BusinessStatus.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/BusinessStatus.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/BusinessStatus.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/BusinessType.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/BusinessType.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/BusinessType.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/BusinessType.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/DataSourceType.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DataSourceType.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/DataSourceType.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/DataSourceType.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/DeleteFlag.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/DeleteFlag.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/DesensitizedType.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/DesensitizedType.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/HttpMethod.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/HttpMethod.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/LimitType.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/LimitType.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/LimitType.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/LimitType.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/OperatorType.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/OperatorType.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/OperatorType.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/OperatorType.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
similarity index 45%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
index 898d1efc..e2107993 100644
--- a/openhis-server/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
@@ -2,173 +2,211 @@ package com.core.common.enums;
 
 /**
  * 租户配置项字典（不存在DB中，以此文件为基准，新增修改只需在这里改）
- * 
+ *
  * @author system
  */
 public enum TenantOptionDict {
     /**
      * 医院名称
      */
-    HOSPITAL_NAME("hospitalName", "医院名称"),
+    HOSPITAL_NAME("hospitalName", "医院名称", 0),
+    /**
+     * 医疗机构等级
+     */
+    MEDINS_LV("medinsLv", "医疗机构等级", 1),
     /**
      * 定点医药机构编号
      */
-    FIXMEDINS_CODE("fixmedinsCode", "定点医药机构编号"),
+    FIXMEDINS_CODE("fixmedinsCode", "定点医药机构编号", 2),
     /**
      * 电子发票appid
      */
-    APP_ID("app_id", "电子发票appid"),
+    APP_ID("app_id", "电子发票appid", 3),
     /**
      * 电子发票key
      */
-    KEY("key", "电子发票key"),
+    KEY("key", "电子发票key", 4),
     /**
      * 电子发票url
      */
-    URL("url", "电子发票url"),
+    URL("url", "电子发票url", 5),
     /**
      * 医保开关
      */
-    YB_SWITCH("yb_switch", "医保开关"),
+    YB_SWITCH("yb_switch", "医保开关", 6),
     /**
      * 客户端私钥
      */
-    CLI_PRV_KEY("cliPrvKey", "客户端私钥"),
+    CLI_PRV_KEY("cliPrvKey", "客户端私钥", 7),
     /**
      * 客户端公钥
      */
-    CLI_PUB_KEY("cliPubKey", "客户端公钥"),
+    CLI_PUB_KEY("cliPubKey", "客户端公钥", 8),
     /**
      * 服务端公钥
      */
-    SERVER_PUB_KEY("serverPubKey", "服务端公钥"),
+    SERVER_PUB_KEY("serverPubKey", "服务端公钥", 9),
     /**
      * 定点医药机构名称
      */
-    FIXMEDINS_NAME("fixmedinsName", "定点医药机构名称"),
+    FIXMEDINS_NAME("fixmedinsName", "定点医药机构名称", 10),
     /**
      * 行政区划
      */
-    ADMVS("admvs", "行政区划"),
+    ADMVS("admvs", "行政区划", 11),
     /**
      * 授权范围
      */
-    SCOPE("scope", "授权范围"),
+    SCOPE("scope", "授权范围", 12),
     /**
      * 授权类型
      */
-    GRANT_TYPE("grantType", "授权类型"),
+    GRANT_TYPE("grantType", "授权类型", 13),
     /**
      * 密码
      */
-    PASSWORD("password", "密码"),
+    PASSWORD("password", "密码", 14),
     /**
      * 用户名
      */
-    USERNAME("username", "用户名"),
+    USERNAME("username", "用户名", 15),
     /**
      * 客户端安全码
      */
-    CLIENT_SECRET("clientSecret", "客户端安全码"),
+    CLIENT_SECRET("clientSecret", "客户端安全码", 16),
     /**
      * 客户端ID
      */
-    CLIENT_ID("clientId", "客户端ID"),
+    CLIENT_ID("clientId", "客户端ID", 17),
     /**
      * 生产环境客户端公钥
      */
-    PROD_CLI_PUB_KEY("prod_cliPubKey", "生产环境客户端公钥"),
+    PROD_CLI_PUB_KEY("prod_cliPubKey", "生产环境客户端公钥", 18),
     /**
      * 生产环境客户端私钥
      */
-    PROD_CLI_PRV_KEY("prod_cliPrvKey", "生产环境客户端私钥"),
+    PROD_CLI_PRV_KEY("prod_cliPrvKey", "生产环境客户端私钥", 19),
     /**
      * 生产环境客户端ID
      */
-    PROD_CLIENT_ID("prod_clientId", "生产环境客户端ID"),
+    PROD_CLIENT_ID("prod_clientId", "生产环境客户端ID", 20),
     /**
      * 文件路径
      */
-    FILE_PATH("filePath", "文件路径"),
+    FILE_PATH("filePath", "文件路径", 21),
     /**
      * 电子地址
      */
-    ELE_ADDRESS("eleAddress", "电子地址"),
+    ELE_ADDRESS("eleAddress", "电子地址", 22),
     /**
      * 服务地址
      */
-    ADDRESS("address", "服务地址"),
+    ADDRESS("address", "服务地址", 23),
     /**
      * 超时时间
      */
-    TIME("time", "超时时间"),
+    TIME("time", "超时时间", 24),
     /**
      * 是否加密
      */
-    IS_ENCRYPT("isEncrypt", "是否加密"),
+    IS_ENCRYPT("isEncrypt", "是否加密", 25),
     /**
      * 医保区划
      */
-    INSUPLC_ADMDVS("insuplc_admdvs", "医保区划"),
+    INSUPLC_ADMDVS("insuplc_admdvs", "医保区划", 26),
     /**
      * 电子处方appId
      */
-    PRE_APP_ID("pre_app_id", "电子处方appId"),
+    PRE_APP_ID("pre_app_id", "电子处方appId", 27),
     /**
      * 电子处方appSecret
      */
-    PRE_APP_SECRET("pre_app_secret", "电子处方appSecret"),
+    PRE_APP_SECRET("pre_app_secret", "电子处方appSecret", 28),
     /**
      * 电子处方私钥
      */
-    APP_PRVKEY("APP_PRVKEY", "电子处方私钥"),
+    APP_PRVKEY("APP_PRVKEY", "电子处方私钥", 29),
     /**
      * 电子处方公钥
      */
-    PLAF_PUBKEY("PLAF_PUBKEY", "电子处方公钥"),
+    PLAF_PUBKEY("PLAF_PUBKEY", "电子处方公钥", 30),
     /**
      * 医保客户端ID
      */
-    YB_CLIENT_ID("ybClientId", "医保客户端ID"),
+    YB_CLIENT_ID("ybClientId", "医保客户端ID", 31),
     /**
      * 医保客户端安全码
      */
-    YB_CLIENT_SECRET("ybClientSecret", "医保客户端安全码"),
+    YB_CLIENT_SECRET("ybClientSecret", "医保客户端安全码", 32),
     /**
      * 医保用户名
      */
-    YB_USERNAME("ybUsername", "医保用户名"),
+    YB_USERNAME("ybUsername", "医保用户名", 33),
     /**
      * 医保密码
      */
-    YB_PASSWORD("ybPassword", "医保密码"),
+    YB_PASSWORD("ybPassword", "医保密码", 34),
     /**
      * 医保授权类型
      */
-    YB_GRANT_TYPE("ybGrantType", "医保授权类型"),
+    YB_GRANT_TYPE("ybGrantType", "医保授权类型", 35),
     /**
      * 医保授权范围
      */
-    YB_SCOPE("ybScope", "医保授权范围"),
+    YB_SCOPE("ybScope", "医保授权范围", 36),
     /**
      * 医保密钥
      */
-    YB_CLI_PRV_KEY("ybCliPrvKey", "医保密钥"),
+    YB_CLI_PRV_KEY("ybCliPrvKey", "医保密钥", 37),
     /**
      * 医保服务URL
      */
-    YB_URL("ybUrl", "医保服务URL"),
+    YB_URL("ybUrl", "医保服务URL", 38),
     /**
      * 医院等级
      */
-    HOSPITAL_LV("hospital_lv", "医院等级");
+    HOSPITAL_LV("hospital_lv", "医院等级", 39),
+    /**
+     * LIS接口地址
+     */
+    LIS_API_URL("lisApiUrl", "LIS接口地址", 40),
+    /**
+     * LISAppId
+     */
+    LIS_APP_ID("lisAppId", "LISAppId", 41),
+    /**
+     * LISAppSecret
+     */
+    LIS_APP_SECRET("lisAppSecret", "LISAppSecret", 42),
+    /**
+     * PACS接口地址
+     */
+    PACS_API_URL("pacsApiUrl", "PACS接口地址", 43),
+    /**
+     * PACSAppId
+     */
+    PACS_APP_ID("pacsAppId", "PACSAppId", 44),
+    /**
+     * PACSAppSecret
+     */
+    PACS_APP_SECRET("pacsAppSecret", "PACSAppSecret", 45),
+    /**
+     * PACSAppSecret
+     */
+    INVOICE_URL("invoiceUrl", "电子发票中转服务的路径", 46),
+    /**
+     * PACSAppSecret
+     */
+    FORWARD_SWITCH("forwardSwitch", "电子发票中转服务开关", 47);
 
     private final String code;
     private final String name;
+    private final Integer sort;
 
-    TenantOptionDict(String code, String name) {
+    TenantOptionDict(String code, String name, Integer sort) {
         this.code = code;
         this.name = name;
+        this.sort = sort;
     }
 
     public String getCode() {
@@ -179,6 +217,10 @@ public enum TenantOptionDict {
         return name;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
     public static TenantOptionDict getByCode(String code) {
         if (code == null) {
             return null;
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/TenantStatus.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantStatus.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/TenantStatus.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantStatus.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/UserStatus.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/UserStatus.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/enums/UserStatus.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/enums/UserStatus.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/CustomException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/CustomException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/CustomException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/CustomException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/DemoModeException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/DemoModeException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/DemoModeException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/DemoModeException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/GlobalException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/GlobalException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/GlobalException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/GlobalException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/NonCaptureException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/NonCaptureException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/NonCaptureException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/NonCaptureException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/ServiceException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/ServiceException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/ServiceException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/ServiceException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/UtilException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/UtilException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/UtilException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/UtilException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/base/BaseException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/base/BaseException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/base/BaseException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/base/BaseException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/file/FileException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/file/FileException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/file/FileNameLengthLimitExceededException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileNameLengthLimitExceededException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/file/FileNameLengthLimitExceededException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileNameLengthLimitExceededException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/file/FileSizeLimitExceededException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileSizeLimitExceededException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/file/FileSizeLimitExceededException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileSizeLimitExceededException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/file/FileUploadException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileUploadException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/file/FileUploadException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/file/FileUploadException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/file/InvalidExtensionException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/file/InvalidExtensionException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/file/InvalidExtensionException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/file/InvalidExtensionException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/job/TaskException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/job/TaskException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/job/TaskException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/job/TaskException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/BlackListException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/BlackListException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/BlackListException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/BlackListException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/CaptchaException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/CaptchaException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/CaptchaException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/CaptchaException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/CaptchaExpireException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/CaptchaExpireException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/CaptchaExpireException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/CaptchaExpireException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/UserException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/UserException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/UserNotExistsException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserNotExistsException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/UserNotExistsException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserNotExistsException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/UserPasswordNotMatchException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserPasswordNotMatchException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/UserPasswordNotMatchException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserPasswordNotMatchException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/exception/user/UserPasswordRetryLimitExceedException.java b/openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserPasswordRetryLimitExceedException.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/exception/user/UserPasswordRetryLimitExceedException.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/exception/user/UserPasswordRetryLimitExceedException.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/filter/PropertyPreExcludeFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/PropertyPreExcludeFilter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/filter/PropertyPreExcludeFilter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/filter/PropertyPreExcludeFilter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/filter/XssFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/filter/XssFilter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java
similarity index 80%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java
index 2a43840b..142b9eb6 100644
--- a/openhis-server/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java
@@ -1,5 +1,6 @@
 package com.core.common.utils;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Period;
 import java.time.ZoneId;
@@ -14,6 +15,24 @@ import java.util.Date;
  */
 public final class AgeCalculatorUtil {
 
+    /**
+     * 计算年龄
+     * 
+     * @param birthDate 生日
+     * @return 年龄
+     */
+    public static int calculateAge(Date birthDate) {
+        if (birthDate == null) {
+            return 0;
+        }
+        // 将Date转换为LocalDate（需指定时区）
+        LocalDate birthLocalDate = birthDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        LocalDate currentDate = LocalDate.now();
+        // 计算两个日期之间的Period
+        Period period = Period.between(birthLocalDate, currentDate);
+        return period.getYears();
+    }
+
     /**
      * 当前年龄取得（床位列表表示年龄用）
      */
@@ -29,7 +48,7 @@ public final class AgeCalculatorUtil {
         Period period = Period.between(dateTime.toLocalDate(), now.toLocalDate());
         int months = period.getMonths();
         int days = period.getDays();
-        long hours = ChronoUnit.HOURS.between(dateTime, now) - (days * 24);
+        long hours = ChronoUnit.HOURS.between(dateTime, now) - (days * 24L);
 
         if (hours < 0) {
             hours += 24;
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/Arith.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/Arith.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/Arith.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/Arith.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/ChineseConvertUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ChineseConvertUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/ChineseConvertUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/ChineseConvertUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/DateUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/DateUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/DesensitizedUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DesensitizedUtil.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/DesensitizedUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/DesensitizedUtil.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/DictUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/DictUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/LogUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/LogUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/LogUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/LogUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/MessageUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/MessageUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/PageUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/PageUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/PageUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/PageUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/SecurityUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/SecurityUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/ServletUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/ServletUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/StringUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/StringUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/Threads.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/Threads.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java
new file mode 100644
index 00000000..0fa72194
--- /dev/null
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java
@@ -0,0 +1,90 @@
+package com.core.common.utils;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Calendar;
+import java.util.Date;
+
+
+/**
+ * 时间处理工具类
+ */
+public class TimeUtils {
+    private static final ZoneId DEFAULT_ZONE = ZoneId.systemDefault();
+    private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss");
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(DEFAULT_ZONE);
+
+    /**
+     * 解析时间字符串
+     */
+    public static LocalTime parseTime(String timeStr) {
+        if (timeStr == null) {
+            throw new IllegalArgumentException("时间未设定");
+        }
+
+        try {
+            if (timeStr.length() == 4) {
+                // 处理"0200"格式
+                int hours = Integer.parseInt(timeStr.substring(0, 2));
+                int minutes = Integer.parseInt(timeStr.substring(2, 4));
+                return LocalTime.of(hours, minutes);
+            } else if (timeStr.contains(":")) {
+                // 处理"HH:mm"格式
+                return LocalTime.parse(timeStr, DateTimeFormatter.ofPattern("HH:mm"));
+            } else {
+                throw new IllegalArgumentException("不支持的时间格式: " + timeStr);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("时间解析失败: " + timeStr, e);
+        }
+    }
+
+    /**
+     * LocalTime转Date
+     */
+    public static Date localTimeToDate(LocalTime localTime) {
+        LocalDateTime localDateTime = LocalDateTime.of(LocalDate.now(), localTime);
+        return Date.from(localDateTime.atZone(DEFAULT_ZONE).toInstant());
+    }
+
+    /**
+     * Date转LocalDate
+     */
+    public static LocalDate dateToLocalDate(Date date) {
+        return date.toInstant().atZone(DEFAULT_ZONE).toLocalDate();
+    }
+
+    /**
+     * Date转字符串(HH:mm:ss)
+     */
+    public static String dateToTimeString(Date date) {
+        return date.toInstant()
+                .atZone(DEFAULT_ZONE)
+                .toLocalTime()
+                .format(TIME_FORMATTER);
+    }
+
+    /**
+     * Date转字符串(yyyy-MM-dd)
+     */
+    public static String dateToDateString(Date date) {
+        return date.toInstant()
+                .atZone(DEFAULT_ZONE)
+                .toLocalDate()
+                .format(DATE_FORMATTER);
+    }
+
+    /**
+     * 解析日期时间字符串
+     */
+    public static LocalDateTime parseDateTime(String dateStr) {
+        return LocalDateTime.parse(dateStr, DATE_TIME_FORMATTER);
+    }
+}
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java
similarity index 91%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java
index 8ef51023..87d88227 100644
--- a/openhis-server/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanUtils.java
@@ -8,24 +8,30 @@ import java.util.regex.Pattern;
 
 /**
  * Bean 工具类
- * 
+ *
  * @author system
  */
 public class BeanUtils extends org.springframework.beans.BeanUtils {
-    /** Bean方法名中属性名开始的下标 */
+    /**
+     * Bean方法名中属性名开始的下标
+     */
     private static final int BEAN_METHOD_PROP_INDEX = 3;
 
-    /** * 匹配getter方法的正则表达式 */
+    /**
+     * 匹配getter方法的正则表达式
+     */
     private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
 
-    /** * 匹配setter方法的正则表达式 */
+    /**
+     * 匹配setter方法的正则表达式
+     */
     private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
 
     /**
      * Bean属性复制工具方法。
-     * 
+     *
      * @param dest 目标对象
-     * @param src 源对象
+     * @param src  源对象
      */
     public static void copyBeanProp(Object dest, Object src) {
         try {
@@ -37,7 +43,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils {
 
     /**
      * 获取对象的setter方法。
-     * 
+     *
      * @param obj 对象
      * @return 对象的setter方法列表
      */
@@ -62,7 +68,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils {
 
     /**
      * 获取对象的getter方法。
-     * 
+     *
      * @param obj 对象
      * @return 对象的getter方法列表
      */
@@ -86,7 +92,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils {
     /**
      * 检查Bean方法名中的属性名是否相等。<br>
      * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
-     * 
+     *
      * @param m1 方法名1
      * @param m2 方法名2
      * @return 属性名一样返回true，否则返回false
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/file/FileUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/file/FileUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/file/MimeTypeUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/MimeTypeUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/file/MimeTypeUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/file/MimeTypeUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/html/EscapeUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/html/EscapeUtil.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/html/EscapeUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/html/EscapeUtil.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/html/HTMLFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/html/HTMLFilter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/html/HTMLFilter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/html/HTMLFilter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/poi/ExcelHandlerAdapter.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelHandlerAdapter.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/poi/ExcelHandlerAdapter.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelHandlerAdapter.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/sign/Base64.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Base64.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/sign/Base64.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Base64.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/sql/SqlUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/sql/SqlUtil.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/sql/SqlUtil.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/sql/SqlUtil.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/uuid/IdUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/IdUtils.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/uuid/IdUtils.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/IdUtils.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/uuid/Seq.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/uuid/Seq.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/utils/uuid/UUID.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/utils/uuid/UUID.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/xss/Xss.java b/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/xss/Xss.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java
diff --git a/openhis-server/core-common/src/main/java/com/core/common/xss/XssValidator.java b/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java
similarity index 100%
rename from openhis-server/core-common/src/main/java/com/core/common/xss/XssValidator.java
rename to openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java
diff --git a/openhis-server/core-flowable/pom.xml b/openhis-server-new/core-flowable/pom.xml
similarity index 100%
rename from openhis-server/core-flowable/pom.xml
rename to openhis-server-new/core-flowable/pom.xml
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java
diff --git a/openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java
similarity index 100%
rename from openhis-server/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java
rename to openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java
diff --git a/openhis-server/core-framework/pom.xml b/openhis-server-new/core-framework/pom.xml
similarity index 100%
rename from openhis-server/core-framework/pom.xml
rename to openhis-server-new/core-framework/pom.xml
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/DruidConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/DruidConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/FilterConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/FilterConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/I18nConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/I18nConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
similarity index 96%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
index b87817b2..1c1d5661 100644
--- a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
@@ -95,8 +95,8 @@ public class MybatisPlusConfig {
                 "adm_patient_identifier", "adm_practitioner", "adm_practitioner_role", "adm_supplier", "cli_condition",
                 "cli_condition_definition", "cli_diagnosis_belong_binding", "cli_procedure", "cli_procedure_performer",
                 "doc_emr", "doc_emr_template", "doc_emr_detail", "doc_emr_dict", "fin_claim", "fin_claim_response",
-                "fin_contract", "fin_payment_notice", "fin_payment_rec_detail", "fin_payment_reconciliation",
-                "med_medication", "med_medication_definition", "med_medication_dispense", "med_medication_request",
+                "fin_payment_notice", "fin_payment_rec_detail", "fin_payment_reconciliation", "med_medication",
+                "med_medication_definition", "med_medication_dispense", "med_medication_request",
                 "wor_activity_definition", "wor_device_dispense", "wor_device_request", "wor_inventory_item",
                 "wor_service_request", "wor_service_request_detail", "wor_supply_delivery", "wor_supply_request",
                 "sys_operation_record"));
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/RedisConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/RedisConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/RedisConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/RedisConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/ServerConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/ServerConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/TenantContext.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/TenantContext.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/TenantContext.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/TenantContext.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/domain/Server.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/domain/Server.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
similarity index 94%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
index 97a3ed96..42ed2172 100644
--- a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
@@ -18,6 +18,7 @@ import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.domain.R;
+import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.core.domain.model.LoginUserExtend;
@@ -35,6 +36,7 @@ import com.core.framework.manager.factory.AsyncFactory;
 import com.core.framework.security.context.AuthenticationContextHolder;
 import com.core.system.domain.SysTenant;
 import com.core.system.service.ISysConfigService;
+import com.core.system.service.ISysTenantOptionService;
 import com.core.system.service.ISysTenantService;
 import com.core.system.service.ISysUserService;
 
@@ -63,6 +65,9 @@ public class SysLoginService {
     @Autowired
     private ISysTenantService sysTenantService;
 
+    @Autowired
+    private ISysTenantOptionService sysTenantOptionService;
+
     /**
      * 登录验证
      * 
@@ -146,6 +151,10 @@ public class SysLoginService {
             loginUser.getUser().setOrgId(loginUserExtend.getOrgId()); // 科室id
             loginUser.getUser().setOrgName(loginUserExtend.getOrgName()); // 科室名称
         }
+        List<SysRole> roleList = userService.getRoleList(loginUser.getUserId());
+        if (!roleList.isEmpty()) {
+            loginUser.setRoleList(roleList);
+        }
 
         // 设置租户ID
         loginUser.getUser().setTenantId(tenantId);
@@ -163,6 +172,12 @@ public class SysLoginService {
             optionJson.put(key, value);
         }
         loginUser.setOptionJson(optionJson);
+
+        // TODO:下面的配置项启用后，上面option集合处理注释掉
+
+        // 全部租户配置项
+        Map<String, String> optionMap = sysTenantOptionService.getAllTenantOption(tenantId);
+        loginUser.setOptionMap(optionMap);
     }
 
     /**
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
similarity index 99%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
index 3e69fae7..f8815c02 100644
--- a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
@@ -17,7 +17,7 @@ import com.core.system.service.ISysRoleService;
 
 /**
  * 用户权限处理
- * 
+ *
  * @author system
  */
 @Component
@@ -30,7 +30,7 @@ public class SysPermissionService {
 
     /**
      * 获取角色数据权限
-     * 
+     *
      * @param user 用户信息
      * @return 角色权限信息
      */
@@ -47,7 +47,7 @@ public class SysPermissionService {
 
     /**
      * 获取菜单数据权限
-     * 
+     *
      * @param user 用户信息
      * @return 菜单权限信息
      */
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/TokenService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/TokenService.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java
diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java
similarity index 100%
rename from openhis-server/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java
rename to openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java
diff --git a/openhis-server/core-generator/pom.xml b/openhis-server-new/core-generator/pom.xml
similarity index 100%
rename from openhis-server/core-generator/pom.xml
rename to openhis-server-new/core-generator/pom.xml
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/config/GenConfig.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/config/GenConfig.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/config/GenConfig.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/config/GenConfig.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/controller/GenController.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/controller/GenController.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/domain/GenTable.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/domain/GenTable.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/service/IGenTableService.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/service/IGenTableService.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/util/GenUtils.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/util/GenUtils.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java
diff --git a/openhis-server/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java
similarity index 100%
rename from openhis-server/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java
rename to openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java
diff --git a/openhis-server/core-generator/src/main/resources/generator.yml b/openhis-server-new/core-generator/src/main/resources/generator.yml
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/generator.yml
rename to openhis-server-new/core-generator/src/main/resources/generator.yml
diff --git a/openhis-server/core-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/openhis-server-new/core-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
rename to openhis-server-new/core-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
diff --git a/openhis-server/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/openhis-server-new/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml
rename to openhis-server-new/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml
diff --git a/openhis-server/core-generator/src/main/resources/vm/java/domain.java.vm b/openhis-server-new/core-generator/src/main/resources/vm/java/domain.java.vm
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/vm/java/domain.java.vm
rename to openhis-server-new/core-generator/src/main/resources/vm/java/domain.java.vm
diff --git a/openhis-server/core-generator/src/main/resources/vm/java/mapper.java.vm b/openhis-server-new/core-generator/src/main/resources/vm/java/mapper.java.vm
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/vm/java/mapper.java.vm
rename to openhis-server-new/core-generator/src/main/resources/vm/java/mapper.java.vm
diff --git a/openhis-server/core-generator/src/main/resources/vm/java/service.java.vm b/openhis-server-new/core-generator/src/main/resources/vm/java/service.java.vm
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/vm/java/service.java.vm
rename to openhis-server-new/core-generator/src/main/resources/vm/java/service.java.vm
diff --git a/openhis-server/core-generator/src/main/resources/vm/java/serviceImpl.java.vm b/openhis-server-new/core-generator/src/main/resources/vm/java/serviceImpl.java.vm
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/vm/java/serviceImpl.java.vm
rename to openhis-server-new/core-generator/src/main/resources/vm/java/serviceImpl.java.vm
diff --git a/openhis-server/core-generator/src/main/resources/vm/xml/mapper.xml.vm b/openhis-server-new/core-generator/src/main/resources/vm/xml/mapper.xml.vm
similarity index 100%
rename from openhis-server/core-generator/src/main/resources/vm/xml/mapper.xml.vm
rename to openhis-server-new/core-generator/src/main/resources/vm/xml/mapper.xml.vm
diff --git a/openhis-server/core-quartz/pom.xml b/openhis-server-new/core-quartz/pom.xml
similarity index 100%
rename from openhis-server/core-quartz/pom.xml
rename to openhis-server-new/core-quartz/pom.xml
diff --git a/openhis-server/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java
similarity index 100%
rename from openhis-server/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java
rename to openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java
diff --git a/openhis-server/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java
similarity index 100%
rename from openhis-server/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java
rename to openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java
diff --git a/openhis-server/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java
similarity index 100%
rename from openhis-server/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java
rename to openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java
diff --git a/openhis-server/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java
similarity index 100%
rename from openhis-server/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java
rename to openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java
diff --git a/openhis-server/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java
similarity index 100%
rename from openhis-server/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java
rename to openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java
diff --git a/openhis-server/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java
similarity index 100%
rename from openhis-server/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java
rename to openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java
diff --git a/openhis-server/core-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/openhis-server-new/core-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
similarity index 100%
rename from openhis-server/core-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
rename to openhis-server-new/core-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
diff --git a/openhis-server/core-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/openhis-server-new/core-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
similarity index 100%
rename from openhis-server/core-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
rename to openhis-server-new/core-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
diff --git a/openhis-server/core-system/pom.xml b/openhis-server-new/core-system/pom.xml
similarity index 100%
rename from openhis-server/core-system/pom.xml
rename to openhis-server-new/core-system/pom.xml
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysCache.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysCache.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysCache.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysCache.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysConfig.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysConfig.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysDeployForm.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysDeployForm.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysExpression.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysExpression.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysForm.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysForm.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysListener.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysListener.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysLogininfor.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysLogininfor.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysNotice.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysNotice.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysOperLog.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysOperLog.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysPost.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysPost.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysRoleDept.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysRoleDept.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysRoleDept.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysRoleDept.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysRoleMenu.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysRoleMenu.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysRoleMenu.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysRoleMenu.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysTaskForm.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTaskForm.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysTaskForm.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTaskForm.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysTenant.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysTenant.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysTenantOption.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
similarity index 89%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
index 554f6c13..afb2acdd 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java
@@ -24,7 +24,7 @@ public class SysTenantOption implements Serializable {
     /**
      * ID（使用数据库序列生成）
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -37,12 +37,6 @@ public class SysTenantOption implements Serializable {
      */
     private String optionCode;
 
-    /**
-     * 配置项名称
-     */
-    @TableField(exist = false)
-    private String optionName;
-
     /**
      * 配置项内容
      */
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysUserOnline.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserOnline.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysUserOnline.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserOnline.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysUserPost.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserPost.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysUserPost.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserPost.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysUserRole.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserRole.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysUserRole.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserRole.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/SysUserTenant.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserTenant.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/SysUserTenant.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserTenant.java
diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java
new file mode 100644
index 00000000..22cfee11
--- /dev/null
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java
@@ -0,0 +1,29 @@
+package com.core.system.domain.dto;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 保存租户配置项详情Dto
+ * 
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class SaveTenantOptionDetailDto {
+
+    /**
+     * 名称
+     */
+    private Integer tenantId;
+
+    /**
+     * 内容
+     */
+    private List<TenantOptionDto> optionList;
+
+}
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/dto/SysTenantOptionDto.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/TenantOptionDto.java
similarity index 92%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/dto/SysTenantOptionDto.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/TenantOptionDto.java
index 04498c81..607a3134 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/domain/dto/SysTenantOptionDto.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/TenantOptionDto.java
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-public class SysTenantOptionDto {
+public class TenantOptionDto {
 
     /**
      * 编码
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/vo/MetaVo.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/MetaVo.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/vo/MetaVo.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/MetaVo.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java
similarity index 93%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java
index 40ecd69a..409028ec 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java
@@ -3,6 +3,7 @@ package com.core.system.mapper;
 import java.util.List;
 import java.util.Map;
 
+import com.core.common.core.domain.entity.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -155,4 +156,12 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     List<Map<String, String>> getOptionList(@Param("tenantId") Integer tenantId);
 
+    /**
+     * 查询当前登录账号角色集合
+     *
+     * @param userId 系统用户id
+     * @return 当前登录账号角色集合
+     */
+    List<SysRole> getRoleList(@Param("userId") Long userId);
+
 }
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysConfigService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysConfigService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysConfigService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysConfigService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysDeptService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDeptService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysDeptService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDeptService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysDictDataService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictDataService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysDictDataService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictDataService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysExpressionService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysExpressionService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysExpressionService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysExpressionService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysListenerService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysListenerService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysListenerService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysListenerService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysLogininforService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysLogininforService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysLogininforService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysLogininforService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysMenuService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysMenuService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysMenuService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysMenuService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysNoticeService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysNoticeService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysOperLogService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysOperLogService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysOperLogService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysOperLogService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysPostService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysPostService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysPostService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysPostService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysRoleService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysRoleService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysRoleService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysRoleService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java
similarity index 34%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java
index 9979a176..060fc923 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java
@@ -1,13 +1,13 @@
 package com.core.system.service;
 
 import java.util.List;
+import java.util.Map;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.core.common.core.domain.R;
-import com.core.common.enums.TenantOptionDict;
 import com.core.system.domain.SysTenantOption;
-import com.core.system.domain.dto.SysTenantOptionDto;
+import com.core.system.domain.dto.SaveTenantOptionDetailDto;
+import com.core.system.domain.dto.TenantOptionDto;
 
 /**
  * 租户配置项表Service接口
@@ -17,46 +17,33 @@ import com.core.system.domain.dto.SysTenantOptionDto;
 public interface ISysTenantOptionService extends IService<SysTenantOption> {
 
     /**
-     * 查询租户配置项分页列表
-     *
-     * @param tenantId 租户ID查询
-     * @param optionCode 配置项编码查询
-     * @param pageNum 当前页
-     * @param pageSize 每页多少条
-     * @return 租户配置项分页列表
+     * 查询全部租户配置项
+     * 
+     * @param tenantId 租户ID
+     * @return 全部租户配置项
      */
-    R<IPage<SysTenantOption>> getTenantOptionPage(Integer tenantId, String optionCode, Integer pageNum,
-        Integer pageSize);
+    Map<String, String> getAllTenantOption(Integer tenantId);
 
     /**
-     * 新增租户配置项
+     * 查询租户配置项详情列表
      *
-     * @param sysTenantOption 租户配置项实体
-     * @return 结果
+     * @param tenantId 租户ID
+     * @return 租户配置项详情列表
      */
-    R<?> addTenantOption(SysTenantOption sysTenantOption);
+    List<TenantOptionDto> getTenantOptionDetailList(Integer tenantId);
 
     /**
-     * 查询租户配置项下拉列表
+     * 保存租户配置项详情列表
      *
-     * @return 租户配置项下拉列表
-     */
-    List<SysTenantOptionDto> getTenantOptionDropdown();
-
-    /**
-     * 查询全部租户配置项
-     * 
-     * @param tenantId 租户ID
-     * @return 全部租户配置项
+     * @param saveTenantOptionDetailDto 参数DTO
+     * @return 结果
      */
-    List<SysTenantOptionDto> getAllTenantOption(Integer tenantId);
+    R<?> saveTenantOptionDetailList(SaveTenantOptionDetailDto saveTenantOptionDetailDto);
 
     /**
-     * 查询指定的租户配置项内容
+     * 查询租户配置项前端form表单列表
      *
-     * @param tenantId 租户ID
-     * @param tenantOptionDict 配置项字典枚举
-     * @return 指定的租户配置项内容（不存在返回NULL）
+     * @return 租户配置项前端form表单列表
      */
-    SysTenantOptionDto getTenantOptionContent(Integer tenantId, TenantOptionDict tenantOptionDict);
+    List<TenantOptionDto> getTenantOptionFormList();
 }
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysTenantService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysTenantService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysUserOnlineService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserOnlineService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysUserOnlineService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserOnlineService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysUserService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java
similarity index 94%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysUserService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java
index 5256db6c..574744fe 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/service/ISysUserService.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.domain.model.LoginUserExtend;
 
@@ -229,5 +230,13 @@ public interface ISysUserService {
      * @param tenantId 租户id
      * @return option集合
      */
-    List<Map<String,String>> getOptionList(Integer tenantId);
+    List<Map<String, String>> getOptionList(Integer tenantId);
+
+    /**
+     * 查询当前登录账号角色id集合
+     * 
+     * @param userId 系统用户id
+     * @return 当前登录账号角色id集合
+     */
+    List<SysRole> getRoleList(Long userId);
 }
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/ISysUserTenantService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserTenantService.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/ISysUserTenantService.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserTenantService.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java
similarity index 98%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java
index 6157ff39..e21f039b 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java
@@ -22,7 +22,7 @@ import com.core.system.service.ISysConfigService;
 
 /**
  * 参数配置 服务层实现
- * 
+ *
  * @author system
  */
 @Service
@@ -43,7 +43,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 查询参数配置信息
-     * 
+     *
      * @param configId 参数配置ID
      * @return 参数配置信息
      */
@@ -57,7 +57,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 根据键名查询参数配置信息
-     * 
+     *
      * @param configKey 参数key
      * @return 参数键值
      */
@@ -79,7 +79,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 获取验证码开关
-     * 
+     *
      * @return true开启，false关闭
      */
     @Override
@@ -93,7 +93,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 查询参数配置列表
-     * 
+     *
      * @param config 参数配置信息
      * @return 参数配置集合
      */
@@ -104,7 +104,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 新增参数配置
-     * 
+     *
      * @param config 参数配置信息
      * @return 结果
      */
@@ -119,7 +119,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 修改参数配置
-     * 
+     *
      * @param config 参数配置信息
      * @return 结果
      */
@@ -139,7 +139,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 批量删除参数信息
-     * 
+     *
      * @param configIds 需要删除的参数ID
      */
     @Override
@@ -185,7 +185,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 校验参数键名是否唯一
-     * 
+     *
      * @param config 参数配置信息
      * @return 结果
      */
@@ -201,7 +201,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
 
     /**
      * 设置cache key
-     * 
+     *
      * @param configKey 参数键
      * @return 缓存键key
      */
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java
diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java
new file mode 100644
index 00000000..d29d704c
--- /dev/null
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java
@@ -0,0 +1,132 @@
+package com.core.system.service.impl;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.core.domain.R;
+import com.core.common.enums.TenantOptionDict;
+import com.core.system.domain.SysTenantOption;
+import com.core.system.domain.dto.SaveTenantOptionDetailDto;
+import com.core.system.domain.dto.TenantOptionDto;
+import com.core.system.mapper.SysTenantOptionMapper;
+import com.core.system.service.ISysTenantOptionService;
+
+/**
+ * 租户配置项表Service业务层处理
+ * 
+ * @author system
+ */
+@Service
+public class SysTenantOptionServiceImpl extends ServiceImpl<SysTenantOptionMapper, SysTenantOption>
+    implements ISysTenantOptionService {
+
+    /**
+     * 查询全部租户配置项
+     *
+     * @param tenantId 租户ID
+     * @return 全部租户配置项
+     */
+    @Override
+    public Map<String, String> getAllTenantOption(Integer tenantId) {
+        // 查询该租户所有配置项
+        List<SysTenantOption> sysTenantOptionList =
+            baseMapper.selectList(new LambdaQueryWrapper<SysTenantOption>().eq(SysTenantOption::getTenantId, tenantId));
+        if (sysTenantOptionList.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        // 作成Map
+        return sysTenantOptionList.stream()
+            .collect(Collectors.toMap(SysTenantOption::getOptionCode, SysTenantOption::getOptionContent));
+    }
+
+    /**
+     * 查询租户配置项详情列表
+     *
+     * @param tenantId 租户ID
+     * @return 租户配置项详情列表
+     */
+    @Override
+    public List<TenantOptionDto> getTenantOptionDetailList(Integer tenantId) {
+        // 获取全部租户配置项字典，并按照指定顺序排序
+        TenantOptionDict[] optionDictArray = TenantOptionDict.values();
+        List<TenantOptionDict> optionDictList = Arrays.stream(optionDictArray)
+            .sorted(Comparator.comparing(TenantOptionDict::getSort)).collect(Collectors.toList());
+        // 查询该租户所有配置项，并作成Map
+        List<SysTenantOption> sysTenantOptionList =
+            baseMapper.selectList(new LambdaQueryWrapper<SysTenantOption>().eq(SysTenantOption::getTenantId, tenantId));
+        Map<String, String> sysTenantOptionMap = sysTenantOptionList.stream()
+            .collect(Collectors.toMap(SysTenantOption::getOptionCode, SysTenantOption::getOptionContent));
+        // 循环查询结果，返回字典项和实际配置的值
+        List<TenantOptionDto> dtoList = new ArrayList<>();
+        TenantOptionDto dto;
+        for (TenantOptionDict dict : optionDictList) {
+            dto = new TenantOptionDto();
+            dto.setCode(dict.getCode()).setName(dict.getName()).setContent(sysTenantOptionMap.get(dict.getCode()));
+            dtoList.add(dto);
+        }
+        return dtoList;
+    }
+
+    /**
+     * 保存租户配置项详情列表
+     *
+     * @param saveTenantOptionDetailDto 参数DTO
+     * @return 结果
+     */
+    @Override
+    public R<?> saveTenantOptionDetailList(SaveTenantOptionDetailDto saveTenantOptionDetailDto) {
+        // 入参配置项详情列表作成Map
+        Map<String, TenantOptionDto> tenantOptionDtoMap = saveTenantOptionDetailDto.getOptionList().stream()
+            .collect(Collectors.toMap(TenantOptionDto::getCode, Function.identity()));
+        // 查询该租户所有配置项，并作成Map
+        List<SysTenantOption> sysTenantOptionList = baseMapper.selectList(new LambdaQueryWrapper<SysTenantOption>()
+            .eq(SysTenantOption::getTenantId, saveTenantOptionDetailDto.getTenantId()));
+        Map<String, SysTenantOption> sysTenantOptionMap =
+            sysTenantOptionList.stream().collect(Collectors.toMap(SysTenantOption::getOptionCode, Function.identity()));
+        // 循环配置项字典
+        List<SysTenantOption> newOptionList = new ArrayList<>();
+        List<SysTenantOption> existOptionList = new ArrayList<>();
+        SysTenantOption newOption;
+        for (TenantOptionDict dict : TenantOptionDict.values()) {
+            // 根据是否输入，是否已存在，区分并作成新增列表和更新列表
+            TenantOptionDto inputOption = tenantOptionDtoMap.getOrDefault(dict.getCode(), new TenantOptionDto());
+            SysTenantOption existOption = sysTenantOptionMap.get(dict.getCode());
+            if (existOption == null) {
+                newOption = new SysTenantOption().setTenantId(saveTenantOptionDetailDto.getTenantId())
+                    .setOptionCode(dict.getCode())
+                    .setOptionContent(Optional.ofNullable(inputOption.getContent()).orElse(""));
+                newOptionList.add(newOption);
+            } else {
+                existOption.setOptionContent(Optional.ofNullable(inputOption.getContent()).orElse(""));
+                existOptionList.add(existOption);
+            }
+        }
+        // 新增
+        if (!newOptionList.isEmpty()) {
+            this.saveBatch(newOptionList);
+        }
+        // 更新
+        if (!existOptionList.isEmpty()) {
+            this.updateBatchById(existOptionList);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 查询租户配置项前端form表单列表
+     *
+     * @return 租户配置项前端form表单列表
+     */
+    @Override
+    public List<TenantOptionDto> getTenantOptionFormList() {
+        return Arrays.stream(TenantOptionDict.values()).sorted(Comparator.comparing(TenantOptionDict::getSort))
+            .map(dict -> new TenantOptionDto().setCode(dict.getCode()).setName(dict.getName()))
+            .collect(Collectors.toList());
+    }
+
+}
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java
similarity index 97%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java
index 6fbd0ac8..74372424 100644
--- a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java
@@ -1,14 +1,12 @@
 package com.core.system.service.impl;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.validation.Validator;
 
-import com.core.common.core.domain.model.LoginUserExtend;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +18,7 @@ import com.core.common.annotation.DataScope;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.entity.SysUser;
+import com.core.common.core.domain.model.LoginUserExtend;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
@@ -506,7 +505,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 医院id
      */
     @Override
-    public Long getHospitalIdByOrgId(Long orgId){
+    public Long getHospitalIdByOrgId(Long orgId) {
         return userMapper.getHospitalIdByOrgId(orgId);
     }
 
@@ -517,8 +516,19 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return option集合
      */
     @Override
-    public List<Map<String,String>> getOptionList(Integer tenantId){
+    public List<Map<String, String>> getOptionList(Integer tenantId) {
         return userMapper.getOptionList(tenantId);
     }
 
+    /**
+     * 查询当前登录账号角色集合
+     *
+     * @param userId 系统用户id
+     * @return 当前登录账号角色集合
+     */
+    @Override
+    public List<SysRole> getRoleList(Long userId) {
+        return userMapper.getRoleList(userId);
+    }
+
 }
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java
similarity index 100%
rename from openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java
rename to openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java
diff --git a/openhis-server/core-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/flowable/SysTaskFormMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/flowable/SysTaskFormMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/flowable/SysTaskFormMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/flowable/SysTaskFormMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysConfigMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysConfigMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysConfigMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysConfigMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysDeployFormMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysDeployFormMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysDeployFormMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysDeployFormMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysDeptMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysDeptMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysDeptMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysDeptMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysExpressionMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysExpressionMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysExpressionMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysExpressionMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysFormMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysFormMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysFormMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysFormMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysListenerMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysListenerMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysListenerMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysListenerMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysLogininforMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysLogininforMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysLogininforMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysMenuMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysMenuMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysMenuMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysMenuMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysOperLogMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysOperLogMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysOperLogMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysPostMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysPostMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysPostMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysPostMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysRoleMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysRoleMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysTenantMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysTenantMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysTenantMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysTenantMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysTenantOptionMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysTenantOptionMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysTenantOptionMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysTenantOptionMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysUserMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
similarity index 95%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysUserMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
index 4ea96e7e..1a4b9676 100644
--- a/openhis-server/core-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -293,14 +293,21 @@
     </select>
 
     <select id="getOptionList" resultType="map">
-        SELECT
-            option_key AS optionkey,
-            option_value AS optionvalue
-        FROM
-            sys_option
-        WHERE
-            delete_flag = '0'
+        SELECT option_key   AS optionkey,
+               option_value AS optionvalue
+        FROM sys_option
+        WHERE delete_flag = '0'
           AND tenant_id = #{tenantId}
     </select>
 
+    <select id="getRoleList" resultType="com.core.common.core.domain.entity.SysRole">
+        SELECT sr.role_id   AS roleId,
+               sr.role_name AS roleName,
+               sr.role_key  AS roleKey
+        FROM sys_role AS sr
+                 RIGHT JOIN sys_user_role AS sur ON sur.role_id = sr.role_id
+            AND sur.user_id = #{userId}
+        WHERE sr.del_flag = '0'
+    </select>
+
 </mapper> 
\ No newline at end of file
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserPostMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysUserPostMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysUserPostMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysUserTenantMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserTenantMapper.xml
similarity index 100%
rename from openhis-server/core-system/src/main/resources/mapper/system/SysUserTenantMapper.xml
rename to openhis-server-new/core-system/src/main/resources/mapper/system/SysUserTenantMapper.xml
diff --git a/openhis-server/openhis-application/pom.xml b/openhis-server-new/openhis-application/pom.xml
similarity index 100%
rename from openhis-server/openhis-application/pom.xml
rename to openhis-server-new/openhis-application/pom.xml
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/OpenHisApplication.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
similarity index 93%
rename from openhis-server/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
index 1a8f389b..cdaba740 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
@@ -3,14 +3,16 @@ package com.openhis;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import com.openhis.web.ybmanage.config.YbServiceConfig;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import com.openhis.web.ybmanage.config.YbServiceConfig;
 
 /**
  * 启动程序
@@ -19,6 +21,7 @@ import org.springframework.core.env.Environment;
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.openhis"})
 @EnableConfigurationProperties(YbServiceConfig.class)
+@EnableAsync
 public class OpenHisApplication {
     public static void main(String[] args) throws UnknownHostException {
         // System.setProperty("spring.devtools.restart.enabled", "false");
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/config/HttpConfig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/config/HttpConfig.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/StocktakingBatchTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/StocktakingBatchTask.java
new file mode 100644
index 00000000..58dc314d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/StocktakingBatchTask.java
@@ -0,0 +1,54 @@
+package com.openhis.quartz.task;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.core.common.core.domain.R;
+import com.core.common.utils.DateUtils;
+import com.openhis.web.inventorymanage.appservice.IProductStocktakingAppService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.core.common.utils.StringUtils;
+import com.core.framework.config.TenantContext;
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.service.ILocationService;
+
+/**
+ * 批量盘点定时任务
+ * 
+ * @author yuxj
+ */
+@Component("stocktakingBatchTask")
+public class StocktakingBatchTask {
+
+    Logger logger = LoggerFactory.getLogger(StocktakingBatchTask.class);
+    @Resource
+    IProductStocktakingAppService productStocktakingAppService;
+
+    public void autoStocktakingBatch(Integer tenantId) {
+        // 定时任务指定租户id,示例
+        try {
+            // 在控制台打印当前时间加执行的功能名
+            System.out.println("执行自动批量盘点START：" + DateUtils.getNowDate());
+            logger.info("执行自动批量盘点START：" + DateUtils.getNowDate());
+
+            // 设置当前线程的租户ID
+            TenantContext.setCurrentTenant(tenantId);
+            //执行自动盘点
+            productStocktakingAppService.autoStocktakingBatch();
+
+            logger.info("执行自动批量盘点END：" + DateUtils.getNowDate());
+            // 在控制台打印当前时间加执行的功能名
+            System.out.println("执行自动批量盘点END：" + DateUtils.getNowDate());
+        } finally {
+            // 清除线程局部变量，防止内存泄漏
+            TenantContext.clear();
+        }
+
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java
new file mode 100644
index 00000000..859b02a1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java
@@ -0,0 +1,64 @@
+package com.openhis.web.basedatamanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+import com.openhis.web.basedatamanage.dto.OrganizationDto;
+
+/**
+ * BodyStructure 应该服务类
+ */
+public interface IBodyStructureAppService {
+    /**
+     * 查询身体部位树
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 身体部位树分页列表
+     */
+    Page<BodyStructureDto> getBodyStructureTree(Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 身体部位信息详情
+     *
+     * @param id 身体部位信息id
+     * @return 身体部位详情
+     */
+    R<?> getBodyStructureInfo(Long id);
+
+    /**
+     * 添加/编辑体身体部位信息
+     *
+     * @param bodyStructureDto 身体部位信息
+     * @return 操作结果
+     */
+    R<?> addOrEditBodyStructure(BodyStructureDto bodyStructureDto);
+
+    /**
+     * 身体部位信息
+     *
+     * @param ids 身体部位信息id
+     * @return 操作结果
+     */
+    R<?> deleteBodyStructure(String ids);
+
+    /**
+     * 身体部位启用
+     *
+     * @param id 身体部位信息id
+     * @return 操作结果
+     */
+    R<?> activeBodyStructure(Long id);
+
+    /**
+     * 身体部位停用
+     *
+     * @param id 身体部位信息id
+     * @return 操作结果
+     */
+    R<?> inactiveBodyStructure(Long id);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
similarity index 75%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
index 914b643e..9a0c96a2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
@@ -5,6 +5,9 @@ import javax.servlet.http.HttpServletRequest;
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
 import com.openhis.web.basedatamanage.dto.LocationPageParam;
+import com.openhis.web.common.dto.LocationDto;
+
+import java.util.List;
 
 /**
  * Location 应该服务类
@@ -13,12 +16,13 @@ public interface ILocationAppService {
     /**
      * 位置信息
      *
-     * @param formKey 查询条件
+     * @param formList 类型
      * @param pageNo 当前页码
      * @param pageSize 查询条数
+     * @param isInHospital 是否为住院
      * @return 位置信息分页列表
      */
-    R<?> getLocationTree(Integer formKey, Integer pageNo, Integer pageSize);
+    R<?> getLocationTree(List<Integer> formList, Integer pageNo, Integer pageSize, String isInHospital);
 
     /**
      * 位置信息详情
@@ -71,4 +75,20 @@ public interface ILocationAppService {
      * @return 初始化信息
      */
     R<?> locationInit();
+
+    /**
+     * 启用
+     *
+     * @param locationIdList 位置id
+     * @return 操作结果
+     */
+    R<?> enableLocation(List<Long> locationIdList);
+
+    /**
+     * 停用
+     *
+     * @param locationIdList 位置id
+     * @return 操作结果
+     */
+    R<?> deactivateLocation(List<Long> locationIdList);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
new file mode 100644
index 00000000..f620478e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
@@ -0,0 +1,196 @@
+package com.openhis.web.basedatamanage.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.ChineseConvertUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.BodyStructure;
+import com.openhis.administration.service.IBodyStructureService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService;
+import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+
+@Service
+public class BodyStructureAppServiceImpl implements IBodyStructureAppService {
+
+    @Resource
+    private IBodyStructureService bodyStructureService;
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Override
+    public Page<BodyStructureDto> getBodyStructureTree(Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        // 查询身体部位列表
+        Page<BodyStructure> page = bodyStructureService.page(new Page<>(pageNo, pageSize));
+        List<BodyStructure> bodyStructureList = page.getRecords();
+        // 将身体部位列表转为树结构
+        List<BodyStructureDto> orgTree = buildTree(bodyStructureList);
+        Page<BodyStructureDto> orgQueryDtoPage = new Page<>(pageNo, pageSize, page.getTotal());
+        orgQueryDtoPage.setRecords(orgTree);
+        return orgQueryDtoPage;
+    }
+
+    /**
+     * 将身体部位列表转换为树结构
+     *
+     * @param records 机构列表
+     * @return tree
+     */
+    private List<BodyStructureDto> buildTree(List<BodyStructure> records) {
+        // 按b_no的层级排序，确保父节点先处理
+        List<BodyStructure> sortedRecords = records.stream()
+            .sorted(Comparator.comparingInt(r -> r.getBusNo().split("\\.").length)).collect(Collectors.toList());
+
+        Map<String, BodyStructureDto> nodeMap = new HashMap<>();
+        List<BodyStructureDto> tree = new ArrayList<>();
+
+        for (BodyStructure record : sortedRecords) {
+            String bNo = record.getBusNo();
+            String[] parts = bNo.split("\\.");
+            BodyStructureDto node = new BodyStructureDto();
+            BeanUtils.copyProperties(record, node);
+            node.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, node.getStatusEnum()));
+
+            // 将当前节点加入映射
+            nodeMap.put(bNo, node);
+
+            if (parts.length == 1) {
+                // 根节点
+                tree.add(node);
+            } else {
+                // 获取父节点的b_no（去掉最后一部分）
+                String parentBNo = String.join(".", Arrays.copyOf(parts, parts.length - 1));
+                BodyStructureDto parent = nodeMap.get(parentBNo);
+
+                if (parent != null) {
+                    parent.getChildren().add(node);
+                } else {
+                    // 处理父节点不存在的情况（例如数据缺失）
+                    // 可根据需求调整为将节点加入根或抛出异常
+                }
+            }
+        }
+        return tree;
+    }
+
+    /**
+     * 身体部位信息详情
+     *
+     * @param id 身体部位id
+     * @return 机构信息详情
+     */
+    @Override
+    public R<?> getBodyStructureInfo(Long id) {
+        BodyStructure bodyStructure = bodyStructureService.getById(id);
+        return R.ok(bodyStructure,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"身体部位信息查询"}));
+    }
+
+    /**
+     * 添加/编辑部位
+     *
+     * @param bodyStructureDto 身体部位信息
+     * @return 操作结果
+     */
+    @Override
+    public R<?> addOrEditBodyStructure(BodyStructureDto bodyStructureDto) {
+
+        // 新增身体部位信息
+        BodyStructure bodyStructure = new BodyStructure();
+        BeanUtils.copyProperties(bodyStructureDto, bodyStructure);
+
+        // 拼音码
+        bodyStructure.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(bodyStructureDto.getName()));
+        // 五笔码
+        bodyStructure.setWbStr(ChineseConvertUtils.toWBFirstLetter(bodyStructureDto.getName()));
+
+        if (bodyStructureDto.getId() != null) {
+            // 更新身体部位信息
+            bodyStructureService.updateById(bodyStructure);
+        } else {
+            bodyStructure.setStatusEnum(PublicationStatus.ACTIVE.getValue());
+            // 采番bus_no三位
+            String code = assignSeqUtil.getSeq(AssignSeqEnum.BODY_STRUCTURE_NO.getPrefix(), 3);
+            // 如果传了上级部位 把当前的code拼到后边
+            if (StringUtils.isNotEmpty(bodyStructure.getBusNo())) {
+                bodyStructure.setBusNo(String.format(CommonConstants.Common.MONTAGE_FORMAT, bodyStructure.getBusNo(),
+                    CommonConstants.Common.POINT, code));
+            } else {
+                bodyStructure.setBusNo(code);
+            }
+            // 生成待发送的机构信息
+            bodyStructureService.save(bodyStructure);
+        }
+        // 返回身体部位id
+        return R.ok(bodyStructure.getId(),
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"身体部位信息更新添加"}));
+    }
+
+    /**
+     * 删除身体部位
+     *
+     * @param id 身体部位id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deleteBodyStructure(String id) {
+
+        List<Long> orgIdList = new ArrayList<>();
+        if (id != null) {
+            orgIdList = Arrays.stream(id.split(",")).map(Long::parseLong).collect(Collectors.toList());
+        }
+
+        // 删除身体部位信息
+        boolean deleteOrgSuccess = bodyStructureService.removeByIds(orgIdList);
+        return deleteOrgSuccess
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"身体部位信息"}))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"身体部位信息"}));
+    }
+
+    /**
+     * 身体部位列表启用
+     *
+     * @param id 身体部位列表信息id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> activeBodyStructure(Long id) {
+        // 机构启用
+        boolean result = bodyStructureService.activeBodyStructure(id);
+        return result
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"身体部位信息启用"}))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"身体部位信息启用"}));
+    }
+
+    /**
+     * 身体部位列表停用
+     *
+     * @param id 身体部位列表信息id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> inactiveBodyStructure(Long id) {
+        // 机构停用
+        boolean result = bodyStructureService.inactiveBodyStructure(id);
+        return result
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"身体部位信息停用"}))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"身体部位信息停用"}));
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
similarity index 66%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
index 6b461123..1cbe64bd 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
@@ -13,13 +13,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.core.common.utils.AssignSeqUtil;
-import com.core.common.utils.ChineseConvertUtils;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.StringUtils;
+import com.core.common.utils.*;
+import com.openhis.administration.domain.EncounterLocation;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.mapper.LocationMapper;
+import com.openhis.administration.service.IEncounterLocationService;
 import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.IPractitionerRoleService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
@@ -28,6 +28,7 @@ import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basedatamanage.appservice.ILocationAppService;
 import com.openhis.web.basedatamanage.dto.*;
+import com.openhis.web.common.appservice.ICommonService;
 
 @Service
 public class LocationAppServiceImpl implements ILocationAppService {
@@ -35,12 +36,21 @@ public class LocationAppServiceImpl implements ILocationAppService {
     @Resource
     private ILocationService locationService;
 
+    @Resource
+    private ICommonService commonService;
+
     @Resource
     private AssignSeqUtil assignSeqUtil;
 
     @Resource
     private LocationMapper locationMapper;
 
+    @Resource
+    private IPractitionerRoleService practitionerRoleService;
+
+    @Resource
+    private IEncounterLocationService encounterLocationService;
+
     /**
      * 位置初始化
      *
@@ -59,6 +69,86 @@ public class LocationAppServiceImpl implements ILocationAppService {
         return R.ok(initDto);
     }
 
+    /**
+     * 启用
+     *
+     * @param locationIdList 位置id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> enableLocation(List<Long> locationIdList) {
+        List<Location> locationList = locationService.getLocationList(locationIdList);
+        if (locationIdList != null && !locationIdList.isEmpty()) {
+            for (Location location : locationList) {
+                if (LocationForm.HOUSE.getValue().equals(location.getFormEnum())
+                    || LocationForm.BED.getValue().equals(location.getFormEnum())) {
+                    // 获取父节点的busNo（病区）
+                    String parentBusNo =
+                        location.getBusNo().substring(0, location.getBusNo().indexOf(CommonConstants.Common.POINT));
+                    // 查询所有父集位置
+                    List<Location> fatherLocations =
+                        locationService.list(new LambdaQueryWrapper<Location>().like(Location::getBusNo, parentBusNo)
+                            .in(Location::getFormEnum, LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue()));
+                    // 启用所有对应的父节点
+                    for (Location fatherLocation : fatherLocations) {
+                        fatherLocation.setStatusEnum(LocationStatus.ACTIVE.getValue());
+                        locationService.updateLocation(fatherLocation);
+                    }
+                    // 病床单独设置状态为空闲
+                    if (LocationForm.BED.getValue().equals(location.getFormEnum())) {
+                        location.setStatusEnum(LocationStatus.IDLE.getValue());
+                        locationService.updateLocation(location);
+                    }
+                } else {
+                    location.setStatusEnum(LocationStatus.ACTIVE.getValue());
+                    locationService.updateLocation(location);
+                }
+            }
+            return R.ok("启用成功");
+        }
+        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+    }
+
+    /**
+     * 停用
+     *
+     * @param locationIdList 位置id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deactivateLocation(List<Long> locationIdList) {
+        List<Location> locationList = locationService.getLocationList(locationIdList);
+        if (locationIdList != null && !locationIdList.isEmpty()) {
+            for (Location location : locationList) {
+                if (LocationForm.BED.getValue().equals(location.getFormEnum())) {
+                    List<EncounterLocation> encounterLocationList =
+                        encounterLocationService.getEncounterLocationInfo(null, location.getId());
+                    if (encounterLocationList != null && !encounterLocationList.isEmpty()) {
+                        return R.fail("有被占用的床位，不可停用");
+                    }
+                } else if (LocationForm.HOUSE.getValue().equals(location.getFormEnum())) {
+                    // 检查病房下是否有启用的病床
+                    List<com.openhis.web.common.dto.LocationDto> activeBeds =
+                        commonService.getChildLocation(location.getId(), LocationForm.BED.getValue());
+                    if ((activeBeds != null && !activeBeds.isEmpty())) {
+                        return R.fail("病房下有启用或被占用的床位，不可停用");
+                    }
+                } else if (LocationForm.WARD.getValue().equals(location.getFormEnum())) {
+                    // 检查病区下是否有启用的病房
+                    List<com.openhis.web.common.dto.LocationDto> activeHouses =
+                        commonService.getChildLocation(location.getId(), LocationForm.HOUSE.getValue());
+                    if ((activeHouses != null && !activeHouses.isEmpty())) {
+                        return R.fail("病区下有启用或被占用的病房，不可停用");
+                    }
+                }
+                location.setStatusEnum(LocationStatus.INACTIVE.getValue());
+                locationService.updateLocation(location);
+            }
+            return R.ok("停用成功");
+        }
+        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+    }
+
     /**
      * 位置信息详情
      *
@@ -110,7 +200,7 @@ public class LocationAppServiceImpl implements ILocationAppService {
     @Override
     public R<?> getLocationPage(LocationPageParam locationPageParam, String searchKey, Integer pageNo, Integer pageSize,
         HttpServletRequest request) {
-        //数据初始化，不使用eq条件拼接
+        // 数据初始化，不使用eq条件拼接
         List<Integer> formList = locationPageParam.getLocationFormList();
         locationPageParam.setLocationFormList(null);
         String busNo = locationPageParam.getBusNo();
@@ -156,6 +246,10 @@ public class LocationAppServiceImpl implements ILocationAppService {
         Location location = new Location();
         BeanUtils.copyProperties(locationAddOrEditDto, location);
         location.setFormEnum(Integer.valueOf(locationAddOrEditDto.getFormEnum()));
+        // 新增病床设置状态为空闲
+        if (LocationForm.BED.getValue().equals(Integer.valueOf(locationAddOrEditDto.getFormEnum()))) {
+            location.setStatusEnum(LocationStatus.IDLE.getValue());
+        }
         // 拼音码
         location.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(locationAddOrEditDto.getName()));
         // 五笔码
@@ -200,18 +294,25 @@ public class LocationAppServiceImpl implements ILocationAppService {
     /**
      * 位置分页列表-树型
      *
+     * @param formList 类型
      * @param pageNo 当前页码
      * @param pageSize 查询条数
+     * @param isInHospital 是否住院
      * @return 位置分页列表
      */
     @Override
-    public R<?> getLocationTree(Integer formKey, Integer pageNo, Integer pageSize) {
+    public R<?> getLocationTree(List<Integer> formList, Integer pageNo, Integer pageSize, String isInHospital) {
 
         LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
-        if (formKey != null) {
-            queryWrapper.eq(Location::getFormEnum, formKey);
+        if (formList != null && !formList.isEmpty()) {
+            queryWrapper.in(Location::getFormEnum, formList);
+        }
+        if (Whether.YES.getCode().equals(isInHospital)) {
+            // 当前登录者的id
+            Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+            List<Long> locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId);
+            queryWrapper.in(Location::getId, locationIds);
         }
-
         // 查询位置列表
         Page<Location> page = locationService.page(new Page<>(pageNo, pageSize), queryWrapper);
         List<Location> locationList = page.getRecords();
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java
new file mode 100644
index 00000000..8ba0f608
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.basedatamanage.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService;
+import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 身体部位管理controller
+ *
+ * @author
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/base-data-manage/body-structure")
+@Slf4j
+@AllArgsConstructor
+public class BodyStructureController {
+
+    private final IBodyStructureAppService bodyStructureService;
+
+    /**
+     * 身体部位分页列表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 身体部位分页列表
+     */
+    @GetMapping(value = "/body")
+    public R<?> getBodyStructurePage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize, HttpServletRequest request) {
+        Page<BodyStructureDto> bodyStructureTree = bodyStructureService.getBodyStructureTree(pageNo, pageSize, request);
+        return R.ok(bodyStructureTree,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"身体部位信息"}));
+    }
+
+    /**
+     * 获取身体部位需要编辑的信息
+     *
+     * @param id 身体部位信息
+     * @return 操作结果
+     */
+    @GetMapping("/body-getById")
+    public R<?> getOrgInfo(@Validated @RequestParam Long id) {
+        return bodyStructureService.getBodyStructureInfo(id);
+    }
+
+    /**
+     * 添加/编辑身体部位
+     *
+     * @param bodyStructureDto 身体部位信息
+     * @return 操作结果
+     */
+    @PostMapping("/body")
+    public R<?> addOrEditInventoryReceipt(@Validated @RequestBody BodyStructureDto bodyStructureDto) {
+        return bodyStructureService.addOrEditBodyStructure(bodyStructureDto);
+    }
+
+    /**
+     * 删除身体部位
+     *
+     * @param ids 需要删除的Id
+     * @return 操作结果
+     */
+    @DeleteMapping("/body")
+    public R<?> deleteBodyStructure(@RequestParam String ids) {
+        return bodyStructureService.deleteBodyStructure(ids);
+    }
+
+    /**
+     * 身体部位启用
+     * 
+     * @param id 启用数据的Id
+     * @return 操作结果
+     *
+     */
+    @PutMapping("/body-active")
+    public R<?> activeBodyStructure(@RequestParam Long id) {
+        return bodyStructureService.activeBodyStructure(id);
+    }
+
+    /**
+     * 身体部位停用
+     * 
+     * @param id 停用数据的Id
+     * @return 操作结果
+     *
+     */
+    @PutMapping("/body-inactive")
+    public R<?> inactiveBodyStructure(@RequestParam Long id) {
+        return bodyStructureService.inactiveBodyStructure(id);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java
new file mode 100644
index 00000000..3d2ed964
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.basedatamanage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.domain.Frequency;
+import com.openhis.administration.service.IFrequencyService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
+import com.openhis.web.basedatamanage.dto.FrequencyDto;
+import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
+import com.openhis.web.basedatamanage.dto.OrganizationDto;
+import com.openhis.web.basedatamanage.dto.OrganizationInitDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 频次信息管理controller
+ *
+ */
+@RestController
+@RequestMapping("/personalization/frequency")
+@Slf4j
+@AllArgsConstructor
+public class FrequencyController {
+
+    private final IFrequencyService frequencyService;
+
+    /**
+     * 频次详情分页列表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 机构分页列表
+     */
+    @GetMapping(value = "/getPageList")
+    public R<?> getOrganizationPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize, String code,HttpServletRequest request) {
+        Page<Frequency> pageList= frequencyService.getPageList(pageNo, pageSize, code,request) ;
+        return R.ok(pageList,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"频次详情信息"}));
+    }
+
+
+    @PostMapping("/save")
+    public R<?> addOrEditFrequency(@Validated @RequestBody FrequencyDto frequencyDto) {
+        // 创建 Frequency 对象
+        Frequency frequency = new Frequency();
+        // 使用 BeanUtils 拷贝属性
+        BeanUtils.copyProperties(frequencyDto, frequency);
+        // 获取并转换 dayTimes 字段
+        List<String> dayTimesList = frequencyDto.getDayTimes();
+        if (dayTimesList != null && !dayTimesList.isEmpty()) {
+            Collections.sort(dayTimesList);
+            String dayTimesStr = String.join(",", dayTimesList);  // 转换为逗号分隔的字符串
+            frequency.setDayTimes(dayTimesStr);  // 将转换后的字符串设置到 Frequency 对象
+        }
+
+        return R.ok(frequencyService.saveOrUpdate(frequency, new LambdaQueryWrapper<Frequency>().eq(Frequency::getRateCode, frequency.getRateCode())),MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"保存频次详情"}));
+    }
+
+    @DeleteMapping("{id}")
+    public R<?> deleteFrequency(@PathVariable Long id) {
+        return R.ok(frequencyService.removeById(id),MessageUtils.createMessage(PromptMsgConstant.Common.M00003, new Object[] {"删除频次详情"}));
+    }
+
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
similarity index 76%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
index 0a3cd91c..3ad9df17 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
@@ -3,9 +3,12 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.web.common.dto.LocationDto;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,15 +48,18 @@ public class LocationController {
     /**
      * 位置分页列表-树型
      *
+     * @param formList 类型
      * @param pageNo 当前页码
      * @param pageSize 查询条数
+     * @param isInHospital 是否住院
      * @return 位置分页列表
      */
     @GetMapping(value = "/location-page-tree")
-    public R<?> getLocationPage(@RequestParam(required = false, value = "formKey", defaultValue = "") Integer formKey,
+    public R<?> getLocationPage(@RequestParam List<Integer> formList,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return locationAppService.getLocationTree(formKey, pageNo, pageSize);
+        @RequestParam(value = "pageSize", defaultValue = "1000") Integer pageSize,
+        @RequestParam(value = "isInHospital", defaultValue = "0") String isInHospital) {
+        return locationAppService.getLocationTree(formList, pageNo, pageSize, isInHospital);
     }
 
     /**
@@ -118,4 +124,26 @@ public class LocationController {
         return locationAppService.deleteLocation(busNo);
     }
 
+    /**
+     * 启用
+     *
+     * @param locationIdList 位置id
+     * @return 操作结果
+     */
+    @PutMapping("/enable")
+    public R<?> enableLocation(@RequestBody List<Long> locationIdList) {
+        return locationAppService.enableLocation(locationIdList);
+    }
+
+    /**
+     * 停用
+     *
+     * @param locationIdList 位置id
+     * @return 操作结果
+     */
+    @PutMapping("/deactivate")
+    public R<?> deactivateLocation(@RequestBody List<Long> locationIdList) {
+        return locationAppService.deactivateLocation(locationIdList);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java
new file mode 100644
index 00000000..e49eefae
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.basedatamanage.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liuhr
+ * @date 2025-07-23
+ */
+@Data
+@Accessors(chain = true)
+public class BodyStructureDto {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 名称 */
+    private String name;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 子集合 */
+    private List<BodyStructureDto> children = new ArrayList<>();
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java
new file mode 100644
index 00000000..1cb03d51
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java
@@ -0,0 +1,90 @@
+package com.openhis.web.basedatamanage.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author
+ * @Date 2025/8/25
+ */
+@Data
+public class FrequencyDto {
+    /**
+     * 频次代码，唯一标识与字典表对应
+     */
+    private String rateCode;
+
+    /**
+     * 频次名称
+     */
+    private String name;
+
+    /**
+     * 每天执行的次数
+     */
+    private Integer dayCount;
+
+    /**
+     * 每次执行之间的间隔（天数）
+     */
+    private Integer dayInterval;
+
+    /**
+     * 每天的具体执行时间点，逗号分隔
+     */
+    private List<String> dayTimes;
+
+    /**
+     * 是否周期性每周执行，0 为否，1 为是
+     */
+    private Integer weekCycleFlag;
+
+    /**
+     * 每周执行的间隔，单位为周
+     */
+    private Integer weekInterval;
+
+    /**
+     * 每周执行的次数
+     */
+    private Integer weekTimes;
+
+    /**
+     * 是否为连续执行，0 为否，1 为是
+     */
+    private Integer continueFlag;
+
+    /**
+     * 执行总次数，记录任务累计执行次数
+     */
+    private Integer totalExecutionCount;
+
+    /**
+     * 任务执行周期长度
+     */
+    private Integer executionPeriod;
+
+    /**
+     * 任务执行周期的单位，如 day、week、month
+     */
+    private String executionPeriodUnit;
+
+    /**
+     * 第三方代码，外部系统使用
+     */
+    private String thirdCode;
+
+    /**
+     * 备注信息
+     */
+    private String memo;
+
+    /**
+     * 并发戳，用于版本控制和并发冲突检测
+     */
+    private Integer concurrencyStamp;
+
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
similarity index 86%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
index 3763684e..c88b9ef0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
@@ -4,10 +4,7 @@
 package com.openhis.web.basedatamanage.dto;
 
 import java.sql.Time;
-import java.util.Date;
-import java.util.Timer;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -44,7 +41,9 @@ public class OrgLocQueryDto {
      * 诊疗定义id
      */
     @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictCode = "id", dictText = "name", dictTable = "wor_activity_definition")
     private Long activityDefinitionId;
+    private String activityDefinitionId_dictText;
 
     /**
      * 诊疗类型
@@ -54,11 +53,11 @@ public class OrgLocQueryDto {
     private String activityCategoryCode_dictText;
 
     /** 开始时间 */
-    //@JsonFormat(pattern = "HH:mm:ss")
+    // @JsonFormat(pattern = "HH:mm:ss")
     private Time startTime;
 
     /** 结束时间 */
-    //@JsonFormat(pattern = "HH:mm:ss")
+    // @JsonFormat(pattern = "HH:mm:ss")
     private Time endTime;
 
     /** 显示顺序 */
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
similarity index 70%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
index 173be8f4..5c3ec3d4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
@@ -3,23 +3,21 @@
  */
 package com.openhis.web.catalogmanage.controller;
 
-import com.core.common.annotation.Anonymous;
-import com.core.common.core.domain.R;
-import com.openhis.web.catalogmanage.appservice.ICatalogService;
-import com.openhis.web.patientmanage.appservice.IPatientInformationService;
-import com.openhis.web.patientmanage.dto.PatientInfoSearchParam;
-import com.openhis.web.ybmanage.config.YbServiceConfig;
-import io.swagger.models.auth.In;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
+import com.core.common.annotation.Anonymous;
+import com.core.common.core.domain.R;
+import com.openhis.web.catalogmanage.appservice.ICatalogService;
+import com.openhis.web.ybmanage.config.YbServiceConfig;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 医保目录
@@ -37,6 +35,7 @@ public class CatalogController {
     ICatalogService iCatalogService;
     @Autowired
     YbServiceConfig ybServiceConfig;
+
     /**
      * 分页查询医保目录信息,可选条件
      *
@@ -47,12 +46,10 @@ public class CatalogController {
      */
     @Anonymous
     @GetMapping("/page")
-    public R<?> getPage(Integer catalogType,
-                        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-
+    public R<?> getPage(Integer catalogType, @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
         System.out.println(ybServiceConfig.getUrl());
-        return R.ok(iCatalogService.getPage(catalogType, searchKey, pageNo, pageSize,request));
+        return R.ok(iCatalogService.getPage(catalogType, searchKey, pageNo, pageSize, request));
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java
new file mode 100644
index 00000000..778152f6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.chargemanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+
+/**
+ * 门诊收费 service
+ *
+ * @author zwh
+ * @date 2025-03-12
+ */
+public interface IInpatientChargeAppService {
+
+    /**
+     * 查询就诊患者分页列表
+     *
+     * @param encounterPatientPageParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 就诊患者分页列表
+     */
+    R<?> getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 根据就诊id查询患者处方列表
+     *
+     * @param encounterId 就诊id
+     * @return 患者处方列表
+     */
+    List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId, String startTime,
+        String endTime);
+
+    /**
+     * 医保转自费
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    R<?> changeToSelfPay(Long encounterId);
+
+    /**
+     * 自费转医保
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    R<?> changeToMedicalInsurance(Long encounterId);
+
+    /**
+     * 门诊收费页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> outpatientChargeInit();
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
index ba2411b0..9ed70df6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
@@ -59,9 +59,11 @@ public interface IOutpatientRefundAppService {
      * 根据就诊id查询患者的退费账单
      *
      * @param encounterId 就诊id
+     * @param billDateSTime 收费时间开始
+     * @param billDateETime 收费时间结束
      * @return 退费账单列表
      */
-    R<?> getEncounterPatientRefund(Long encounterId);
+    R<?> getEncounterPatientRefund(Long encounterId, String billDateSTime, String billDateETime);
 
     /**
      * 根据就诊id查询患者因退费重新生成的账单
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
index d56d4f83..0497e04e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
@@ -26,13 +26,6 @@ public interface IOutpatientRegistrationAppService {
      */
     Page<PatientMetadata> getPatientMetadataBySearchKey(String searchKey, Integer pageNo, Integer pageSize);
 
-    /**
-     * 查询费用性质
-     *
-     * @return 费用性质
-     */
-    List<ContractMetadata> getContractMetadata();
-
     /**
      * 查询门诊科室数据
      *
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
new file mode 100644
index 00000000..b4243141
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.chargemanage.appservice.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.service.IAccountService;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AdministrativeGender;
+import com.openhis.common.enums.ChargeItemContext;
+import com.openhis.common.enums.ChargeItemStatus;
+import com.openhis.common.enums.EncounterClass;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.chargemanage.appservice.IInpatientChargeAppService;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageDto;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.openhis.web.chargemanage.dto.OutpatientInitDto;
+import com.openhis.web.chargemanage.mapper.InpatientChargeAppMapper;
+
+/**
+ * 门诊收费 impl
+ *
+ * @author zwh
+ * @date 2025-03-12
+ */
+@Service
+public class InpatientChargeAppServiceImpl implements IInpatientChargeAppService {
+
+    @Autowired
+    private InpatientChargeAppMapper inpatientChargeAppMapper;
+    @Autowired
+    private IChargeItemService chargeItemService;
+    @Autowired
+    private IAccountService accountService;
+
+    /**
+     * 门诊收费页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> outpatientChargeInit() {
+        OutpatientInitDto initDto = new OutpatientInitDto();
+        List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions = new ArrayList<>();
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.PLANNED.getValue(),
+            ChargeItemStatus.PLANNED.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLABLE.getValue(),
+            ChargeItemStatus.BILLABLE.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLED.getValue(),
+            ChargeItemStatus.BILLED.getInfo()));
+        initDto.setChargeItemStatusOptions(chargeItemStatusOptions);
+        return R.ok(initDto);
+    }
+
+    /**
+     * 查询就诊患者分页列表
+     *
+     * @param encounterPatientPageParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 就诊患者分页列表
+     */
+    @Override
+    public R<?> getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<EncounterPatientPageParam> queryWrapper = HisQueryUtils.buildQueryWrapper(
+            encounterPatientPageParam, searchKey,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
+                CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo,
+                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)),
+            request);
+        // 就诊患者分页列表
+        Page<EncounterPatientPageDto> encounterPatientPage = inpatientChargeAppMapper
+            .selectEncounterPatientPage(EncounterClass.IMP.getValue(), new Page<>(pageNo, pageSize), queryWrapper);
+
+        encounterPatientPage.getRecords().forEach(e -> {
+            // 性别枚举
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 收费状态枚举
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));
+            // 计算年龄
+            e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
+        });
+        return R.ok(encounterPatientPage);
+    }
+
+    /**
+     * 根据就诊id查询患者处方列表
+     *
+     * @param encounterId 就诊id
+     * @return 患者处方列表
+     */
+    @Override
+    public List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId, String startTime,
+        String endTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+
+        startTime = startTime + "000000";
+
+        endTime = endTime + "235959";
+
+        Date startDate = null;
+        Date endDate = null;
+        try {
+            startDate = sdf.parse(startTime);
+            endDate = sdf.parse(endTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        List<EncounterPatientPrescriptionDto> prescriptionDtoList =
+            inpatientChargeAppMapper.selectEncounterPatientPrescription(encounterId,
+                ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.MEDICATION.getValue(),
+                ChargeItemContext.DEVICE.getValue(), ChargeItemContext.REGISTER.getValue(),
+                ChargeItemStatus.PLANNED.getValue(), ChargeItemStatus.BILLABLE.getValue(),
+                ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDING.getValue(),
+                ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue(), startDate, endDate);
+        prescriptionDtoList.forEach(e -> {
+            // 收费状态枚举
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));
+        });
+        return prescriptionDtoList;
+    }
+
+    /**
+     * 医保转自费
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> changeToSelfPay(Long encounterId) {
+        // 获取就诊患者的自费账户id
+        Long accountId = accountService.getSelfPayAccount(encounterId);
+        if (accountId == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00008, new Object[] {"自费账户"}));
+        }
+        // 医保转自费
+        boolean result = chargeItemService.updateAccountType(encounterId, accountId);
+        if (!result) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00009, null));
+        }
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 自费转医保
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> changeToMedicalInsurance(Long encounterId) {
+        // 获取就诊患者的医保账户id
+        Long accountId = accountService.getMedicalInsuranceAccount(encounterId);
+        if (accountId == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00008, new Object[] {"医保账户"}));
+        }
+        // 自费转医保
+        boolean result = chargeItemService.updateAccountType(encounterId, accountId);
+        if (!result) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00009, null));
+        }
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
index dc040a8c..155c5085 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
@@ -25,6 +25,7 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.AdministrativeGender;
 import com.openhis.common.enums.ChargeItemContext;
 import com.openhis.common.enums.ChargeItemStatus;
+import com.openhis.common.enums.EncounterClass;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService;
@@ -90,8 +91,8 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
                 CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)),
             request);
         // 就诊患者分页列表
-        Page<EncounterPatientPageDto> encounterPatientPage =
-            outpatientChargeAppMapper.selectEncounterPatientPage(new Page<>(pageNo, pageSize), queryWrapper);
+        Page<EncounterPatientPageDto> encounterPatientPage = outpatientChargeAppMapper
+            .selectEncounterPatientPage(new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.AMB.getValue());
 
         encounterPatientPage.getRecords().forEach(e -> {
             // 性别枚举
@@ -137,14 +138,14 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
         // 获取就诊患者的自费账户id
         Long accountId = accountService.getSelfPayAccount(encounterId);
         if (accountId == null) {
-            R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00008, new Object[] {"自费账户"}));
         }
         // 医保转自费
         boolean result = chargeItemService.updateAccountType(encounterId, accountId);
         if (!result) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00009, null));
         }
-        return R.ok();
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
     }
 
     /**
@@ -158,13 +159,13 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
         // 获取就诊患者的医保账户id
         Long accountId = accountService.getMedicalInsuranceAccount(encounterId);
         if (accountId == null) {
-            R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00008, new Object[] {"医保账户"}));
         }
         // 自费转医保
         boolean result = chargeItemService.updateAccountType(encounterId, accountId);
         if (!result) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Payment.M00009, null));
         }
-        return R.ok();
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
similarity index 98%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
index 17852af9..caaffbea 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
@@ -17,6 +17,8 @@ import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
 
+import java.util.List;
+
 /**
  * 门诊划价 impl
  *
@@ -66,7 +68,7 @@ public class OutpatientPricingAppServiceImpl implements IOutpatientPricingAppSer
     public IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
         Long organizationId, Integer pageNo, Integer pageSize) {
         return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null,
-            organizationId, pageNo, pageSize, Whether.YES.getValue());
+            organizationId, pageNo, pageSize, Whether.YES.getValue(), List.of(1, 2, 3));
     }
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
similarity index 82%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
index 6b46e98c..a0b85578 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
@@ -22,6 +22,7 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.common.constant.CommonConstants;
@@ -168,9 +169,9 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     MedicationRequest medicationRequest = medicationRequestService.getById(creatdDto.getRequestId());
                     // 生成新的药品请求
                     medicationRequest.setId(null); // 药品请求id
-                    medicationRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 10)); // 药品请求编码
-                    medicationRequest.setPrescriptionNo(
-                        String.valueOf(new StringBuilder("C").append(creatdDto.getPrescriptionNo()))); // 处方号
+                    medicationRequest
+                        .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4)); // 药品请求编码
+                    medicationRequest.setPrescriptionNo(String.valueOf("C" + creatdDto.getPrescriptionNo())); // 处方号
                     medicationRequestService.save(medicationRequest);
 
                     // 药品发放查询
@@ -178,7 +179,8 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                         medicationDispenseService.getById(creatdDto.getDispenseId());
                     // 生成新的药品发放
                     medicationDispense.setId(null); // 药品发放id
-                    medicationDispense.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 10)); // 药品发放编码
+                    medicationDispense
+                        .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4)); // 药品发放编码
                     medicationDispense.setMedReqId(medicationRequest.getId()); // 药品请求id
                     medicationDispenseService.save(medicationDispense);
 
@@ -188,8 +190,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     chargeItem.setRefundId(chargeItem.getId());// 退费id
                     chargeItem.setId(null); // 费用项id
                     chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo())); // 编码
-                    chargeItem.setPrescriptionNo(
-                        String.valueOf(new StringBuilder("C").append(creatdDto.getPrescriptionNo()))); // 处方号
+                    chargeItem.setPrescriptionNo(String.valueOf("C" + creatdDto.getPrescriptionNo())); // 处方号
                     chargeItem.setServiceId(medicationRequest.getId()); // 医疗服务ID
                     chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());// 收费单状态：待收费
                     chargeItemService.save(chargeItem);
@@ -199,7 +200,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     ServiceRequest serviceRequest = serviceRequestService.getById(creatdDto.getRequestId());
                     // 生成新的服务请求
                     serviceRequest.setId(null); // 服务请求id
-                    serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10)); // 服务请求编码
+                    serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); // 服务请求编码
                     serviceRequestService.save(serviceRequest);
 
                     // 费用项查询
@@ -217,14 +218,14 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     DeviceRequest deviceRequest = deviceRequestService.getById(creatdDto.getRequestId());
                     // 生成新的耗材请求
                     deviceRequest.setId(null); // 耗材请求id
-                    deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 10)); // 耗材请求编码
+                    deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4)); // 耗材请求编码
                     deviceRequestService.save(deviceRequest);
 
                     // 耗材发放查询
                     DeviceDispense deviceDispense = deviceDispenseService.getById(creatdDto.getDispenseId());
                     // 生成新的耗材发放
                     deviceDispense.setId(null); // 耗材id
-                    deviceDispense.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 10)); // 器材发放id
+                    deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4)); // 器材发放id
                     deviceDispense.setDeviceReqId(deviceRequest.getId()); // 器材请求id
                     deviceDispenseService.save(deviceDispense);
 
@@ -269,13 +270,13 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     }
                     // 生成药品请求(退药)
                     medicationRequest.setId(null); // 药品请求id
-                    medicationRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 10)); // 药品请求编码
+                    medicationRequest
+                        .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4)); // 药品请求编码
                     medicationRequest.setQuantity(dto.getQuantity() * (-1)); // 请求数量
                     medicationRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
-                    medicationRequest.setStatusEnum(RequestStatus.IN_REFUND.getValue()); // 请求状态
+                    medicationRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
                     medicationRequest.setRefundMedicineId(dto.getRequestId()); // 退药id
-                    medicationRequest
-                        .setPrescriptionNo(String.valueOf(new StringBuilder("T").append(dto.getPrescriptionNo())));
+                    medicationRequest.setPrescriptionNo(String.valueOf("T" + dto.getPrescriptionNo()));
                     medicationRequestService.save(medicationRequest);
 
                 } else {
@@ -292,14 +293,14 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     // 服务请求查询
                     ServiceRequest serviceRequest = serviceRequestService.getById(dto.getRequestId());
                     if (serviceRequest.getRefundServiceId() != null) {
-                        throw new ServiceException("已申请退药，请勿重复申请");
+                        throw new ServiceException("已申请退费，请勿重复申请");
                     }
                     // 生成服务请求(取消服务)
                     serviceRequest.setId(null); // 服务请求id
-                    serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10)); // 服务请求编码
+                    serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); // 服务请求编码
                     serviceRequest.setQuantity(dto.getQuantity() * (-1)); // 请求数量
                     serviceRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
-                    serviceRequest.setStatusEnum(RequestStatus.ENDED.getValue()); // 请求状态
+                    serviceRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
                     serviceRequest.setRefundServiceId(dto.getRequestId()); // 退药id
                     serviceRequestService.save(serviceRequest);
 
@@ -316,36 +317,22 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     || DispenseStatus.PART_COMPLETED.getValue().equals(dto.getDispenseStatus())) {
                     // 耗材请求查询
                     DeviceRequest deviceRequest = deviceRequestService.getById(dto.getRequestId());
-                    if (deviceRequest.getRefundDeviceId() != null) {
-                        throw new ServiceException("已申请退药，请勿重复申请");
-                    }
-                    // 生成耗材请求(退耗材)
-                    deviceRequest.setId(null); // 耗材请求id
-                    deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 10)); // 耗材请求编码
-                    deviceRequest.setQuantity(dto.getQuantity() * (-1)); // 请求数量
-                    deviceRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
-                    deviceRequest.setStatusEnum(RequestStatus.IN_REFUND.getValue()); // 请求状态
-                    deviceRequest.setRefundDeviceId(dto.getRequestId()); // 退药id
-                    deviceRequestService.save(deviceRequest);
-
-                } else {
-                    if (DispenseStatus.STOPPED.getValue().equals(dto.getDispenseStatus())
-                        && NotPerformedReason.REFUND.getValue().equals(dto.getNotPerformedReason())) {
-                        throw new ServiceException("已申请退药，请勿重复申请");
+                    if (deviceRequest.getRefundDeviceId() == null) {
+                        // 生成耗材请求(退耗材)
+                        deviceRequest.setId(null); // 耗材请求id
+                        deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4)); // 耗材请求编码
+                        deviceRequest.setQuantity(dto.getQuantity() * (-1)); // 请求数量
+                        deviceRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
+                        deviceRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
+                        deviceRequest.setRefundDeviceId(dto.getRequestId()); // 退药id
+                        deviceRequestService.save(deviceRequest);
                     }
+                } else if (!DispenseStatus.STOPPED.getValue().equals(dto.getDispenseStatus())) {
                     devDisIdList.add(dto.getDispenseId());
                 }
             }
         }
 
-        // // 付款id集合
-        // List<Long> paymentIdList =
-        // refundItemList.stream().map(RefundItemParam::getPaymentId).collect(Collectors.toList());
-        // // 付款id去重
-        // paymentIdList = paymentIdList.stream().distinct().collect(Collectors.toList());
-        // // 更新支付状态：退款中
-        // paymentReconciliationService.updateRefundingStatus(paymentIdList);
-
         // 更新收费状态：退费中
         chargeItemService.updateRefundChargeStatus(chargeItemIdList);
 
@@ -387,10 +374,11 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                 CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)),
             request);
         // 就诊患者分页列表
-        Page<EncounterPatientPageDto> encounterPatientPage = outpatientRefundAppMapper.selectBilledEncounterPatientPage(
-            new Page<>(pageNo, pageSize), queryWrapper, ChargeItemStatus.BILLED.getValue(),
-            ChargeItemStatus.REFUNDING.getValue(), ChargeItemStatus.REFUNDED.getValue(),
-            ChargeItemStatus.PART_REFUND.getValue(), AccountType.MEDICAL_ELECTRONIC_CERTIFICATE.getCode());
+        Page<EncounterPatientPageDto> encounterPatientPage =
+            outpatientRefundAppMapper.selectBilledEncounterPatientPage(new Page<>(pageNo, pageSize), queryWrapper,
+                ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDING.getValue(),
+                ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue(),
+                AccountType.MEDICAL_ELECTRONIC_CERTIFICATE.getCode(), EncounterClass.AMB.getValue());
 
         encounterPatientPage.getRecords().forEach(e -> {
             // 性别枚举
@@ -409,14 +397,17 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
      * 根据就诊id查询患者的退费账单
      *
      * @param encounterId 就诊id
+     * @param billDateSTime 收费时间开始
+     * @param billDateETime 收费时间结束
      * @return 退费账单列表
      */
     @Override
-    public R<?> getEncounterPatientRefund(Long encounterId) {
-        List<EncounterPatientRefundDto> refundDtoList = outpatientRefundAppMapper.selectEncounterPatientRefund(
-            encounterId, ChargeItemStatus.REFUNDING.getValue(), ChargeItemStatus.REFUNDED.getValue(),
-            ChargeItemStatus.PART_REFUND.getValue(), CommonConstants.TableName.WOR_SERVICE_REQUEST,
-            CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.TableName.MED_MEDICATION_REQUEST);
+    public R<?> getEncounterPatientRefund(Long encounterId, String billDateSTime, String billDateETime) {
+        List<EncounterPatientRefundDto> refundDtoList =
+            outpatientRefundAppMapper.selectEncounterPatientRefund(encounterId, ChargeItemStatus.REFUNDING.getValue(),
+                ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue(),
+                CommonConstants.TableName.WOR_SERVICE_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, billDateSTime, billDateETime);
         refundDtoList.forEach(e -> {
             // 收费状态枚举
             e.setChargeStatus_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getChargeStatus()));
@@ -467,18 +458,22 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                 new LambdaQueryWrapper<MedicationRequest>().in(MedicationRequest::getRefundMedicineId, medReqIdList));
             if (!medicationRequestList.isEmpty()) {
                 if (medicationRequestList.stream().map(MedicationRequest::getStatusEnum)
-                    .anyMatch(x -> x.equals(RequestStatus.IN_REFUND.getValue()))) {
+                    .anyMatch(x -> x.equals(RequestStatus.CANCELLED.getValue()))) {
                     throw new ServiceException("请先退药后再退费");
                 }
             }
         }
-        if (!devReqIdList.isEmpty()) {
-            List<DeviceRequest> deviceRequestList = deviceRequestService
-                .list(new LambdaQueryWrapper<DeviceRequest>().in(DeviceRequest::getRefundDeviceId, devReqIdList));
-            if (!deviceRequestList.isEmpty()) {
-                if (deviceRequestList.stream().map(DeviceRequest::getStatusEnum)
-                    .anyMatch(x -> x.equals(RequestStatus.IN_REFUND.getValue()))) {
-                    throw new ServiceException("请先退耗材后再退费");
+        String fixmedinsCode =
+            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
+        if (!HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
+            if (!devReqIdList.isEmpty()) {
+                List<DeviceRequest> deviceRequestList = deviceRequestService
+                    .list(new LambdaQueryWrapper<DeviceRequest>().in(DeviceRequest::getRefundDeviceId, devReqIdList));
+                if (!deviceRequestList.isEmpty()) {
+                    if (deviceRequestList.stream().map(DeviceRequest::getStatusEnum)
+                        .anyMatch(x -> x.equals(RequestStatus.CANCELLED.getValue()))) {
+                        throw new ServiceException("请先退耗材后再退费");
+                    }
                 }
             }
         }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
similarity index 66%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
index 9272a1ef..8ae4fb20 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
@@ -9,9 +9,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.administration.domain.*;
-import com.openhis.financial.domain.PaymentReconciliation;
-import liquibase.pro.packaged.A;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -20,10 +17,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
-import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.*;
 import com.openhis.administration.mapper.PatientMapper;
 import com.openhis.administration.service.*;
 import com.openhis.common.constant.CommonConstants;
@@ -32,19 +30,18 @@ import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.mapper.ContractMapper;
-import com.openhis.financial.service.IContractService;
+import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.basicservice.dto.HealthcareServiceDto;
 import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
 import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
-import com.openhis.web.chargemanage.dto.*;
+import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
+import com.openhis.web.chargemanage.dto.OrgMetadata;
+import com.openhis.web.chargemanage.dto.PatientMetadata;
+import com.openhis.web.chargemanage.dto.PractitionerMetadata;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
-import com.openhis.workflow.service.IServiceRequestService;
 import com.openhis.yb.model.CancelRegPaymentModel;
 import com.openhis.yb.service.YbManager;
 
@@ -57,9 +54,6 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     @Resource
     PatientMapper patientMapper;
 
-    @Resource
-    ContractMapper contractMapper;
-
     @Resource
     OutpatientRegistrationAppMapper outpatientRegistrationAppMapper;
 
@@ -69,12 +63,6 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     @Resource
     IEncounterService iEncounterService;
 
-    @Resource
-    IEncounterLocationService iEncounterLocationService;
-
-    @Resource
-    IEncounterParticipantService iEncounterParticipantService;
-
     @Resource
     IAccountService iAccountService;
 
@@ -88,41 +76,40 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     YbManager ybManager;
 
     @Resource
-    IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
-
-    @Resource
-    AssignSeqUtil assignSeqUtil;
-
-    @Resource
-    IServiceRequestService iServiceRequestService;
-
-    @Resource
-    IContractService iContractService;
+    IPaymentRecService iPaymentRecService;
 
     @Resource
-    IPaymentRecService iPaymentRecService;
+    IPatientIdentifierService patientIdentifierService;
 
     /**
      * 门诊挂号 - 查询患者信息
      *
      * @param searchKey 模糊查询关键字
-     * @param pageNo    当前页
-     * @param pageSize  每页多少条
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
      * @return 患者信息
      */
     @Override
     public Page<PatientMetadata> getPatientMetadataBySearchKey(String searchKey, Integer pageNo, Integer pageSize) {
         // 构建查询条件
         QueryWrapper<Patient> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-                new HashSet<>(Arrays.asList("id_card", "name", "py_str", "wb_str")), null);
+            new HashSet<>(Arrays.asList("id_card", "name", "py_str", "wb_str")), null);
         // 设置排序
         queryWrapper.orderByDesc("update_time");
+        // 通过证件号匹配 patient
+        if (StringUtils.isNotEmpty(searchKey)) {
+            PatientIdentifier patientIdentifier = patientIdentifierService
+                .getOne(new LambdaQueryWrapper<PatientIdentifier>().eq(PatientIdentifier::getIdentifierNo, searchKey));
+            if (patientIdentifier != null) {
+                queryWrapper.or(q -> q.eq("id", patientIdentifier.getPatientId()));
+            }
+        }
         // 患者信息
         Page<PatientMetadata> patientMetadataPage =
-                HisPageUtils.selectPage(patientMapper, queryWrapper, pageNo, pageSize, PatientMetadata.class);
+            HisPageUtils.selectPage(patientMapper, queryWrapper, pageNo, pageSize, PatientMetadata.class);
         // 现有就诊过的患者id集合
         List<Long> patientIdList =
-                iEncounterService.list().stream().map(e -> e.getPatientId()).collect(Collectors.toList());
+            iEncounterService.list().stream().map(e -> e.getPatientId()).collect(Collectors.toList());
 
         patientMetadataPage.getRecords().forEach(e -> {
             // 性别枚举
@@ -131,34 +118,12 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
             // 初复诊
             e.setFirstEnum_enumText(patientIdList.contains(e.getId()) ? EncounterType.FOLLOW_UP.getInfo()
-                    : EncounterType.INITIAL.getInfo());
+                : EncounterType.INITIAL.getInfo());
 
         });
         return patientMetadataPage;
     }
 
-    /**
-     * 查询费用性质
-     *
-     * @return 费用性质
-     */
-    @Override
-    public List<ContractMetadata> getContractMetadata() {
-        // TODO: Contract表的基础数据维护还没做,具体不知道状态字段的取值是什么,先查询默认值为0的数据
-        List<Contract> ContractList =
-                contractMapper.selectList(new LambdaQueryWrapper<Contract>().eq(Contract::getStatusEnum, 0));
-        // 复制同名字段并 return
-        return ContractList.stream().map(contract -> {
-            ContractMetadata metadata = new ContractMetadata();
-            try {
-                BeanUtils.copyProperties(contract, metadata);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            return metadata;
-        }).collect(Collectors.toList());
-    }
-
     /**
      * 查询门诊科室数据
      *
@@ -167,7 +132,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     @Override
     public List<OrgMetadata> getOrgMetadata() {
         List<Organization> list =
-                iOrganizationService.getList(OrganizationType.DEPARTMENT.getValue(), OrganizationClass.CLINIC.getValue());
+            iOrganizationService.getList(OrganizationType.DEPARTMENT.getValue(), OrganizationClass.CLINIC.getValue());
         List<OrgMetadata> orgMetadataList = new ArrayList<>();
         OrgMetadata orgMetadata;
         for (Organization organization : list) {
@@ -181,21 +146,21 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     /**
      * 根据科室id筛选医生
      *
-     * @param orgId     科室ID
+     * @param orgId 科室ID
      * @param searchKey 模糊查询关键字
-     * @param pageNo    当前页
-     * @param pageSize  每页多少条
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
      * @return 筛选医生
      */
     @Override
     public IPage<PractitionerMetadata> getPractitionerMetadataByLocationId(Long orgId, String searchKey, Integer pageNo,
-                                                                           Integer pageSize) {
+        Integer pageSize) {
         // 构建查询条件
         QueryWrapper<PractitionerMetadata> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-                new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null);
+            new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null);
         IPage<PractitionerMetadata> practitionerMetadataPage =
-                outpatientRegistrationAppMapper.getPractitionerMetadataPage(new Page<>(pageNo, pageSize), orgId,
-                        PractitionerRoles.DOCTOR.getCode(), queryWrapper);
+            outpatientRegistrationAppMapper.getPractitionerMetadataPage(new Page<>(pageNo, pageSize), orgId,
+                PractitionerRoles.DOCTOR.getCode(), queryWrapper);
         practitionerMetadataPage.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
@@ -207,22 +172,22 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
      * 根据机构id筛选服务项目
      *
      * @param organizationId 机构id
-     * @param searchKey      模糊查询关键字
-     * @param pageNo         当前页
-     * @param pageSize       每页多少条
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
      * @return 服务项目
      */
     @Override
     public IPage<HealthcareServiceDto> getHealthcareMetadataByOrganizationId(Long organizationId, String searchKey,
-                                                                             Integer pageNo, Integer pageSize) {
+        Integer pageNo, Integer pageSize) {
         // 构建查询条件
         HealthcareServiceDto healthcareServiceDto = new HealthcareServiceDto();
         healthcareServiceDto.setOfferedOrgId(organizationId);
         QueryWrapper<HealthcareServiceDto> queryWrapper = HisQueryUtils.buildQueryWrapper(healthcareServiceDto,
-                searchKey, new HashSet<>(Arrays.asList("name", "charge_name")), null);
+            searchKey, new HashSet<>(Arrays.asList("name", "charge_name")), null);
         return healthcareServiceBizMapper.getHealthcareServicePage(new Page<>(pageNo, pageSize),
-                CommonConstants.TableName.ADM_HEALTHCARE_SERVICE, CommonConstants.TableName.WOR_ACTIVITY_DEFINITION,
-                queryWrapper);
+            CommonConstants.TableName.ADM_HEALTHCARE_SERVICE, CommonConstants.TableName.WOR_ACTIVITY_DEFINITION,
+            queryWrapper);
     }
 
     /**
@@ -240,31 +205,32 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         iEncounterService.returnRegister(cancelRegPaymentDto.getEncounterId());
         // 查询账户信息
         Account account = iAccountService
-                .getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, cancelRegPaymentDto.getEncounterId())
-                        .ne(Account::getTypeCode, AccountType.PERSONAL_CASH_ACCOUNT.getCode())
-                        .eq(Account::getEncounterFlag, Whether.YES.getValue()));
+            .getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, cancelRegPaymentDto.getEncounterId())
+                .ne(Account::getTypeCode, AccountType.PERSONAL_CASH_ACCOUNT.getCode())
+                .eq(Account::getEncounterFlag, Whether.YES.getValue()));
 
         CancelPaymentDto cancelPaymentDto = new CancelPaymentDto();
         BeanUtils.copyProperties(cancelRegPaymentDto, cancelPaymentDto);
 
         // 开通医保的处理
         if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
-                && account != null && !"0000".equals(account.getContractNo())) {
+            && account != null && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(account.getContractNo())) {
             CancelRegPaymentModel model = new CancelRegPaymentModel();
             BeanUtils.copyProperties(cancelRegPaymentDto, model);
+            model.setContractNo(account.getContractNo());
             ybManager.cancelReg(model);
             cancelPaymentDto.setSetlId(model.getSetlId());
-            //return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"医保退号"}));
+            // return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"医保退号"}));
         }
 
         R<?> result = iPaymentRecService.cancelRegPayment(cancelPaymentDto);
 
         PaymentReconciliation paymentRecon = null;
         if (PaymentReconciliation.class.isAssignableFrom(result.getData().getClass())) {
-            paymentRecon = (PaymentReconciliation) result.getData();
+            paymentRecon = (PaymentReconciliation)result.getData();
         }
-        if(paymentRecon!=null) {
-            List<String> strings = Arrays.asList(paymentRecon.getChargeItemIds().split(","));
+        if (paymentRecon != null) {
+            String[] strings = paymentRecon.getChargeItemIds().split(",");
             List<Long> chargeItemIds = new ArrayList<>();
             for (String string : strings) {
                 chargeItemIds.add(Long.parseLong(string));
@@ -276,28 +242,28 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         }
 
         // 2025/05/05 该处保存费用项后，会通过统一收费处理进行收费
-        return R.ok(paymentRecon, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"退号"}));
+        return R.ok(paymentRecon, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"退号"}));
     }
 
     /**
      * 查询当日就诊数据
      *
      * @param searchKey 模糊查询关键字
-     * @param pageNo    当前页
-     * @param pageSize  每页多少条
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
      * @return 当日就诊数据
      */
     @Override
     public IPage<CurrentDayEncounterDto> getCurrentDayEncounter(String searchKey, Integer pageNo, Integer pageSize,
-                                                                HttpServletRequest request) {
+        HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<CurrentDayEncounterDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-                new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
-                request);
+            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
+            request);
 
         IPage<CurrentDayEncounterDto> currentDayEncounter = outpatientRegistrationAppMapper.getCurrentDayEncounter(
-                new Page<>(pageNo, pageSize), EncounterClass.AMB.getValue(), ParticipantType.ADMITTER.getCode(),
-                queryWrapper, ChargeItemContext.REGISTER.getValue(), PaymentStatus.SUCCESS.getValue());
+            new Page<>(pageNo, pageSize), EncounterClass.AMB.getValue(), ParticipantType.ADMITTER.getCode(),
+            queryWrapper, ChargeItemContext.REGISTER.getValue(), PaymentStatus.SUCCESS.getValue());
         currentDayEncounter.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java
new file mode 100644
index 00000000..8d7386a1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.chargemanage.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.chargemanage.appservice.IInpatientChargeAppService;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 门诊收费 controller
+ *
+ * @author zwh
+ * @date 2025-03-12
+ */
+@RestController
+@RequestMapping("/charge-manage/inpa-charge")
+@Slf4j
+@AllArgsConstructor
+public class InpatientChargeController {
+
+    @Autowired
+    private IInpatientChargeAppService inpatientChargeAppService;
+
+    /**
+     * 收费页面初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> outpatientChargeInit() {
+        return inpatientChargeAppService.outpatientChargeInit();
+    }
+
+    /**
+     * 查询就诊患者分页列表
+     *
+     * @param encounterPatientPageParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 就诊患者分页列表
+     */
+    @GetMapping(value = "/encounter-patient-page")
+    public R<?> getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(inpatientChargeAppService.getEncounterPatientPage(encounterPatientPageParam, searchKey, pageNo,
+            pageSize, request));
+    }
+
+    /**
+     * 根据就诊id查询患者处方列表
+     *
+     * @param encounterId 就诊id
+     * @return 患者处方列表
+     */
+    @GetMapping(value = "/patient-prescription")
+    public R<?> getEncounterPatientPrescription(@RequestParam Long encounterId, @RequestParam String startTime,
+        @RequestParam String endTime) {
+        return R.ok(inpatientChargeAppService.getEncounterPatientPrescription(encounterId, startTime, endTime));
+    }
+
+    /**
+     * 医保转自费
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    @PutMapping("/self-pay")
+    public R<?> changeToSelfPay(@RequestParam Long encounterId) {
+        return inpatientChargeAppService.changeToSelfPay(encounterId);
+    }
+
+    /**
+     * 自费转医保
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    @PutMapping("/medical-insurance")
+    public R<?> changeToMedicalInsurance(@RequestParam Long encounterId) {
+        return inpatientChargeAppService.changeToMedicalInsurance(encounterId);
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
index 86ae6066..426c424d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
@@ -88,11 +88,14 @@ public class OutpatientRefundController {
      * 根据就诊id查询患者的退费账单
      *
      * @param encounterId 就诊id
+     * @param billDateSTime 收费时间开始
+     * @param billDateETime 收费时间结束
      * @return 退费账单列表
      */
     @GetMapping(value = "/patient-refund")
-    public R<?> getEncounterPatientRefund(@RequestParam Long encounterId) {
-        return outpatientRefundAppService.getEncounterPatientRefund(encounterId);
+    public R<?> getEncounterPatientRefund(@RequestParam Long encounterId, @RequestParam String billDateSTime,
+        @RequestParam String billDateETime) {
+        return outpatientRefundAppService.getEncounterPatientRefund(encounterId, billDateSTime, billDateETime);
     }
 
     /**
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
similarity index 93%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
index cd44fcd9..d2f72db4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
@@ -4,21 +4,20 @@
 package com.openhis.web.chargemanage.controller;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
 import com.openhis.common.enums.PriorityLevel;
+import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto;
+import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
 
 import lombok.AllArgsConstructor;
@@ -37,6 +36,7 @@ public class OutpatientRegistrationController {
 
     @Autowired
     private IEleInvoiceService eleInvoiceService;
+
     /**
      * 基础数据初始化
      */
@@ -67,16 +67,6 @@ public class OutpatientRegistrationController {
         return R.ok(iOutpatientRegistrationAppService.getPatientMetadataBySearchKey(searchKey, pageNo, pageSize));
     }
 
-    /**
-     * 查询费用性质
-     *
-     * @return 费用性质
-     */
-    @GetMapping(value = "/contract-list")
-    public R<?> getContractList() {
-        return R.ok(iOutpatientRegistrationAppService.getContractMetadata());
-    }
-
     /**
      * 查询就诊科室
      *
@@ -127,7 +117,8 @@ public class OutpatientRegistrationController {
             if (PaymentReconciliation.class.isAssignableFrom(result.getData().getClass())) {
                 paymentRecon = (PaymentReconciliation)result.getData();
             }
-            R<?> eleResult = eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelRegPaymentDto.getReason());
+            R<?> eleResult =
+                eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelRegPaymentDto.getReason());
             if (eleResult.getCode() != 200) {
                 // 因取消付款成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                 return R.ok(null, " 取消付款成功，电子发票开具失败 :" + eleResult.getMsg());
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
similarity index 86%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
index f4279df4..1e9abc1b 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
@@ -6,6 +6,9 @@ package com.openhis.web.chargemanage.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -124,5 +127,12 @@ public class EncounterPatientPageDto {
     /**
      * 结算时间
      */
-    private Date billDate;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date maxBillDate;
+
+    /**
+     * 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
similarity index 93%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
index 7e731241..b7acf614 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
@@ -53,6 +53,11 @@ public class EncounterPatientPageParam {
      */
     private Date receptionTime;
 
+    /**
+     * 住院开始时间
+     */
+    private Date startTime;
+
     /**
      * 收费时间
      */
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
index 9b56191e..8d63b2da 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
@@ -100,4 +100,7 @@ public class EncounterPatientPrescriptionDto {
 
     /** 合同名称 */
     private String contractName;
+
+    /** 服务所在表 */
+    private String serviceTable;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
index 8ad19c9d..c074d5a6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
@@ -7,11 +7,12 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-import com.openhis.web.paymentmanage.dto.PaymentDetailDto;
 
+import com.openhis.yb.dto.PaymentDetailDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -41,6 +42,14 @@ public class EncounterPatientRefundDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
+    /** 请求ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 发放ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
     /** 处方号 */
     private String prescriptionNo;
 
@@ -62,6 +71,9 @@ public class EncounterPatientRefundDto {
     /** 收款人 */
     private String entererName;
 
+    /** 服务表名 */
+    private String serviceTable;
+
     /** 收费状态 */
     private Integer chargeStatus;
     private String chargeStatus_enumText;
@@ -96,6 +108,7 @@ public class EncounterPatientRefundDto {
     private BigDecimal totalPrice;
 
     /** 结算时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date billDate;
 
     /**
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
similarity index 79%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
index b7b39ca8..26eb6dd7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
@@ -1,14 +1,14 @@
 package com.openhis.web.chargemanage.dto;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
-import com.openhis.web.paymentmanage.dto.PaymentDetailDto;
 import com.openhis.yb.dto.Info5301SpecialConditionResult;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 /**
  * 门诊挂号 新增参数
  */
@@ -45,7 +45,7 @@ public class OutpatientRegistrationAddParam {
     @Valid
     private AccountFormData accountFormData;
     /**
-     * 费用项管理-表单数据  //todo:挂号费会绑定诊查费，该字段会变成List，挂号前先把这个收费项开个前台，后台没有保存
+     * 费用项管理-表单数据 //todo:挂号费会绑定诊查费，该字段会变成List，挂号前先把这个收费项开个前台，后台没有保存
      */
     @Valid
     private ChargeItemFormData chargeItemFormData;
@@ -53,7 +53,7 @@ public class OutpatientRegistrationAddParam {
     /**
      * 密钥 医保挂号时使用
      */
-    private String busiCardInfo;//2025/05/16 前后端一致，前端大写，后端保持大写
+    private String busiCardInfo;// 2025/05/16 前后端一致，前端大写，后端保持大写
 
     /**
      * 类型 医保挂号时使用
@@ -63,14 +63,13 @@ public class OutpatientRegistrationAddParam {
      * 医保个人结算方式 参照枚举 按项目结算 01 按定额结算 02
      */
     private String YbPsnSetlWay;
-
-    public OutpatientRegistrationAddParam(){
-        this.YbPsnSetlWay = "01";
-    }
-
     /**
      * 特慢病列表
      */
     private List<Info5301SpecialConditionResult> feedetail;
 
+    public OutpatientRegistrationAddParam() {
+        this.YbPsnSetlWay = "01";
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
similarity index 53%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
index 2971f890..78bc2dd5 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
@@ -1,22 +1,22 @@
 package com.openhis.web.chargemanage.dto;
 
-import com.openhis.web.paymentmanage.dto.PaymentDetailDto;
+import java.util.List;
+
+import com.openhis.yb.dto.PaymentDetailDto;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.Valid;
-import java.util.List;
-
 @Data
 @Accessors(chain = true)
 public class OutpatientRegistrationSettleParam {
 
     OutpatientRegistrationAddParam outpatientRegistrationAddParam;
 
-    String chrgBchno;//收费批次号 付款时必传
+    String chrgBchno;// 收费批次号 付款时必传
 
-    String busNo;//挂号no
+    String busNo;// 挂号no
 
-    List<PaymentDetailDto> paymentDetails;//支付渠道 付款时必传
+    List<PaymentDetailDto> paymentDetails;// 支付渠道 付款时必传
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java
new file mode 100644
index 00000000..7c704e23
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.chargemanage.mapper;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageDto;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+
+/**
+ * 门诊收费 appMapper
+ *
+ * @author zwh
+ * @date 2025-03-13
+ */
+@Repository
+public interface InpatientChargeAppMapper {
+
+    /**
+     * 查询就诊患者分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @return 就诊患者分页列表
+     */
+    Page<EncounterPatientPageDto> selectEncounterPatientPage(@Param("classEnum") Integer classEnum,
+        @Param("page") Page<EncounterPatientPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper);
+
+    /**
+     * 根据就诊id查询患者处方列表
+     *
+     * @param encounterId 就诊id
+     * @param activity 项目
+     * @param medication 药品
+     * @param device 耗材
+     * @param register 挂号费
+     * @param planned 收费状态：待收费
+     * @param billable 收费状态：待结算
+     * @param billed 收费状态：已结算
+     * @param refunding 收费状态：退费中
+     * @param refunded 收费状态：全部退费
+     * @param partRefund 收费状态：部分退费
+     * @return 患者处方列表
+     */
+    List<EncounterPatientPrescriptionDto> selectEncounterPatientPrescription(@Param("encounterId") Long encounterId,
+        @Param("activity") Integer activity, @Param("medication") Integer medication, @Param("device") Integer device,
+        @Param("register") Integer register, @Param("planned") Integer planned, @Param("billable") Integer billable,
+        @Param("billed") Integer billed, @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
+        @Param("partRefund") Integer partRefund, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
index 77d569f2..a43d2086 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
@@ -29,10 +29,11 @@ public interface OutpatientChargeAppMapper {
      *
      * @param page 分页
      * @param queryWrapper 查询条件
+     * @param amb 就诊类型：门诊
      * @return 就诊患者分页列表
      */
     Page<EncounterPatientPageDto> selectEncounterPatientPage(@Param("page") Page<EncounterPatientPageDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper);
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper, @Param("amb") Integer amb);
 
     /**
      * 根据就诊id查询患者处方列表
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
index 86cb6363..439cb429 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
@@ -60,12 +60,13 @@ public interface OutpatientRefundAppMapper {
      * @param refunded 收费状态：已退费
      * @param partRefund 收费状态：部分退费
      * @param insurance 账户类型：医保
+     * @param amb 就诊类型：门诊
      * @return 已结算就诊患者分页列表
      */
     Page<EncounterPatientPageDto> selectBilledEncounterPatientPage(@Param("page") Page<EncounterPatientPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper, @Param("billed") Integer billed,
         @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
-        @Param("partRefund") Integer partRefund, @Param("insurance") String insurance);
+        @Param("partRefund") Integer partRefund, @Param("insurance") String insurance, @Param("amb") Integer amb);
 
     /**
      * 查询患者退费项目
@@ -77,10 +78,13 @@ public interface OutpatientRefundAppMapper {
      * @param worServiceRequest 服务请求表
      * @param worDeviceRequest 设备请求表
      * @param medMedicationRequest 药品请求表
+     * @param billDateSTime 收费时间开始
+     * @param billDateETime 收费时间结束
      * @return 查询患者退费项目
      */
     List<EncounterPatientRefundDto> selectEncounterPatientRefund(@Param("encounterId") Long encounterId,
         @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
         @Param("partRefund") Integer partRefund, @Param("worServiceRequest") String worServiceRequest,
-        @Param("worDeviceRequest") String worDeviceRequest, @Param("medMedicationRequest") String medMedicationRequest);
+        @Param("worDeviceRequest") String worDeviceRequest, @Param("medMedicationRequest") String medMedicationRequest,
+        @Param("billDateSTime") String billDateSTime, @Param("billDateETime") String billDateETime);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
similarity index 60%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
index c1ba63ab..4f929a87 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
@@ -6,8 +6,10 @@ package com.openhis.web.common.appservice;
 import java.util.List;
 
 import com.core.common.core.domain.R;
+import com.openhis.administration.domain.Organization;
 import com.openhis.web.common.dto.InventoryItemParam;
 import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.common.dto.SearchTraceNoParam;
 
 /**
  * app常用接口
@@ -38,6 +40,13 @@ public interface ICommonService {
      */
     List<LocationDto> getCabinetList();
 
+    /**
+     * 仓库列表
+     *
+     * @return 仓库列表
+     */
+    List<LocationDto> getWarehouseList();
+
     /**
      * 药库列表(库房用)
      *
@@ -55,9 +64,10 @@ public interface ICommonService {
     /**
      * 获取病区列表
      *
-     * @return 药库列表
+     * @param orgId 科室id
+     * @return 病区列表
      */
-    List<LocationDto> getWardList();
+    List<LocationDto> getWardList(Long orgId);
 
     /**
      * 库存项目下拉列表（药库业务使用）
@@ -86,6 +96,13 @@ public interface ICommonService {
      */
     R<?> getDepartmentList();
 
+    /**
+     * 科室列表
+     *
+     * @return 科室列表
+     */
+    List<Organization> departmentList();
+
     /**
      * 根据追溯码获取药品/耗材信息
      *
@@ -93,4 +110,43 @@ public interface ICommonService {
      * @return 项目信息
      */
     R<?> getItemInfoByTraceNo(List<String> traceNoList);
+
+    /**
+     * 追溯码查询
+     *
+     * @param searchTraceNoParam 查询条件
+     * @return 项目信息
+     */
+    R<?> searchTraceNo(SearchTraceNoParam searchTraceNoParam);
+
+    /**
+     * 查询费用性质
+     *
+     * @return 费用性质
+     */
+    R<?> getContractMetadata();
+
+    /**
+     * 根据科室查询护士
+     *
+     * @param orgId 科室id
+     * @return 护士列表
+     */
+    R<?> getNurseListByOrg(Long orgId);
+
+    /**
+     * 根据父级位置id查询他所有的子集
+     *
+     * @param locationId 位置id
+     * @param locationForm 位置类型
+     * @return 位置列表
+     */
+    List<LocationDto> getChildLocation(Long locationId, Integer locationForm);
+
+    /**
+     * 查询登录者管理的病区
+     *
+     * @return 病区列表
+     */
+    List<LocationDto> getPractitionerWard();
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
index 23ec406f..6cbb4cfc 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
@@ -4,6 +4,7 @@
 package com.openhis.web.common.appservice.impl;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -18,21 +19,24 @@ import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.Location;
+import com.openhis.administration.domain.TraceNoManage;
+import com.openhis.administration.mapper.TraceNoManageMapper;
 import com.openhis.administration.service.ILocationService;
 import com.openhis.administration.service.IOrganizationService;
 import com.openhis.administration.service.IPractitionerRoleService;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.ItemType;
-import com.openhis.common.enums.OrganizationType;
-import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.mapper.ContractMapper;
+import com.openhis.web.chargemanage.dto.ContractMetadata;
 import com.openhis.web.common.appservice.ICommonService;
 import com.openhis.web.common.dto.*;
 import com.openhis.web.common.mapper.CommonAppMapper;
 import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.administration.domain.Organization;
 
 /**
  * app常用接口
@@ -43,6 +47,9 @@ import com.openhis.workflow.service.IInventoryItemService;
 @Service
 public class CommonServiceImpl implements ICommonService {
 
+    @Resource
+    private TraceNoManageMapper traceNoManageMapper;
+
     @Resource
     private CommonAppMapper commonAppMapper;
 
@@ -58,6 +65,9 @@ public class CommonServiceImpl implements ICommonService {
     @Resource
     private IInventoryItemService iInventoryItemService;
 
+    @Resource
+    private ContractMapper contractMapper;
+
     /**
      * 获取药房列表
      *
@@ -123,6 +133,24 @@ public class CommonServiceImpl implements ICommonService {
         return locationDtoList;
     }
 
+    /**
+     * 获取仓库列表
+     *
+     * @return 仓库列表
+     */
+    @Override
+    public List<LocationDto> getWarehouseList() {
+        List<Location> pharmacyList = locationService.getWarehouseList();
+        List<LocationDto> locationDtoList = new ArrayList<>();
+        LocationDto locationDto;
+        for (Location location : pharmacyList) {
+            locationDto = new LocationDto();
+            BeanUtils.copyProperties(location, locationDto);
+            locationDtoList.add(locationDto);
+        }
+        return locationDtoList;
+    }
+
     /**
      * 获取药库列表(库房用)
      *
@@ -171,11 +199,17 @@ public class CommonServiceImpl implements ICommonService {
     /**
      * 获取病区列表
      *
+     * @param orgId 科室id
      * @return 病区列表
      */
     @Override
-    public List<LocationDto> getWardList() {
-        List<Location> getWardList = locationService.getWardList();
+    public List<LocationDto> getWardList(Long orgId) {
+        List<Location> getWardList = new ArrayList<>();
+        if (orgId != null) {
+            getWardList = locationService.getWardList(orgId);
+        } else {
+            getWardList = locationService.getWardList(null);
+        }
         List<LocationDto> locationDtoList = new ArrayList<>();
         LocationDto locationDto;
         for (Location location : getWardList) {
@@ -261,6 +295,16 @@ public class CommonServiceImpl implements ICommonService {
         return R.ok(organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null));
     }
 
+    /**
+     * 科室列表
+     *
+     * @return 科室列表
+     */
+    @Override
+    public List<Organization> departmentList(){
+        return organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
+    }
+
     /**
      * 根据追溯码获取药品/耗材信息
      *
@@ -272,10 +316,14 @@ public class CommonServiceImpl implements ICommonService {
         Map<String, String> traceNoMap = new HashMap<>();
         for (String traceNo : traceNoList) {
             if (traceNo != null && !StringUtils.isEmpty(traceNo)) {
+                // 数据源更改
                 InventoryItem inventoryItem = iInventoryItemService.getOne(
                     new LambdaQueryWrapper<InventoryItem>().like(InventoryItem::getTraceNo, traceNo).last("LIMIT 1"));
                 if (inventoryItem != null) {
                     String itemId = inventoryItem.getItemId().toString();
+                    // TraceNoManage traceNoManage = commonAppMapper.getInfoByTraceNo("%" + traceNo + "%");
+                    // if (traceNoManage != null) {
+                    // String itemId = traceNoManage.getItemId().toString();
                     // 如果map中已经存在该itemId，拼接traceNo，否则直接添加
                     if (traceNoMap.containsKey(itemId)) {
                         String existingTraceNos = traceNoMap.get(itemId);
@@ -291,4 +339,116 @@ public class CommonServiceImpl implements ICommonService {
         return R.ok(traceNoMap);
     }
 
+    /**
+     * 追溯码查询
+     *
+     * @param searchTraceNoParam 查询条件
+     * @return 项目信息
+     */
+    @Override
+    public R<?> searchTraceNo(SearchTraceNoParam searchTraceNoParam) {
+        List<TraceNoManage> traceNoManageList = new ArrayList<>();
+        Map<String, String> traceNoMap = new HashMap<>();
+        // 判断传入的是药品还是耗材，查询追溯码状态只有进的数据
+        if (searchTraceNoParam.getItemType().equals(ItemType.MEDICINE.getValue())) {
+            traceNoManageList = traceNoManageMapper.getItemTraceNoInfo(
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, searchTraceNoParam.getItemId(),
+                searchTraceNoParam.getLocationId(), searchTraceNoParam.getLotNumber());
+        } else if (searchTraceNoParam.getItemType().equals(ItemType.DEVICE.getValue())) {
+            traceNoManageList = traceNoManageMapper.getItemTraceNoInfo(CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                searchTraceNoParam.getItemId(), searchTraceNoParam.getLocationId(), searchTraceNoParam.getLotNumber());
+        }
+        if (traceNoManageList != null) {
+            for (TraceNoManage traceNoItem : traceNoManageList) {
+                traceNoMap.put(traceNoItem.getItemId().toString(), traceNoItem.getTraceNo());
+            }
+        }
+        return R.ok(traceNoMap);
+    }
+
+    /**
+     * 查询费用性质
+     *
+     * @return 费用性质
+     */
+    @Override
+    public R<?> getContractMetadata() {
+        // TODO: Contract表的基础数据维护还没做,具体不知道状态字段的取值是什么,先查询默认值为0的数据
+        List<Contract> ContractList =
+            contractMapper.selectList(new LambdaQueryWrapper<Contract>().eq(Contract::getStatusEnum, 0));
+        // 复制同名字段并 return
+        return R.ok(ContractList.stream().map(contract -> {
+            ContractMetadata metadata = new ContractMetadata();
+            try {
+                BeanUtils.copyProperties(contract, metadata);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return metadata;
+        }).collect(Collectors.toList()));
+    }
+
+    /**
+     * 根据科室查询护士
+     *
+     * @param orgId 科室id
+     * @return 护士列表
+     */
+    @Override
+    public R<?> getNurseListByOrg(Long orgId) {
+        return R.ok(practitionerRoleService.getNurseList(orgId));
+    }
+
+    /**
+     * 根据父级位置id查询他所有的子集
+     *
+     * @param locationId 位置id
+     * @param locationForm 位置类型
+     * @return 位置列表
+     */
+    @Override
+    public List<LocationDto> getChildLocation(Long locationId, Integer locationForm) {
+        // 获取当前位置信息
+        Location location = locationService.getById(locationId);
+        // 查询所有子集位置
+        List<Location> childLocations = locationService.list(new LambdaQueryWrapper<Location>()
+            .likeRight(Location::getBusNo, location.getBusNo()).eq(Location::getFormEnum, locationForm)
+            .ne(Location::getStatusEnum, LocationStatus.INACTIVE.getValue()));
+        List<LocationDto> locationDtoList = new ArrayList<>();
+        LocationDto locationDto;
+        for (Location childLocation : childLocations) {
+            locationDto = new LocationDto();
+            BeanUtils.copyProperties(childLocation, locationDto);
+            locationDtoList.add(locationDto);
+        }
+        // 8. 返回成功响应
+        return locationDtoList;
+    }
+
+    /**
+     * 查询登录者管理的病区
+     *
+     * @return 病区列表
+     */
+    @Override
+    public List<LocationDto> getPractitionerWard() {
+        // 查询当前登录者管理的病区
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        List<Long> locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId);
+        List<Location> locationList = locationService.getLocationList(locationIds);
+        List<Location> wardList = new ArrayList<>();
+        for (Location ward : locationList) {
+            if (LocationForm.WARD.getValue().equals(ward.getFormEnum())) {
+                wardList.add(ward);
+            }
+        }
+        List<LocationDto> locationDtoList = new ArrayList<>();
+        LocationDto locationDto;
+        for (Location ward : wardList) {
+            locationDto = new LocationDto();
+            BeanUtils.copyProperties(ward, locationDto);
+            locationDtoList.add(locationDto);
+        }
+        return locationDtoList;
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
similarity index 69%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
index 8c9949e2..20eead33 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
@@ -3,6 +3,8 @@
  */
 package com.openhis.web.common.controller;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,12 +15,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.core.common.core.domain.R;
 import com.openhis.web.common.appservice.ICommonService;
 import com.openhis.web.common.dto.InventoryItemParam;
+import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.common.dto.SearchTraceNoParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * app常用接口
  *
@@ -90,8 +92,8 @@ public class CommonAppController {
      * @return 病区列表
      */
     @GetMapping(value = "/ward-list")
-    public R<?> getWardList() {
-        return R.ok(commonService.getWardList());
+    public R<?> getWardList(@RequestParam(value = "orgId", required = false) Long orgId) {
+        return R.ok(commonService.getWardList(orgId));
     }
 
     /**
@@ -143,4 +145,57 @@ public class CommonAppController {
         return commonService.getItemInfoByTraceNo(traceNoList);
     }
 
+    /**
+     * 追溯码查询
+     *
+     * @param searchTraceNoParam 查询条件
+     * @return 项目信息
+     */
+    @GetMapping(value = "/search-trace-no")
+    public R<?> searchTraceNo(SearchTraceNoParam searchTraceNoParam) {
+        return commonService.searchTraceNo(searchTraceNoParam);
+    }
+
+    /**
+     * 查询费用性质
+     *
+     * @return 费用性质
+     */
+    @GetMapping(value = "/contract-list")
+    public R<?> getContractList() {
+        return commonService.getContractMetadata();
+    }
+
+    /**
+     * 根据科室查询护士
+     *
+     * @param orgId 科室id
+     * @return 护士列表
+     */
+    @GetMapping(value = "/nurse-list")
+    public R<?> getNurseListByOrg(Long orgId) {
+        return commonService.getNurseListByOrg(orgId);
+    }
+
+    /**
+     * 根据父级位置id查询他所有的子集
+     *
+     * @param locationId 位置id
+     * @param locationForm 位置类型
+     * @return 位置列表
+     */
+    @GetMapping(value = "/child-location-list")
+    public List<LocationDto> getChildLocation(Long locationId, Integer locationForm) {
+        return commonService.getChildLocation(locationId, locationForm);
+    }
+
+    /**
+     * 查询登录者管理的病区
+     *
+     * @return 病区列表
+     */
+    @GetMapping(value = "/practitioner-ward")
+    public List<LocationDto> getPractitionerWard() {
+        return commonService.getPractitionerWard();
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
new file mode 100644
index 00000000..50197306
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 执行信息dto
+ *
+ * @author zwh
+ * @date 2025-08-13
+ */
+@Data
+@Accessors(chain = true)
+public class PerformInfoDto {
+
+    /** 请求id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 医嘱项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 住院id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 发放id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /** 执行id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long procedureId;
+
+    /** 请求所在表 */
+    private String requestTable;
+
+    /** 执行位置 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 执行开始时间 */
+    private Date exeStartTime;
+
+    /** 执行结束时间 */
+    private Date exeEndTime;
+
+    /** 组号 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
+    /** 执行时间列表 */
+    private List<String> executeTimes;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
new file mode 100644
index 00000000..684b7a83
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 执行记录dto
+ *
+ * @author zwh
+ * @date 2025-08-14
+ */
+@Data
+@Accessors(chain = true)
+public class PerformRecordDto {
+
+    /** 执行id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long procedureId;
+
+    /** 执行状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 执行时间 */
+    private Date occurrenceTime;
+
+    /** 执行位置 */
+    private String locationName;
+
+    /** 执行科室 */
+    private String orgName;
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 执行开始时间 */
+    private Date startTime;
+
+    /** 执行结束时间 */
+    private Date endTime;
+
+    /** 执行人 */
+    private String practitionerName;
+
+    /** 取消执行id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long refundId;
+
+    /** 操作时间 */
+    private Date createTime;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java
new file mode 100644
index 00000000..c1ff23b1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 追溯码查询条件
+ *
+ * @author yuxj
+ * @date 2025-07-10
+ */
+@Data
+@Accessors(chain = true)
+public class SearchTraceNoParam {
+
+    /**
+     * 项目类型
+     */
+    private Integer itemType; // 1:药品 , 2: 耗材 , 3:诊疗
+
+    /**
+     * 项目id
+     */
+    private Long itemId;
+
+    /**
+     * 药房药库
+     */
+    private Long locationId;
+
+    /**
+     * 产品批号
+     */
+    private String lotNumber;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
index c1c0903b..b28b6700 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
@@ -5,6 +5,7 @@ package com.openhis.web.common.mapper;
 
 import java.util.List;
 
+import com.openhis.administration.domain.TraceNoManage;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -57,4 +58,12 @@ public interface CommonAppMapper {
         @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
         @Param("objLocationId") Long objLocationId, @Param("lotNumber") String lotNumber, @Param("itemId") Long itemId,
         @Param("purchase") String purchase);
+
+    /**
+     * 查询追溯码信息
+     *
+     * @param traceNo  追溯码
+     * @return
+     */
+    TraceNoManage getInfoByTraceNo(@Param("traceNo") String traceNo);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
index 7851f248..26dc7570 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
@@ -8,13 +8,13 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.openhis.web.datadictionary.dto.MedicationSearchParam;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
+import com.openhis.web.datadictionary.dto.MedicationSearchParam;
 
 /**
  * 药品目录 service
@@ -37,8 +37,8 @@ public interface IMedicationManageAppService {
      * @param pageSize 查询条数
      * @return 药品目录查询结果
      */
-    R<?> getMedicationList(MedicationSearchParam medicationSearchParam,String searchKey,
-        Integer pageNo, Integer pageSize, HttpServletRequest request);
+    R<?> getMedicationList(MedicationSearchParam medicationSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
 
     /**
      * 药品目录详细查询
@@ -82,4 +82,19 @@ public interface IMedicationManageAppService {
         @RequestParam(value = "ybMatchFlag", defaultValue = "-1") Integer ybMatchFlag,
         @RequestParam(value = "statusEnum", defaultValue = "-1") Integer statusEnum,
         @RequestParam(value = "categoryCode", defaultValue = "") String categoryCode, HttpServletResponse response);
+
+    /**
+     * 导入药品目录
+     * 
+     * @param file 文件
+     * @return 结果
+     */
+    R<?> importData(MultipartFile file);
+
+    /**
+     * 获取导入模板
+     *
+     * @param response 响应
+     */
+    void importTemplate(HttpServletResponse response);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
index f5f5bac8..1c992957 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.datadictionary.appservice.impl;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,6 +32,8 @@ import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
 import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.administration.service.IChargeItemDefinitionService;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
@@ -51,7 +55,7 @@ import com.openhis.workflow.service.ISupplyRequestService;
 import com.openhis.yb.service.YbManager;
 
 /**
- * 药品目录 impl
+ * TODO:DTO已UI最小需要值返回 药品目录 impl
  *
  * @author
  * @date 2025-03-17
@@ -65,6 +69,12 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
     @Autowired
     private IMedicationDefinitionService medicationDefinitionService;
 
+    @Autowired
+    IChargeItemDefinitionService chargeItemDefinitionService;
+
+    @Autowired
+    IChargeItemDefDetailService chargeItemDefDetailService;
+
     @Autowired
     private MedicationManageSearchMapper medicationManageSearchMapper;
     @Autowired
@@ -100,7 +110,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
     public R<?> getMedicationInit() {
 
         MedicationManageInitDto medicationManageInitDto = new MedicationManageInitDto();
-        // 获取状态
+        // 获取状态，从枚举里面取下拉值
         List<MedicationManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
             .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
             .collect(Collectors.toList());
@@ -164,7 +174,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
     }
 
     /**
-     * 药品目录查询
+     * 已评审 药品目录查询
      *
      * @param
      * @param searchKey 查询条件-模糊查询
@@ -230,21 +240,25 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
     }
 
     /**
-     * 编辑药品目录信息
+     * 已评审 编辑药品目录信息
      *
      * @param medicationManageUpDto 药品目录信息
      */
     @Override
     public R<?> editMedication(@Validated @RequestBody MedicationManageUpDto medicationManageUpDto) {
-        // 校验是否可以编辑
-        boolean result = supplyRequestService.verifyAbleEdit(medicationManageUpDto.getMedicationDefId());
-        if (result) {
-            return R.fail("该药品已经发生过业务，不可编辑");
-        }
+        // // 校验是否可以编辑
+        // boolean result = supplyRequestService.verifyAbleEdit(medicationManageUpDto.getMedicationDefId());
+        // if (result) {
+        // return R.fail("该药品已经发生过业务，不可编辑");
+        // }
         // boolean result = medicationDispenseService.verifyAbleEdit(medicationManageUpDto.getMedicationDefId());
         // if (result) {
         // return R.fail("该药品已经发生过业务，不可编辑");
         // }
+
+        // Todo:用Medication和medicationDefinition的domainservice来创造新的实例，根据业务需求，使用构造函数；
+        // 如果小于5哥变量，就用基本类型传递，如果大于5哥，在domain层定义构造方法的入参
+
         MedicationDefinition medicationDefinition = new MedicationDefinition();
         Medication medication = new Medication();
         BeanUtils.copyProperties(medicationManageUpDto, medication); // 子表信息
@@ -286,7 +300,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             // 插入操作记录
             iOperationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, medication);
-
+            // Todo:封装一个价格初始话的方法给app层调用
             // 更新价格表
             boolean updateChargeItemDefinition = itemDefinitionServic.updateItem(chargeItemDefinition);
             // 更新子表,修改购入价,条件:采购
@@ -309,7 +323,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
     }
 
     /**
-     * 药品目录详细查询
+     * 已评审 药品目录详细查询
      *
      * @param id 查询条件
      * @return 药品目录查询结果
@@ -342,6 +356,8 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             medication.setStatusEnum(PublicationStatus.RETIRED.getValue());
             medicationList.add(medication);
         }
+
+        // TODO:别用三元，日志在业务代码以后记录
         // 插入操作记录
         iOperationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
             CommonConstants.TableName.MED_MEDICATION_DEFINITION, ids);
@@ -352,7 +368,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
     }
 
     /**
-     * 药品目录启用
+     * TODO：业务代码写在Domain里 药品目录启用
      *
      * @param ids 药品目录ID列表
      * @return
@@ -447,4 +463,35 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         util.exportExcel(response, list, "药品目录");
         return null;
     }
+
+    /**
+     * 导入药品目录
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    @Override
+    public R<?> importData(MultipartFile file) {
+        ExcelUtil<MedicationImportDto> util = new ExcelUtil<>(MedicationImportDto.class);
+        List<MedicationImportDto> dtoList;
+        try {
+            dtoList = util.importExcel(file.getInputStream());
+        } catch (IOException e) {
+            return R.fail("文件读取失败");
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取导入模板
+     *
+     * @param response 响应
+     */
+    @Override
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<MedicationImportDto> util = new ExcelUtil<>(MedicationImportDto.class);
+        util.importTemplateExcel(response, "药品目录数据");
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
similarity index 76%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
index 679ec3cc..3a2413ba 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
@@ -5,20 +5,21 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.openhis.web.datadictionary.dto.MedicationSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.datadictionary.appservice.IMedicationManageAppService;
 import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
+import com.openhis.web.datadictionary.dto.MedicationSearchParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * TODO:药品目录
+ * 已评审 TODO:药品目录
  *
  * @author lpt
  * @date 2025-02-21
@@ -33,7 +34,7 @@ public class MedicationManageController {
     private IMedicationManageAppService medicationManageAppService;
 
     /**
-     * 药品目录初始化
+     * 已评审 药品目录初始化
      *
      * @return
      */
@@ -43,7 +44,7 @@ public class MedicationManageController {
     }
 
     /**
-     * 查询药品目录分页列表
+     * 已评审 查询药品目录分页列表
      *
      * @param medicationSearchParam 查询条件
      * @param searchKey 模糊查询条件
@@ -52,16 +53,16 @@ public class MedicationManageController {
      * @return
      */
     @GetMapping("/information-page")
-    public R<?> getMedicationList(
-        MedicationSearchParam medicationSearchParam,@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+    public R<?> getMedicationList(MedicationSearchParam medicationSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return medicationManageAppService.getMedicationList(medicationSearchParam,searchKey,pageNo,
-            pageSize, request);
+        return medicationManageAppService.getMedicationList(medicationSearchParam, searchKey, pageNo, pageSize,
+            request);
     }
 
     /**
-     * 根据id查询药品详情
+     * 已评审 根据id查询药品详情
      *
      * @param id 药品ID
      * @return
@@ -71,20 +72,26 @@ public class MedicationManageController {
         return medicationManageAppService.getMedicationOne(id);
     }
 
-    // 药品目录编辑
+    /**
+     * 已评审 药品目录编辑
+     * 
+     * @param medicationManageUpDto
+     * @return
+     */
     @PutMapping("/information")
     public R<?> editMedication(@RequestBody MedicationManageUpDto medicationManageUpDto) {
         return medicationManageAppService.editMedication(medicationManageUpDto);
     }
 
     /**
-     * 药品目录停用
+     * 一品神 药品目录停用
      *
      * @param ids 药品ID列表
      * @return
      */
     @PutMapping("/information-stop")
     public R<?> editMedicationStop(@RequestBody List<Long> ids) {
+        // todo：用动宾短语命名业务方法 如stopMedication
         return medicationManageAppService.editMedicationStop(ids);
     }
 
@@ -100,7 +107,7 @@ public class MedicationManageController {
     }
 
     /**
-     * 新增外来药品目录
+     * 已评审 新增外来药品目录
      *
      * @param medicationManageUpDto 药品目录信息
      * @return
@@ -138,4 +145,25 @@ public class MedicationManageController {
         @RequestParam(value = "categoryCode", defaultValue = "") String categoryCode, HttpServletResponse response) {
         return medicationManageAppService.exportMedication(searchKey, ybMatchFlag, statusEnum, categoryCode, response);
     }
+
+    /**
+     * 导入药品目录
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    @PostMapping("/import-data")
+    public R<?> importData(MultipartFile file) {
+        return medicationManageAppService.importData(file);
+    }
+
+    /**
+     * 获取导入模板
+     *
+     * @param response 响应
+     */
+    @PostMapping("/import-template")
+    public void importTemplate(HttpServletResponse response) {
+        medicationManageAppService.importTemplate(response);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
index 85026623..c6935d33 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
@@ -98,6 +98,9 @@ public class DeviceManageDto {
     /** 医保编码 */
     private String ybNo;
 
+    /** 医药机构目录编码 */
+    private String ybOrgNo;
+
     /** 医保对码标记 */
     private Integer ybMatchFlag;
     private String ybMatchFlag_enumText;
@@ -157,4 +160,10 @@ public class DeviceManageDto {
     /** 医保等级 */
     private Integer chrgitmLv;
 
+    /** 最小库存警戒数量(常规单位) */
+    private BigDecimal itemMinQuantity;
+
+    /** 最大库存警戒数量(常规单位) */
+    private BigDecimal itemMaxQuantity;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
similarity index 92%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
index f2307005..2b579dd0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
@@ -89,6 +89,9 @@ public class DeviceManageUpDto {
     /** 医保编码 */
     private String ybNo;
 
+    /** 医药机构目录编码 */
+    private String ybOrgNo;
+
     /** 医保对码标记 */
     private Integer ybMatchFlag;
 
@@ -136,4 +139,10 @@ public class DeviceManageUpDto {
     
     /** 医保等级 */
     private Integer chrgitmLv;
+
+    /** 最小库存警戒数量(常规单位) */
+    private BigDecimal itemMinQuantity;
+
+    /** 最大库存警戒数量(常规单位) */
+    private BigDecimal itemMaxQuantity;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
index 38f5bc23..f1b2e080 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
@@ -67,7 +67,8 @@ public class DiagnosisTreatmentDto {
     private String statusEnum_enumText;
 
     /** 身体部位 */
-    @Dict(dictCode = "body_site_code")
+    @Dict(dictTable = "adm_body_structure", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String bodySiteCode;
     private String bodySiteCode_dictText;
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
new file mode 100644
index 00000000..e110cdc5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
@@ -0,0 +1,195 @@
+package com.openhis.web.datadictionary.dto;
+
+import java.math.BigDecimal;
+
+import com.core.common.annotation.Excel;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品目录导入Dto
+ *
+ * @author GuoRui
+ * @date 2025-08-18
+ */
+@Data
+@Accessors(chain = true)
+public class MedicationImportDto {
+
+    // ---------------------- 药品定义 med_medication_definition -------------------------------------
+
+    /** 药品名称 */
+    @Excel(name = "药品名称")
+    private String name;
+
+    /** 药品版本 */
+    @Excel(name = "药品版本")
+    private String version;
+
+    /** 英文药名 */
+    @Excel(name = "英文药名")
+    private String nameEn;
+
+    /** 药品分类 */
+    @Excel(name = "药品分类", dictType = "med_category_code", comboReadDict = true)
+    private String categoryCode;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    private String merchandiseName;
+
+    /** 药品单位 */
+    @Excel(name = "药品单位", dictType = "unit_code", comboReadDict = true)
+    private String unitCode;
+
+    /** 最小单位 */
+    @Excel(name = "最小单位", dictType = "unit_code", comboReadDict = true)
+    private String minUnitCode;
+
+    /** 拆零比 */
+    @Excel(name = "拆零比")
+    private BigDecimal partPercent;
+
+    /** 剂量形式 */
+    @Excel(name = "剂量形式", dictType = "dose_from_code", comboReadDict = true)
+    private String doseFrom;
+
+    /** 批准文号 */
+    @Excel(name = "批准文号")
+    private String approvalNumber;
+
+    /** 医保是否对码 */
+    @Excel(name = "医保是否对码", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String ybMatchFlag;
+
+    /** 医保编码 */
+    @Excel(name = "医保编码")
+    private String ybNo;
+
+    /** 是否皮试 */
+    @Excel(name = "是否皮试", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String skinTestFlag;
+
+    /** 是否为注射药物 */
+    @Excel(name = "是否为注射药物", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String injectFlag;
+
+    /** 生产厂商文本 */
+    @Excel(name = "生产厂商文本")
+    private String manufacturerText;
+
+    /** 是否限制使用 */
+    @Excel(name = "是否限制使用", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String restrictedFlag;
+
+    /** 限制使用范围 */
+    @Excel(name = "限制使用范围")
+    private String restrictedScope;
+
+    /** 儿童用药标志 */
+    @Excel(name = "儿童用药标志", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String childrenFlag;
+
+    /** 贯标国家编码 */
+    @Excel(name = "贯标国家编码")
+    private String nationalDrugCode;
+
+    /** 拆分属性 */
+    @Excel(name = "拆分属性", readConverterExp = "1=门诊按最小单位每次量向上取整,2=门诊按包装单位不可拆分,3=门诊按最小单位总量向上取整,4=门诊按包装单位每次量向上取整",
+        combo = "门诊按最小单位每次量向上取整,门诊按包装单位不可拆分,门诊按最小单位总量向上取整,门诊按包装单位每次量向上取整")
+    private String partAttributeEnum;
+
+    /** 是否抗生素 */
+    @Excel(name = "是否抗生素", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String antibioticFlag;
+
+    /** 抗生素分类 */
+    @Excel(name = "抗生素分类", dictType = "antibiotic_type_code", comboReadDict = true)
+    private String antibioticCode;
+
+    /** 权限限制 */
+    @Excel(name = "权限限制", readConverterExp = "1=非限制使用,2=限制使用,3=特殊使用", combo = "非限制使用,限制使用,特殊使用")
+    private String restrictedEnum;
+
+    /** 是否自制 */
+    @Excel(name = "是否自制", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String selfFlag;
+
+    /** 基药标识 */
+    @Excel(name = "基药标识", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String basicFlag;
+
+    /** 住院临时医嘱拆分属性 */
+    @Excel(name = "住院临时医嘱拆分属性",
+        readConverterExp = "1=临时医嘱按最小单位每次量向上取整,2=临时医嘱按包装单位开立,3=临时医嘱按最小单位总量向上取整,4=临时医嘱按包装单位每次量向上取整",
+        combo = "临时医嘱按最小单位每次量向上取整,临时医嘱按包装单位开立,临时医嘱按最小单位总量向上取整,临时医嘱按包装单位每次量向上取整")
+    private String thoPartAttributeEnum;
+
+    /** 剂量单位换算比 */
+    @Excel(name = "剂量单位换算比")
+    private BigDecimal unitConversionRatio;
+
+    /** 医保等级 */
+    @Excel(name = "医保等级", dictType = "chrgitm_lv", comboReadDict = true)
+    private String chrgitmLv;
+
+    /** 处方标志 */
+    @Excel(name = "处方标志", readConverterExp = "0=否,1=是", combo = "否,是")
+    private String rxFlag;
+
+    // ---------------------- 药品基本信息 med_medication ----------------------------------------------
+
+    /** 所在位置名称（locationId） */
+    @Excel(name = "所在位置名称")
+    private String locationName;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String totalVolume;
+
+    /** 用法 */
+    @Excel(name = "用法", dictType = "method_code", comboReadDict = true)
+    private String methodCode;
+
+    /** 用药频次 */
+    @Excel(name = "用药频次", dictType = "rate_code", comboReadDict = true)
+    private String rateCode;
+
+    /** 单次剂量 */
+    @Excel(name = "单次剂量")
+    private BigDecimal dose;
+
+    /** 剂量单位 */
+    @Excel(name = "剂量单位", dictType = "unit_code", comboReadDict = true)
+    private String doseUnitCode;
+
+    /** 单次最大剂量 */
+    @Excel(name = "单次最大剂量")
+    private BigDecimal maxUnit;
+
+    // ---------------------- 费用定价 adm_charge_item_definition ----------------------------------------------
+
+    /** 财务类别 */
+    @Excel(name = "财务类别", dictType = "fin_type_code", comboReadDict = true)
+    private String typeCode;
+
+    /** 医保费用类别 */
+    @Excel(name = "医保费用类别", dictType = "med_chrgitm_type", comboReadDict = true)
+    private String ybType;
+
+    // ---------------------- 费用定价子表 adm_charge_item_def_detail ----------------------------------------------
+
+    /** 购入价 */
+    @Excel(name = "购入价")
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    @Excel(name = "零售价")
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    @Excel(name = "最高零售价")
+    private BigDecimal maximumRetailPrice;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
index c5a0744f..285c4e3d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
@@ -44,6 +44,15 @@ public interface MedicationManageSearchMapper extends BaseMapper<ChargeItemDefin
      */
     MedicationManageDto getOne(@Param("id") Long id, @Param("tenantId") Integer tenantId);
 
+    /**
+     *
+     * @param searchKey
+     * @param ybMatchFlag
+     * @param statusEnum
+     * @param categoryCode
+     * @param tenantId
+     * @return
+     */
     List<MedicationManageDto> getList(@Param("searchKey") String searchKey, @Param("ybMatchFlag") Integer ybMatchFlag,
                                       @Param("statusEnum") Integer statusEnum, @Param("categoryCode") String categoryCode,@Param("tenantId") Integer tenantId);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java
new file mode 100644
index 00000000..e5bb470f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java
@@ -0,0 +1,79 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+/**
+ * 科室材料共通方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentCommonService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    DepartmentInitDto init();
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    R<?> getPage(DepartmentSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request,String locationFlg,Integer supplyType);
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> deleteOrder(String busNo);
+
+//    /**
+//     * 提交审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> submitApproval(String busNo);
+
+//    /**
+//     * 同意审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> agreeApproval(String busNo);
+
+//    /**
+//     * 撤回审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> withdrawApproval(String busNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
new file mode 100644
index 00000000..166021e3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
@@ -0,0 +1,40 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料发出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentIssuanceOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 发出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 发出单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 添加/编辑发出单
+     *
+     * @param dispenseIdList 耗材发放id
+     * @return 操作结果
+     */
+    boolean addOrEditIssuanceOrder(List<Long> dispenseIdList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
new file mode 100644
index 00000000..ba09f0c4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentProfitLossOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    R<?> addOrEditProfitLossOrder(List<DepartmentDetailDto> profitLossOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
new file mode 100644
index 00000000..68b0193d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
@@ -0,0 +1,89 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+
+/**
+ * 科室材料审批方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentReceiptApprovalService {
+
+    /**
+     * 请领单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> requisitionOrderAgreeApproval(String busNo);
+
+    /**
+     * 药房入库单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> stockInOrderAgreeApproved(String busNo);
+
+    /**
+     * 科室材料退库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> returnToWarehouseAgreeApproved(String busNo);
+
+
+//     /**
+//     * 药房发药审批通过
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//     R<?> dispensingAgreeApproved(String busNo);
+
+    /**
+     * 药房损益单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> profitLossAgreeApproved(String busNo);
+
+    /**
+     * 药房盘点单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> stocktakingAgreepproved(String busNo);
+     /**
+     * 药房调入单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> transferInAgreeApproved(String busNo);
+
+    /**
+     * 药房调出单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> transferOutAgreeApproved(String busNo);
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    List<SupplyItemDetailDto> getSupplyItemDetail(String busNo);
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
new file mode 100644
index 00000000..a54b42d9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料请领单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentRequisitionOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 请领单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 请领单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑请领单
+     *
+     * @param requisitionOrderDtoList 请领信息
+     * @return 操作结果
+     */
+    R<?> addOrEditRequisitionOrder(List<DepartmentDetailDto> requisitionOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
new file mode 100644
index 00000000..d9a7d8ce
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentReturnToWarehouseOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToDispensaryOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditReturnToWarehouseOrder(List<DepartmentDetailDto> returnToDispensaryOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
new file mode 100644
index 00000000..fbee5cf2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料入库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentStockInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 入库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 入库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑入库单
+     *
+     * @param stockInOrderDtoList 入库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStockInOrder(List<DepartmentDetailDto> stockInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
new file mode 100644
index 00000000..9a0e90a9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentStocktakingOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStocktakingOrder(List<DepartmentDetailDto> stocktakingOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
new file mode 100644
index 00000000..37c4e2a3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料调入单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentTransferInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑调出单
+     *
+     * @param transferInOrderDtoList 调出信息
+     * @return 操作结果
+     */
+    R<?> addOrEditTransferInOrder(List<DepartmentDetailDto> transferInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
new file mode 100644
index 00000000..d94d01d9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.departmentmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+
+/**
+ * 科室材料调出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IDepartmentTransferOutOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑调出单
+     *
+     * @param transferOutOrderDtoList 调出信息
+     * @return 操作结果
+     */
+    R<?> addOrEditTransferOutOrder(List<DepartmentDetailDto> transferOutOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
new file mode 100644
index 00000000..7d4285db
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
@@ -0,0 +1,224 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.administration.domain.Organization;
+import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.enums.*;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.common.appservice.ICommonService;
+import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.dto.DepartmentDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料订货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentCommonServiceImpl implements IDepartmentCommonService {
+
+    @Resource
+    private ISupplierService supplierService;
+
+    @Resource
+    private IPractitionerService practitionerService;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private DepartmentCommonMapper departmentCommonMapper;
+    @Resource
+    private ICommonService commonServiceImpl;
+    @Resource
+    private IOrganizationService organizationService;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public DepartmentInitDto init() {
+        DepartmentInitDto orderInitDto = new DepartmentInitDto();
+
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 查询经手人列表
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 经手人信息
+        List<DepartmentInitDto.LongOption> practitionerListOption = practitionerList.stream()
+            .map(practitioner -> new DepartmentInitDto.LongOption(practitioner.getId(), practitioner.getName()))
+            .collect(Collectors.toList());
+        // 供应商信息
+        List<DepartmentInitDto.SupplierOption> supplierListOption = supplierList.stream()
+            .map(supplier -> new DepartmentInitDto.SupplierOption(supplier.getId(), supplier.getName() ,supplier.getPhone()))
+            .collect(Collectors.toList());
+        // 审批状态
+        List<DepartmentInitDto.IntegerOption> supplyStatusOption = Stream.of(SupplyStatus.values()).map(
+            supplyStatus -> new DepartmentInitDto.IntegerOption(supplyStatus.getValue(), supplyStatus.getInfo()))
+            .collect(Collectors.toList());
+
+        // 包装情况
+        List<DepartmentInitDto.IntegerOption> packagingConditionOption = Stream.of(PackagingCondition.values())
+            .map(packagingCondition -> new DepartmentInitDto.IntegerOption(packagingCondition.getValue(),
+                packagingCondition.getInfo()))
+            .collect(Collectors.toList());
+
+        // 验收结果
+        List<DepartmentInitDto.IntegerOption> acceptanceResultOption = Stream.of(AcceptanceResult.values())
+            .map(acceptanceResult -> new DepartmentInitDto.IntegerOption(acceptanceResult.getValue(),
+                acceptanceResult.getInfo()))
+            .collect(Collectors.toList());
+
+        // 仓库列表
+        List<LocationDto> warehouseList = commonServiceImpl.getWarehouseList();
+        // 科室列表
+        List<Organization> departmentList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
+
+        orderInitDto.setWarehouseListOptions(warehouseList).setDepartmentListOptions(departmentList)
+            .setSupplierOption(supplierListOption).setPractitionerOption(practitionerListOption)
+            .setSupplyStatusOptions(supplyStatusOption).setPackagingConditionOptions(packagingConditionOption)
+            .setAcceptanceResultoryOptions(acceptanceResultOption);
+
+        return orderInitDto;
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @Override
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+
+        Long locationId = purchaseOrderSearchParam.getLocationId();
+        purchaseOrderSearchParam.setLocationId(null);
+        Long supplierId = purchaseOrderSearchParam.getSupplierId();
+        purchaseOrderSearchParam.setSupplierId(null);
+        // 构建查询条件
+        QueryWrapper<DepartmentSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name, CommonConstants.FieldName.PyStr)), request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.Name);
+
+        Page<DepartmentDeviceInfoDto> medicationInfoDto = departmentCommonMapper
+            .getDeviceInfo(new Page<>(pageNo, pageSize), queryWrapper, locationId, supplierId);
+
+        for (DepartmentDeviceInfoDto item : medicationInfoDto.getRecords()) {
+            List<DepartmentDeviceInfoDto.Option> unitList = new ArrayList<>();
+            unitList
+                .add(new DepartmentDeviceInfoDto.Option(item.getUnitCode(), item.getUnitCode_dictText()));
+            unitList.add(
+                new DepartmentDeviceInfoDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(medicationInfoDto);
+    }
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    @Override
+    public R<?> getPage(DepartmentSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request,  String locationFlg,Integer supplyType) {
+        //判断哪个画面使用
+        if (supplyType != null) {
+            purchaseOrderSearchParam.setTypeEnum(supplyType);
+        }
+//        if (locationForm != null) {
+//            purchaseOrderSearchParam.setLocationTypeEnum(locationForm);
+//        }
+        String originalBusNoFlg = purchaseOrderSearchParam.getOriginalBusNoFlg();
+        purchaseOrderSearchParam.setOriginalBusNoFlg(null);
+        // 构建查询条件
+        QueryWrapper<DepartmentSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(
+                    Arrays.asList(CommonConstants.FieldName.SupplyBusNo, CommonConstants.FieldName.ApplicantName)),
+                request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.SupplyBusNo);
+        // 查询订货单分页列表
+        Page<DepartmentDto> purchaseOrderDtoPage =
+            departmentCommonMapper.getPage(new Page<>(pageNo, pageSize), queryWrapper,originalBusNoFlg, locationFlg);
+
+        purchaseOrderDtoPage.getRecords().forEach(e -> {
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        return R.ok(purchaseOrderDtoPage);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deleteOrder(String busNo) {
+        // 根据原始单据号查询信息
+        List<SupplyRequest> supplyRequest = supplyRequestService.getSupplyByOriginalBusNo(busNo);
+        if (!supplyRequest.isEmpty()) {
+            // 将原始单据号信息的原始单据号删除
+            boolean flg = supplyRequestService.updateByBusNo(supplyRequest.get(0).getBusNo());
+            if (!flg) {
+                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        // 删除单据
+        boolean result = supplyRequestService.removeByBusNo(busNo);
+        return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
new file mode 100644
index 00000000..08553fa2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
@@ -0,0 +1,179 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentIssuanceOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料发出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentIssuanceOrderServiceImpl implements IDepartmentIssuanceOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Resource
+    private ISupplyDeliveryService supplyDeliveryService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+    @Autowired
+    private DepartmentIssuanceOrderMapper departmentIssuanceOrderMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto issuanceOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption
+            .add(new DepartmentInitDto.IntegerOption(SupplyCategory.OUTPATIENT_PATIENT_DISPENSING.getValue(),
+                SupplyCategory.OUTPATIENT_PATIENT_DISPENSING.getInfo()));
+        supplyCategoryOption
+            .add(new DepartmentInitDto.IntegerOption(SupplyCategory.INPATIENT_PATIENT_DISPENSING.getValue(),
+                SupplyCategory.INPATIENT_PATIENT_DISPENSING.getInfo()));
+        supplyCategoryOption.add(
+            new DepartmentInitDto.IntegerOption(SupplyCategory.INPATIENT_PATIENT_SUMMARY_DISPENSING.getValue(),
+                SupplyCategory.INPATIENT_PATIENT_SUMMARY_DISPENSING.getInfo()));
+
+        issuanceOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(issuanceOrderInitDto);
+    }
+
+    /**
+     * 发出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 发出单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> issuanceOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        issuanceOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        return R.ok(issuanceOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    public String getBusNo() {
+        return assignSeqUtil.getSeqByDay(AssignSeqEnum.DISPENSING_ORDER.getPrefix(), 4);
+    }
+
+    /**
+     * 添加/编辑发出单
+     *
+     * @param dispenseIdList 耗材发放id
+     * @return 操作结果
+     */
+
+    @Override
+    public boolean addOrEditIssuanceOrder(List<Long> dispenseIdList) {
+
+        // 获取单据号
+        String busNo = this.getBusNo();
+        // 获取更表所需信息
+        List<DepartmentDetailDto> detailDto =
+            departmentIssuanceOrderMapper.getInfo(dispenseIdList, DispenseStatus.COMPLETED.getValue());
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        SupplyRequest supplyRequest;
+        List<SupplyDelivery> supplyDeliveryList = new ArrayList<>();
+        SupplyDelivery supplyDelivery;
+        for (DepartmentDetailDto item : detailDto) {
+            // 供应申请
+            supplyRequest = new SupplyRequest().setBusNo(busNo).setTypeEnum(SupplyType.DISPENSING_ORDER.getValue())
+                .setStatusEnum(SupplyStatus.AGREE.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setLotNumber(item.getLotNumber())
+                .setSourceTypeEnum(LocationForm.CABINET.getValue()).setSourceLocationId(item.getSourceLocationId())
+                .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(item.getApplyTime()).setApproverId(item.getApproverId())
+                .setApprovalTime(item.getApprovalTime());
+            supplyRequestList.add(supplyRequest);
+            // 供应发放
+            supplyDelivery = new SupplyDelivery().setRequestId(supplyRequest.getId())
+                .setStatusEnum(DispenseStatus.COMPLETED.getValue()).setTypeEnum(supplyRequest.getTypeEnum())
+                .setItemTable(supplyRequest.getItemTable()).setItemId(supplyRequest.getItemId())
+                .setBasedOnTable(CommonConstants.TableName.WOR_DEVICE_DISPENSE).setBasedOnIds(item.getDispenseIds())
+                .setUnitCode(supplyRequest.getUnitCode()).setQuantity(supplyRequest.getItemQuantity())
+                .setLotNumber(supplyRequest.getLotNumber())
+                .setPractitionerId(supplyRequest.getApplicantId()).setOccurrenceTime(supplyRequest.getApprovalTime())
+                .setReceiverId(supplyRequest.getPurposeLocationId()).setReceiveTime(supplyRequest.getApprovalTime());
+
+            supplyDeliveryList.add(supplyDelivery);
+        }
+
+        // 更新供应请求表
+        boolean requestFlg = supplyRequestService.saveBatch(supplyRequestList);
+        if (!requestFlg) {
+            return false;
+        }
+        // 更新供应发放表
+        boolean deliveryFlg = supplyDeliveryService.saveBatch(supplyDeliveryList);
+        if (!deliveryFlg) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
new file mode 100644
index 00000000..b22470c8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
@@ -0,0 +1,174 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentProfitLossOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentProfitLossOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentProfitLossOrderServiceImpl implements IDepartmentProfitLossOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto purchaseOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.STANDBY_RESCUE_MEDICINES.getValue(),
+            SupplyCategory.STANDBY_RESCUE_MEDICINES.getInfo()));
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.DAMAGED_EXPIRED_MEDICINES.getValue(),
+            SupplyCategory.DAMAGED_EXPIRED_MEDICINES.getInfo()));
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.DONATED_MEDICINES.getValue(),
+            SupplyCategory.DONATED_MEDICINES.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> profitLossOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        profitLossOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : profitLossOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(profitLossOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_PRPFITLOSS.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditProfitLossOrder(List<DepartmentDetailDto> profitLossOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (DepartmentDetailDto item : profitLossOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.DEPARTMENT_PRPFITLOSS.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                    .setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                    .setTraceNoUnitCode(item.getTraceNoUnitCode()).setReason(item.getReason())
+                    .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                    .setApplicantId(item.getApplicantId())
+                    .setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
new file mode 100644
index 00000000..f3411347
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
@@ -0,0 +1,933 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.common.enums.TraceNoStatus;
+import com.openhis.common.enums.Whether;
+import com.openhis.common.enums.ybenums.YbInvChgType;
+import com.openhis.common.enums.ybenums.YbRxFlag;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+import com.openhis.yb.dto.Medical3503Param;
+import com.openhis.yb.dto.MedicalInventory3501Param;
+import com.openhis.yb.dto.MedicalInventory3502Param;
+import com.openhis.yb.dto.MedicalPurchase3504Param;
+import com.openhis.yb.service.YbManager;
+
+/**
+ * 科室材料审批
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentReceiptApprovalServiceImpl implements IDepartmentReceiptApprovalService {
+    @Autowired
+    private ITraceNoAppService traceNoAppService;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private ISupplyDeliveryService supplyDeliveryService;
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+    @Autowired
+    private ReceiptApprovalMapper receiptApprovalMapper;
+    @Autowired
+    private YbManager ybService;
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+    @Autowired
+    private IReceiptApprovalAppService receiptApprovalAppService;
+
+    /**
+     * 请领单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> requisitionOrderAgreeApproval(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // // 获取审批通过后的供应请求id列表
+        // List<Long> supplyReqIdList = agreedList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+        //
+        // // 校验(已经审批通过的单号(发放状态是已完成),不能再重复审批通过)
+        // boolean validation = supplyDeliveryService.supplyDeliveryValidation(supplyReqIdList);
+        // if (validation) {
+        // throw new ServiceException("请勿重复审批");
+        // }
+        // // 根据单据，生成供应发放单
+        // List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        // if (deliveredList.isEmpty()) {
+        // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        // }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 科室材料入库单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> stockInOrderAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            InventoryItem inventoryItemPurpose = null;
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplyList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplyList.add(supplyItemDetailDto);
+                } else {
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(调拨数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+调拨数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新源仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            if (!supplyList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplyList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.PURCHASE_STOCKIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保商品采购接口 todo 科室材料相关医保接口未对应
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3503商品采购上传错误，错误项目编码" + uploadFailedNoList;
+                } else {
+                    returnMsg = "3503商品采购上传成功";
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药库退库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> returnToWarehouseAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource;
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemSource = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算退货后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 仓库库存-(退货数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 仓库库存-退货数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.PURCHASE_RETURN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 调用医保采购退货接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3504采购退货上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+    //
+    // /**
+    // * 科室材料发药审批通过 todo 发药只查询，没有审批
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // @Override
+    // public R<?> dispensingAgreeApproved(String busNo) {
+    // // 获取当前时间
+    // Date now = DateUtils.getNowDate();
+    // // 审批单据并返回单据详情
+    // List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+    // if (agreedList.isEmpty()) {
+    // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+    // // 根据单据，发放物品
+    // List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+    // if (deliveredList.isEmpty()) {
+    // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+    //
+    // // 查询供应项目的详细信息
+    // List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+    //
+    // if (!supplyItemDetailList.isEmpty()) {
+    //
+    // for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+    // // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
+    // List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+    // supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+    // supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+    // InventoryItem inventoryItemSource = new InventoryItem();
+    // if (!inventoryItemSourceList.isEmpty()) {
+    // inventoryItemSource = inventoryItemSourceList.get(0);
+    //
+    // // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+    // BigDecimal baseQuantitySource = inventoryItemSource.getQuantity();
+    // // 最小数量（最小单位库存数量）
+    // BigDecimal minQuantitySource = inventoryItemSource.getQuantity();
+    //
+    // // 供应申请的物品计量单位与包装单位相同
+    // if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+    // if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+    // // 库存数量不足
+    // return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+    // } else {
+    // // 源仓库库存-(领用数量*拆零比)
+    // minQuantitySource = minQuantitySource.subtract(
+    // supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+    // }
+    // } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+    // if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+    // // 库存数量不足
+    // return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+    // } else {
+    // // 供应申请的物品计量单位与最小单位相同
+    // // 源仓库库存-领用数量
+    // minQuantitySource = minQuantitySource.subtract(supplyItemDetailDto.getItemQuantity());
+    // }
+    // }
+    // // 更新源仓库库存数量
+    // Boolean aBooleanSource = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
+    // baseQuantitySource, minQuantitySource, now, supplyItemDetailDto.getTraceNo());
+    //
+    // if (!aBooleanSource) {
+    // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+    // }
+    // }
+    //
+    // }
+    // return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    // }
+
+    /**
+     * 科室材料损益单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> profitLossAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 返回信息
+        String returnMsg = null;
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItem = new InventoryItem();
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItem = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算报损后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 数量*拆零比
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity());
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 数量
+                        minQuantity = supplyItemDetailDto.getItemQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.PURCHASE_PRPFITLOSS.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保库存变更接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
+                    YbInvChgType.DESTRUCTION, false, false, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 科室材料盘点单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> stocktakingAgreepproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 首次盘存列表
+        List<SupplyItemDetailDto> firstSupplyItemDetailList = new ArrayList<>();
+        // 药品/耗材发放列表
+        List<MedicationDispense> medicationDispenses = null;
+        List<DeviceDispense> deviceDispenses = null;
+        // 返回信息
+        String stocktakingReturnMsg = null;
+        String changeReturnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            // 获取盘盈列表（itemQuantity > 0）
+            List<SupplyItemDetailDto> positiveList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .collect(Collectors.toList());
+            // 获取盘亏列表（itemQuantity < 0）
+            List<SupplyItemDetailDto> negativeList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) < 0)
+                .collect(Collectors.toList());
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                // 查看该批号的药品/耗材是否发放过(用于证明是否首次盘存)
+                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    medicationDispenses = medicationDispenseService.list(new LambdaQueryWrapper<MedicationDispense>()
+                        .eq(MedicationDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (medicationDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    deviceDispenses = deviceDispenseService.list(new LambdaQueryWrapper<DeviceDispense>()
+                        .in(DeviceDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (deviceDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                }
+                if (!inventoryItemList.isEmpty()) {
+                    InventoryItem inventoryItem = inventoryItemList.get(0);
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItem.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getTotalQuantity());
+                        // 供应申请的物品计量单位与最小单位相同
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        minQuantity = supplyItemDetailDto.getTotalQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+
+                String ybSwitch =
+                    SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+                if (Whether.YES.getCode().equals(ybSwitch)) {
+                    // 如果首次盘点信息不为空
+                    if (!firstSupplyItemDetailList.isEmpty()) {
+                        // 调用医保盘存接口，盘盈
+                        List<String> uploadFailedNoList = this.ybInventoryIntegrated(firstSupplyItemDetailList,
+                            YbInvChgType.INVENTORY_GAIN, true, false, false, now);
+                        if (!uploadFailedNoList.isEmpty()) {
+                            stocktakingReturnMsg = "3501盘存上传错误，错误项目编码" + uploadFailedNoList;
+                        }
+                    }
+                    List<String> uploadFailedGainList = null;
+                    List<String> uploadFailedLossList = null;
+                    if (!positiveList.isEmpty()) {
+                        // 调用医保库存变更接口，盘盈
+                        uploadFailedGainList = this.ybInventoryIntegrated(positiveList, YbInvChgType.INVENTORY_GAIN,
+                            false, false, false, now);
+                    }
+                    if (!negativeList.isEmpty()) {
+                        // 调用医保库存变更接口，盘亏
+                        uploadFailedLossList = this.ybInventoryIntegrated(negativeList, YbInvChgType.INVENTORY_LOSS,
+                            false, false, false, now);
+                    }
+                    if (uploadFailedGainList != null || uploadFailedLossList != null) {
+                        changeReturnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedGainList + uploadFailedLossList;
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.PURCHASE_STOCKTAKING.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(stocktakingReturnMsg + changeReturnMsg,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 科室材料调入单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> transferInAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+
+        if (!supplyItemDetailList.isEmpty()) {
+
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplylList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemPurpose = null;
+                if (!inventoryItemPurposeList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemPurposeList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplylList.add(supplyItemDetailDto);
+                } else {
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItemPurpose.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(退库数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+退库数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanPurpose =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+                    if (!bBooleanPurpose) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            if (!supplylList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplylList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.PURCHASE_TRANSFERIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 科室材料调出单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> transferOutAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource = null;
+                if (!inventoryItemSourceList.isEmpty()) {
+                    inventoryItemSource = inventoryItemSourceList.get(0);
+
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItemSource.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 源仓库库存-(退库数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 源仓库库存-退库数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanSource =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+                    if (!bBooleanSource) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.PURCHASE_TRANSFEROUT.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    @Override
+    public List<SupplyItemDetailDto> getSupplyItemDetail(String busNo) {
+        return receiptApprovalMapper.selectSupplyDetail(busNo, DispenseStatus.COMPLETED.getValue());
+    }
+
+    /**
+     * 医保库存相关进销存接口
+     *
+     * @param supplyItemDetailList 供应申请项目详细信息
+     * @param ybInvChgType 库存变更类型
+     * @param firstFlag 首次盘存标识
+     * @param now 库存变更时间
+     * @return 上传失败的id集合
+     */
+    private List<String> ybInventoryIntegrated(List<SupplyItemDetailDto> supplyItemDetailList,
+        YbInvChgType ybInvChgType, Boolean firstFlag, Boolean purchaseFlag, Boolean returnFlag, Date now) {
+        List<String> uploadFailedNoList = new ArrayList<>();
+        R<?> result;
+        R<?> firstResult = R.ok();
+        R<?> returnResult = R.ok();
+        R<?> purchaseResult = R.ok();
+        for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            if (supplyItemDetailDto.getYbNo() == null) {
+                continue;
+            }
+            switch (ybInvChgType) {
+                case ALLOCATION_IN:
+                case ALLOCATION_OUT:
+                case INVENTORY_GAIN:
+                case INVENTORY_LOSS:
+                case DESTRUCTION:
+                case OTHER_IN:
+                case OTHER_OUT:
+                case DONATION_IN:
+                case DONATION_RETURN_OUT:
+                case PURCHASE_IN:
+                case RETURN_OUT:
+                    if (firstFlag) {
+                        firstResult =
+                            ybService.uploadInventoryCount(getMedicalInventory3501Param(supplyItemDetailDto, now), now);
+                        if (firstResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (returnFlag) {
+                        returnResult =
+                            ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
+                        if (returnResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (purchaseFlag) {
+                        purchaseResult = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
+                        if (purchaseResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    result = ybService.updateInventoryCount(
+                        getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
+                    if (result.getCode() != 200) {
+                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                    }
+                    break;
+                default:
+                    throw new IllegalArgumentException("未知的库存变更类型: " + ybInvChgType);
+            }
+        }
+        return uploadFailedNoList;
+    }
+
+    private MedicalPurchase3504Param getMedicalPurchase3504Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        MedicalPurchase3504Param medicalPurchase3504Param = new MedicalPurchase3504Param();
+        medicalPurchase3504Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setPurcInvoNo(supplyItemDetailDto.getInvoiceNo())
+            .setManuDate(supplyItemDetailDto.getStartTime()).setExpyEnd(supplyItemDetailDto.getEndTime())
+            .setPurcRetnCnt(supplyItemDetailDto.getItemQuantity()).setPurcRetnStoinTime(now)
+            .setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+        return medicalPurchase3504Param;
+    }
+
+    private Medical3503Param getMedical3503Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        Medical3503Param medical3503Param = new Medical3503Param();
+        medical3503Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setManuLotnum(supplyItemDetailDto.getLotNumber())
+            .setProdentpName(supplyItemDetailDto.getManufacturerText())
+            .setAprvno(supplyItemDetailDto.getApprovalNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+            .setExpyEnd(supplyItemDetailDto.getEndTime()).setPurcRetnCnt(supplyItemDetailDto.getItemQuantity())
+            .setPurcRetnStoinTime(now).setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+
+        return medical3503Param;
+    }
+
+    private MedicalInventory3502Param getMedicalInventory3502Param(SupplyItemDetailDto supplyItemDetailDto, Date now,
+        String ybInvChgType) {
+        MedicalInventory3502Param medicalInventory3502Param = new MedicalInventory3502Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        // 查询商品价格信息
+        List<ItemChargeDetailDto> itemChargeDetailList =
+            receiptApprovalAppService.getItemChargeDetail(List.of(supplyItemDetailDto.getItemId()));
+        if (!inventoryItemList.isEmpty() && !itemChargeDetailList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            // 最小单位售卖价格
+            BigDecimal minPrice = BigDecimal.ZERO;
+            Optional<BigDecimal> price = itemChargeDetailList.stream()
+                .filter(x -> x.getConditionValue().equals(supplyItemDetailDto.getLotNumber()))
+                .map(ItemChargeDetailDto::getSellPrice).findFirst();
+            if (price.isPresent()) {
+                if (supplyItemDetailDto.getPartPercent().compareTo(BigDecimal.ZERO) > 0) {
+                    minPrice = price.get().divide(supplyItemDetailDto.getPartPercent(), RoundingMode.HALF_UP);
+                }
+            }
+            // 转换为JSON
+            JSONArray medicalTraceNo = new JSONArray();
+            // 获取追溯码信息
+            if (supplyItemDetailDto.getTraceNo() != null) {
+                List<String> traceNoList =
+                    Arrays.stream(supplyItemDetailDto.getTraceNo().split(CommonConstants.Common.COMMA))
+                        .map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
+                for (String traceNo : traceNoList) {
+                    Map<String, String> traceNoMap = new HashMap<>();
+                    traceNoMap.put("drug_trac_codg", traceNo);
+                    medicalTraceNo.add(traceNoMap);
+                }
+            }
+            medicalInventory3502Param.setMedListCodg(supplyItemDetailDto.getYbNo()).setInvChgType(ybInvChgType)
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setPric(minPrice).setCnt(totalQuantity)
+                .setInvChgTime(now).setDrugtracinfo(medicalTraceNo);
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3502Param;
+    }
+
+    private MedicalInventory3501Param getMedicalInventory3501Param(SupplyItemDetailDto supplyItemDetailDto, Date date) {
+        MedicalInventory3501Param medicalInventory3501Param = new MedicalInventory3501Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        if (!inventoryItemList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            medicalInventory3501Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable()).setInvdate(date).setInvCnt(totalQuantity)
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+                .setExpyEnd(supplyItemDetailDto.getEndTime());
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3501Param;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
new file mode 100644
index 00000000..424e5eaf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
@@ -0,0 +1,163 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentRequisitionOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentRequisitionOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料请领单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentRequisitionOrderServiceImpl implements IDepartmentRequisitionOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto requisitionOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.PURCHASE_APPLICATION.getValue(),
+            SupplyCategory.PURCHASE_APPLICATION.getInfo()));
+
+        requisitionOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(requisitionOrderInitDto);
+    }
+
+    /**
+     * 请领单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 请领单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> requisitionOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        requisitionOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : requisitionOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(requisitionOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_REQUISITION.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑请领单
+     *
+     * @param requisitionOrderDtoList 请领信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditRequisitionOrder(List<DepartmentDetailDto> requisitionOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(requisitionOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        for (DepartmentDetailDto item : requisitionOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.DEPARTMENT_REQUISITION.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                    .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setSupplierId(item.getSupplierId())
+                    .setReason(item.getReason()).setSourceTypeEnum(LocationForm.CABINET.getValue())
+                    .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                    .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                    .setApplyTime(item.getApplyTime()).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
new file mode 100644
index 00000000..6dd1368d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
@@ -0,0 +1,165 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentReturnToWarehouseOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentReturnToWarehouseOrderServiceImpl implements IDepartmentReturnToWarehouseOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto purchaseOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> returnToDispensaryOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        returnToDispensaryOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : returnToDispensaryOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(returnToDispensaryOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_RETURN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToDispensaryOrderDtoList 退库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditReturnToWarehouseOrder(List<DepartmentDetailDto> returnToDispensaryOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToDispensaryOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (DepartmentDetailDto item : returnToDispensaryOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.DEPARTMENT_RETURN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setStartTime(item.getStartTime()).setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setSupplierId(item.getSupplierId()).setReason(item.getReason())
+                .setSourceTypeEnum(LocationForm.DEPARTMENT.getValue()).setSourceLocationId(item.getSourceLocationId())
+                .setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
new file mode 100644
index 00000000..fb29b8c3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
@@ -0,0 +1,172 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentStockInOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentStockInOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料入库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentStockInOrderServiceImpl implements IDepartmentStockInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto purchaseOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 入库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 入库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> stockInOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stockInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : stockInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stockInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_STOCKIN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑入库单
+     *
+     * @param stockInOrderDtoList 入库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStockInOrder(List<DepartmentDetailDto> stockInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(stockInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(stockInOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockInOrderDtoList.get(0).getOriginalBusNo(), stockInOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (DepartmentDetailDto item : stockInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.DEPARTMENT_STOCKIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setStartTime(item.getStartTime()).setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setSupplierId(item.getSupplierId()).setReason(item.getReason())
+                .setSourceTypeEnum(LocationForm.WAREHOUSE.getValue()).setSourceLocationId(item.getSourceLocationId())
+                .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
new file mode 100644
index 00000000..fa706958
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
@@ -0,0 +1,167 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentStocktakingOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentStocktakingOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentStocktakingOrderServiceImpl implements IDepartmentStocktakingOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto purchaseOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(
+            SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(
+            SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> stocktakingOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stocktakingOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : stocktakingOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stocktakingOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_STOCKTAKING.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStocktakingOrder(List<DepartmentDetailDto> stocktakingOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(stocktakingOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (DepartmentDetailDto item : stocktakingOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.DEPARTMENT_STOCKTAKING.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setTotalQuantity(item.getTotalQuantity()).setPrice(item.getPrice()).setTotalPrice(item.getTotalPrice())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setBatchInventory(item.getBatchInventory()).setLotNumber(item.getLotNumber())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setReasonCode(item.getReasonCode()).setReason(item.getReason())
+                .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
new file mode 100644
index 00000000..eda10695
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
@@ -0,0 +1,165 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentTransferInOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentTransferInOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料调入单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentTransferInOrderServiceImpl implements IDepartmentTransferInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto purchaseOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> transferInOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        transferInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : transferInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(transferInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_TRANSFERIN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑调出单
+     *
+     * @param transferInOrderDtoList 调出信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditTransferInOrder(List<DepartmentDetailDto> transferInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (DepartmentDetailDto item : transferInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.DEPARTMENT_TRANSFERIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setRetailPrice(item.getPrice())
+                .setTotalRetailPrice(item.getTotalPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setEndTime(item.getEndTime())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
new file mode 100644
index 00000000..4a0c6943
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
@@ -0,0 +1,165 @@
+package com.openhis.web.departmentmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentTransferOutOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
+import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.openhis.web.departmentmanage.mapper.DepartmentTransferOutOrderMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 科室材料调出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class DepartmentTransferOutOrderServiceImpl implements IDepartmentTransferOutOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private DepartmentCommonMapper departmentCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DepartmentInitDto purchaseOrderInitDto = departmentCommonService.init();
+
+        // 单据分类
+        List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<DepartmentDetailDto> transferOutOrderDtoDetailPage =
+            departmentCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        transferOutOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<DepartmentDetailDto.Option> unitList;
+        for (DepartmentDetailDto item : transferOutOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new DepartmentDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new DepartmentDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(transferOutOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEPARTMENT_TRANSFEROUT.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑调出单
+     *
+     * @param transferOutOrderDtoList 调出信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditTransferOutOrder(List<DepartmentDetailDto> transferOutOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferOutOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (DepartmentDetailDto item : transferOutOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.DEPARTMENT_TRANSFEROUT.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setRetailPrice(item.getPrice())
+                .setTotalRetailPrice(item.getTotalPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setEndTime(item.getEndTime())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
new file mode 100644
index 00000000..72c4fe79
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
@@ -0,0 +1,82 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentIssuanceOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料发出单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/issuance-order")
+@Slf4j
+public class DepartmentIssuanceOrderController {
+
+    @Autowired
+    private IDepartmentIssuanceOrderService departmentIssuanceOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+    /**
+     * 发出单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentIssuanceOrderService.init();
+    }
+
+    /**
+     * 发出单单据列表
+     *
+     * @param issuanceOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 发出单据分页列表
+     */
+    @GetMapping(value = "/issuance-order-page")
+    public R<?> getPage(DepartmentSearchParam issuanceOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(issuanceOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.DISPENSING_ORDER.getValue());
+    }
+    /**
+     * 发出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 发出单单据详情
+     */
+    @GetMapping(value = "/issuance-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentIssuanceOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
new file mode 100644
index 00000000..7c9d8009
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
@@ -0,0 +1,137 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentProfitLossOrderService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料损益单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/profitLoss-order")
+@Slf4j
+public class DepartmentProfitLossOrderController {
+
+    @Autowired
+    private IDepartmentProfitLossOrderService departmentProfitLossOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+    /**
+     * 损益单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentProfitLossOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 损益单单据列表
+     *
+     * @param profitLossOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 损益单据分页列表
+     */
+    @GetMapping(value = "/profitLoss-order-page")
+    public R<?> getPage(DepartmentSearchParam profitLossOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(profitLossOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.DEPARTMENT_PRPFITLOSS.getValue());
+    }
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @GetMapping(value = "/profitLoss-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentProfitLossOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentProfitLossOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-profitLossOrder")
+    public R<?> addOrEditProfitLossOrder(@Validated @RequestBody List<DepartmentDetailDto> profitLossOrderDtoList) {
+        return departmentProfitLossOrderService.addOrEditProfitLossOrder(profitLossOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-profitLossOrder")
+    public R<?> deleteProfitLossOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.profitLossAgreeApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
new file mode 100644
index 00000000..d4d39b1c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
@@ -0,0 +1,139 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentRequisitionOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料请领单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/requisition-order")
+@Slf4j
+public class DepartmentRequisitionOrderController {
+
+    @Autowired
+    private IDepartmentRequisitionOrderService departmentRequisitionOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+    /**
+     * 请领单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentRequisitionOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param requisitionOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam requisitionOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(requisitionOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 请领单单据列表
+     *
+     * @param requisitionOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 请领单据分页列表
+     */
+    @GetMapping(value = "/requisition-order-page")
+    public R<?> getPage(DepartmentSearchParam requisitionOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(requisitionOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.DEPARTMENT_REQUISITION.getValue());
+    }
+    /**
+     * 请领单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 请领单单据详情
+     */
+    @GetMapping(value = "/requisition-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentRequisitionOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentRequisitionOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param requisitionOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-requisitionOrder")
+    public R<?> addOrEditRequisitionOrder(@Validated @RequestBody List<DepartmentDetailDto> requisitionOrderDtoList) {
+        return departmentRequisitionOrderService.addOrEditRequisitionOrder(requisitionOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-requisitionOrder")
+    public R<?> deleteRequisitionOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.requisitionOrderAgreeApproval(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
new file mode 100644
index 00000000..996cbfe0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
@@ -0,0 +1,137 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料退库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/returnToWarehouse-order")
+@Slf4j
+public class DepartmentReturnToWarehouseOrderController {
+
+    @Autowired
+    private IDepartmentReturnToWarehouseOrderService departmentReturnToWarehouseOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+    /**
+     * 退库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentReturnToWarehouseOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 退库单单据列表
+     *
+     * @param returnToDispensaryOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 退库单据分页列表
+     */
+    @GetMapping(value = "/returnToDispensary-order-page")
+    public R<?> getPage(DepartmentSearchParam returnToDispensaryOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(returnToDispensaryOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.DEPARTMENT_RETURN.getValue());
+    }
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @GetMapping(value = "/returnToDispensary-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentReturnToWarehouseOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentReturnToWarehouseOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToDispensaryOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-returnToDispensaryOrder")
+    public R<?> addOrEditReturnToDispensaryOrder(@Validated @RequestBody List<DepartmentDetailDto> returnToDispensaryOrderDtoList) {
+        return departmentReturnToWarehouseOrderService.addOrEditReturnToWarehouseOrder(returnToDispensaryOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-returnToDispensaryOrder")
+    public R<?> deleteReturnToDispensaryOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.returnToWarehouseAgreeApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java
new file mode 100644
index 00000000..66a63beb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java
@@ -0,0 +1,137 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentStockInOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料入库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/stockIn-order")
+@Slf4j
+public class DepartmentStockInOrderController {
+
+    @Autowired
+    private IDepartmentStockInOrderService departmentStockInOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+    /**
+     * 入库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentStockInOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 入库单单据列表
+     *
+     * @param stockInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 入库单据分页列表
+     */
+    @GetMapping(value = "/stockIn-order-page")
+    public R<?> getPage(DepartmentSearchParam stockInOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(stockInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.DEPARTMENT_STOCKIN.getValue());
+    }
+    /**
+     * 入库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 入库单单据详情
+     */
+    @GetMapping(value = "/stockIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentStockInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentStockInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑入库单
+     *
+     * @param stockInOrderDtoList 入库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stockInOrder")
+    public R<?> addOrEditStockInOrder(@Validated @RequestBody List<DepartmentDetailDto> stockInOrderDtoList) {
+        return departmentStockInOrderService.addOrEditStockInOrder(stockInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stockInOrder")
+    public R<?> deleteStockInOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.stockInOrderAgreeApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
new file mode 100644
index 00000000..5c200e85
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
@@ -0,0 +1,137 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentStocktakingOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料盘点单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/stocktaking-order")
+@Slf4j
+public class DepartmentStocktakingOrderController {
+
+    @Autowired
+    private IDepartmentStocktakingOrderService departmentStocktakingOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+    /**
+     * 盘点单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentStocktakingOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 盘点单单据列表
+     *
+     * @param stocktakingOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 盘点单据分页列表
+     */
+    @GetMapping(value = "/stocktaking-order-page")
+    public R<?> getPage(DepartmentSearchParam stocktakingOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(stocktakingOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.DEPARTMENT_STOCKTAKING.getValue());
+    }
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @GetMapping(value = "/stocktaking-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentStocktakingOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentStocktakingOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stocktakingOrder")
+    public R<?> addOrEditStocktakingOrder(@Validated @RequestBody List<DepartmentDetailDto> stocktakingOrderDtoList) {
+        return departmentStocktakingOrderService.addOrEditStocktakingOrder(stocktakingOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stocktakingOrder")
+    public R<?> deleteStocktakingOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.stocktakingAgreepproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java
new file mode 100644
index 00000000..31b1c617
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java
@@ -0,0 +1,139 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentTransferInOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料调入单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/transferIn-order")
+@Slf4j
+public class DepartmentTransferInOrderController {
+
+    @Autowired
+    private IDepartmentTransferInOrderService departmentTransferInOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+
+    /**
+     * 调入单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentTransferInOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 调入单单据列表
+     *
+     * @param transferInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 调入单据分页列表
+     */
+    @GetMapping(value = "/transferIn-order-page")
+    public R<?> getPage(DepartmentSearchParam transferInOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(transferInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.DEPARTMENT_TRANSFERIN.getValue());
+    }
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    @GetMapping(value = "/transferIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentTransferInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentTransferInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferInOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-transferInOrder")
+    public R<?> addOrEditTransferInOrder(@Validated @RequestBody List<DepartmentDetailDto> transferInOrderDtoList) {
+        return departmentTransferInOrderService.addOrEditTransferInOrder(transferInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-transferInOrder")
+    public R<?> deleteTransferInOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.transferInAgreeApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
new file mode 100644
index 00000000..e508d829
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
@@ -0,0 +1,139 @@
+package com.openhis.web.departmentmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.openhis.web.departmentmanage.appservice.IDepartmentTransferOutOrderService;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 科室材料调出单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/department/transferOut-order")
+@Slf4j
+public class DepartmentTransferOutOrderController {
+
+    @Autowired
+    private IDepartmentTransferOutOrderService departmentTransferOutOrderService;
+
+    @Autowired
+    private IDepartmentCommonService departmentCommonService;
+
+    @Autowired
+    private IDepartmentReceiptApprovalService departmentReceiptApprovalService;
+
+    /**
+     * 调出单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return departmentTransferOutOrderService.init();
+    }
+
+    /**
+     * 获取物资
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 物资信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(DepartmentSearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 调出单单据列表
+     *
+     * @param transferOutOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 调出单据分页列表
+     */
+    @GetMapping(value = "/transferOut-order-page")
+    public R<?> getPage(DepartmentSearchParam transferOutOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return departmentCommonService.getPage(transferOutOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.DEPARTMENT_TRANSFEROUT.getValue());
+    }
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    @GetMapping(value = "/transferOut-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return departmentTransferOutOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return departmentTransferOutOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferOutOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-transferOutOrder")
+    public R<?> addOrEditTransferOutOrder(@Validated @RequestBody List<DepartmentDetailDto> transferOutOrderDtoList) {
+        return departmentTransferOutOrderService.addOrEditTransferOutOrder(transferOutOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-transferOutOrder")
+    public R<?> deleteTransferOutOrder(@RequestParam String busNo) {
+        return departmentCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return departmentReceiptApprovalService.transferOutAgreeApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java
new file mode 100644
index 00000000..e992b24f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.departmentmanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据详细信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class DepartmentDetailDto implements Serializable {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 单据号 */
+    private String busNo;
+    /** 再生成单据号 */
+    private String originalBusNo;
+
+    /** 药品编码 */
+    private String itemBusNo;
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 物品名称 */
+    private String itemName;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 选择单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 常规单位 */
+    @Dict(dictCode = "unit_code")
+    private String maxUnitCode;
+    private String maxUnitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private String partPercent;
+
+    /** 数量 */
+    private BigDecimal itemQuantity;
+
+    /** 合计数量 */
+    private BigDecimal totalQuantity;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 零价金额 */
+    private BigDecimal totalRetailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 备注 */
+    private String remake;
+
+    /** 理由类型 */
+    private String  reasonCode;
+
+    /** 摘要（理由） */
+    private String  reason;
+
+    /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 源仓库类型 */
+    private Integer sourceTypeEnum;
+    /** 源仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+
+    /** 目的仓库类型 */
+    private Integer purposeTypeEnum;
+    /** 目的仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long purposeLocationId;
+
+    /** 采购员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+
+    /** 审批人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 单据分类 */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+
+    /** 供应商联系人 */
+    private String phone;
+
+    /** 仓库员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long  practitionerId;
+
+    /** 发票号 */
+    private String invoiceNo;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 生产日期 */
+    private Date startTime;
+
+    /** 失效日期 */
+    private Date endTime;
+
+    /** 追溯码*/
+    private String traceNo;
+
+    /** 追溯码单位 */
+    @Dict(dictCode = "unit_code")
+    private String traceNoUnitCode;
+    private String traceNoUnitCode_dictText;
+
+    /** 包装情况 */
+    private Integer packagingConditionEnum;
+    private String packagingConditionEnum_enumText;
+
+    /** 验收结果 */
+    private Integer acceptanceResultEnum;
+    private String acceptanceResultEnum_enumText;
+
+    /** 禁用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date occurrenceTime;
+
+    /** 药品发放id */
+    private String dispenseIds;
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+        public Option() {
+        }
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
new file mode 100644
index 00000000..462795e8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.departmentmanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 物资信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class DepartmentDeviceInfoDto implements Serializable {
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 物品编号 */
+    private String busNo;
+
+    /** 物品名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 包装单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+
+//    /** 价格单位 */
+//    @Dict(dictCode = "unit_code")
+//    private String conditionUnitCode;
+//    private String conditionUnitCode_dictText;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 库存最小警戒线 */
+    private BigDecimal itemMinQuantity;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 生产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date productionDate;
+
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date expirationDate;
+
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java
new file mode 100644
index 00000000..9483ba2a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.departmentmanage.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class DepartmentDto implements Serializable {
+    /** 单据号 */
+    private String supplyBusNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    private String locationTypeEnum_enumText;
+
+    /** 仓库 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_location")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 采购员 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+    private String applicantId_dictText;
+
+    /** 审批人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java
new file mode 100644
index 00000000..6aad96ff
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.departmentmanage.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.administration.domain.Organization;
+import com.openhis.web.common.dto.LocationDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据初期信息
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class DepartmentInitDto implements Serializable {
+
+    /**
+     * 单据号
+     */
+    private String busNo;
+
+    /**
+     * 库房类型列表
+     */
+    private List<DispensaryOption> warehouseTypeOption;
+
+    /**
+     * 库房列表
+     */
+    private List<LongOption> warehouseOption;
+
+    /**
+     * 供应商列表
+     */
+     private List<SupplierOption> supplierOption;
+
+    /**
+     * 人员列表
+     */
+    private List<LongOption> practitionerOption;
+    /**
+     * 审批状态
+     */
+    private List<IntegerOption> supplyStatusOptions;
+
+    /**
+     * 单据类型
+     */
+    private List<IntegerOption> supplyTypeOptions;
+
+    /**
+     * 单据分类
+     */
+    private List<IntegerOption> supplyCategoryOptions;
+    /**
+     * 包装情况
+     */
+    private List<IntegerOption> packagingConditionOptions;
+    /**
+     * 包装情况
+     */
+    private List<IntegerOption> acceptanceResultoryOptions;
+
+    /**
+     * 仓库
+     */
+    private List<LocationDto> WarehouseListOptions;
+
+    /**
+     * 科室
+     */
+    private  List<Organization> departmentListOptions;
+
+    @Data
+    public static class LongOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public LongOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class SupplierOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+        private String phone;
+
+        public SupplierOption(Long value, String label, String phone) {
+            this.value = value;
+            this.label = label;
+            this.phone = phone;
+        }
+    }
+
+    @Data
+    public static class IntegerOption {
+        private Integer value;
+        private String label;
+
+        public IntegerOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class DispensaryOption {
+        private Integer value;
+        private String label;
+        private List<LocationDto> locationOption;
+        private List<DispensaryItemOption> orderOption;
+
+        public DispensaryOption(Integer value, String label,List<LocationDto> locationOption,List<DispensaryItemOption> orderOption) {
+            this.value = value;
+            this.label = label;
+            this.locationOption = locationOption;
+            this.orderOption = orderOption;
+        }
+    }
+
+    @Data
+    public static class DispensaryItemOption {
+        private Integer value;
+        private String label;
+
+        public DispensaryItemOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java
new file mode 100644
index 00000000..692d00e0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.departmentmanage.dto;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据查询条件
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class DepartmentSearchParam implements Serializable {
+    /** id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /** 单据号 */
+    private String busNo;
+
+    /** 采购员 */
+    private String applicantName;
+
+    /** 项目名 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 供应商id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+    /** 单据状态 */
+    private Integer statusEnum;
+
+    /** 再生成单据号flg */
+    private String originalBusNoFlg;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java
new file mode 100644
index 00000000..cf40b097
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java
@@ -0,0 +1,58 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.openhis.web.departmentmanage.dto.DepartmentDto;
+import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto;
+import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+
+/**
+ * 科室材料共通 mapper
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentCommonMapper {
+    /**
+     * 根据供应商获取物资
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param locationId 仓库id
+     * @return 物资信息
+     */
+
+    Page<DepartmentDeviceInfoDto> getDeviceInfo(
+        @Param("page") Page<DepartmentDeviceInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<DepartmentSearchParam> queryWrapper,
+        @Param("locationId") Long locationId, @Param("supplierId") Long supplierId);
+
+    /**
+     * 查询订货单分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param originalBusNoFlg 再生成单据号flg
+     * @param locationFlg 仓库flg
+     * @return 订货单分页列表
+     */
+    Page<DepartmentDto> getPage(@Param("page") Page<DepartmentDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<DepartmentSearchParam> queryWrapper,
+        @Param("originalBusNoFlg") String originalBusNoFlg, @Param("locationFlg") String locationFlg);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    Page<DepartmentDetailDto> getDetailPage(@Param("page") Page<DepartmentDetailDto> page,
+        @Param("busNo") String busNo);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
new file mode 100644
index 00000000..856156a0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
@@ -0,0 +1,26 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 科室材料发出单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentIssuanceOrderMapper {
+
+    /**
+     * 获取更表所需信息
+     *
+     * @param dispenseIdList 耗材发放id
+     * @param dispenseStatus 发放状态
+     * @return 单据详情
+     */
+    List<DepartmentDetailDto> getInfo(@Param("dispenseIdList") List<Long> dispenseIdList,@Param("dispenseStatus") Integer dispenseStatus);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
new file mode 100644
index 00000000..6570df0e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料损益单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentProfitLossOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
new file mode 100644
index 00000000..bd781261
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料请领单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentRequisitionOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
new file mode 100644
index 00000000..7889b315
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料退库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentReturnToWarehouseOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
new file mode 100644
index 00000000..a279c2a5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料入库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentStockInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
new file mode 100644
index 00000000..69dfd679
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料盘点单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentStocktakingOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
new file mode 100644
index 00000000..947ec1c9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料调入单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentTransferInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
new file mode 100644
index 00000000..04b69151
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.departmentmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 科室材料调出单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface DepartmentTransferOutOrderMapper {
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
index afe3d2b0..95da46fe 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
@@ -24,11 +24,12 @@ public interface IDoctorStationAdviceAppService {
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @param pricingFlag 划价标记
+     * @param adviceTypes 医嘱类型参数集合
      * @return 医嘱信息
      */
     IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
         List<Long> adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize,
-        Integer pricingFlag);
+        Integer pricingFlag, List<Integer> adviceTypes);
 
     /**
      * 门诊保存医嘱
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAllergyIntolAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAllergyIntolAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAllergyIntolAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAllergyIntolAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
similarity index 80%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
index 1deb91bc..41339626 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
@@ -77,4 +77,29 @@ public interface IDoctorStationChineseMedicalAppService {
      */
     R<?> saveOrSignTcmAdvice(AdviceSaveParam adviceSaveParam, String adviceOpType);
 
+    /**
+     * 查询中医医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @return 医嘱请求数据
+     */
+    R<?> getTcmRequestBaseInfo(Long encounterId);
+
+    /**
+     * 查询中医历史医嘱请求数据
+     *
+     * @param patientId 病人id
+     * @param encounterId 就诊id
+     * @return 中医历史医嘱请求数据
+     */
+    R<?> getTcmRequestHistoryInfo(Long patientId, Long encounterId);
+
+    /**
+     * 删除中医诊断
+     *
+     * @param syndromeGroupNo 中医证候组号
+     * @return 结果
+     */
+    R<?> delTcmDiagnosis(String syndromeGroupNo);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
similarity index 93%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
index 42a021c0..9dba844b 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
@@ -51,12 +51,13 @@ public interface IDoctorStationDiagnosisAppService {
      * 查询诊断信息
      *
      * @param searchKey 模糊查询关键字
+     * @param typeCode 用于区分 西医诊断 [1] 中医诊断 [2]
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @return 诊断信息
      */
-    Page<ConditionDefinitionMetadata> getConditionDefinitionMetadataSearchKey(String searchKey, Integer pageNo,
-        Integer pageSize);
+    Page<ConditionDefinitionMetadata> getConditionDefinitionMetadataSearchKey(String searchKey, String typeCode,
+        Integer pageNo, Integer pageSize);
 
     /**
      * 医生保存诊断
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
similarity index 89%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
index 71cf88c9..3c5a9c70 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
@@ -22,6 +22,16 @@ public interface IDoctorStationElepPrescriptionService {
      */
     R<?> elepPrescriptionInit();
 
+    /**
+     * 获取全部常用药品信息
+     *
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param searchKey 模糊查询关键字
+     * @return 药品信息
+     */
+    R<?> getAllMedicationUsualInfo(String searchKey, Integer pageNo, Integer pageSize);
+
     /**
      * 获取全部药品信息
      *
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
index 2717d30b..1c1ea147 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
@@ -1,11 +1,14 @@
 package com.openhis.web.doctorstation.appservice;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.servlet.http.HttpServletRequest;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
 
 /**
  * 医生站-主页面 应用Service
@@ -49,4 +52,24 @@ public interface IDoctorStationMainAppService {
      */
     R<?> completeEncounter(Long encounterId);
 
+    /**
+     * 查询处方号列表信息
+     *
+     * @param prescriptionInfoBaseDto 处方dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 处方号列表信息
+     */
+    IPage<PrescriptionInfoBaseDto> getPrescriptionPageInfo(PrescriptionInfoBaseDto prescriptionInfoBaseDto,
+        String searchKey, Integer pageNo, Integer pageSize);
+
+    /**
+     * 查询处方详情
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方详情
+     */
+    List<PrescriptionInfoDetailDto> getPrescriptionDetailInfo(String prescriptionNo);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java
new file mode 100644
index 00000000..5421e073
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java
@@ -0,0 +1,51 @@
+package com.openhis.web.doctorstation.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.doctorstation.dto.ReservationRecordDto;
+
+/**
+ * 医生站-预约记录 应用Service
+ */
+public interface IReservationRecordAppService {
+
+    /**
+     * 保存预约记录
+     *
+     * @param reservationRecordDto 预约记录dto
+     * @return 结果
+     */
+    R<?> saveReservation(ReservationRecordDto reservationRecordDto);
+
+    /**
+     * 编辑预约记录
+     *
+     * @param reservationRecordDto 预约记录dto
+     * @return 结果
+     */
+    R<?> editReservation(ReservationRecordDto reservationRecordDto);
+
+    /**
+     * 删除预约记录
+     *
+     * @param id id
+     * @return 结果
+     */
+    R<?> delReservation(Long id);
+
+    /**
+     * 查询 预约记录
+     *
+     * @param reservationRecordDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 预约记录
+     */
+    IPage<ReservationRecordDto> getReservationInfo(ReservationRecordDto reservationRecordDto, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
similarity index 55%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index ad0da7dc..f324a649 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -1,7 +1,5 @@
 package com.openhis.web.doctorstation.appservice.impl;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -11,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,12 +18,8 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IOrganizationLocationService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
@@ -33,14 +28,12 @@ import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
-import com.openhis.web.datadictionary.dto.ActivityChildJsonDto;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.doctorstation.dto.*;
 import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
+import com.openhis.web.doctorstation.utils.DoctorStationSendApplyUtil;
 import com.openhis.web.doctorstation.utils.PrescriptionUtils;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
 import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.domain.DeviceRequest;
 import com.openhis.workflow.domain.ServiceRequest;
@@ -49,9 +42,12 @@ import com.openhis.workflow.service.IDeviceDispenseService;
 import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.IServiceRequestService;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 医生站-医嘱/处方 应用实现类
  */
+@Slf4j
 @Service
 public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAppService {
 
@@ -73,8 +69,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     @Resource
     IChargeItemService iChargeItemService;
 
-    @Resource
-    IOrganizationLocationService iOrganizationLocationService;
+    // @Resource
+    // IOrganizationLocationService iOrganizationLocationService;
 
     @Resource
     IMedicationDispenseService iMedicationDispenseService;
@@ -91,11 +87,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     @Resource
     IActivityDefinitionService iActivityDefinitionService;
 
-    @Resource
-    IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
+    // @Resource
+    // OutpatientRegistrationAppMapper outpatientRegistrationAppMapper;
 
     @Resource
-    OutpatientRegistrationAppMapper outpatientRegistrationAppMapper;
+    DoctorStationSendApplyUtil doctorStationSendApplyUtil;
 
     /**
      * 查询医嘱信息
@@ -108,12 +104,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @param pricingFlag 划价标记
+     * @param adviceTypes 医嘱类型参数集合
      * @return 医嘱信息
      */
     @Override
     public IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
         List<Long> adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize,
-        Integer pricingFlag) {
+        Integer pricingFlag, List<Integer> adviceTypes) {
         // 构建查询条件
         QueryWrapper<AdviceBaseDto> queryWrapper = HisQueryUtils.buildQueryWrapper(adviceBaseDto, searchKey,
             new HashSet<>(Arrays.asList("advice_name", "py_str", "wb_str")), null);
@@ -121,7 +118,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             new Page<>(pageNo, pageSize), PublicationStatus.ACTIVE.getValue(), organizationId,
             CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
             CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, DeviceCategory.SINGLE_USE.getCode(), pricingFlag,
-            adviceDefinitionIdParamList, queryWrapper);
+            adviceDefinitionIdParamList, adviceTypes, queryWrapper);
         List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords();
         // 医嘱定义ID集合
         List<Long> adviceDefinitionIdList =
@@ -134,15 +131,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             doctorStationAdviceAppMapper.getAdviceInventory(locationId, adviceDefinitionIdList,
                 CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
         // 待发放个数信息
-        List<AdviceInventoryDto> adviceDraftInventoryList =
-            doctorStationAdviceAppMapper.getAdviceDraftInventory(CommonConstants.TableName.MED_MEDICATION_DEFINITION,
-                CommonConstants.TableName.ADM_DEVICE_DEFINITION, DispenseStatus.DRAFT.getValue());
+        List<AdviceInventoryDto> adviceDraftInventoryList = doctorStationAdviceAppMapper.getAdviceDraftInventory(
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+            DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue());
         // 预减库存
         List<AdviceInventoryDto> adviceInventory =
             adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
         // 费用定价子表信息
-        List<AdvicePriceDto> childCharge =
-            doctorStationAdviceAppMapper.getChildCharge(ConditionCode.LOT_NUMBER.getCode(), chargeItemDefinitionIdList);
+        List<AdvicePriceDto> childCharge = doctorStationAdviceAppMapper
+            .getChildCharge(ConditionCode.LOT_NUMBER_COST.getCode(), chargeItemDefinitionIdList);
         // 费用定价主表信息
         List<AdvicePriceDto> mainCharge = doctorStationAdviceAppMapper.getMainCharge(chargeItemDefinitionIdList);
         String unitCode = ""; // 包装单位
@@ -242,22 +239,39 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         }
         // 当前时间
         Date curDate = new Date();
+        // 医嘱签发编码
+        String signCode = assignSeqUtil.getSeq(AssignSeqEnum.ADVICE_SIGN.getPrefix(), 10);
 
         /**
          * 处理药品请求
          */
-        this.handMedication(medicineList, curDate, adviceOpType, organizationId);
+        this.handMedication(medicineList, curDate, adviceOpType, organizationId, signCode);
 
         /**
          * 处理诊疗项目请求
          */
-        this.handService(activityList, curDate, adviceOpType, organizationId);
+        this.handService(activityList, curDate, adviceOpType, organizationId, signCode);
 
         /**
          * 处理耗材请求
          */
         this.handDevice(deviceList, curDate, adviceOpType);
 
+        // 签发时,把草稿状态的账单更新为待收费
+        if (AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType) && !adviceSaveList.isEmpty()) {
+            // 签发的医嘱id集合
+            List<Long> requestIds = adviceSaveList.stream()
+                .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
+                .collect(Collectors.toList()).stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
+            // 就诊id
+            Long encounterId = adviceSaveList.get(0).getEncounterId();
+            iChargeItemService.update(new LambdaUpdateWrapper<ChargeItem>()
+                .set(ChargeItem::getStatusEnum, ChargeItemStatus.PLANNED.getValue())
+                .eq(ChargeItem::getEncounterId, encounterId)
+                .eq(ChargeItem::getStatusEnum, ChargeItemStatus.DRAFT.getValue())
+                .in(ChargeItem::getServiceId, requestIds));
+        }
+
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"门诊医嘱"}));
     }
 
@@ -265,7 +279,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
      * 处理药品
      */
     private void handMedication(List<AdviceSaveDto> medicineList, Date curDate, String adviceOpType,
-        Long organizationId) {
+        Long organizationId, String signCode) {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 保存操作
@@ -291,9 +305,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.MED_MEDICATION_REQUEST,
                 adviceSaveDto.getRequestId());
             // 删除基于这个药品生成的需要执行的诊疗请求
-            iServiceRequestService.remove(new LambdaQueryWrapper<ServiceRequest>()
-                .eq(ServiceRequest::getId, adviceSaveDto.getRequestId()).isNotNull(ServiceRequest::getBasedOnTable)
-                .eq(ServiceRequest::getStatusEnum, RequestStatus.IN_PROGRESS.getValue()));
+            iServiceRequestService.remove(
+                new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getBasedOnId, adviceSaveDto.getRequestId())
+                    .isNotNull(ServiceRequest::getBasedOnTable)
+                    .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue()));
         }
         // 当前时间毫秒值
         Long currentTimeMillis = System.currentTimeMillis();
@@ -310,7 +325,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                         adviceSaveDto.setGroupId(currentTimeMillis + adviceSaveDto.getGroupId());
                     }
                 }
-                i = i++;
+                i = ++i;
             }
             // 生成处方号
             prescriptionUtils.generatePrescriptionNumbers(insertOrUpdateList);
@@ -322,14 +337,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             medicationRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
             medicationRequest.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
             medicationRequest.setGroupId(adviceSaveDto.getGroupId()); // 组号
+            if (is_sign) {
+                medicationRequest.setSignCode(signCode);
+            }
             // 只有保存时才处理的字段属性
             if (is_save) {
-                medicationRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 10));
+                medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
                 medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
                 medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
                 medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
                 medicationRequest.setLotNumber(adviceSaveDto.getLotNumber()); // 产品批号
-                medicationRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型,默认-门诊
+                medicationRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型
                 medicationRequest.setMedicationId(adviceSaveDto.getAdviceDefinitionId());// 医嘱定义id
                 medicationRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 medicationRequest.setPractitionerId(adviceSaveDto.getPractitionerId()); // 开方医生
@@ -346,13 +364,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 medicationRequest.setDose(adviceSaveDto.getDose()); // 单次剂量
                 medicationRequest.setDoseUnitCode(adviceSaveDto.getDoseUnitCode()); // 剂量单位
                 medicationRequest.setDispensePerDuration(adviceSaveDto.getDispensePerDuration()); // 每次发药供应天数
-                medicationRequest.setSkinTestFlag(adviceSaveDto.getSkinTestFlag()); // 皮试标记
                 medicationRequest.setPackageId(adviceSaveDto.getPackageId()); // 组套id
                 medicationRequest.setContentJson(adviceSaveDto.getContentJson()); // 请求内容json
                 medicationRequest.setYbClassEnum(adviceSaveDto.getYbClassEnum());// 类别医保编码
                 medicationRequest.setSkinTestFlag(adviceSaveDto.getSkinTestFlag()); // 皮试标志
                 medicationRequest.setInfusionFlag(adviceSaveDto.getInjectFlag()); // 输液标志
-
+                medicationRequest.setSortNumber(adviceSaveDto.getSortNumber()); // 排序号
             }
             iMedicationRequestService.saveOrUpdate(medicationRequest);
             // 第一次保存时,如果药品请求为皮试或输液,自动开立对应绑定的诊疗请求
@@ -361,7 +378,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                     || Whether.YES.getValue().equals(adviceSaveDto.getInjectFlag()))) {
                     // 查询已经存在的当前数据
                     medicationRequest = iMedicationRequestService.getById(medicationRequest.getId());
-                    this.generateActRequestByMedicationFlag(medicationRequest, organizationId, adviceSaveDto);
+                    adviceUtils.generateActRequestByMedicationFlag(medicationRequest, organizationId, adviceSaveDto);
                 }
             }
             // 保存时 处理药品发放 和 保存药品费用项
@@ -371,7 +388,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 // 保存药品费用项
                 chargeItem = new ChargeItem();
                 chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
-                chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
+                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
                 chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
@@ -398,300 +415,80 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 iChargeItemService.saveOrUpdate(chargeItem);
             }
         }
-        // 签发时,如果是输液药品,生成仅用于执行的 "静脉输液" request(同一个组号生成一个)
-        if (is_sign) {
-            List<AdviceSaveDto> filteredList = insertOrUpdateList.stream()
+        // 签发时
+        /*    if (is_sign) {
+            // --------------------如果是输液药品,生成仅用于执行的 "静脉输液" request(同一个组号生成一个)
+            List<AdviceSaveDto> injectList = insertOrUpdateList.stream()
                 .filter(dto -> Whether.YES.getValue().equals(dto.getInjectFlag()) && dto.getGroupId() != null) // 过滤条件：输液且groupId不为null
                 .collect(Collectors.groupingBy(AdviceSaveDto::getGroupId)) // 按groupId分组
                 .values().stream().map(group -> group.get(0)).collect(Collectors.toList()); // 取每组中的第一个元素
-            AdviceBaseDto adviceBaseDto;
             // 静脉输液的诊疗定义id
             Long intravenousInfusionDefinitionId = iActivityDefinitionService
                 .getAppointActivityDefinitionId(CommonConstants.BusinessName.INTRAVENOUS_INFUSION);
             // 对应的诊疗医嘱信息
-            adviceBaseDto = new AdviceBaseDto();
-            adviceBaseDto.setAdviceDefinitionId(intravenousInfusionDefinitionId); // 医嘱定义id
-            AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService
-                .getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1, 1, Whether.NO.getValue())
-                .getRecords().get(0);
-
-            ServiceRequest serviceRequest;
-            for (AdviceSaveDto adviceSaveDto : filteredList) {
+            AdviceBaseDto injectQueryAdviceBaseDto = new AdviceBaseDto();
+            injectQueryAdviceBaseDto.setAdviceDefinitionId(intravenousInfusionDefinitionId); // 医嘱定义id
+            AdviceBaseDto injectAdviceBaseDto = this.getAdviceBaseInfo(injectQueryAdviceBaseDto, null, null, null,
+                organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+            ServiceRequest serviceRequestInjectExe;
+            for (AdviceSaveDto adviceSaveDto : injectList) {
                 Long groupId = adviceSaveDto.getGroupId();// 组号
                 Integer quantity = adviceSaveDto.getExecuteNum();// 执行次数
                 // 生成诊疗请求
-                serviceRequest = new ServiceRequest();
-                serviceRequest.setStatusEnum(RequestStatus.IN_PROGRESS.getValue());// 请求状态,待执行
-                serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
-                serviceRequest.setQuantity(quantity); // 请求数量
-                serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
-                serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
-                serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
-                serviceRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
-                serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
-                serviceRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
-                serviceRequest.setAuthoredTime(curDate); // 请求签发时间
-                serviceRequest.setOrgId(organizationId); // 执行科室
-                serviceRequest.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
-                serviceRequest.setBasedOnId(adviceSaveDto.getRequestId());
-                serviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                serviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                serviceRequest.setGroupId(groupId);// 组号
-                iServiceRequestService.save(serviceRequest);
+                serviceRequestInjectExe = new ServiceRequest();
+                serviceRequestInjectExe.setStatusEnum(RequestStatus.COMPLETED.getValue());// 请求状态,已完成
+                serviceRequestInjectExe
+                    .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                serviceRequestInjectExe.setQuantity(quantity); // 请求数量
+                serviceRequestInjectExe.setUnitCode(injectAdviceBaseDto.getUnitCode()); // 请求单位编码
+                serviceRequestInjectExe.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
+                serviceRequestInjectExe.setActivityId(injectAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
+                serviceRequestInjectExe.setPatientId(adviceSaveDto.getPatientId()); // 患者
+                serviceRequestInjectExe.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
+                serviceRequestInjectExe.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+                serviceRequestInjectExe.setAuthoredTime(curDate); // 请求签发时间
+                serviceRequestInjectExe.setOrgId(organizationId); // 执行科室
+                serviceRequestInjectExe.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
+                serviceRequestInjectExe.setBasedOnId(adviceSaveDto.getRequestId());
+                serviceRequestInjectExe.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                serviceRequestInjectExe.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                serviceRequestInjectExe.setGroupId(groupId);// 组号
+                iServiceRequestService.save(serviceRequestInjectExe);
             }
-        }
-    }
-
-    /**
-     * 药品请求为皮试或输液,开立对应的请求及账单
-     */
-    private void generateActRequestByMedicationFlag(MedicationRequest medicationRequest, Long organizationId,
-        AdviceSaveDto adviceSaveDto) {
-        // 当前登录账号的科室id
-        Long orgId = SecurityUtils.getLoginUser().getOrgId();
-        // 皮试
-        boolean isSkinTest = Whether.YES.getValue().equals(medicationRequest.getSkinTestFlag());
-        // 输液
-        boolean isInfusion = Whether.YES.getValue().equals(medicationRequest.getInfusionFlag());
-        // 当前时间
-        Date curDate = new Date();
-        AdviceBaseDto adviceBaseDto;
-        ServiceRequest serviceRequest;
-        ServiceRequest serviceRequestUseExe;
-        AdviceBaseDto activityAdviceBaseDto;
-        Integer quantity;
-        ChargeItem chargeItem;
-        DeviceRequest deviceRequest;
-        // 生成皮试检查对应的请求和账单;生成皮试检查这个诊疗自身的请求,以及皮试检查诊疗绑定的耗材(包括发放)
-        if (isSkinTest) {
-            quantity = 1; // 请求数量
+            // --------------------如果是皮试药品,生成仅用于执行的 "皮试检查" request(每个药品生成一个)
+            List<AdviceSaveDto> skinTestList = insertOrUpdateList.stream()
+                .filter(dto -> Whether.YES.getValue().equals(dto.getSkinTestFlag())).collect(Collectors.toList());
             // 皮试检查的诊疗定义id
             Long skinTestInspectionDefinitionId = iActivityDefinitionService
                 .getAppointActivityDefinitionId(CommonConstants.BusinessName.SKIN_TEST_INSPECTION);
-            if (skinTestInspectionDefinitionId != null) {
-                adviceBaseDto = new AdviceBaseDto();
-                adviceBaseDto.setAdviceDefinitionId(skinTestInspectionDefinitionId); // 医嘱定义id
-                // 对应的诊疗医嘱信息
-                activityAdviceBaseDto = iDoctorStationAdviceAppService
-                    .getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1, 1, Whether.NO.getValue())
-                    .getRecords().get(0);
-                if (activityAdviceBaseDto != null) {
-                    // 费用定价
-                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
-                    if (advicePriceDto != null) {
-                        // 生成诊疗请求,用于执行
-                        serviceRequestUseExe = new ServiceRequest();
-                        serviceRequestUseExe.setStatusEnum(RequestStatus.IN_PROGRESS.getValue());// 请求状态,待执行
-                        serviceRequestUseExe
-                            .setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
-                        serviceRequestUseExe.setQuantity(quantity); // 请求数量
-                        serviceRequestUseExe.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
-                        serviceRequestUseExe.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
-                        serviceRequestUseExe.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
-                        serviceRequestUseExe.setPatientId(medicationRequest.getPatientId()); // 患者
-                        serviceRequestUseExe.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
-                        serviceRequestUseExe.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                        serviceRequestUseExe.setAuthoredTime(curDate); // 请求签发时间
-                        serviceRequestUseExe.setOrgId(organizationId); // 执行科室
-                        serviceRequestUseExe.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
-                        serviceRequestUseExe.setBasedOnId(medicationRequest.getId());
-                        serviceRequestUseExe.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                        serviceRequestUseExe.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                        iServiceRequestService.save(serviceRequestUseExe);
-
-                        // 生成诊疗请求,用于收费
-                        serviceRequest = new ServiceRequest();
-                        serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态,默认已发送
-                        serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
-                        serviceRequest.setQuantity(quantity); // 请求数量
-                        serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
-                        serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
-                        serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
-                        serviceRequest.setPatientId(medicationRequest.getPatientId()); // 患者
-                        serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
-                        serviceRequest.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                        serviceRequest.setAuthoredTime(curDate); // 请求签发时间
-                        serviceRequest.setOrgId(organizationId); // 执行科室
-                        serviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                        serviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                        iServiceRequestService.save(serviceRequest);
-                        // 生成账单
-                        chargeItem = new ChargeItem();
-                        chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
-                        chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 待收费
-                        chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                        chargeItem.setPatientId(medicationRequest.getPatientId()); // 患者
-                        chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
-                        chargeItem.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                        chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
-                        chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
-                        chargeItem.setRequestingOrgId(orgId); // 开立科室
-                        chargeItem.setEnteredDate(curDate); // 开立时间
-                        chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
-                        chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
-                        chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
-                        chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
-                        chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
-                        chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                        chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-
-                        chargeItem.setQuantityValue(quantity); // 数量
-                        chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
-                        chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
-                        // 计算总价,保留4位小数
-                        BigDecimal qty = new BigDecimal(quantity);
-                        chargeItem
-                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-                        iChargeItemService.save(chargeItem);
-                    }
-                }
-                // 查询皮试检查绑定的耗材id及请求数量
-                List<ActivityDeviceDto> tmpActivityList = outpatientRegistrationAppMapper.getTmpActivityList(
-                    String.valueOf(skinTestInspectionDefinitionId), CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-                for (ActivityDeviceDto activityDeviceDto : tmpActivityList) {
-                    quantity = activityDeviceDto.getQuantity(); // 请求数量
-                    adviceBaseDto = new AdviceBaseDto();
-                    adviceBaseDto.setAdviceDefinitionId(activityDeviceDto.getDevActId());
-                    // 对应的耗材医嘱信息
-                    activityAdviceBaseDto = iDoctorStationAdviceAppService
-                        .getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1, 1, Whether.NO.getValue())
-                        .getRecords().get(0);
-                    // 库存信息
-                    AdviceInventoryDto adviceInventoryDto = activityAdviceBaseDto.getInventoryList().get(0);
-                    // 价格信息
-                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
-                    if (adviceInventoryDto != null && advicePriceDto != null) {
-                        // 耗材请求
-                        deviceRequest = new DeviceRequest();
-                        deviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue()); // 请求状态,已发送
-                        deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 10));
-                        deviceRequest.setQuantity(quantity); // 请求数量
-                        deviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
-                        deviceRequest.setLotNumber(adviceInventoryDto.getLotNumber());// 产品批号
-                        deviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
-                        deviceRequest.setDeviceDefId(activityAdviceBaseDto.getAdviceDefinitionId());// 耗材定义id
-                        deviceRequest.setPatientId(medicationRequest.getPatientId()); // 患者
-                        deviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
-                        deviceRequest.setOrgId(organizationId);// 开方人科室
-                        deviceRequest.setReqAuthoredTime(curDate); // 请求开始时间
-                        // 发放耗材房
-                        deviceRequest.setPerformLocation(activityAdviceBaseDto.getLocationId());
-                        deviceRequest.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                        deviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                        deviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                        iDeviceRequestService.save(deviceRequest);
-                        // 耗材发放
-                        iDeviceDispenseService.handleDeviceDispense(deviceRequest, DbOpType.INSERT.getCode());
-                        // 耗材账单
-                        chargeItem = new ChargeItem();
-                        chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
-                        chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
-                        chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
-                        chargeItem.setPatientId(medicationRequest.getPatientId()); // 患者
-                        chargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 类型
-                        chargeItem.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                        chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
-                        chargeItem.setDefDetailId(advicePriceDto.getDefinitionDetailId()); // 定价子表主键
-                        chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
-                        chargeItem.setEnteredDate(curDate); // 开立时间
-                        chargeItem.setServiceTable(CommonConstants.TableName.WOR_DEVICE_REQUEST);// 医疗服务类型
-                        chargeItem.setServiceId(deviceRequest.getId()); // 医疗服务ID
-                        chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
-                        chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
-                        chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
-                        chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                        chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-
-                        chargeItem.setQuantityValue(quantity); // 数量
-                        chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
-                        chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
-                        // 计算总价,保留4位小数
-                        BigDecimal qty = new BigDecimal(quantity);
-                        chargeItem
-                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-                        iChargeItemService.save(chargeItem);
-                    }
-                }
-            }
-        }
-        // 生成用法(输液)绑定的诊疗对应的请求和账单
-        if (isInfusion) {
-            // 分组id
-            Long groupId = medicationRequest.getGroupId();
-            // 执行次数
-            Integer executeNum = medicationRequest.getExecuteNum();
-            // 用法
-            String methodCode = medicationRequest.getMethodCode();
-            // 查询用法绑定的诊疗信息
-            List<ActivityDeviceDto> tmpActivityList = outpatientRegistrationAppMapper.getTmpActivityList(methodCode,
-                CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
-            for (ActivityDeviceDto activityDeviceDto : tmpActivityList) {
-                quantity = activityDeviceDto.getQuantity() * executeNum; // 请求数量
-                adviceBaseDto = new AdviceBaseDto();
-                adviceBaseDto.setAdviceDefinitionId(activityDeviceDto.getDevActId());
-                // 对应的诊疗医嘱信息
-                activityAdviceBaseDto = iDoctorStationAdviceAppService
-                    .getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1, 1, Whether.NO.getValue())
-                    .getRecords().get(0);
-                if (activityAdviceBaseDto != null) {
-                    // 费用定价
-                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
-                    if (advicePriceDto != null) {
-                        // 同一个组号,只生成一次请求和账单
-                        ServiceRequest one = iServiceRequestService
-                            .getOne(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getGroupId, groupId));
-                        if (one == null) {
-                            // 生成诊疗请求
-                            serviceRequest = new ServiceRequest();
-                            serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态,已发送
-                            serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
-                            serviceRequest.setQuantity(quantity); // 请求数量
-                            serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
-                            serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
-                            serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
-                            serviceRequest.setPatientId(medicationRequest.getPatientId()); // 患者
-                            serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
-                            serviceRequest.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                            serviceRequest.setAuthoredTime(curDate); // 请求签发时间
-                            serviceRequest.setOrgId(organizationId); // 执行科室
-                            serviceRequest.setGroupId(groupId); // 分组id
-                            serviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                            serviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                            iServiceRequestService.save(serviceRequest);
-
-                            chargeItem = new ChargeItem();
-                            chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
-                            chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 待收费
-                            chargeItem
-                                .setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                            chargeItem.setPatientId(medicationRequest.getPatientId()); // 患者
-                            chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
-                            chargeItem.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
-                            chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
-                            chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
-                            chargeItem.setRequestingOrgId(orgId); // 开立科室
-                            chargeItem.setEnteredDate(curDate); // 开立时间
-                            chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
-                            chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
-                            chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
-                            chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
-                            chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
-                            chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
-                            chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-
-                            chargeItem.setQuantityValue(quantity); // 数量
-                            chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
-                            chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
-                            // 计算总价,保留4位小数
-                            BigDecimal qty = new BigDecimal(quantity);
-                            chargeItem.setTotalPrice(
-                                qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-                            iChargeItemService.saveOrUpdate(chargeItem);
-                        }
-                    }
-                }
+            AdviceBaseDto skinTestQueryAdviceBaseDto = new AdviceBaseDto();
+            skinTestQueryAdviceBaseDto.setAdviceDefinitionId(skinTestInspectionDefinitionId); // 医嘱定义id
+            // 对应的诊疗医嘱信息
+            AdviceBaseDto skinTestAdviceBaseDto = this.getAdviceBaseInfo(skinTestQueryAdviceBaseDto, null, null, null,
+                organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+            ServiceRequest serviceRequestSkinTestExe;
+            for (AdviceSaveDto adviceSaveDto : skinTestList) {
+                // 生成诊疗请求,用于执行
+                serviceRequestSkinTestExe = new ServiceRequest();
+                serviceRequestSkinTestExe.setStatusEnum(RequestStatus.COMPLETED.getValue());// 请求状态,已完成
+                serviceRequestSkinTestExe
+                    .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                serviceRequestSkinTestExe.setQuantity(1); // 请求数量
+                serviceRequestSkinTestExe.setUnitCode(skinTestAdviceBaseDto.getUnitCode()); // 请求单位编码
+                serviceRequestSkinTestExe.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
+                serviceRequestSkinTestExe.setActivityId(skinTestAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
+                serviceRequestSkinTestExe.setPatientId(adviceSaveDto.getPatientId()); // 患者
+                serviceRequestSkinTestExe.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
+                serviceRequestSkinTestExe.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+                serviceRequestSkinTestExe.setAuthoredTime(curDate); // 请求签发时间
+                serviceRequestSkinTestExe.setOrgId(organizationId); // 执行科室
+                serviceRequestSkinTestExe.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
+                serviceRequestSkinTestExe.setBasedOnId(adviceSaveDto.getRequestId());
+                serviceRequestSkinTestExe.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                serviceRequestSkinTestExe.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                iServiceRequestService.save(serviceRequestSkinTestExe);
             }
-        }
+        }*/
     }
 
     /**
@@ -729,12 +526,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             deviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
             // 只有保存时才处理的字段属性
             if (is_save) {
-                deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 10));
+                deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
                 deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
                 deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
                 deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());// 产品批号
 
-                deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型,默认-门诊
+                deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型
                 deviceRequest.setDeviceDefId(adviceSaveDto.getAdviceDefinitionId());// 耗材定义id
                 deviceRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 deviceRequest.setRequesterId(adviceSaveDto.getPractitionerId()); // 开方医生
@@ -760,7 +557,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 // 保存耗材费用项
                 chargeItem = new ChargeItem();
                 chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
-                chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
+                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -791,7 +588,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     /**
      * 处理诊疗
      */
-    private void handService(List<AdviceSaveDto> activityList, Date curDate, String adviceOpType, Long organizationId) {
+    private void handService(List<AdviceSaveDto> activityList, Date curDate, String adviceOpType, Long organizationId,
+        String signCode) {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 保存操作
@@ -819,13 +617,16 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             serviceRequest = new ServiceRequest();
             serviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id
             serviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态
+            if (is_sign) {
+                serviceRequest.setSignCode(signCode);
+            }
             // 只有保存时才处理的字段属性
             if (is_save) {
-                serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
+                serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
                 serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
                 serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
 
-                serviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型,默认-门诊
+                serviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型
                 serviceRequest.setActivityId(adviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
                 serviceRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 serviceRequest.setRequesterId(adviceSaveDto.getPractitionerId()); // 开方医生
@@ -845,7 +646,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 chargeItem = new ChargeItem();
                 chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
-                chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
+                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -868,114 +669,35 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
 
                 iChargeItemService.saveOrUpdate(chargeItem);
-            }
-            // 第一次保存时,处理诊疗套餐的子项信息
-            if (adviceSaveDto.getRequestId() == null) {
-                ActivityDefinition activityDefinition =
-                    iActivityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
-                String childrenJson = activityDefinition.getChildrenJson();
-                if (is_save && childrenJson != null) {
-                    serviceRequest = iServiceRequestService.getById(adviceSaveDto.getRequestId());
-                    this.handleActivityChild(serviceRequest, childrenJson, organizationId, adviceSaveDto);
-                }
-            }
-        }
-    }
 
-    /**
-     * 处理诊疗子项信息
-     * 
-     * @param mainServiceRequest 主项的诊疗请求
-     * @param childrenJson 诊疗子项JSON
-     * @param organizationId 患者挂号对应的科室id
-     * @param adviceSaveDto 医嘱保存信息
-     */
-    private void handleActivityChild(ServiceRequest mainServiceRequest, String childrenJson, Long organizationId,
-        AdviceSaveDto adviceSaveDto) {
-        // 当前登录账号的科室id
-        Long orgId = SecurityUtils.getLoginUser().getOrgId();
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            // 将JSON字符串转换为List<ActivityChildJsonDto>
-            List<ActivityChildJsonDto> activityChildJsonDtoList =
-                objectMapper.readValue(childrenJson, new TypeReference<>() {});
-            // 创建子项的诊疗请求
-            Long adviceDefinitionId; // 诊疗医嘱定义ID
-            Integer quantity; // 子项请求数量
-            List<ChargeItem> chargeItemList = new ArrayList<>(); // 子项账单集合
-            ServiceRequest serviceRequest;
-            ChargeItem chargeItem;
-            AdviceBaseDto adviceBaseDto;
-            // 当前时间
-            Date curDate = new Date();
-            for (ActivityChildJsonDto activityChildJsonDto : activityChildJsonDtoList) {
-                adviceDefinitionId = activityChildJsonDto.getAdviceDefinitionId();
-                quantity = activityChildJsonDto.getChildrenRequestNum();
-                adviceBaseDto = new AdviceBaseDto();
-                adviceBaseDto.setAdviceDefinitionId(adviceDefinitionId);
-                // 对应的子项诊疗医嘱信息
-                AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService
-                    .getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1, 1, Whether.NO.getValue())
-                    .getRecords().get(0);
-                if (activityAdviceBaseDto != null) {
-                    // 费用定价
-                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
-                    if (advicePriceDto != null) {
-                        // 生成诊疗请求
-                        serviceRequest = new ServiceRequest();
-                        serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态,默认已完成
-                        serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
-                        serviceRequest.setQuantity(quantity); // 请求数量
-                        serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
-                        serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
-                        serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
-                        serviceRequest.setPatientId(mainServiceRequest.getPatientId()); // 患者
-                        serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
-                        serviceRequest.setEncounterId(mainServiceRequest.getEncounterId()); // 就诊id
-                        serviceRequest.setAuthoredTime(curDate); // 请求签发时间
-                        serviceRequest.setOrgId(organizationId); // 执行科室
-
-                        iServiceRequestService.save(serviceRequest);
-
-                        // 生成账单
-                        chargeItem = new ChargeItem();
-                        chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue());
-                        chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 待收费
-                        chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                        chargeItem.setPatientId(mainServiceRequest.getPatientId()); // 患者
-                        chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
-                        chargeItem.setEncounterId(mainServiceRequest.getEncounterId()); // 就诊id
-                        chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
-                        chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
-                        chargeItem.setRequestingOrgId(orgId); // 开立科室
-                        chargeItem.setEnteredDate(curDate); // 开立时间
-                        chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
-                        chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
-                        chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
-                        chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
-                        chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
-
-                        chargeItem.setQuantityValue(quantity); // 数量
-                        chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
-                        chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
-                        // 计算总价,保留4位小数
-                        BigDecimal qty = new BigDecimal(quantity);
-                        chargeItem
-                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-
-                        chargeItemList.add(chargeItem);
+                // 第一次保存时,处理诊疗套餐的子项信息
+                if (adviceSaveDto.getRequestId() == null) {
+                    ActivityDefinition activityDefinition =
+                        iActivityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
+                    String childrenJson = activityDefinition.getChildrenJson();
+                    if (childrenJson != null) {
+                        // 诊疗子项参数类
+                        ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
+                        activityChildrenJsonParams.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
+                        activityChildrenJsonParams.setPatientId(serviceRequest.getPatientId()); // 患者
+                        activityChildrenJsonParams.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
+                        activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
+                        activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
+                        adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
                     }
                 }
             }
-            // 更新主项账单的 children_json 字段
-            String chargeItemChildrenJson = objectMapper.writeValueAsString(chargeItemList);
-            ChargeItem mainChargeItem = new ChargeItem();
-            mainChargeItem.setId(adviceSaveDto.getChargeItemId()); // 主键
-            mainChargeItem.setChildrenJson(chargeItemChildrenJson); // 子项json
-            iChargeItemService.updateById(mainChargeItem);
 
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
+            // 只有在签发时
+            if (is_sign) {
+                // 发送跨系统申请
+                adviceSaveDto.setRequestId(serviceRequest.getId());
+                try {
+                    doctorStationSendApplyUtil.sendCrossSystemApply(adviceSaveDto, organizationId, curDate);
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
         }
     }
 
@@ -1041,10 +763,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             });
             List<Long> chargeItemIdList = chargeItemList.stream().map(ChargeItem::getId).collect(Collectors.toList());
             // 根据id更新收费项目状态
-            iChargeItemService.updatePaymentStatus(chargeItemIdList, ChargeItemStatus.PLANNED.getValue());// 撤回后需要繼續帶簽發
+            iChargeItemService.updatePaymentStatus(chargeItemIdList, ChargeItemStatus.DRAFT.getValue());// 撤回后需要更新为草稿
             if (!medReqIdList.isEmpty()) {
                 // 根据请求id更新请求状态
-                iMedicationRequestService.updateDraftStatusBatch(medReqIdList);
+                iMedicationRequestService.updateDraftStatusBatch(medReqIdList, null, null);
             }
             if (!devReqIdList.isEmpty()) {
                 // 根据请求id更新请求状态
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAllergyIntolAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAllergyIntolAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAllergyIntolAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAllergyIntolAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
similarity index 42%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
index 048ccd13..c99cf67e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
@@ -1,5 +1,7 @@
 package com.openhis.web.doctorstation.appservice.impl;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -7,14 +9,18 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.domain.EncounterDiagnosis;
+import com.openhis.administration.service.IChargeItemService;
 import com.openhis.administration.service.IEncounterDiagnosisService;
 import com.openhis.clinical.domain.Condition;
 import com.openhis.clinical.domain.ConditionDefinition;
@@ -27,11 +33,14 @@ import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationChineseMedicalAppService;
 import com.openhis.web.doctorstation.dto.*;
 import com.openhis.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
+import com.openhis.workflow.service.IActivityDefinitionService;
 
 /**
  * 医生站-中医 应用实现类
@@ -54,6 +63,18 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
     @Resource
     IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
 
+    @Resource
+    IMedicationRequestService iMedicationRequestService;
+
+    @Resource
+    IMedicationDispenseService iMedicationDispenseService;
+
+    @Resource
+    IActivityDefinitionService iActivityDefinitionService;
+
+    @Resource
+    IChargeItemService iChargeItemService;
+
     @Resource
     AssignSeqUtil assignSeqUtil;
 
@@ -147,33 +168,36 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         Long encounterId = saveDiagnosisParam.getEncounterId();
         // 诊断定义集合
         List<SaveDiagnosisChildParam> diagnosisChildList = saveDiagnosisParam.getDiagnosisChildList();
-        // 先删除再保存 (中医)
-        iEncounterDiagnosisService.deleteEncounterDiagnosisInfos(encounterId);
         // 保存诊断管理
         Condition condition;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
             condition = new Condition();
+            condition.setId(saveDiagnosisChildParam.getConditionId());
             condition.setVerificationStatusEnum(saveDiagnosisChildParam.getVerificationStatusEnum());
             condition.setPatientId(patientId);
             condition.setDefinitionId(saveDiagnosisChildParam.getDefinitionId());
             condition.setYbNo(saveDiagnosisChildParam.getYbNo());
             condition.setTcmFlag(Whether.YES.getValue());// 中医标识
-            // 返回诊断id
-            Long conditionId = iConditionService.saveConditionByDoctor(condition);
-            saveDiagnosisChildParam.setConditionId(conditionId);
+            condition.setRecordedDatetime(new Date());
+            condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
+            iConditionService.saveOrUpdate(condition);
+            saveDiagnosisChildParam.setConditionId(condition.getId());
         }
         // 保存就诊诊断
         EncounterDiagnosis encounterDiagnosis;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
             encounterDiagnosis = new EncounterDiagnosis();
+            encounterDiagnosis.setId(saveDiagnosisChildParam.getEncounterDiagnosisId());
             encounterDiagnosis.setEncounterId(encounterId);
             encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
             encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());
             encounterDiagnosis.setDiagSrtNo(saveDiagnosisChildParam.getDiagSrtNo()); // 排序号
             encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
+            encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
+            encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
             encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识
             encounterDiagnosis.setSyndromeGroupNo(saveDiagnosisChildParam.getSyndromeGroupNo());// 中医证候组号
-            iEncounterDiagnosisService.save(encounterDiagnosis);
+            iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
         }
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"中医诊断"}));
     }
@@ -224,7 +248,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         adviceBaseDto.setAdviceType(1); // 医嘱类型为药品
         adviceBaseDto.setCategoryCode(medCategoryCode.CHINESE_HERBAL_MEDICINE.getValue());// 中草药
         return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId,
-            adviceDefinitionIdParamList, organizationId, pageNo, pageSize, pricingFlag);
+            adviceDefinitionIdParamList, organizationId, pageNo, pageSize, pricingFlag, List.of(1, 2, 3));
     }
 
     /**
@@ -244,6 +268,8 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         boolean is_sign = AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType);
         // 当前时间
         Date curDate = new Date();
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 患者挂号对应的科室id
         Long organizationId = adviceSaveParam.getOrganizationId();
         // 保存时,校验库存
@@ -260,31 +286,271 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         MedicationRequest medicationRequest;
         // 费用项
         ChargeItem chargeItem;
+        // 新增 + 修改
+        List<AdviceSaveDto> insertOrUpdateList =
+            medicineList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
+                || DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList());
+        // 删除
+        List<AdviceSaveDto> deleteList = medicineList.stream()
+            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+        for (AdviceSaveDto adviceSaveDto : deleteList) {
+            iMedicationRequestService.removeById(adviceSaveDto.getRequestId());
+            // 删除已经产生的药品发放信息
+            iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
+            // 删除费用项
+            iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.MED_MEDICATION_REQUEST,
+                adviceSaveDto.getRequestId());
+        }
         // 是否代煎
         Integer sufferingFlag = adviceSaveParam.getSufferingFlag();
-        for (AdviceSaveDto adviceSaveDto : medicineList) {
+
+        if (is_sign) {
+            // 按groupId分组
+            Map<Long, List<AdviceSaveDto>> groupMap =
+                insertOrUpdateList.stream().collect(Collectors.groupingBy(AdviceSaveDto::getGroupId));
+            // 为每个分组生成唯一的处方号
+            groupMap.forEach((groupId, groupList) -> {
+                String prescriptionNo =
+                    assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_CHINESE_HERBAL_MEDICINE.getPrefix(), 8);
+                groupList.forEach(dto -> dto.setPrescriptionNo(prescriptionNo));
+            });
+        }
+
+        // 医嘱签发编码
+        String signCode = assignSeqUtil.getSeq(AssignSeqEnum.ADVICE_SIGN.getPrefix(), 10);
+        for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
             // 中药付数
             Integer chineseHerbsDoseQuantity = adviceSaveDto.getChineseHerbsDoseQuantity();
             medicationRequest = new MedicationRequest();
             medicationRequest.setTcmFlag(Whether.YES.getValue());// 中医标识
             medicationRequest.setId(adviceSaveDto.getRequestId()); // 主键id
             medicationRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
+            if (is_sign) {
+                medicationRequest.setGroupId(adviceSaveDto.getGroupId()); // 组号
+                medicationRequest.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
+                medicationRequest.setSignCode(signCode);
+            }
             // 只有保存时才处理的字段属性
             if (is_save) {
-                medicationRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 10));
+                medicationRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
                 medicationRequest.setChineseHerbsDoseQuantity(chineseHerbsDoseQuantity); // 中药付数
                 medicationRequest.setSufferingFlag(sufferingFlag); // 代煎标识
                 medicationRequest.setQuantity(adviceSaveDto.getQuantity() * chineseHerbsDoseQuantity); // 请求数量
+                medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
+                medicationRequest.setLotNumber(adviceSaveDto.getLotNumber()); // 产品批号
+                medicationRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型
+                medicationRequest.setMedicationId(adviceSaveDto.getAdviceDefinitionId());// 医嘱定义id
+                medicationRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
+                medicationRequest.setPractitionerId(adviceSaveDto.getPractitionerId()); // 开方医生
+                medicationRequest.setOrgId(adviceSaveDto.getFounderOrgId()); // 开方人科室
+                medicationRequest.setReqAuthoredTime(curDate); // 请求开始时间
+                // 发放药房
+                medicationRequest.setPerformLocation(adviceSaveDto.getLocationId());
+                medicationRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+                medicationRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                medicationRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                medicationRequest.setTherapyEnum(adviceSaveDto.getTherapyEnum()); // 治疗类型,默认-临时
+                medicationRequest.setMethodCode(adviceSaveDto.getMethodCode()); // 用法
+                medicationRequest.setRateCode(adviceSaveDto.getRateCode()); // 用药频次
+                medicationRequest.setDose(adviceSaveDto.getDose()); // 单次剂量
+                medicationRequest.setDoseUnitCode(adviceSaveDto.getDoseUnitCode()); // 剂量单位
+                // medicationRequest.setDispensePerDuration(adviceSaveDto.getDispensePerDuration()); // 每次发药供应天数
+                medicationRequest.setContentJson(adviceSaveDto.getContentJson()); // 请求内容json
+                medicationRequest.setYbClassEnum(adviceSaveDto.getYbClassEnum());// 类别医保编码
+            }
+            iMedicationRequestService.saveOrUpdate(medicationRequest);
+            if (is_save) {
+                // 处理药品发放
+                iMedicationDispenseService.handleMedicationDispense(medicationRequest, adviceSaveDto.getDbOpType());
+                // 保存药品费用项
+                chargeItem = new ChargeItem();
+                chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
+                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 默认-草稿
+                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
+                chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
+                chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
+                chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
+                chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+                chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
+                chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
+                chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
+                chargeItem.setRequestingOrgId(orgId); // 开立科室
+                chargeItem.setEnteredDate(curDate); // 开立时间
+                chargeItem.setServiceTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);// 医疗服务类型
+                chargeItem.setServiceId(medicationRequest.getId()); // 医疗服务ID
+                chargeItem.setProductTable(adviceSaveDto.getAdviceTableName());// 产品所在表
+                chargeItem.setProductId(adviceSaveDto.getAdviceDefinitionId());// 收费项id
+                chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+                chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+
+                chargeItem.setQuantityValue(medicationRequest.getQuantity()); // 数量
+                chargeItem.setQuantityUnit(medicationRequest.getUnitCode()); // 单位
+                chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
+                // 计算总价,保留4位小数
+                BigDecimal qty = new BigDecimal(chargeItem.getQuantityValue());
+                chargeItem.setTotalPrice(qty.multiply(chargeItem.getUnitPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
 
+                chargeItem.setTcmFlag(Whether.YES.getValue());// 中医标识
+                iChargeItemService.saveOrUpdate(chargeItem);
             }
+        }
+        // 就诊id
+        Long encounterId = medicineList.get(0).getEncounterId();
+        // 患者id
+        Long patientId = medicineList.get(0).getPatientId();
+        // 账户id
+        Long accountId = medicineList.get(0).getAccountId();
+        // 诊断ID
+        Long conditionId = medicineList.get(0).getConditionId();
+        // 就诊诊断id
+        Long encounterDiagnosisId = medicineList.get(0).getEncounterDiagnosisId();
+        // 中药代煎定义id
+        Long sufferingDefinitionId =
+            iActivityDefinitionService.getAppointActivityDefinitionId(CommonConstants.BusinessName.SUFFERING_TCM);
+        // 签发时,生成中药代煎的账单,只生成一次
+        if (Whether.YES.getValue().equals(sufferingFlag) && is_sign) {
+            Integer quantity = 1; // 请求数量
 
-            // 代煎,生成中药代煎的request,及对应的账单
-            if (Whether.YES.getValue().equals(sufferingFlag)) {
+            AdviceBaseDto adviceBaseDto = new AdviceBaseDto();
+            adviceBaseDto.setAdviceDefinitionId(sufferingDefinitionId); // 医嘱定义id
+            // 当前是否已经生成了贵代煎账单
+            ChargeItem one = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getEncounterId, encounterId).eq(ChargeItem::getProductId, sufferingDefinitionId));
+            if (one == null) {
+                // 对应的诊疗医嘱信息
+                AdviceBaseDto activityAdviceBaseDto =
+                    iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1,
+                        1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+                if (activityAdviceBaseDto != null) {
+                    // 费用定价
+                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
+                    if (advicePriceDto != null) {
+                        // 生成账单
+                        chargeItem = new ChargeItem();
+                        chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
+                        chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 草稿
+                        chargeItem.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix(), 4));
+                        chargeItem.setPatientId(patientId); // 患者
+                        chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
+                        chargeItem.setEncounterId(encounterId); // 就诊id
+                        chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
+                        chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
+                        chargeItem.setRequestingOrgId(orgId); // 开立科室
+                        chargeItem.setEnteredDate(curDate); // 开立时间
+                        chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
+                        chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
+                        chargeItem.setAccountId(accountId);// 关联账户ID
+                        chargeItem.setConditionId(conditionId); // 诊断id
+                        chargeItem.setEncounterDiagnosisId(encounterDiagnosisId); // 就诊诊断id
 
+                        chargeItem.setQuantityValue(quantity); // 数量
+                        chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
+                        chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
+                        // 计算总价,保留4位小数
+                        BigDecimal qty = new BigDecimal(quantity);
+                        chargeItem
+                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                        chargeItem.setTcmFlag(Whether.YES.getValue());// 中医标识
+                        iChargeItemService.save(chargeItem);
+                    }
+                }
             }
+        } else if (Whether.NO.getValue().equals(sufferingFlag)) {
+            // 删除中药代煎的账单
+            iChargeItemService.remove(new LambdaQueryWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, encounterId)
+                .eq(ChargeItem::getProductId, sufferingDefinitionId));
+        }
+
+        // 签发时,把草稿状态的账单更新为待收费[中医]
+        if (AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType) && !medicineList.isEmpty()) {
+            // 签发的医嘱id集合
+            List<Long> requestIds = medicineList.stream()
+                .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
+                .collect(Collectors.toList()).stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
+            iChargeItemService.update(new LambdaUpdateWrapper<ChargeItem>()
+                .set(ChargeItem::getStatusEnum, ChargeItemStatus.PLANNED.getValue())
+                .eq(ChargeItem::getEncounterId, encounterId)
+                .eq(ChargeItem::getStatusEnum, ChargeItemStatus.DRAFT.getValue())
+                .in(ChargeItem::getServiceId, requestIds));
         }
 
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"门诊中医医嘱"}));
     }
 
+    /**
+     * 查询中医医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @return 医嘱请求数据
+     */
+    public R<?> getTcmRequestBaseInfo(Long encounterId) {
+        // 当前账号的参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 医嘱请求数据
+        List<RequestBaseDto> requestBaseInfo = doctorStationChineseMedicalAppMapper.getTcmRequestBaseInfo(encounterId,
+            null, CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+            CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode());
+        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
+            // 请求状态
+            requestBaseDto
+                .setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, requestBaseDto.getStatusEnum()));
+            // 收费状态
+            requestBaseDto.setChargeStatus_enumText(
+                EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
+        }
+        return R.ok(requestBaseInfo);
+    }
+
+    /**
+     * 查询中医历史医嘱请求数据
+     *
+     * @param patientId 病人id
+     * @param encounterId 就诊id
+     * @return 中医历史医嘱请求数据
+     */
+    @Override
+    public R<?> getTcmRequestHistoryInfo(Long patientId, Long encounterId) {
+        // 当前账号的参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 医嘱请求数据
+        List<RequestBaseDto> requestBaseInfo =
+            doctorStationChineseMedicalAppMapper.getTcmRequestHistoryInfo(encounterId, patientId,
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode());
+        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
+            // 请求状态
+            requestBaseDto
+                .setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, requestBaseDto.getStatusEnum()));
+            // 收费状态
+            requestBaseDto.setChargeStatus_enumText(
+                EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
+        }
+        return R.ok(requestBaseInfo);
+    }
+
+    /**
+     * 删除中医诊断
+     *
+     * @param syndromeGroupNo 中医证候组号
+     * @return 结果
+     */
+    @Override
+    public R<?> delTcmDiagnosis(String syndromeGroupNo) {
+        // 诊断id集合
+        List<Long> conditionIds = doctorStationChineseMedicalAppMapper.getConditionIds(syndromeGroupNo);
+        if (conditionIds.isEmpty()) {
+            return R.fail("数据已被删除,请刷新页面");
+        }
+        if (doctorStationChineseMedicalAppMapper.getAdviceNumByConditionIds(conditionIds) > 0) {
+            return R.fail("所选诊断已经存在医嘱记录，不允许删除");
+        }
+        for (Long conditionId : conditionIds) {
+            iConditionService.removeById(conditionId);
+            iEncounterDiagnosisService.remove(
+                new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getConditionId, conditionId));
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"就诊诊断信息"}));
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
similarity index 86%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
index 4f18f844..5571296e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
@@ -1,6 +1,7 @@
 package com.openhis.web.doctorstation.appservice.impl;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
@@ -152,13 +153,14 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
      * 查询诊断信息
      *
      * @param searchKey 模糊查询关键字
+     * @param typeCode 用于区分 西医诊断 [1] 中医诊断 [2]
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @return 诊断信息
      */
     @Override
-    public Page<ConditionDefinitionMetadata> getConditionDefinitionMetadataSearchKey(String searchKey, Integer pageNo,
-        Integer pageSize) {
+    public Page<ConditionDefinitionMetadata> getConditionDefinitionMetadataSearchKey(String searchKey, String typeCode,
+        Integer pageNo, Integer pageSize) {
         // 构建查询条件
         ConditionDefinition conditionDefinition = new ConditionDefinition();
         // 查询状态是有效的
@@ -167,6 +169,16 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
             new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null);
         // 设置排序
         queryWrapper.orderByDesc("update_time");
+        // 拼接 用于区分 西医诊断 [1] 中医诊断 [2] 的查询条件
+        if (typeCode != null && !typeCode.isEmpty()) {
+            if ("1".equals(typeCode)) {
+                // 西医诊断：source_enum in (1,2,3,4,7)
+                queryWrapper.in("source_enum", Arrays.asList(1, 2, 3, 4, 7));
+            } else if ("2".equals(typeCode)) {
+                // 中医诊断：source_enum in (5,6)
+                queryWrapper.in("source_enum", Arrays.asList(5, 6));
+            }
+        }
         // 诊断信息
         Page<ConditionDefinitionMetadata> conditionDefinitionMetadataPage = HisPageUtils
             .selectPage(conditionDefinitionMapper, queryWrapper, pageNo, pageSize, ConditionDefinitionMetadata.class);
@@ -189,29 +201,34 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         // 诊断定义集合
         List<SaveDiagnosisChildParam> diagnosisChildList = saveDiagnosisParam.getDiagnosisChildList();
         // 先删除再保存
-        iEncounterDiagnosisService.deleteEncounterDiagnosisInfos(encounterId);
+        // iEncounterDiagnosisService.deleteEncounterDiagnosisInfos(encounterId);
         // 保存诊断管理
         Condition condition;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
             condition = new Condition();
+            condition.setId(saveDiagnosisChildParam.getConditionId());
             condition.setVerificationStatusEnum(saveDiagnosisChildParam.getVerificationStatusEnum());
             condition.setPatientId(patientId);
             condition.setDefinitionId(saveDiagnosisChildParam.getDefinitionId());
             condition.setYbNo(saveDiagnosisChildParam.getYbNo());
-            // 返回诊断id
-            Long conditionId = iConditionService.saveConditionByDoctor(condition);
-            saveDiagnosisChildParam.setConditionId(conditionId);
+            condition.setRecordedDatetime(new Date());
+            condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
+            iConditionService.saveOrUpdate(condition);
+            saveDiagnosisChildParam.setConditionId(condition.getId());
         }
         // 保存就诊诊断
         EncounterDiagnosis encounterDiagnosis;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
             encounterDiagnosis = new EncounterDiagnosis();
+            encounterDiagnosis.setId(saveDiagnosisChildParam.getEncounterDiagnosisId());
             encounterDiagnosis.setEncounterId(encounterId);
             encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
             encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());
             encounterDiagnosis.setDiagSrtNo(saveDiagnosisChildParam.getDiagSrtNo()); // 排序号
             encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
-            iEncounterDiagnosisService.save(encounterDiagnosis);
+            encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
+            encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
+            iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
         }
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"}));
     }
@@ -263,14 +280,14 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         List<DiagnosisQueryDto> encounterDiagnosis = doctorStationDiagnosisAppMapper.getEncounterDiagnosis(encounterId);
         for (DiagnosisQueryDto diagnosis : encounterDiagnosis) {
             // 中医诊断/西医诊断
-//            if (ConditionDefinitionSource.TRADITIONAL_CHINESE_MEDICINE_DIAGNOSIS.getValue()
-//                .equals(diagnosis.getSourceEnum())
-//                || ConditionDefinitionSource.TRADITIONAL_CHINESE_MEDICINE_SYNDROME_CATALOG.getValue()
-//                    .equals(diagnosis.getSourceEnum())) {
-//                diagnosis.setTypeName(CommonConstants.BusinessName.TCM_DIAGNOSIS);
-//            } else {
-//                diagnosis.setTypeName(CommonConstants.BusinessName.WESTERN_MEDICINE_DIAGNOSIS);
-//            }
+            if (ConditionDefinitionSource.TRADITIONAL_CHINESE_MEDICINE_DIAGNOSIS.getValue()
+                .equals(diagnosis.getSourceEnum())
+                || ConditionDefinitionSource.TRADITIONAL_CHINESE_MEDICINE_SYNDROME_CATALOG.getValue()
+                    .equals(diagnosis.getSourceEnum())) {
+                diagnosis.setTypeName(CommonConstants.BusinessName.TCM_DIAGNOSIS);
+            } else {
+                diagnosis.setTypeName(CommonConstants.BusinessName.WESTERN_MEDICINE_DIAGNOSIS);
+            }
             // 验证状态
             diagnosis.setVerificationStatusEnum_enumText(
                 EnumUtils.getInfoByValue(ConditionVerificationStatus.class, diagnosis.getVerificationStatusEnum()));
@@ -286,6 +303,10 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
      */
     @Override
     public R<?> delEncounterDiagnosis(Long conditionId) {
+        // 对应诊断开过医嘱不允许删除
+        if (doctorStationDiagnosisAppMapper.getAdviceNumByConditionId(conditionId) > 0) {
+            return R.fail("所选诊断已经存在医嘱记录，不允许删除");
+        }
         iConditionService.removeById(conditionId);
         iEncounterDiagnosisService
             .remove(new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getConditionId, conditionId));
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
similarity index 51%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
index 431bef6a..8747ad2e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
@@ -7,23 +7,35 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.YbCommonConstants;
 import com.openhis.common.enums.ybenums.YbRxItemTypeCode;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.Contract;
 import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
 import com.openhis.web.doctorstation.mapper.DoctorStationElepPrescriptionMapper;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
 import com.openhis.workflow.domain.ElepMedicationRequest;
+import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.mapper.InventoryItemMapper;
 import com.openhis.workflow.service.IElepMedicationRequestService;
 import com.openhis.ybcatalog.domain.CatalogDrugInfo;
+import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
+import com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper;
 import com.openhis.ybcatalog.service.ICatalogDrugInfoService;
+import com.openhis.ybcatalog.service.ICatalogDrugInfoUsualService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -38,9 +50,10 @@ import com.openhis.web.doctorstation.dto.*;
  * 医生站-电子处方 应用实现类
  */
 @Service
-public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationElepPrescriptionService {
+public class DoctorStationElepPrescriptionServiceImpl extends ServiceImpl<CatalogDrugInfoUsualMapper, CatalogDrugInfoUsual>
+        implements IDoctorStationElepPrescriptionService {
     @Autowired
-    ICatalogDrugInfoService catalogDrugInfoService;
+    ICatalogDrugInfoUsualService catalogDrugInfoUsualService;
     @Autowired
     DoctorStationElepPrescriptionMapper elepPrescriptionMapper;
     @Autowired
@@ -62,9 +75,15 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
 
         // 处方类别
         List<ElepPrescriptionInitDto.commonStatusOption> rxTypeCodeListOptions = Stream.of(YbRxItemTypeCode.values())
-            .map(prescriptionType -> new ElepPrescriptionInitDto.commonStatusOption(prescriptionType.getValue(),
-                prescriptionType.getDescription()))
-            .collect(Collectors.toList());
+                .map(prescriptionType -> new ElepPrescriptionInitDto.commonStatusOption(prescriptionType.getValue(),
+                        prescriptionType.getDescription()))
+                .collect(Collectors.toList());
+//        //获取诊断信息
+//        List<ElepPrescriptionInitConditionDto> conditionInfoList = elepPrescriptionMapper.selectConditionInfo(encounterId);
+//        // 诊断列表
+//        List<ElepPrescriptionInitDto.conditionStatusOption> conditionListOptions = conditionInfoList.stream()
+//                .map(conditionInfo -> new ElepPrescriptionInitDto.conditionStatusOption(conditionInfo.getConditionId(), conditionInfo.getConditionName()))
+//                .collect(Collectors.toList());
 
         initDto.setRxTypeCodeListOptions(rxTypeCodeListOptions);
         return R.ok(initDto);
@@ -73,14 +92,35 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
     /**
      * 获取药品信息
      *
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
+     * @param pageNo    当前页
+     * @param pageSize  每页多少条
+     * @param searchKey 模糊查询关键字
+     * @return 药品信息
+     */
+    @Override
+    public R<?> getAllMedicationUsualInfo(String searchKey, Integer pageNo, Integer pageSize) {
+        //从yb_catalog_drug_info_usual表中取数据
+        IPage<CatalogDrugInfoUsual> medicationUsualInfo = catalogDrugInfoUsualService.selectCatalogDrugInfoUsual(pageNo, pageSize, searchKey);
+        return R.ok(medicationUsualInfo);
+    }
+
+    /**
+     * 获取药品信息
+     *
+     * @param pageNo    当前页
+     * @param pageSize  每页多少条
      * @param searchKey 模糊查询关键字
      * @return 药品信息
      */
     @Override
     public R<?> getAllMedicationInfo(String searchKey, Integer pageNo, Integer pageSize) {
-        IPage<CatalogDrugInfo> medicationInfo = catalogDrugInfoService.selectCatalogDrugInfo(pageNo, pageSize, searchKey);
+        // 构建查询条件
+        QueryWrapper<String> queryWrapper =
+                HisQueryUtils.buildQueryWrapper(null, searchKey,
+                        new HashSet<>(Arrays.asList("registered_name", "pinyin_code", "wubi_code", "approval_no")),
+                        null);
+        //从yb_catalog_drug_info表中取数据
+        IPage<CatalogDrugInfo> medicationInfo = elepPrescriptionMapper.selectCatalogDrugInfo(new Page<>(pageNo, pageSize), queryWrapper);
         return R.ok(medicationInfo);
     }
 
@@ -88,15 +128,15 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
      * 获取处方信息
      *
      * @param patientId 患者id
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
+     * @param pageNo    当前页
+     * @param pageSize  每页多少条
      * @return 药品信息
      */
     @Override
     public R<?> getPrescriptionInfo(Long patientId, Integer pageNo, Integer pageSize) {
         // 处方信息查询
         IPage<ElepPrescriptionInfoDto> prescriptionInfo =
-            elepPrescriptionMapper.selectElepPrescriptionInfo(new Page<>(pageNo, pageSize), patientId);
+                elepPrescriptionMapper.selectElepPrescriptionInfo(new Page<>(pageNo, pageSize), patientId);
         // 状态转换
         prescriptionInfo.getRecords().forEach(infoDto -> {
             infoDto.setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, infoDto.getStatusEnum()));
@@ -109,15 +149,15 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
      * 获取药品信息
      *
      * @param prescriptionNo 处方号
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
+     * @param pageNo         当前页
+     * @param pageSize       每页多少条
      * @return 药品详细信息
      */
     @Override
     public R<?> getMedicationInfo(String prescriptionNo, Integer pageNo, Integer pageSize) {
         // 药品详细查询
         IPage<ElepMedicationInfoDto> medicationInfo =
-            elepPrescriptionMapper.selectMedicationInfo(new Page<>(pageNo, pageSize), prescriptionNo);
+                elepPrescriptionMapper.selectMedicationInfo(new Page<>(pageNo, pageSize), prescriptionNo);
         return R.ok(medicationInfo);
     }
 
@@ -151,16 +191,13 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
         // 根据处方号查询处方信息
         List<ElepMedicationRequest> requestList = elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionInfo.getPrescriptionNo());
         if (!requestList.isEmpty()) {
-            List<Integer> idList = requestList.stream().map(ElepMedicationRequest::getId).collect(Collectors.toList());
+            List<Long> idList = requestList.stream().map(ElepMedicationRequest::getId).collect(Collectors.toList());
             // 处方信息删除
             elepMedicationRequestService.removeByIds(idList);
         }
 
         // 搜索更表需要信息
         ElepPrescriptionInfoParam info = elepPrescriptionMapper.selectSaveInfo(prescriptionInfo.getEncounterId());
-       if(info.getConditionId() == null){
-           return R.fail("请先新增主诊断");
-       }
 
         // 设置处方信息
         List<ElepMedicationRequest> elepMedicationRequestList = new ArrayList<>();
@@ -168,64 +205,68 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
         for (ElepMedicationInfoDto item : prescriptionInfo.getMedicationInfoList()) {
             elepMedicationRequest = new ElepMedicationRequest();
             elepMedicationRequest
-                // ID
-                .setId(null)
-                // 医院内部处方编号
-                .setPrescriptionNo(prescriptionInfo.getPrescriptionNo())
-                // 医院id
-                .setOrganizationId(info.getOrganizationId())
-                // 门诊/住院病历号
-                .setIptOtpNo(info.getIptOtpNo())
-                // 科室病区
-                .setDepartmentWard(info.getDepartmentWard())
-                // 医保类型
-                .setInsuranceEnum(info.getInsuranceEnum())
-                // 开具日期
-                .setIssueTime(now)
-                // 开具科室
-                .setOrgId(user.getOrgId())
-                // 患者
-                .setPatientId(prescriptionInfo.getPatientId())
-                // 就诊id
-                .setEncounterId(prescriptionInfo.getEncounterId())
-                // 诊断id
-                .setConditionId(info.getConditionId())
-                // 有效天数
-                .setValidityDays(prescriptionInfo.getValidityDays())
-                // 药品定义id
-                .setMedicationId(item.getMedicationId())
-                // 药品剂量
-                .setMedDosage(item.getMedDosage())
-                // 药品剂量单位
-                .setMedDosageUnitCode(item.getMedDosageUnitCode())
-                // 药品频率
-                .setMedFrequency(item.getMedFrequency())
-                // 药品途径
-                .setMedRoute(item.getMedRoute())
-                // 请求数量
-                .setQuantity(item.getQuantity())
-                // 请求单位
-                .setUnitCode(item.getUnitCode())
-                // 开方医师
-                .setPrescribingDrId(user.getId())
-                // 处方状态
-                .setStatusEnum(RequestStatus.DRAFT.getValue())
-                // 延长原因
-                .setExtensionReason(prescriptionInfo.getExtensionReason())
-                // 处方类别
-                .setRxTypeCode(item.getRxTypeCode())
-                // 支持用药信息
-                .setSupportInfo(item.getSupportInfo())
-                // 服药时间(开始)
-                .setEffectiveDoseStart(item.getEffectiveDoseStart())
-                // 服药时间(结束)
-                .setEffectiveDoseEnd(item.getEffectiveDoseEnd())
-                // 给药间隔
-                .setDispenseInterval(item.getDispenseInterval())
-                // 单次发药数
-                .setDispensePerQuantity(item.getDispensePerQuantity())
-                // 每次发药供应天数
-                .setDispensePerDuration(item.getDispensePerDuration());
+                    // ID
+                    .setId(null)
+                    // 医院内部处方编号
+                    .setPrescriptionNo(prescriptionInfo.getPrescriptionNo())
+                    // 医院id
+                    .setOrganizationId(info.getOrganizationId())
+                    // 门诊/住院病历号
+                    .setIptOtpNo(info.getIptOtpNo())
+                    // 科室病区
+                    .setDepartmentWard(info.getDepartmentWard())
+                    // 医保类型
+                    .setInsuranceEnum(info.getInsuranceEnum())
+                    // 开具日期
+                    .setIssueTime(now)
+                    // 开具科室
+                    .setOrgId(user.getOrgId())
+                    // 患者
+                    .setPatientId(prescriptionInfo.getPatientId())
+                    // 就诊id
+                    .setEncounterId(prescriptionInfo.getEncounterId())
+                    // 诊断id
+                    .setConditionId(prescriptionInfo.getConditionId())
+                    // 有效天数
+                    .setValidityDays(prescriptionInfo.getValidityDays())
+                    // 药品定义id
+                    .setMedicationId(item.getMedicationId())
+                    // 药品剂量
+                    .setMedDosage(item.getMedDosage())
+                    // 药品剂量单位
+                    .setMedDosageUnitCode(item.getMedDosageUnitCode())
+                    // 药品频率
+                    .setMedFrequency(item.getMedFrequency())
+                    // 药品途径
+                    .setMedRoute(item.getMedRoute())
+                    // 请求数量
+                    .setQuantity(item.getQuantity())
+                    // 请求单位
+                    .setUnitCode(item.getUnitCode())
+                    // 开方医师
+                    .setPrescribingDrId(user.getId())
+                    // 处方状态
+                    .setStatusEnum(RequestStatus.DRAFT.getValue())
+                    // 延长原因
+                    .setExtensionReason(prescriptionInfo.getExtensionReason())
+                    // 处方类别
+                    .setRxTypeCode(item.getRxTypeCode())
+                    // 处方详细类别
+                    .setRxItemTypeCode(item.getRxItemTypeCode())
+                    // 支持用药信息
+                    .setSupportInfo(item.getSupportInfo())
+                    // 服药时间(开始)
+                    .setEffectiveDoseStart(item.getEffectiveDoseStart())
+                    // 服药时间(结束)
+                    .setEffectiveDoseEnd(item.getEffectiveDoseEnd())
+                    // 给药间隔
+                    .setDispenseInterval(item.getDispenseInterval())
+                    // 单次发药数
+                    .setDispensePerQuantity(item.getDispensePerQuantity())
+                    // 每次发药供应天数
+                    .setDispensePerDuration(item.getDispensePerDuration())
+                    // 药品版本号
+                    .setVersion(item.getVersion());
             elepMedicationRequestList.add(elepMedicationRequest);
         }
 
@@ -235,7 +276,23 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
         }
 
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"电子处方"}));
+        CatalogDrugInfoUsual usualInfo;
+        CatalogDrugInfoUsual usualInfoInsert = new CatalogDrugInfoUsual();
+        CatalogDrugInfo drugInfo;
+        for (ElepMedicationInfoDto item : prescriptionInfo.getMedicationInfoList()) {
+            // 保存常用药品
+            usualInfo = baseMapper.selectOne(new LambdaUpdateWrapper<CatalogDrugInfoUsual>().eq(CatalogDrugInfoUsual::getMedicalCatalogCode, item.getMedicationId()));
+            if (usualInfo == null) {
+                drugInfo = elepPrescriptionMapper.selectCatalogDrugInfoByNo(item.getMedicationId(), item.getVersion());
+                BeanUtils.copyProperties(drugInfo, usualInfoInsert);
+                boolean usualFlg = catalogDrugInfoUsualService.save(usualInfoInsert);
+                if (!usualFlg) {
+                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+                }
+            }
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"电子处方"}));
     }
 
     /**
@@ -259,25 +316,25 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
         // 修改处方信息
         if (prescriptionInfo.getId() == null) {
             elepMedicationRequestList = elepMedicationRequestService
-                .selectElepMedicationRequestByPrescriptionNo(prescriptionInfo.getPrescriptionNo());
+                    .selectElepMedicationRequestByPrescriptionNo(prescriptionInfo.getPrescriptionNo());
             // 判断信息是否存在
             if (elepMedicationRequestList == null) {
                 return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
             }
             for (ElepMedicationRequest item : elepMedicationRequestList) {
                 item
-                    // 开具日期
-                    .setIssueTime(now)
-                    // 开具科室
-                    .setOrgId(user.getOrgId())
-                    // 开方医师
-                    .setPrescribingDrId(user.getId())
-                    // 有效天数
-                    .setValidityDays(prescriptionInfo.getValidityDays())
-                    // 延长原因
-                    .setExtensionReason(prescriptionInfo.getExtensionReason())
-                    // 处方类别
-                    .setRxTypeCode(prescriptionInfo.getRxTypeCode());
+                        // 开具日期
+                        .setIssueTime(now)
+                        // 开具科室
+                        .setOrgId(user.getOrgId())
+                        // 开方医师
+                        .setPrescribingDrId(user.getId())
+                        // 有效天数
+                        .setValidityDays(prescriptionInfo.getValidityDays())
+                        // 延长原因
+                        .setExtensionReason(prescriptionInfo.getExtensionReason())
+                        // 处方类别
+                        .setRxTypeCode(prescriptionInfo.getRxTypeCode());
             }
             // 修改处方
             boolean flg = elepMedicationRequestService.updateBatchById(elepMedicationRequestList);
@@ -293,38 +350,44 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
                 return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
             }
             elepMedicationRequest
-                // 开具日期
-                .setIssueTime(now)
-                // 开具科室
-                .setOrgId(user.getOrgId())
-                // 开方医师
-                .setPrescribingDrId(user.getId())
-                // 药品定义id
-                .setMedicationId(prescriptionInfo.getMedicationId())
-                // 药品剂量
-                .setMedDosage(prescriptionInfo.getMedDosage())
-                // 药品剂量单位
-                .setMedDosageUnitCode(prescriptionInfo.getMedDosageUnitCode())
-                // 药品频率
-                .setMedFrequency(prescriptionInfo.getMedFrequency())
-                // 药品途径
-                .setMedRoute(prescriptionInfo.getMedRoute())
-                // 请求数量
-                .setQuantity(prescriptionInfo.getQuantity())
-                // 请求单位
-                .setUnitCode(prescriptionInfo.getUnitCode())
-                // 支持用药信息
-                .setSupportInfo(prescriptionInfo.getSupportInfo())
-                // 服药时间(开始)
-                .setEffectiveDoseStart(prescriptionInfo.getEffectiveDoseStart())
-                // 服药时间(结束)
-                .setEffectiveDoseEnd(prescriptionInfo.getEffectiveDoseEnd())
-                // 给药间隔
-                .setDispenseInterval(prescriptionInfo.getDispenseInterval())
-                // 单次发药数
-                .setDispensePerQuantity(prescriptionInfo.getDispensePerQuantity())
-                // 每次发药供应天数
-                .setDispensePerDuration(prescriptionInfo.getDispensePerDuration());
+                    // 开具日期
+                    .setIssueTime(now)
+                    // 开具科室
+                    .setOrgId(user.getOrgId())
+                    // 开方医师
+                    .setPrescribingDrId(user.getId())
+                    // 药品定义id
+                    .setMedicationId(prescriptionInfo.getMedicationId())
+                    // 诊断id
+                    .setConditionId(prescriptionInfo.getConditionId())
+                    // 药品剂量
+                    .setMedDosage(prescriptionInfo.getMedDosage())
+                    // 药品剂量单位
+                    .setMedDosageUnitCode(prescriptionInfo.getMedDosageUnitCode())
+                    // 药品频率
+                    .setMedFrequency(prescriptionInfo.getMedFrequency())
+                    // 药品途径
+                    .setMedRoute(prescriptionInfo.getMedRoute())
+                    // 请求数量
+                    .setQuantity(prescriptionInfo.getQuantity())
+                    // 请求单位
+                    .setUnitCode(prescriptionInfo.getUnitCode())
+                    // 支持用药信息
+                    .setSupportInfo(prescriptionInfo.getSupportInfo())
+                    // 服药时间(开始)
+                    .setEffectiveDoseStart(prescriptionInfo.getEffectiveDoseStart())
+                    // 服药时间(结束)
+                    .setEffectiveDoseEnd(prescriptionInfo.getEffectiveDoseEnd())
+                    // 给药间隔
+                    .setDispenseInterval(prescriptionInfo.getDispenseInterval())
+                    // 单次发药数
+                    .setDispensePerQuantity(prescriptionInfo.getDispensePerQuantity())
+                    // 处方详细类别
+                    .setRxItemTypeCode(prescriptionInfo.getRxItemTypeCode())
+                    // 每次发药供应天数
+                    .setDispensePerDuration(prescriptionInfo.getDispensePerDuration())
+                    // 药品版本号
+                    .setVersion(prescriptionInfo.getVersion());
 
             // 修改处方
             boolean flg = elepMedicationRequestService.updateById(elepMedicationRequest);
@@ -333,7 +396,7 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
             }
         }
 
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"电子处方"}));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"电子处方"}));
     }
 
     /**
@@ -350,20 +413,20 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
 
         if (deletePrescriptionInfoParam.getIdList().isEmpty()) {
             elepMedicationRequestList = elepMedicationRequestService
-                .selectElepMedicationRequestByPrescriptionNoList(deletePrescriptionInfoParam.getPrescriptionNoList());
+                    .selectElepMedicationRequestByPrescriptionNoList(deletePrescriptionInfoParam.getPrescriptionNoList());
             // 判断信息是否存在
             if (elepMedicationRequestList == null) {
                 return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
             }
             // 删除处方
             boolean flg = elepMedicationRequestService
-                .deleteElepMedicationRequestByPrescriptionNo(deletePrescriptionInfoParam.getPrescriptionNoList());
+                    .deleteElepMedicationRequestByPrescriptionNo(deletePrescriptionInfoParam.getPrescriptionNoList());
             if (!flg) {
                 return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
             }
         } else {
             elepMedicationRequestList =
-                elepMedicationRequestService.selectElepMedicationRequestById(deletePrescriptionInfoParam.getIdList());
+                    elepMedicationRequestService.selectElepMedicationRequestById(deletePrescriptionInfoParam.getIdList());
             // 判断信息是否存在
             if (elepMedicationRequestList == null) {
                 return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
@@ -374,7 +437,7 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
                 return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
             }
         }
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"电子处方"}));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[]{"电子处方"}));
     }
 
     /**
@@ -387,7 +450,7 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
     public R<?> issuancePrescription(List<String> prescriptionNoList) {
         // 搜索处方信息
         List<ElepMedicationRequest> elepMedicationRequestList =
-            elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNoList(prescriptionNoList);
+                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNoList(prescriptionNoList);
         // 判断处方是否存在
         if (elepMedicationRequestList == null) {
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
@@ -402,6 +465,6 @@ public class DoctorStationElepPrescriptionServiceImpl implements IDoctorStationE
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
         }
 
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"电子处方"}));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"电子处方"}));
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
similarity index 61%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
index f41f440f..ef5e1fce 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
@@ -3,6 +3,8 @@ package com.openhis.web.doctorstation.appservice.impl;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -25,6 +27,8 @@ import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
 import com.openhis.web.doctorstation.mapper.DoctorStationMainAppMapper;
 
 /**
@@ -55,6 +59,18 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
     @Override
     public IPage<PatientInfoDto> getPatientInfo(PatientInfoDto patientInfoDto, String searchKey, Integer pageNo,
         Integer pageSize, HttpServletRequest request, Integer pricingFlag) {
+        // 当前登录账号ID
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+        Long currentUserOrganizationId = SecurityUtils.getLoginUser().getOrgId();
+        // 不是待诊的情况,需要参与者账户id(接诊医生)的条件
+        if (!EncounterStatus.PLANNED.getValue().equals(patientInfoDto.getStatusEnum())) {
+            patientInfoDto.setJzPractitionerUserId(userId);
+        }
+        // 划价时
+        if (Whether.YES.getValue().equals(pricingFlag)) {
+            userId = null;
+            currentUserOrganizationId = null;
+        }
         // 构建查询条件
         QueryWrapper<PatientInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(patientInfoDto, searchKey,
             new HashSet<>(Arrays.asList("patient_name", "id_card", "phone")), request);
@@ -64,17 +80,10 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
         } else {
             queryWrapper.orderByDesc("register_time");
         }
-        // 当前登录账号ID
-        Long userId = SecurityUtils.getLoginUser().getUserId();
-        Long currentUserOrganizationId = SecurityUtils.getLoginUser().getOrgId();
-        // 划价时
-        if (Whether.YES.getValue().equals(pricingFlag)) {
-            userId = null;
-            currentUserOrganizationId = null;
-        }
         IPage<PatientInfoDto> patientInfo = doctorStationMainAppMapper.getPatientInfo(new Page<>(pageNo, pageSize),
-            ParticipantType.REGISTRATION_DOCTOR.getCode(), ClinicalStatus.INACTIVE.getValue(), userId,
-            currentUserOrganizationId, pricingFlag, EncounterStatus.PLANNED.getValue(), queryWrapper);
+            ParticipantType.REGISTRATION_DOCTOR.getCode(), ParticipantType.ADMITTER.getCode(),
+            ClinicalStatus.INACTIVE.getValue(), userId, currentUserOrganizationId, pricingFlag,
+            EncounterStatus.PLANNED.getValue(), queryWrapper);
         patientInfo.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
@@ -138,4 +147,62 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
         return update > 0 ? R.ok() : R.fail();
     }
 
+    /**
+     * 查询处方号列表信息
+     *
+     * @param prescriptionInfoBaseDto 处方dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 处方号列表信息
+     */
+    @Override
+    public IPage<PrescriptionInfoBaseDto> getPrescriptionPageInfo(PrescriptionInfoBaseDto prescriptionInfoBaseDto,
+        String searchKey, Integer pageNo, Integer pageSize) {
+        // 构建查询条件
+        QueryWrapper<PrescriptionInfoBaseDto> queryWrapper = HisQueryUtils.buildQueryWrapper(prescriptionInfoBaseDto,
+            searchKey, new HashSet<>(Arrays.asList("prescription_no", "patient_name", "practitioner_name")), null);
+        IPage<PrescriptionInfoBaseDto> prescriptionPageInfo =
+            doctorStationMainAppMapper.getPrescriptionPageInfo(new Page<>(pageNo, pageSize), queryWrapper);
+        List<PrescriptionInfoBaseDto> PrescriptionInfo = prescriptionPageInfo.getRecords();
+        // 本次就诊的处方信息
+        List<PrescriptionInfoDetailDto> prescriptionDetailInfo =
+            doctorStationMainAppMapper.getPrescriptionDetailInfo(null, prescriptionInfoBaseDto.getEncounterId());
+        for (PrescriptionInfoBaseDto infoBaseDto : PrescriptionInfo) {
+            // 性别
+            infoBaseDto.setGenderEnum_enumText(
+                EnumUtils.getInfoByValue(AdministrativeGender.class, infoBaseDto.getGenderEnum()));
+            // 计算年龄
+            infoBaseDto
+                .setAge(infoBaseDto.getBirthDate() != null ? AgeCalculatorUtil.getAge(infoBaseDto.getBirthDate()) : "");
+            // 处方单详情
+            List<PrescriptionInfoDetailDto> prescriptionInfoDetailList = prescriptionDetailInfo.stream()
+                .filter(e -> infoBaseDto.getPrescriptionNo().equals(e.getPrescriptionNo()))
+                .collect(Collectors.toList());
+            infoBaseDto.setPrescriptionInfoDetailList(prescriptionInfoDetailList);
+        }
+        return prescriptionPageInfo;
+    }
+
+    /**
+     * 查询处方详情
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方详情
+     */
+    @Override
+    public List<PrescriptionInfoDetailDto> getPrescriptionDetailInfo(String prescriptionNo) {
+        List<PrescriptionInfoDetailDto> prescriptionDetailInfo =
+            doctorStationMainAppMapper.getPrescriptionDetailInfo(prescriptionNo, null);
+        for (PrescriptionInfoDetailDto prescriptionInfoDetailDto : prescriptionDetailInfo) {
+            // 请求状态
+            prescriptionInfoDetailDto.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(RequestStatus.class, prescriptionInfoDetailDto.getStatusEnum()));
+            // 收费状态
+            prescriptionInfoDetailDto.setChargeStatus_enumText(
+                EnumUtils.getInfoByValue(ChargeItemStatus.class, prescriptionInfoDetailDto.getChargeStatus()));
+        }
+        return prescriptionDetailInfo;
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
new file mode 100644
index 00000000..44fb7d9f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
@@ -0,0 +1,130 @@
+package com.openhis.web.doctorstation.appservice.impl;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.clinical.domain.ReservationRecord;
+import com.openhis.clinical.service.IReservationRecordService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.doctorstation.appservice.IReservationRecordAppService;
+import com.openhis.web.doctorstation.dto.ReservationRecordDto;
+import com.openhis.web.doctorstation.mapper.ReservationRecordAppMapper;
+
+/**
+ * 医生站-预约记录 应用实现类
+ */
+@Service
+public class ReservationRecordAppServiceImpl implements IReservationRecordAppService {
+
+    @Resource
+    ReservationRecordAppMapper reservationRecordAppMapper;
+
+    @Resource
+    IReservationRecordService iReservationRecordService;
+
+    /**
+     * 保存预约记录
+     *
+     * @param reservationRecordDto 预约记录dto
+     * @return 结果
+     */
+    @Override
+    public R<?> saveReservation(ReservationRecordDto reservationRecordDto) {
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+
+        ReservationRecord reservationRecord = new ReservationRecord();
+
+        reservationRecord.setPatientName(reservationRecordDto.getPatientName()); // 患者名称
+        reservationRecord.setPatientTel(reservationRecordDto.getPatientTel()); // 患者联系方式
+        reservationRecord.setChiefComplaint(reservationRecordDto.getChiefComplaint()); // 主诉
+        reservationRecord.setReservationTime(reservationRecordDto.getReservationTime());// 就诊预约时间
+        reservationRecord.setRemark(reservationRecordDto.getRemark()); // 备注
+        reservationRecord.setOrgId(orgId); // 预约科室id
+        reservationRecord.setPractitionerId(practitionerId); // 预约医生id
+        iReservationRecordService.save(reservationRecord);
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"预约记录"}));
+    }
+
+    /**
+     * 编辑预约记录
+     *
+     * @param reservationRecordDto 预约记录dto
+     * @return 结果
+     */
+    @Override
+    public R<?> editReservation(ReservationRecordDto reservationRecordDto) {
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+
+        ReservationRecord reservationRecord = new ReservationRecord();
+
+        reservationRecord.setId(reservationRecordDto.getId()); // id
+        reservationRecord.setPatientName(reservationRecordDto.getPatientName()); // 患者名称
+        reservationRecord.setPatientTel(reservationRecordDto.getPatientTel()); // 患者联系方式
+        reservationRecord.setChiefComplaint(reservationRecordDto.getChiefComplaint()); // 主诉
+        reservationRecord.setReservationTime(reservationRecordDto.getReservationTime());// 就诊预约时间
+        reservationRecord.setRemark(reservationRecordDto.getRemark()); // 备注
+        reservationRecord.setOrgId(orgId); // 预约科室id
+        reservationRecord.setPractitionerId(practitionerId); // 预约医生id
+        iReservationRecordService.updateById(reservationRecord);
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"预约记录"}));
+    }
+
+    /**
+     * 删除预约记录
+     *
+     * @param id id
+     * @return 结果
+     */
+    @Override
+    public R<?> delReservation(Long id) {
+        iReservationRecordService.removeById(id);
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"预约记录"}));
+    }
+
+    /**
+     * 查询 预约记录
+     *
+     * @param reservationRecordDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 预约记录
+     */
+    @Override
+    public IPage<ReservationRecordDto> getReservationInfo(ReservationRecordDto reservationRecordDto, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+
+        // 构建查询条件
+        QueryWrapper<ReservationRecordDto> queryWrapper = HisQueryUtils.buildQueryWrapper(reservationRecordDto,
+            searchKey, new HashSet<>(Arrays.asList("patient_name", "chief_complaint", "patient_tel")), request);
+
+        return reservationRecordAppMapper.getReservationInfo(new Page<>(pageNo, pageSize), orgId, practitionerId,
+            queryWrapper);
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
index d90cf53f..7eed2156 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
@@ -36,6 +36,7 @@ public class DoctorStationAdviceController {
      * @param searchKey 模糊查询关键字
      * @param locationId 药房id
      * @param adviceDefinitionIdParamList 医嘱定义id参数集合
+     * @param adviceTypes 医嘱类型参数集合
      * @param organizationId 患者挂号对应的科室id
      * @param pageNo 当前页
      * @param pageSize 每页多少条
@@ -47,10 +48,11 @@ public class DoctorStationAdviceController {
         @RequestParam(value = "locationId", required = false) Long locationId,
         @RequestParam(value = "adviceDefinitionIdParamList", required = false) List<Long> adviceDefinitionIdParamList,
         @RequestParam(value = "organizationId") Long organizationId,
+        @RequestParam(value = "adviceTypes") List<Integer> adviceTypes,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         return R.ok(iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId,
-            adviceDefinitionIdParamList, organizationId, pageNo, pageSize, Whether.NO.getValue()));
+            adviceDefinitionIdParamList, organizationId, pageNo, pageSize, Whether.NO.getValue(), adviceTypes));
     }
 
     /**
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAllergyIntolController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAllergyIntolController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAllergyIntolController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAllergyIntolController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
similarity index 66%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
index 28c7eb81..d2ff3138 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import com.core.common.core.domain.R;
 import com.openhis.common.enums.AdviceOpType;
 import com.openhis.common.enums.Whether;
+import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationChineseMedicalAppService;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.AdviceSaveParam;
@@ -28,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 public class DoctorStationChineseMedicalController {
 
     private final IDoctorStationChineseMedicalAppService iDoctorStationChineseMedicalAppService;
+    private final IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
 
     /**
      * 查询中医诊断数据
@@ -40,7 +42,7 @@ public class DoctorStationChineseMedicalController {
     @GetMapping(value = "/condition-info")
     public R<?> getConditionInfo(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        @RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize) {
         return R.ok(iDoctorStationChineseMedicalAppService.getConditionInfo(searchKey, pageNo, pageSize));
     }
 
@@ -55,7 +57,7 @@ public class DoctorStationChineseMedicalController {
     @GetMapping(value = "/syndrome-info")
     public R<?> getSyndromeInfo(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        @RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize) {
         return R.ok(iDoctorStationChineseMedicalAppService.getSyndromeInfo(searchKey, pageNo, pageSize));
     }
 
@@ -117,4 +119,61 @@ public class DoctorStationChineseMedicalController {
             AdviceOpType.SAVE_ADVICE.getCode());
     }
 
+    /**
+     * 门诊签发中医医嘱
+     *
+     * @param adviceSaveParam 医嘱表单信息
+     * @return 结果
+     */
+    @PostMapping(value = "/sign-tcm-advice")
+    public R<?> signTcmAdvice(@RequestBody AdviceSaveParam adviceSaveParam) {
+        return iDoctorStationChineseMedicalAppService.saveOrSignTcmAdvice(adviceSaveParam,
+            AdviceOpType.SIGN_ADVICE.getCode());
+    }
+
+    /**
+     * 门诊签退中医医嘱
+     *
+     * @param requestIdList 请求id列表
+     * @return 结果
+     */
+    @PostMapping(value = "/sign-tcm-off")
+    public R<?> signOffAdvice(@RequestBody List<Long> requestIdList) {
+        return iDoctorStationAdviceAppService.signOffAdvice(requestIdList);
+    }
+
+    /**
+     * 查询医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @return 医嘱请求数据
+     */
+    @GetMapping(value = "/tcm-request-base-info")
+    public R<?> getTcmRequestBaseInfo(@RequestParam Long encounterId) {
+        return iDoctorStationChineseMedicalAppService.getTcmRequestBaseInfo(encounterId);
+    }
+
+    /**
+     * 查询中医历史医嘱请求数据
+     *
+     * @param patientId 病人id
+     * @param encounterId 就诊id
+     * @return 中医历史医嘱请求数据
+     */
+    @GetMapping(value = "/tcm-request-history-info")
+    public R<?> getTcmRequestHistoryInfo(@RequestParam Long patientId, Long encounterId) {
+        return iDoctorStationChineseMedicalAppService.getTcmRequestHistoryInfo(patientId, encounterId);
+    }
+
+    /**
+     * 删除中医诊断
+     * 
+     * @param syndromeGroupNo 中医证候组号
+     * @return 结果
+     */
+    @DeleteMapping(value = "/tcm-diagnosis")
+    public R<?> delTcmDiagnosis(@RequestParam String syndromeGroupNo) {
+        return iDoctorStationChineseMedicalAppService.delTcmDiagnosis(syndromeGroupNo);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
index 4df2744d..fe979205 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
@@ -113,16 +113,18 @@ public class DoctorStationDiagnosisController {
      * 查询诊断定义列表
      * 
      * @param searchKey 模糊查询关键字
+     * @param typeCode 用于区分 西医诊断 [1] 中医诊断 [2]
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @return 诊断定义列表
      */
     @GetMapping(value = "/condition-definition-metadata")
     public R<?> getConditionDefinitionMetadata(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "typeCode", required = false) String typeCode,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return R
-            .ok(iDoctorStationDiagnosisAppService.getConditionDefinitionMetadataSearchKey(searchKey, pageNo, pageSize));
+        return R.ok(iDoctorStationDiagnosisAppService.getConditionDefinitionMetadataSearchKey(searchKey, typeCode,
+            pageNo, pageSize));
     }
 
     /**
@@ -169,5 +171,4 @@ public class DoctorStationDiagnosisController {
         return iDoctorStationDiagnosisAppService.delEncounterDiagnosis(conditionId);
     }
 
-
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
similarity index 87%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
index fc358e7e..ead5b4e9 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
@@ -42,6 +42,20 @@ public class DoctorStationElepPrescriptionController {
         return doctorStationElepService.elepPrescriptionInit();
     }
 
+    /**
+     * 获取全部常用药品信息
+     *
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 药品信息
+     */
+    @GetMapping("/get-allMedicationUsualInfo")
+    public R<?> getAllMedicationUsualInfo(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+                                     @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return doctorStationElepService.getAllMedicationUsualInfo(searchKey, pageNo, pageSize);
+    }
+
     /**
      * 获取全部药品信息
      *
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
similarity index 70%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
index 5e4ef7dd..bb1928ae 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
@@ -15,6 +15,7 @@ import com.openhis.common.enums.Whether;
 import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
 import com.openhis.web.doctorstation.dto.DoctorStationInitDto;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -91,4 +92,33 @@ public class DoctorStationMainController {
         return iDoctorStationMainAppService.completeEncounter(encounterId);
     }
 
+    /**
+     * 查询处方号列表信息
+     * 
+     * @param prescriptionInfoBaseDto 处方dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 处方号列表信息
+     */
+    @GetMapping(value = "/prescription-page-info")
+    public R<?> getPrescriptionPageInfo(PrescriptionInfoBaseDto prescriptionInfoBaseDto,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) {
+        return R.ok(
+            iDoctorStationMainAppService.getPrescriptionPageInfo(prescriptionInfoBaseDto, searchKey, pageNo, pageSize));
+    }
+
+    /**
+     * 查询处方详情
+     * 
+     * @param prescriptionNo 处方号
+     * @return 处方详情
+     */
+    @GetMapping(value = "/prescription-detail-info")
+    public R<?> getPrescriptionDetailInfo(@RequestParam String prescriptionNo) {
+        return R.ok(iDoctorStationMainAppService.getPrescriptionDetailInfo(prescriptionNo));
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java
new file mode 100644
index 00000000..d79a2f66
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.doctorstation.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.doctorstation.appservice.IReservationRecordAppService;
+import com.openhis.web.doctorstation.dto.ReservationRecordDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 医生站-预约记录 controller
+ */
+@RestController
+@RequestMapping("/doctor-station/reservation-record")
+@Slf4j
+@AllArgsConstructor
+public class ReservationRecordController {
+
+    private final IReservationRecordAppService iReservationRecordAppService;
+
+    /**
+     * 保存预约记录
+     * 
+     * @param reservationRecordDto 预约记录dto
+     * @return 结果
+     */
+    @PostMapping(value = "/save-reservation")
+    public R<?> saveReservation(@RequestBody ReservationRecordDto reservationRecordDto) {
+        return iReservationRecordAppService.saveReservation(reservationRecordDto);
+    }
+
+    /**
+     * 编辑预约记录
+     *
+     * @param reservationRecordDto 预约记录dto
+     * @return 结果
+     */
+    @PutMapping(value = "/edit-reservation")
+    public R<?> editReservation(@RequestBody ReservationRecordDto reservationRecordDto) {
+        return iReservationRecordAppService.editReservation(reservationRecordDto);
+    }
+
+    /**
+     * 删除预约记录
+     * 
+     * @param id id
+     * @return 结果
+     */
+    @DeleteMapping("/del-reservation")
+    public R<?> delReservation(@RequestParam Long id) {
+        return iReservationRecordAppService.delReservation(id);
+    }
+
+    /**
+     * 查询 预约记录
+     * 
+     * @param reservationRecordDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 预约记录
+     */
+    @GetMapping(value = "/reservation-info")
+    public R<?> getReservationInfo(ReservationRecordDto reservationRecordDto,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(iReservationRecordAppService.getReservationInfo(reservationRecordDto, searchKey, pageNo, pageSize,
+            request));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java
new file mode 100644
index 00000000..7ef92204
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java
@@ -0,0 +1,39 @@
+package com.openhis.web.doctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 诊疗子项参数类
+ */
+@Data
+@Accessors(chain = true)
+public class ActivityChildrenJsonParams {
+
+    /** 治疗类型 */
+    private Integer therapyEnum;
+
+    /** 患者 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /** 就诊id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 账户id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+    /**
+     * 费用项id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeItemId;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
index e66e8de0..a0569392 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
@@ -161,4 +161,10 @@ public class AdviceBaseDto {
      */
     private List<AdvicePriceDto> priceList;
 
+    /** 是否限制使用 */
+    private Integer restrictedFlag;
+
+    /** 限制使用范围 */
+    private String restrictedScope;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
index ce01a73f..5be0bd99 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
@@ -178,6 +178,11 @@ public class AdviceSaveDto {
     /** 单次剂量 */
     private BigDecimal dose;
 
+    /**
+     * 首次用量
+     */
+    private BigDecimal firstDose;
+
     /** 剂量单位 */
     private String doseUnitCode;
 
@@ -220,12 +225,16 @@ public class AdviceSaveDto {
      */
     private Integer sufferingFlag;
 
+    /**
+     * 排序号
+     */
+    private Integer sortNumber;
+
     /**
      * 设置默认值
      */
     public AdviceSaveDto() {
-        this.chineseHerbsDoseQuantity = 0;
-        this.categoryEnum = EncounterClass.AMB.getValue();
+        this.chineseHerbsDoseQuantity = 1;
         this.therapyEnum = TherapyTimeType.TEMPORARY.getValue();
         this.practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
         this.founderOrgId = SecurityUtils.getLoginUser().getOrgId(); // 开方人科室
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AllergyIntoInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
index a2ced011..887335ae 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
@@ -17,6 +17,10 @@ public class ConditionDefinitionMetadata {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
     /** 所属分类 */
     private Integer sourceEnum;
     private String sourceEnum_enumText;
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
index 14849699..578ce755 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 public class DeletePrescriptionInfoParam {
 
     /** ID */
-    private List<Integer> idList;
+    private List<Long> idList;
 
     /** 医院内部处方编号*/
     private List<String> prescriptionNoList;
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
index a254bfaa..ca99a921 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
@@ -2,8 +2,8 @@ package com.openhis.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import com.openhis.common.annotation.Dict;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -72,4 +72,9 @@ public class DiagnosisQueryDto {
      */
     private String syndromeGroupNo;
 
+    /**
+     * 诊断描述
+     */
+    private String diagnosisDesc;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
similarity index 80%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
index b4a4af51..6253f665 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
 
 import lombok.Data;
@@ -16,6 +18,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class ElepMedicationInfoDto {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 药品定义id */
@@ -60,4 +63,11 @@ public class ElepMedicationInfoDto {
     private Integer dispensePerDuration;
     /** 处方类别 */
     private Integer rxTypeCode;
+    /** 处方详细类别 */
+    private Integer rxItemTypeCode;
+    /** 诊断id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+    /** 药品版本号 */
+    private String version;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
similarity index 80%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
index d23d7de8..a2765700 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -23,12 +25,14 @@ import javax.validation.constraints.Positive;
 public class ElepPrescriptionInfoParam {
 
     /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer id;
 
     /** 医院内部处方编号 */
     private String prescriptionNo;
 
     /** 医院id (前台不传) */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long organizationId;
 
     /** 门诊/住院病历号 (前台不传) */
@@ -44,15 +48,19 @@ public class ElepPrescriptionInfoParam {
     private Date issueTime;
 
     /** 开具科室 (前台不传) */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /** 患者 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
     /** 就诊id */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
-    /** 诊断id (前台不传) */
+    /** 诊断id */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long conditionId;
 
     /** 有效天数 */
@@ -73,6 +81,7 @@ public class ElepPrescriptionInfoParam {
     private String medRoute;
 
     /** 开方医师 (前台不传) */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long prescribingDrId;
 
     /** 延长原因 */
@@ -89,6 +98,9 @@ public class ElepPrescriptionInfoParam {
 
     /** 处方类别 */
     private Integer rxTypeCode;
+    /** 处方类别 */
+    private Integer rxItemTypeCode;
+
     /** 支持用药信息 */
     private String supportInfo;
     /** 服药时间(开始) */
@@ -107,6 +119,9 @@ public class ElepPrescriptionInfoParam {
     /** 每次发药供应天数 */
     private Integer dispensePerDuration;
 
+    /** 药品版本号 */
+    private String version;
+
     /** 药品信息 */
     List<ElepMedicationInfoDto> medicationInfoList;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
new file mode 100644
index 00000000..0ccf0d08
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
@@ -0,0 +1,26 @@
+package com.openhis.web.doctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 诊断信息
+ */
+@Data
+@Accessors(chain = true)
+public class ElepPrescriptionInitConditionDto {
+    /**
+     * 诊断id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private  Long conditionId;
+    /**
+     * 诊断名
+     */
+    private String conditionName;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
similarity index 65%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
index 7579a6d2..49899aa6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
@@ -20,6 +20,11 @@ public class ElepPrescriptionInitDto {
      */
     private List<ElepPrescriptionInitDto.commonStatusOption> rxTypeCodeListOptions;
 
+//    /**
+//     * 诊断列表
+//     */
+//    private List<ElepPrescriptionInitDto.conditionStatusOption> conditionListOptions;
+
 
     @Data
     public static class commonStatusOption {
@@ -32,5 +37,16 @@ public class ElepPrescriptionInitDto {
         }
     }
 
+//    @Data
+//    public static class conditionStatusOption {
+//        private Long value;
+//        private String label;
+//
+//        public conditionStatusOption(Long value, String label) {
+//            this.value = value;
+//            this.label = label;
+//        }
+//    }
+
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
similarity index 85%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
index 244d5540..e3fb069c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
@@ -102,4 +102,16 @@ public class PatientInfoDto {
      * 费用性质
      */
     private String contractName;
+
+    /**
+     * 参与者对应的userId - 挂号医生
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerUserId;
+
+    /**
+     * 参与者对应的userId - 接诊医生
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long jzPractitionerUserId;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java
new file mode 100644
index 00000000..82cdb743
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java
@@ -0,0 +1,93 @@
+package com.openhis.web.doctorstation.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 处方信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class PrescriptionInfoBaseDto {
+
+    /** 处方号 */
+    private String prescriptionNo;
+
+    /**
+     * 就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 患者
+     */
+    private String patientName;
+
+    /**
+     * 诊断定义名称
+     */
+    private String conditionDefinitionName;
+
+    /** 请求时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date requestTime;
+
+    /**
+     * 开方医生
+     */
+    private String practitionerName;
+
+    /** 科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    private Long organizationId;
+    private String organizationId_dictText;
+
+    /** 出生日期 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 性别编码
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 就诊号
+     */
+    private String busNo;
+
+    /**
+     * 费用性质
+     */
+    private String contractName;
+
+    /**
+     * 详情
+     */
+    private List<PrescriptionInfoDetailDto> prescriptionInfoDetailList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java
new file mode 100644
index 00000000..30b5a687
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java
@@ -0,0 +1,132 @@
+package com.openhis.web.doctorstation.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 处方详情信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class PrescriptionInfoDetailDto {
+
+    /** 处方号 */
+    private String prescriptionNo;
+
+    /**
+     * 请求id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /**
+     * 请求人id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_practitioner", dictCode = "id", dictText = "name")
+    private Long requesterId;
+    private String requesterId_dictText;
+
+    /** 请求时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date requestTime;
+
+    /**
+     * 分组id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
+    /** 医嘱名称 */
+    private String adviceName;
+
+    /**
+     * 规格
+     */
+    private String volume;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 请求数量 */
+    private Integer quantity;
+
+    /** 请求单位编码 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 请求状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /**
+     * 用法
+     */
+    @Dict(dictCode = "method_code")
+    private String methodCode;
+    private String methodCode_dictText;
+
+    /**
+     * 使用频次
+     */
+    @Dict(dictCode = "rate_code")
+    private String rateCode;
+    private String rateCode_dictText;
+
+    /**
+     * 单次剂量
+     */
+    private BigDecimal dose;
+
+    /** 剂量单位 */
+    @Dict(dictCode = "unit_code")
+    private String doseUnitCode;
+    private String doseUnitCode_dictText;
+
+    /**
+     * 费用项id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeItemId;
+
+    /**
+     * 总价
+     */
+    private BigDecimal totalPrice;
+
+    /** 收费状态 */
+    private Integer chargeStatus;
+    private String chargeStatus_enumText;
+
+    /**
+     * 物理位置id | 可能是 发药药房id,耗材房id,执行科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long positionId;
+
+    /**
+     * 物理位置| 可能是 发药药房,耗材房,执行科室
+     */
+    private String positionName;
+
+    /** 用药天数 */
+    private Integer dispensePerDuration;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /**
+     * 诊断定义名称
+     */
+    private String conditionDefinitionName;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
index a9360aae..53edefdb 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
@@ -26,6 +26,9 @@ public class RequestBaseDto {
      */
     private String uniqueKey; // requestId拼接adviceType
 
+    /** 处方号 */
+    private String prescriptionNo;
+
     /**
      * 请求人id
      */
@@ -152,4 +155,19 @@ public class RequestBaseDto {
     /** 拆零比 */
     private BigDecimal partPercent;
 
+    /**
+     * 中药付数
+     */
+    private Integer chineseHerbsDoseQuantity;
+
+    /**
+     * 代煎标识 | 0:否 , 1:是
+     */
+    private Integer sufferingFlag;
+
+    /**
+     * 排序号
+     */
+    private Integer sortNumber;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java
new file mode 100644
index 00000000..015b2afd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java
@@ -0,0 +1,67 @@
+package com.openhis.web.doctorstation.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 预约记录 dto
+ */
+@Data
+@Accessors(chain = true)
+public class ReservationRecordDto {
+
+    /**
+     * id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 患者名称
+     */
+    private String patientName;
+
+    /**
+     * 患者联系方式
+     */
+    private String patientTel;
+
+    /**
+     * 主诉
+     */
+    private String chiefComplaint;
+
+    /**
+     * 就诊预约时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reservationTime;
+
+    /**
+     * 预约科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgName;
+
+    /**
+     * 预约医生id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+    private String practitionerName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
similarity index 78%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
index 0199f1a5..c06ffd4d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
@@ -16,6 +16,18 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class SaveDiagnosisChildParam {
 
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
+    /**
+     * 就诊诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterDiagnosisId;
+
     /**
      * 诊断定义id
      */
@@ -37,12 +49,6 @@ public class SaveDiagnosisChildParam {
      */
     private Integer maindiseFlag;
 
-    /**
-     * 诊断ID - 用于存储 adm_encounter_diagnosis表
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long conditionId;
-
     /** 诊断排序（医保文档要求数值型字符长度为2） */
     private Integer diagSrtNo;
 
@@ -54,4 +60,12 @@ public class SaveDiagnosisChildParam {
      */
     private String syndromeGroupNo;
 
+    /**
+     * 诊断描述
+     */
+    private String diagnosisDesc;
+
+    /** 患者疾病诊断类型代码 */
+    private Integer iptDiseTypeCode;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
index d81e47fc..7a67f677 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
@@ -29,6 +29,7 @@ public interface DoctorStationAdviceAppMapper {
      * @param singleUse 单次消耗类 (耗材只查这类)
      * @param pricingFlag 划价标记
      * @param adviceDefinitionIdParamList 医嘱定义id参数集合
+     * @param adviceTypes 医嘱类型参数集合
      * @param queryWrapper 查询条件
      * @return 医嘱信息
      */
@@ -38,6 +39,7 @@ public interface DoctorStationAdviceAppMapper {
         @Param("activityTableName") String activityTableName, @Param("singleUse") String singleUse,
         @Param("pricingFlag") Integer pricingFlag,
         @Param("adviceDefinitionIdParamList") List<Long> adviceDefinitionIdParamList,
+        @Param("adviceTypes") List<Integer> adviceTypes,
         @Param(Constants.WRAPPER) QueryWrapper<AdviceBaseDto> queryWrapper);
 
     /**
@@ -58,11 +60,13 @@ public interface DoctorStationAdviceAppMapper {
      * 
      * @param medicationTableName 药品定义表名
      * @param deviceTableName 耗材定义表名
-     * @param status 发放状态
+     * @param status1 发放状态-草稿
+     * @param status2 发放状态-待配药
      * @return 待发放数量信息
      */
     List<AdviceInventoryDto> getAdviceDraftInventory(@Param("medicationTableName") String medicationTableName,
-        @Param("deviceTableName") String deviceTableName, @Param("status") Integer status);
+        @Param("deviceTableName") String deviceTableName, @Param("status1") Integer status1,
+        @Param("status2") Integer status2);
 
     /**
      * 查询 费用定价子表
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
new file mode 100644
index 00000000..a208091c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
@@ -0,0 +1,77 @@
+package com.openhis.web.doctorstation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.openhis.web.doctorstation.dto.DiagnosisQueryDto;
+import com.openhis.web.doctorstation.dto.RequestBaseDto;
+
+/**
+ * 医生站-中医 应用Mapper
+ */
+@Repository
+public interface DoctorStationChineseMedicalAppMapper {
+
+    /**
+     * 查询中医就诊诊断信息
+     *
+     * @param encounterId 就诊id
+     * @return 中医就诊诊断信息
+     */
+    List<DiagnosisQueryDto> getTcmEncounterDiagnosis(@Param("encounterId") Long encounterId);
+
+    /**
+     * 查询中医医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @param patientId 患者id
+     * @param MED_MEDICATION_REQUEST 药品请求表名
+     * @param WOR_DEVICE_REQUEST 耗材请求表名
+     * @param WOR_SERVICE_REQUEST 诊疗请求表名
+     * @param practitionerId 当前账号的参与者id
+     * @param historyFlag 历史医嘱标记
+     * @return 中医医嘱请求数据
+     */
+    List<RequestBaseDto> getTcmRequestBaseInfo(@Param("encounterId") Long encounterId,
+        @Param("patientId") Long patientId, @Param("MED_MEDICATION_REQUEST") String MED_MEDICATION_REQUEST,
+        @Param("WOR_DEVICE_REQUEST") String WOR_DEVICE_REQUEST,
+        @Param("WOR_SERVICE_REQUEST") String WOR_SERVICE_REQUEST, @Param("practitionerId") Long practitionerId,
+        @Param("historyFlag") String historyFlag);
+
+    /**
+     * 查询中医医嘱历史请求数据
+     *
+     * @param encounterId 就诊id
+     * @param patientId 患者id
+     * @param MED_MEDICATION_REQUEST 药品请求表名
+     * @param WOR_DEVICE_REQUEST 耗材请求表名
+     * @param WOR_SERVICE_REQUEST 诊疗请求表名
+     * @param practitionerId 当前账号的参与者id
+     * @param historyFlag 历史医嘱标记
+     * @return 中医医嘱历史请求数据
+     */
+    List<RequestBaseDto> getTcmRequestHistoryInfo(@Param("encounterId") Long encounterId,
+        @Param("patientId") Long patientId, @Param("MED_MEDICATION_REQUEST") String MED_MEDICATION_REQUEST,
+        @Param("WOR_DEVICE_REQUEST") String WOR_DEVICE_REQUEST,
+        @Param("WOR_SERVICE_REQUEST") String WOR_SERVICE_REQUEST, @Param("practitionerId") Long practitionerId,
+        @Param("historyFlag") String historyFlag);
+
+    /**
+     * 查询中医诊断id集合
+     * 
+     * @param syndromeGroupNo 中医证候组号
+     * @return 中医诊断id集合
+     */
+    List<Long> getConditionIds(@Param("syndromeGroupNo") String syndromeGroupNo);
+
+    /**
+     * 根据诊断id集合查询对应开立的医嘱个数
+     * 
+     * @param conditionIds 诊断id集合
+     * @return 开立的医嘱个数
+     */
+    Integer getAdviceNumByConditionIds(@Param("conditionIds") List<Long> conditionIds);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
similarity index 92%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
index 0cf99ba1..9c04ff8d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
@@ -82,4 +82,12 @@ public interface DoctorStationDiagnosisAppMapper {
      */
     List<DiagnosisQueryDto> getEncounterDiagnosis(@Param("encounterId") Long encounterId);
 
+    /**
+     * 根据诊断id查询对应开立的医嘱个数
+     * 
+     * @param conditionId 诊断id
+     * @return 对应开立的医嘱个数
+     */
+    Integer getAdviceNumByConditionId(@Param("conditionId") Long conditionId);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
similarity index 39%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
index efe460d9..71cfea92 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
@@ -1,32 +1,59 @@
 package com.openhis.web.doctorstation.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.openhis.web.doctorstation.dto.*;
+import com.openhis.web.reportmanage.dto.ChargeReportPageDto;
+import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
+import com.openhis.ybcatalog.domain.CatalogDrugInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.util.List;
+
 /**
  * 医生站-电子处方 应用Mapper
  */
 @Repository
 public interface DoctorStationElepPrescriptionMapper {
 
+    /**
+     * 获取药品信息
+     *
+     * @param medicationNo 药品号
+     * @param version 药品版本号
+     * @return 药品信息
+     */
+    CatalogDrugInfo selectCatalogDrugInfoByNo(@Param("medicationNo") String medicationNo,@Param("version") String version);
+
+    /**
+     * 获取药品信息
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 药品信息
+     */
+    Page<CatalogDrugInfo> selectCatalogDrugInfo(@Param("page") Page<ChargeReportPageDto> page,
+                                                @Param(Constants.WRAPPER) QueryWrapper<String> queryWrapper);
+
     /**
      * 获取处方信息
      *
-     * @param page 分页
+     * @param page      分页
      * @param patientId 患者id
      * @return 药品信息
      */
-    Page<ElepPrescriptionInfoDto> selectElepPrescriptionInfo(@Param("page") Page<ElepPrescriptionInfoDto> page,@Param("patientId") Long patientId);
+    Page<ElepPrescriptionInfoDto> selectElepPrescriptionInfo(@Param("page") Page<ElepPrescriptionInfoDto> page, @Param("patientId") Long patientId);
+
     /**
      * 获取处方信息
      *
      * @param prescriptionNo 处方号
      * @return 药品信息
      */
-    Page<ElepMedicationInfoDto> selectMedicationInfo(@Param("page") Page<ElepPrescriptionInfoDto> page,@Param("prescriptionNo") String prescriptionNo);
+    Page<ElepMedicationInfoDto> selectMedicationInfo(@Param("page") Page<ElepPrescriptionInfoDto> page, @Param("prescriptionNo") String prescriptionNo);
 
     /**
      * 搜索更表需要信息
@@ -36,4 +63,11 @@ public interface DoctorStationElepPrescriptionMapper {
      */
     ElepPrescriptionInfoParam selectSaveInfo(@Param("encounterId") Long encounterId);
 
+//    /**
+//     * 搜索诊断信息
+//     *
+//     * @param encounterId 就诊id
+//     * @return 诊断信息
+//     */
+//    List<ElepPrescriptionInitConditionDto> selectConditionInfo(@Param("encounterId") Long encounterId);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
similarity index 48%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
index ac80061f..22136de9 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
@@ -1,5 +1,7 @@
 package com.openhis.web.doctorstation.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -8,6 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
 
 /**
  * 医生站-主页面 应用Mapper
@@ -19,7 +23,8 @@ public interface DoctorStationMainAppMapper {
      * 查询就诊患者信息
      * 
      * @param page 分页参数
-     * @param participantType 参与者类型
+     * @param participantType 参与者类型 - 挂号医生
+     * @param participantType2 参与者类型 - 接诊医生
      * @param ClinicalStatus 过敏史状态
      * @param userId 当前登录账号ID
      * @param currentUserOrganizationId 当前登录账号所属的科室ID
@@ -29,9 +34,30 @@ public interface DoctorStationMainAppMapper {
      * @return 就诊患者信息
      */
     IPage<PatientInfoDto> getPatientInfo(@Param("page") Page<PatientInfoDto> page,
-        @Param("participantType") String participantType, @Param("ClinicalStatus") Integer ClinicalStatus,
-        @Param("userId") Long userId, @Param("currentUserOrganizationId") Long currentUserOrganizationId,
-        @Param("pricingFlag") Integer pricingFlag, @Param("encounterStatus") Integer encounterStatus,
+        @Param("participantType") String participantType, @Param("participantType2") String participantType2,
+        @Param("ClinicalStatus") Integer ClinicalStatus, @Param("userId") Long userId,
+        @Param("currentUserOrganizationId") Long currentUserOrganizationId, @Param("pricingFlag") Integer pricingFlag,
+        @Param("encounterStatus") Integer encounterStatus,
         @Param(Constants.WRAPPER) QueryWrapper<PatientInfoDto> queryWrapper);
 
+    /**
+     * 查询处方号列表信息
+     * 
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 处方号列表信息
+     */
+    IPage<PrescriptionInfoBaseDto> getPrescriptionPageInfo(@Param("page") Page<PrescriptionInfoBaseDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PrescriptionInfoBaseDto> queryWrapper);
+
+    /**
+     * 查询处方详情
+     *
+     * @param prescriptionNo 处方号
+     * @param encounterId 就诊id
+     * @return 处方详情
+     */
+    List<PrescriptionInfoDetailDto> getPrescriptionDetailInfo(@Param("prescriptionNo") String prescriptionNo,
+        @Param("encounterId") Long encounterId);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java
new file mode 100644
index 00000000..918b57ac
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java
@@ -0,0 +1,31 @@
+package com.openhis.web.doctorstation.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.doctorstation.dto.ReservationRecordDto;
+
+/**
+ * 医生站-预约记录 应用Mapper
+ */
+@Repository
+public interface ReservationRecordAppMapper {
+
+    /**
+     * 查询 预约记录
+     * 
+     * @param page 分页参数
+     * @param orgId 科室id
+     * @param practitionerId 参与者id
+     * @param queryWrapper 查询条件
+     * @return 预约记录
+     */
+    IPage<ReservationRecordDto> getReservationInfo(@Param("page") Page<ReservationRecordDto> page,
+        @Param("orgId") Long orgId, @Param("practitionerId") Long practitionerId,
+        @Param(Constants.WRAPPER) QueryWrapper<ReservationRecordDto> queryWrapper);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
new file mode 100644
index 00000000..ab0fe28b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
@@ -0,0 +1,495 @@
+package com.openhis.web.doctorstation.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.SecurityUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.*;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.openhis.web.datadictionary.dto.ActivityChildJsonDto;
+import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.openhis.web.doctorstation.dto.*;
+import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
+import com.openhis.web.personalization.dto.ActivityDeviceDto;
+import com.openhis.workflow.domain.DeviceRequest;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IDeviceRequestService;
+import com.openhis.workflow.service.IServiceRequestService;
+
+/**
+ * 医嘱工具类
+ */
+@Component
+public class AdviceUtils {
+
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    DoctorStationAdviceAppMapper doctorStationAdviceAppMapper;
+
+    @Resource
+    OutpatientRegistrationAppMapper outpatientRegistrationAppMapper;
+
+    @Resource
+    IActivityDefinitionService iActivityDefinitionService;
+
+    @Resource
+    IDeviceRequestService iDeviceRequestService;
+
+    @Resource
+    IServiceRequestService iServiceRequestService;
+
+    @Resource
+    IDeviceDispenseService iDeviceDispenseService;
+
+    @Resource
+    IChargeItemService iChargeItemService;
+
+    @Resource
+    IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
+
+    /**
+     * 校验库存
+     *
+     * @param adviceSaveList 医嘱信息
+     * @return 提示信息
+     */
+    public String checkInventory(List<AdviceSaveDto> adviceSaveList) {
+        // 医嘱定义ID集合
+        List<Long> adviceDefinitionIdList =
+            adviceSaveList.stream().map(AdviceSaveDto::getAdviceDefinitionId).collect(Collectors.toList());
+        // 医嘱库存集合
+        List<AdviceInventoryDto> adviceInventoryList =
+            doctorStationAdviceAppMapper.getAdviceInventory(null, adviceDefinitionIdList,
+                CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
+        // 待发放个数信息
+        List<AdviceInventoryDto> adviceDraftInventoryList = doctorStationAdviceAppMapper.getAdviceDraftInventory(
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+            DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue());
+        // 预减库存
+        List<AdviceInventoryDto> adviceInventory =
+            this.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
+        // 检查库存
+        for (AdviceSaveDto saveDto : adviceSaveList) {
+            boolean matched = false;
+            for (AdviceInventoryDto inventoryDto : adviceInventory) {
+                // 匹配条件：adviceDefinitionId, adviceTableName, locationId, lotNumber 同时相等
+                if (saveDto.getAdviceDefinitionId().equals(inventoryDto.getItemId())
+                    && saveDto.getAdviceTableName().equals(inventoryDto.getItemTable())
+                    && saveDto.getLocationId().equals(inventoryDto.getLocationId())
+                    && saveDto.getLotNumber().equals(inventoryDto.getLotNumber())) {
+                    matched = true;
+                    // 检查库存是否充足
+                    BigDecimal minUnitQuantity = saveDto.getMinUnitQuantity();
+                    Integer chineseHerbsDoseQuantity = saveDto.getChineseHerbsDoseQuantity(); // 中药付数
+                    // 中草药医嘱的情况
+                    if (chineseHerbsDoseQuantity != null && chineseHerbsDoseQuantity > 0) {
+                        minUnitQuantity =
+                            minUnitQuantity.multiply(BigDecimal.valueOf(chineseHerbsDoseQuantity.longValue()));
+                    }
+                    if (minUnitQuantity.compareTo(inventoryDto.getQuantity()) > 0) {
+                        return saveDto.getAdviceName() + "在" + inventoryDto.getLocationName() + "库存不足";
+                    }
+                    break;
+                }
+            }
+            // 如果没有匹配到库存
+            if (!matched) {
+                return saveDto.getAdviceName() + "未匹配到库存信息";
+            }
+        }
+        return null; // 校验通过
+    }
+
+    /**
+     * 预减库存
+     *
+     * @param adviceInventoryList 库存表数据
+     * @param adviceDraftInventoryList 待发放数据
+     * @return 预减库存
+     */
+    public List<AdviceInventoryDto> subtractInventory(List<AdviceInventoryDto> adviceInventoryList,
+        List<AdviceInventoryDto> adviceDraftInventoryList) {
+        // 1. 将 draft 列表转换为 Map，合并重复键的 quantity
+        Map<String,
+            AdviceInventoryDto> draftMap = adviceDraftInventoryList.stream()
+                .collect(Collectors.toMap(
+                    draft -> String.format(CommonConstants.Common.SS_DD_FORMAT, draft.getItemTable(),
+                        draft.getLotNumber(), draft.getItemId(), draft.getLocationId()),
+                    draft -> draft, (existing, replacement) -> {
+                        // 合并重复键的 quantity
+                        BigDecimal existingQty =
+                            existing.getQuantity() != null ? existing.getQuantity() : BigDecimal.ZERO;
+                        BigDecimal replacementQty =
+                            replacement.getQuantity() != null ? replacement.getQuantity() : BigDecimal.ZERO;
+                        existing.setQuantity(existingQty.add(replacementQty));
+                        return existing;
+                    }));
+        // 2. 遍历原始库存列表，匹配并扣减
+        return adviceInventoryList.stream().map(inventory -> {
+            String key = String.format(CommonConstants.Common.SS_DD_FORMAT, inventory.getItemTable(),
+                inventory.getLotNumber(), inventory.getItemId(), inventory.getLocationId());
+            AdviceInventoryDto draft = draftMap.get(key);
+            if (draft != null) {
+                BigDecimal draftQty = draft.getQuantity() != null ? draft.getQuantity() : BigDecimal.ZERO;
+                BigDecimal newQty = inventory.getQuantity().subtract(draftQty);
+                inventory.setQuantity(newQty.compareTo(BigDecimal.ZERO) >= 0 ? newQty : BigDecimal.ZERO);
+            }
+            return inventory;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 药品请求为皮试或输液,开立对应的请求及账单
+     */
+    public void generateActRequestByMedicationFlag(MedicationRequest medicationRequest, Long organizationId,
+        AdviceSaveDto adviceSaveDto) {
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 皮试
+        boolean isSkinTest = Whether.YES.getValue().equals(medicationRequest.getSkinTestFlag());
+        // 输液
+        boolean isInfusion = Whether.YES.getValue().equals(medicationRequest.getInfusionFlag());
+        // 当前时间
+        Date curDate = new Date();
+        AdviceBaseDto adviceBaseDto;
+        ServiceRequest serviceRequest;
+        AdviceBaseDto activityAdviceBaseDto;
+        Integer quantity;
+        ChargeItem chargeItem;
+        DeviceRequest deviceRequest;
+        // 生成皮试检查对应的请求和账单;生成皮试检查这个诊疗自身的请求,以及皮试检查诊疗绑定的耗材(包括发放)
+        if (isSkinTest) {
+            quantity = 1; // 请求数量
+            // 皮试检查的诊疗定义id
+            Long skinTestInspectionDefinitionId = iActivityDefinitionService
+                .getAppointActivityDefinitionId(CommonConstants.BusinessName.SKIN_TEST_INSPECTION);
+            if (skinTestInspectionDefinitionId != null) {
+                adviceBaseDto = new AdviceBaseDto();
+                adviceBaseDto.setAdviceDefinitionId(skinTestInspectionDefinitionId); // 医嘱定义id
+                // 对应的诊疗医嘱信息
+                activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null,
+                    null, organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+                if (activityAdviceBaseDto != null) {
+                    // 费用定价
+                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
+                    if (advicePriceDto != null) {
+                        // 生成诊疗请求,用于收费
+                        serviceRequest = new ServiceRequest();
+                        serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
+                        serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                        serviceRequest.setQuantity(quantity); // 请求数量
+                        serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+                        serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
+                        serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
+                        serviceRequest.setPatientId(medicationRequest.getPatientId()); // 患者
+                        serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
+                        serviceRequest.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
+                        serviceRequest.setAuthoredTime(curDate); // 请求签发时间
+                        serviceRequest.setOrgId(organizationId); // 执行科室
+                        serviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                        serviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                        iServiceRequestService.save(serviceRequest);
+                        // 生成账单
+                        chargeItem = new ChargeItem();
+                        chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
+                        chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+                        chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+                        chargeItem.setPatientId(medicationRequest.getPatientId()); // 患者
+                        chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
+                        chargeItem.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
+                        chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
+                        chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
+                        chargeItem.setRequestingOrgId(orgId); // 开立科室
+                        chargeItem.setEnteredDate(curDate); // 开立时间
+                        chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
+                        chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
+                        chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
+                        chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
+                        chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+                        chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                        chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+
+                        chargeItem.setQuantityValue(quantity); // 数量
+                        chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
+                        chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
+                        // 计算总价,保留4位小数
+                        BigDecimal qty = new BigDecimal(quantity);
+                        chargeItem
+                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                        iChargeItemService.save(chargeItem);
+                    }
+                }
+                // 查询皮试检查绑定的耗材id及请求数量
+                List<ActivityDeviceDto> tmpActivityList = outpatientRegistrationAppMapper.getTmpActivityList(
+                    String.valueOf(skinTestInspectionDefinitionId), CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+                for (ActivityDeviceDto activityDeviceDto : tmpActivityList) {
+                    quantity = activityDeviceDto.getQuantity(); // 请求数量
+                    adviceBaseDto = new AdviceBaseDto();
+                    adviceBaseDto.setAdviceDefinitionId(activityDeviceDto.getDevActId());
+                    // 对应的耗材医嘱信息
+                    activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null,
+                        null, organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+                    // 库存信息
+                    AdviceInventoryDto adviceInventoryDto = activityAdviceBaseDto.getInventoryList().get(0);
+                    // 价格信息
+                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
+                    if (adviceInventoryDto != null && advicePriceDto != null) {
+                        // 耗材请求
+                        deviceRequest = new DeviceRequest();
+                        deviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue()); // 请求状态
+                        deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
+                        deviceRequest.setQuantity(quantity); // 请求数量
+                        deviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+                        deviceRequest.setLotNumber(adviceInventoryDto.getLotNumber());// 产品批号
+                        deviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
+                        deviceRequest.setDeviceDefId(activityAdviceBaseDto.getAdviceDefinitionId());// 耗材定义id
+                        deviceRequest.setPatientId(medicationRequest.getPatientId()); // 患者
+                        deviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
+                        deviceRequest.setOrgId(organizationId);// 开方人科室
+                        deviceRequest.setReqAuthoredTime(curDate); // 请求开始时间
+                        // 发放耗材房
+                        deviceRequest.setPerformLocation(activityAdviceBaseDto.getLocationId());
+                        deviceRequest.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
+                        deviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                        deviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                        iDeviceRequestService.save(deviceRequest);
+                        // 耗材发放
+                        iDeviceDispenseService.handleDeviceDispense(deviceRequest, DbOpType.INSERT.getCode());
+                        // 耗材账单
+                        chargeItem = new ChargeItem();
+                        chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
+                        chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+                        chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
+                        chargeItem.setPatientId(medicationRequest.getPatientId()); // 患者
+                        chargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 类型
+                        chargeItem.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
+                        chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
+                        chargeItem.setDefDetailId(advicePriceDto.getDefinitionDetailId()); // 定价子表主键
+                        chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
+                        chargeItem.setEnteredDate(curDate); // 开立时间
+                        chargeItem.setServiceTable(CommonConstants.TableName.WOR_DEVICE_REQUEST);// 医疗服务类型
+                        chargeItem.setServiceId(deviceRequest.getId()); // 医疗服务ID
+                        chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
+                        chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
+                        chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+                        chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                        chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+
+                        chargeItem.setQuantityValue(quantity); // 数量
+                        chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
+                        chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
+                        // 计算总价,保留4位小数
+                        BigDecimal qty = new BigDecimal(quantity);
+                        chargeItem
+                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                        iChargeItemService.save(chargeItem);
+                    }
+                }
+            }
+        }
+        // 生成用法(输液)绑定的诊疗对应的请求和账单
+        if (isInfusion) {
+            // 分组id
+            Long groupId = medicationRequest.getGroupId();
+            // 执行次数
+            Integer executeNum = medicationRequest.getExecuteNum();
+            // 用法
+            String methodCode = medicationRequest.getMethodCode();
+            // 查询用法绑定的诊疗信息
+            List<ActivityDeviceDto> tmpActivityList = outpatientRegistrationAppMapper.getTmpActivityList(methodCode,
+                CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
+            for (ActivityDeviceDto activityDeviceDto : tmpActivityList) {
+                quantity = activityDeviceDto.getQuantity() * executeNum; // 请求数量
+                adviceBaseDto = new AdviceBaseDto();
+                adviceBaseDto.setAdviceDefinitionId(activityDeviceDto.getDevActId());
+                // 对应的诊疗医嘱信息
+                activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null,
+                    null, organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+                if (activityAdviceBaseDto != null) {
+                    // 费用定价
+                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
+                    if (advicePriceDto != null) {
+                        // 本次就诊,绑定的诊疗不重复带
+                        ServiceRequest one = iServiceRequestService.getOne(new LambdaQueryWrapper<ServiceRequest>()
+                            .eq(ServiceRequest::getEncounterId, medicationRequest.getEncounterId())
+                            .eq(ServiceRequest::getActivityId, activityAdviceBaseDto.getAdviceDefinitionId()));
+                        if (one == null) {
+                            // 生成诊疗请求
+                            serviceRequest = new ServiceRequest();
+                            serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
+                            serviceRequest
+                                .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                            serviceRequest.setQuantity(quantity); // 请求数量
+                            serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+                            serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
+                            serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
+                            serviceRequest.setPatientId(medicationRequest.getPatientId()); // 患者
+                            serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
+                            serviceRequest.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
+                            serviceRequest.setAuthoredTime(curDate); // 请求签发时间
+                            serviceRequest.setOrgId(organizationId); // 执行科室
+                            serviceRequest.setGroupId(groupId); // 分组id
+                            serviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                            serviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                            iServiceRequestService.save(serviceRequest);
+
+                            chargeItem = new ChargeItem();
+                            chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue()); // 账单生成来源
+                            chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+                            chargeItem
+                                .setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+                            chargeItem.setPatientId(medicationRequest.getPatientId()); // 患者
+                            chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
+                            chargeItem.setEncounterId(medicationRequest.getEncounterId()); // 就诊id
+                            chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
+                            chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
+                            chargeItem.setRequestingOrgId(orgId); // 开立科室
+                            chargeItem.setEnteredDate(curDate); // 开立时间
+                            chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
+                            chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
+                            chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
+                            chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
+                            chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+                            chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+                            chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+
+                            chargeItem.setQuantityValue(quantity); // 数量
+                            chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
+                            chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
+                            // 计算总价,保留4位小数
+                            BigDecimal qty = new BigDecimal(quantity);
+                            chargeItem.setTotalPrice(
+                                qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                            iChargeItemService.saveOrUpdate(chargeItem);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 处理诊疗子项信息
+     *
+     * @param childrenJson 诊疗子项JSON
+     * @param organizationId 患者挂号/住院入库对应的科室id
+     * @param activityChildrenJsonParams 诊疗子项参数类
+     */
+    public void handleActivityChild(String childrenJson, Long organizationId,
+        ActivityChildrenJsonParams activityChildrenJsonParams) {
+        // 治疗类型 (长期/临时)
+        Integer therapyEnum = activityChildrenJsonParams.getTherapyEnum();
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            // 将JSON字符串转换为List<ActivityChildJsonDto>
+            List<ActivityChildJsonDto> activityChildJsonDtoList =
+                objectMapper.readValue(childrenJson, new TypeReference<>() {});
+            // 创建子项的诊疗请求
+            Long adviceDefinitionId; // 诊疗医嘱定义ID
+            Integer quantity; // 子项请求数量
+            List<ChargeItem> chargeItemList = new ArrayList<>(); // 子项账单集合
+            ServiceRequest serviceRequest;
+            ChargeItem chargeItem;
+            AdviceBaseDto adviceBaseDto;
+            // 当前时间
+            Date curDate = new Date();
+            for (ActivityChildJsonDto activityChildJsonDto : activityChildJsonDtoList) {
+                adviceDefinitionId = activityChildJsonDto.getAdviceDefinitionId();
+                quantity = activityChildJsonDto.getChildrenRequestNum();
+                adviceBaseDto = new AdviceBaseDto();
+                adviceBaseDto.setAdviceDefinitionId(adviceDefinitionId);
+                // 对应的子项诊疗医嘱信息
+                AdviceBaseDto activityAdviceBaseDto =
+                    iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1,
+                        1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+                if (activityAdviceBaseDto != null) {
+                    // 费用定价
+                    AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
+                    if (advicePriceDto != null) {
+                        // 生成诊疗请求
+                        serviceRequest = new ServiceRequest();
+                        serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
+                        serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                        serviceRequest.setQuantity(quantity); // 请求数量
+                        serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+                        serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
+                        serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id
+                        serviceRequest.setPatientId(activityChildrenJsonParams.getPatientId()); // 患者
+                        serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生
+                        serviceRequest.setEncounterId(activityChildrenJsonParams.getEncounterId()); // 就诊id
+                        serviceRequest.setAuthoredTime(curDate); // 请求签发时间
+                        serviceRequest.setOrgId(organizationId); // 执行科室
+
+                        iServiceRequestService.save(serviceRequest);
+
+                        // 临时医嘱
+                        if (TherapyTimeType.TEMPORARY.getValue().equals(therapyEnum)) {
+                            // 生成账单
+                            chargeItem = new ChargeItem();
+                            chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue());
+                            chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+                            chargeItem
+                                .setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+                            chargeItem.setPatientId(activityChildrenJsonParams.getPatientId()); // 患者
+                            chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
+                            chargeItem.setEncounterId(activityChildrenJsonParams.getEncounterId()); // 就诊id
+                            chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID
+                            chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID
+                            chargeItem.setRequestingOrgId(orgId); // 开立科室
+                            chargeItem.setEnteredDate(curDate); // 开立时间
+                            chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
+                            chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
+                            chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表
+                            chargeItem.setProductId(activityAdviceBaseDto.getAdviceDefinitionId());// 收费项id
+                            chargeItem.setAccountId(activityChildrenJsonParams.getAccountId());// 关联账户ID
+
+                            chargeItem.setQuantityValue(quantity); // 数量
+                            chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
+                            chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
+                            // 计算总价,保留4位小数
+                            BigDecimal qty = new BigDecimal(quantity);
+                            chargeItem.setTotalPrice(
+                                qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                            chargeItemList.add(chargeItem);
+                        }
+                    }
+                }
+            }
+            // 更新主项账单的 children_json 字段
+            if (chargeItemList.size() > 0) {
+                String chargeItemChildrenJson = objectMapper.writeValueAsString(chargeItemList);
+                ChargeItem mainChargeItem = new ChargeItem();
+                mainChargeItem.setId(activityChildrenJsonParams.getChargeItemId()); // 主键
+                mainChargeItem.setChildrenJson(chargeItemChildrenJson); // 子项json
+                iChargeItemService.updateById(mainChargeItem);
+            }
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java
new file mode 100644
index 00000000..73e225c4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java
@@ -0,0 +1,156 @@
+package com.openhis.web.doctorstation.utils;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.openhis.administration.domain.Organization;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IOrganizationService;
+import com.openhis.administration.service.IPatientService;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.enums.ActivityType;
+import com.openhis.common.enums.ybenums.YbGender;
+import com.openhis.crosssystem.dto.LisApplyDto;
+import com.openhis.crosssystem.dto.LisApplyGroupDto;
+import com.openhis.crosssystem.dto.PacsApplyDto;
+import com.openhis.crosssystem.enums.*;
+import com.openhis.crosssystem.utils.CrossSystemSendApplyUtil;
+import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.workflow.service.IServiceRequestService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 跨系统发送申请工具类
+ *
+ * @author GuoRui
+ * @date 2025-06-27
+ */
+@Slf4j
+@Component
+public class DoctorStationSendApplyUtil {
+
+    @Autowired
+    private CrossSystemSendApplyUtil crossSystemSendApplyUtil;
+    @Autowired
+    private IActivityDefinitionService activityDefinitionService;
+    @Autowired
+    private IOrganizationService organizationService;
+    @Autowired
+    private IServiceRequestService serviceRequestService;
+    @Autowired
+    private IPatientService patientService;
+    @Autowired
+    private IPractitionerService practitionerService;
+
+    /**
+     * 发送跨系统申请
+     *
+     * @param adviceSaveDto 申请参数
+     * @param organizationId 科室ID
+     * @param curDate 当前时间
+     */
+    public void sendCrossSystemApply(AdviceSaveDto adviceSaveDto, Long organizationId, Date curDate) {
+        // 查询诊疗定义
+        ActivityDefinition activityDefinition =
+            activityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
+        if (activityDefinition == null) {
+            throw new ServiceException("发起LIS或PACS请求失败：诊疗信息不存在");
+        }
+        // 查询挂号科室
+        Organization organization = organizationService.getById(organizationId);
+        if (organization == null) {
+            throw new ServiceException("发起LIS或PACS请求失败：挂号科室信息不存在");
+        }
+        // 查询服务请求
+        ServiceRequest serviceRequest = serviceRequestService.getById(adviceSaveDto.getRequestId());
+        if (serviceRequest == null) {
+            throw new ServiceException("发起LIS或PACS请求失败：服务请求信息不存在");
+        }
+        // 查询患者
+        Patient patient = patientService.getById(adviceSaveDto.getPatientId());
+        if (patient == null) {
+            throw new ServiceException("发起LIS或PACS请求失败：患者信息不存在");
+        }
+        // 查询开方医生
+        Practitioner practitioner = practitionerService.getById(adviceSaveDto.getPractitionerId());
+        if (practitioner == null) {
+            throw new ServiceException("发起LIS或PACS请求失败：开方医生信息不存在");
+        }
+        // 查询执行科室
+        Organization organizationExec = organizationService.getById(adviceSaveDto.getPositionId());
+        if (organizationExec == null) {
+            throw new ServiceException("发起LIS或PACS请求失败：执行科室信息不存在");
+        }
+
+        // 检验，发送LIS申请
+        if (ActivityType.PROOF.getValue().equals(activityDefinition.getTypeEnum())) {
+            // LIS性别转换
+            LisPatientSex lisPatientSex;
+            if (patient.getGenderEnum() == null) {
+                lisPatientSex = LisPatientSex.UNKNOWN;
+            } else {
+                if (YbGender.MALE.getValue().equals(patient.getGenderEnum().toString())) {
+                    lisPatientSex = LisPatientSex.MALE;
+                } else if (YbGender.FEMALE.getValue().equals(patient.getGenderEnum().toString())) {
+                    lisPatientSex = LisPatientSex.FEMALE;
+                } else {
+                    lisPatientSex = LisPatientSex.UNKNOWN;
+                }
+            }
+            // 作成LIS申请参数
+            LisApplyDto lisApplyDto = new LisApplyDto().setApplyNo(serviceRequest.getBusNo())
+                .setPatientNo(patient.getBusNo()).setPatientType(LisPatientType.OUTPATIENT)
+                .setPatientName(patient.getName()).setPatientSex(lisPatientSex).setPatientMobile(patient.getPhone())
+                .setApplyDate(curDate).setApplyDoctor(practitioner.getName()).setApplyDept(organization.getName())
+                .setAge(AgeCalculatorUtil.calculateAge(patient.getBirthDate()))
+                .setExecDeptCode(organizationExec.getBusNo()).setExecDeptName(organizationExec.getName())
+                .setIdCard(patient.getIdCard()).setWardId("").setRoomNo("").setBedNo("").setEmergency("")
+                .setDiagnose("").setOutsideFlg(LisOutsideFlg.NO).setApplyDeptCode(organization.getBusNo())
+                .setApplyDeptName(organization.getName()).setGroupList(List.of(new LisApplyGroupDto()
+                    .setGroupCode(activityDefinition.getBusNo()).setGroupName(activityDefinition.getName())));
+            // 发送LIS申请
+            crossSystemSendApplyUtil.sendApplyToLis(lisApplyDto);
+
+            // 检查，发送PACS申请
+        } else if (ActivityType.TEST.getValue().equals(activityDefinition.getTypeEnum())) {
+            // PACS性别转换
+            PacsPatientSex pacsPatientSex;
+            if (patient.getGenderEnum() == null) {
+                pacsPatientSex = PacsPatientSex.UNKNOWN;
+            } else {
+                if (YbGender.MALE.getValue().equals(patient.getGenderEnum().toString())) {
+                    pacsPatientSex = PacsPatientSex.MALE;
+                } else if (YbGender.FEMALE.getValue().equals(patient.getGenderEnum().toString())) {
+                    pacsPatientSex = PacsPatientSex.FEMALE;
+                } else {
+                    pacsPatientSex = PacsPatientSex.UNKNOWN;
+                }
+            }
+            // 作成PACS申请参数
+            PacsApplyDto pacsApplyDto =
+                new PacsApplyDto().setApplyNo(serviceRequest.getBusNo()).setPatientNo(patient.getBusNo())
+                    .setPatientType(PacsPatientType.OUTPATIENT).setPatientName(patient.getName())
+                    .setPatientSex(pacsPatientSex).setPatientMobile(patient.getPhone()).setApplyDate(curDate)
+                    .setApplyDoctorName(practitioner.getName()).setApplyDoctorCode(practitioner.getBusNo())
+                    .setApplyDeptName(organization.getName()).setApplyDeptCode(organization.getBusNo())
+                    .setAge(AgeCalculatorUtil.calculateAge(patient.getBirthDate()))
+                    .setExecDeptCode(organizationExec.getBusNo()).setExecDeptName(organizationExec.getName())
+                    .setExamPart("").setIdCard(patient.getIdCard()).setWardId("").setRoomNo("").setBedNo("")
+                    .setEmergency("").setDiagnose("").setGroupCode(activityDefinition.getBusNo())
+                    .setGroupName(activityDefinition.getName());
+            // 发送PACS申请
+            crossSystemSendApplyUtil.sendApplyToPacs(pacsApplyDto);
+        }
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java
new file mode 100644
index 00000000..cad2522c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java
@@ -0,0 +1,40 @@
+package com.openhis.web.document.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.document.dto.DocDefinitionDto;
+import com.openhis.web.document.dto.DocDefinitonParam;
+
+/**
+ * 文书定义 应用Service
+ */
+public interface IDocDefinitionAppService {
+
+    /**
+     * 新增文书定义
+     *
+     * @param definitionDto
+     * @return
+     */
+    R<?> addDefinition(DocDefinitionDto definitionDto);
+
+
+    /**
+     * 修改文书定义
+     *
+     * @param definitionDto
+     * @return
+     */
+    R<?> updateDefinition(DocDefinitionDto definitionDto);
+
+    /**
+     * 获取文书定义列表 树形结构
+     *
+     * @param param 条件参数
+     * @return
+     */
+    R<?> getTreeList(DocDefinitonParam param);
+
+    R<?> getDefinitionDetailById(Long id);
+
+    DocDefinitionDto getDefinitionById(Long id);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java
new file mode 100644
index 00000000..e5e12d43
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java
@@ -0,0 +1,41 @@
+package com.openhis.web.document.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+
+import java.util.List;
+
+/**
+ * 文书定义 应用Service
+ */
+public interface IDocDefinitionOrganizationAppService {
+
+    /**
+     * 新增文书分配科室列表
+     *
+     * @param organizationDto
+     * @return
+     */
+    R<?> add(DocDefinitionOrganizationDto organizationDto);
+
+    /**
+     * 删除文书分配科室列表
+     *
+     * @param definitionId
+     * @param busNo
+     * @return
+     */
+    R<?> delete(Long definitionId, String busNo);
+
+    /**
+     * 查询文书定义科室列表
+     *
+     * @param definitionId
+     * @param busNo
+     * @return
+     */
+
+    R<?> getOrganizationIdlist(Long definitionId, String busNo);
+
+    R<?> updateOrganization(DocDefinitionOrganizationDto organizationDto);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
new file mode 100644
index 00000000..d21f02f1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
@@ -0,0 +1,53 @@
+package com.openhis.web.document.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.document.dto.DocRecordDto;
+import com.openhis.web.document.dto.DocRecordPatientQueryParam;
+import com.openhis.web.document.dto.DocRecordQueryParam;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 文书记录 应用Service
+ */
+public interface IDocRecordAppService {
+
+    //    /**
+//     * 新增记录
+//     *
+//     * @param docRecordDto 文书记录信息
+//     * @return
+//     */
+//    R<?> createOrEditRecord(DocRecordDto docRecordDto);
+    R<?> addRecord(DocRecordDto docRecordDto);
+
+    R<?> updateRecord(DocRecordDto docRecordDto);
+
+    /**
+     * 根据患者ID或就诊ID获取文书记录列表,只针对不需返回患者具体信息的列表，体温单除外，单独处理
+     */
+    R<?> getRecordByEncounterIdList(DocRecordQueryParam docRecordQueryParam, Integer IsPage, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    R<?> getRecordPageList(DocRecordPatientQueryParam docRecordPatientQueryParam, List<Integer> primaryMenuEnumList, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 根据文书记录ID获取文书记录信息
+     *
+     * @param recordId 文书记录ID
+     * @return
+     */
+
+    R<?> getRecordById(Long recordId);
+
+    R<?> setIsEdit(Long recordId);
+
+    /**
+     * 删除文书分配信息
+     *
+     * @param ids 删除文书分配信息ID列表
+     * @return
+     */
+    R<?> deleteRecord(List<Long> ids);
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
new file mode 100644
index 00000000..4026287d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
@@ -0,0 +1,23 @@
+package com.openhis.web.document.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.web.document.dto.DocStatisticsDto;
+
+import java.util.List;
+
+/**
+ * 文档模板 业务接口
+ */
+public interface IDocStatisticsAppService {
+
+
+    public R<?> createOrUpdte(List<DocStatisticsDto> docStatisticsList);
+
+    public R<?> delete(List<Long> ids);
+
+    public R<?> queryByRecordId(Long recordId);
+
+    public R<?> queryByEncounterId(Long encounterId);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
new file mode 100644
index 00000000..9dc36bb7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
@@ -0,0 +1,74 @@
+package com.openhis.web.document.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 文档模板 业务接口
+ */
+public interface IDocStatisticsDefinitionAppService {
+
+
+    /**
+     * 创建或更新文档模板
+     *
+     * @param docStatisticsDefinitionDto
+     */
+    public R<?> createOrEdit(DocStatisticsDefinitionDto docStatisticsDefinitionDto);
+
+    public R<?> add(DocStatisticsDefinitionDto docStatisticsDefinitionDto);
+
+    public R<?> update(DocStatisticsDefinitionDto docStatisticsDefinitionDto);
+
+    /**
+     * 分页查询列表-不包含options 分页
+     *
+     * @return
+     */
+    public R<?> getPageList(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 获取文档统计定义列表（不分页）
+     *
+     * @param isStatistics 是否统计
+     * @return 文档统计定义列表
+     */
+    public List<DocStatisticsDefinitionDto> getList(Integer isStatistics);
+
+    /**
+     * 获取文档统计定义选项列表并按指定格式返回
+     *
+     * @return 封装了处理结果的响应对象
+     */
+    public R<?> getOptionList();
+
+    /**
+     * 删除文档模板
+     *
+     * @param id
+     */
+
+    public R<?> deleteDocStatisticsDefinition(Long id);
+
+
+    /**
+     * 根据id获取文档统计定义
+     *
+     * @param id
+     * @return 封装了处理结果的响应对象
+     */
+    public R<?> getDocStatisticsDefinitionById(Long id);
+
+    /**
+     * 根据code获取文档统计定义
+     *
+     * @param code
+     * @return 封装了处理结果的响应对象
+     */
+    public R<?> getDocStatisticsDefinitionByCode(String code);
+
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionOptionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionOptionAppService.java
new file mode 100644
index 00000000..9dd6d5e1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionOptionAppService.java
@@ -0,0 +1,36 @@
+package com.openhis.web.document.appservice;
+
+
+import com.core.common.core.domain.AjaxResult;
+import com.core.common.core.domain.R;
+import com.openhis.web.document.dto.DocStatisticsDefinitionOptionDto;
+import com.openhis.web.document.dto.DocStatisticsDefinitionOptionList;
+
+import java.util.List;
+
+/**
+ * 文档模板 业务接口
+ */
+public interface IDocStatisticsDefinitionOptionAppService {
+
+
+    /**
+     * 新增、修改文档模板 统计项选项
+     *
+     * @param docStatisticsDefinitionOptionList
+     */
+    public R<?> add(DocStatisticsDefinitionOptionList docStatisticsDefinitionOptionList);
+
+    public R<?> createOrEdit(DocStatisticsDefinitionOptionList docStatisticsDefinitionOptionList);
+
+    public R<?> deleteDocStatisticsDefinitionOptionById(Long id);
+
+    public DocStatisticsDefinitionOptionList getDocStatisticsDefinitionOptionByDefinitionId(Long docStatisticsDefinitionId);
+
+    /**
+     * 获取文档模板 统计项选项列表
+     */
+    public AjaxResult getDocStatisticsDefinitionOptionList();
+
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
new file mode 100644
index 00000000..7edbb6b8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
@@ -0,0 +1,25 @@
+package com.openhis.web.document.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.document.dto.DocTemplateDto;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 文书模板-一 业务接口
+ */
+public interface IDocTemplateAppService {
+
+    public R<?> add(DocTemplateDto docTemplateDto);
+
+    public R<?> delete(Long id);
+
+    public R<?> update(DocTemplateDto docTemplateDto);
+
+    public R<?> getById(Long id);
+
+    public R<?> getListByDefinitionId(Long definitionId);
+
+    public R<?> getPageList(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
new file mode 100644
index 00000000..5fd809ad
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
@@ -0,0 +1,292 @@
+package com.openhis.web.document.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.DocUseRangeEnum;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.DocDefinitionOrganization;
+import com.openhis.document.service.IDocDefinitionOrganizationService;
+import com.openhis.document.service.IDocDefinitionService;
+import com.openhis.web.document.appservice.IDocDefinitionAppService;
+import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService;
+import com.openhis.web.document.dto.DirectoryNode;
+import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import com.openhis.web.document.dto.DocDefinitionDto;
+import com.openhis.web.document.dto.DocDefinitonParam;
+import com.openhis.web.document.mapper.DocDefinitionAppMapper;
+import com.openhis.web.document.util.DocumentDirectoryProcessor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+public class DocDefinitionAppServiceImpl implements IDocDefinitionAppService {
+    @Resource
+    private IDocDefinitionService docDefinitionService;
+    @Resource
+    private IDocDefinitionOrganizationAppService docDefinitionOrganizationAppService;
+    @Resource
+    private IDocDefinitionOrganizationService docDefinitionOrganizationService;
+    @Resource
+    private DocDefinitionAppMapper docDefinitionAppMapper;
+
+
+    @Autowired(required = false)
+    private AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 新增文书定义（含科室分配逻辑）
+     */
+    @Override
+    public R<?> addDefinition(DocDefinitionDto definitionDto) {
+        // 1. 基础参数校验（按必填优先级排序）
+        if (definitionDto.getName() == null || definitionDto.getName().trim().isEmpty()) {
+            return R.fail("新增文书定义失败：文书名称不能为空（或不能为空白字符）");
+        }
+        if (definitionDto.getVersion() == null || definitionDto.getVersion().trim().isEmpty()) {
+            return R.fail("新增文书定义失败：文书版本号不能为空（或不能为空白字符）");
+        }
+        if (definitionDto.getVueRouter() == null || definitionDto.getVueRouter().trim().isEmpty()) {
+            return R.fail("新增文书定义失败：文书路由不能为空（或不能为空白字符）");
+        }
+
+        // 2. 校验"名称+版本号"唯一性（避免重复创建）
+        long duplicateCount = docDefinitionService.lambdaQuery()
+                .eq(DocDefinition::getName, definitionDto.getName().trim())
+                .eq(DocDefinition::getVersion, definitionDto.getVersion().trim())
+                .count();
+        if (duplicateCount > 0) {
+            log.warn("新增文书定义失败：名称={}、版本号={}的文书已存在",
+                    definitionDto.getName(), definitionDto.getVersion());
+            return R.fail("新增文书定义失败：相同名称和版本号的文书已存在，请修改后重试");
+        }
+
+        // 3. 补充默认值（避免null字段插入数据库）
+        if (definitionDto.getDisplayOrder() == null) {
+            definitionDto.setDisplayOrder(0);
+        }
+        if (definitionDto.getIsValid() == null) {
+            definitionDto.setIsValid(0); // 0-默认无效，需根据业务确认是否改为1
+        }
+
+        // 4. 封装文书定义实体（生成业务编号）
+        DocDefinition docDefinition = new DocDefinition();
+        // 校验AssignSeqUtil是否注入（避免空指针）
+        if (assignSeqUtil == null) {
+            log.error("新增文书定义失败：AssignSeqUtil工具类未注入，无法生成业务编号");
+            return R.fail("新增文书定义失败：系统工具类异常，无法生成业务编号");
+        }
+        String busNo = assignSeqUtil.getSeq(AssignSeqEnum.PURCHASE_DOCUMENT.getPrefix(), 10);
+        docDefinition.setBusNo(busNo);
+        docDefinition.setName(definitionDto.getName().trim());
+        docDefinition.setVersion(definitionDto.getVersion().trim());
+        docDefinition.setDisplayOrder(definitionDto.getDisplayOrder());
+        docDefinition.setHospitalId(SecurityUtils.getLoginUser().getHospitalId());
+        docDefinition.setIsValid(definitionDto.getIsValid());
+        docDefinition.setVueRouter(definitionDto.getVueRouter().trim());
+        docDefinition.setPrimaryMenuEnum(definitionDto.getPrimaryMenuEnum());
+        docDefinition.setSubMenu(definitionDto.getSubMenu());
+        docDefinition.setUseRangeEnum(definitionDto.getUseRangeEnum());
+        docDefinition.setDoctorPermissionEnum(definitionDto.getDoctorPermissionEnum());
+        docDefinition.setNursingPermissionEnum(definitionDto.getNursingPermissionEnum());
+        docDefinition.setMedicalPermissionEnum(definitionDto.getMedicalPermissionEnum());
+        docDefinition.setPharmacistPermissionEnum(definitionDto.getPharmacistPermissionEnum());
+
+        // 5. 保存文书定义
+        boolean saveSuccess = docDefinitionService.save(docDefinition);
+        if (!saveSuccess) {
+            log.error("新增文书定义失败：数据库保存异常（名称={}, 版本号={}, 业务编号={}",
+                    definitionDto.getName(), definitionDto.getVersion(), busNo);
+            return R.fail("新增文书定义失败：数据库保存操作异常");
+        }
+
+        // 6. 科室分配（仅当使用范围为"科室级"时执行）
+        if (DocUseRangeEnum.DEPT_USE.getValue().equals(definitionDto.getUseRangeEnum())
+                && definitionDto.getOrganizationIds() != null
+                && !definitionDto.getOrganizationIds().isEmpty()) {
+            DocDefinitionOrganizationDto orgDto = new DocDefinitionOrganizationDto();
+            orgDto.setBusNo(busNo);
+            orgDto.setDefinitionId(docDefinition.getId());
+            orgDto.setOrganizationIds(definitionDto.getOrganizationIds());
+            // 复用科室分配服务的新增逻辑，直接返回结果
+            return docDefinitionOrganizationAppService.add(orgDto);
+        }
+
+        return R.ok("新增文书定义成功");
+    }
+
+
+    /**
+     * 修改文书定义（版本号冲突时自动新增，含科室分配更新）
+     */
+    @Override
+    public R<?> updateDefinition(DocDefinitionDto definitionDto) {
+        // 1. 基础参数校验（修改必传字段）
+        if (definitionDto.getId() == null) {
+            return R.fail("修改文书定义失败：文书ID不能为空");
+        }
+        if (definitionDto.getName() == null || definitionDto.getName().trim().isEmpty()) {
+            return R.fail("修改文书定义失败：文书名称不能为空（或不能为空白字符）");
+        }
+        if (definitionDto.getVersion() == null || definitionDto.getVersion().trim().isEmpty()) {
+            return R.fail("修改文书定义失败：文书版本号不能为空（或不能为空白字符）");
+        }
+        if (definitionDto.getVueRouter() == null || definitionDto.getVueRouter().trim().isEmpty()) {
+            return R.fail("修改文书定义失败：文书路由不能为空（或不能为空白字符）");
+        }
+        if (definitionDto.getBusNo() == null || definitionDto.getBusNo().trim().isEmpty()) {
+            return R.fail("修改文书定义失败：文书业务编号不能为空（或不能为空白字符）");
+        }
+
+        // 2. 校验文书是否存在
+        DocDefinition existingDoc = docDefinitionService.getById(definitionDto.getId());
+        if (existingDoc == null) {
+            log.warn("修改文书定义失败：未找到ID={}的文书记录", definitionDto.getId());
+            return R.fail("修改文书定义失败：待修改的文书记录不存在");
+        }
+
+        // 3. 版本号冲突处理（版本号不一致时，转为新增逻辑）
+        if (!existingDoc.getVersion().trim().equals(definitionDto.getVersion().trim())) {
+            log.info("修改文书定义：版本号冲突（原版本={}, 新版本={}），自动执行新增逻辑",
+                    existingDoc.getVersion(), definitionDto.getVersion());
+            // 新增前清空ID，避免覆盖原有记录
+            definitionDto.setId(null);
+            return addDefinition(definitionDto);
+        }
+
+        // 4. 补充默认值
+        if (definitionDto.getDisplayOrder() == null) {
+            definitionDto.setDisplayOrder(0);
+        }
+        if (definitionDto.getIsValid() == null) {
+            definitionDto.setIsValid(0);
+        }
+
+        // 5. 封装修改后的数据
+        existingDoc.setBusNo(definitionDto.getBusNo().trim());
+        existingDoc.setName(definitionDto.getName().trim());
+        existingDoc.setVersion(definitionDto.getVersion().trim());
+        existingDoc.setDisplayOrder(definitionDto.getDisplayOrder());
+        existingDoc.setHospitalId(SecurityUtils.getLoginUser().getHospitalId());
+        existingDoc.setIsValid(definitionDto.getIsValid());
+        existingDoc.setVueRouter(definitionDto.getVueRouter().trim());
+        existingDoc.setPrimaryMenuEnum(definitionDto.getPrimaryMenuEnum());
+        existingDoc.setSubMenu(definitionDto.getSubMenu());
+        existingDoc.setUseRangeEnum(definitionDto.getUseRangeEnum());
+        existingDoc.setDoctorPermissionEnum(definitionDto.getDoctorPermissionEnum());
+        existingDoc.setNursingPermissionEnum(definitionDto.getNursingPermissionEnum());
+        existingDoc.setMedicalPermissionEnum(definitionDto.getMedicalPermissionEnum());
+        existingDoc.setPharmacistPermissionEnum(definitionDto.getPharmacistPermissionEnum());
+
+        // 6. 执行修改
+        boolean updateSuccess = docDefinitionService.updateById(existingDoc);
+        if (!updateSuccess) {
+            log.error("修改文书定义失败：数据库更新异常（ID={}, 业务编号={}",
+                    definitionDto.getId(), definitionDto.getBusNo());
+            return R.fail("修改文书定义失败：数据库更新操作异常");
+        }
+
+        // 7. 更新科室分配（仅当使用范围为"科室级"时执行）
+        DocDefinitionOrganizationDto orgDto = new DocDefinitionOrganizationDto();
+        orgDto.setBusNo(existingDoc.getBusNo());
+        orgDto.setDefinitionId(existingDoc.getId());
+        orgDto.setOrganizationIds(definitionDto.getOrganizationIds());
+        // 复用科室分配服务的更新逻辑（先删后加，全量覆盖）
+        return docDefinitionOrganizationAppService.updateOrganization(orgDto);
+    }
+
+    /**
+     * 获取文书定义树形列表（按目录结构组织）
+     */
+    @Override
+    public R<?> getTreeList(DocDefinitonParam param) {
+        // 1. 获取当前登录用户的医院ID（避免跨医院查询）
+        Long hospitalId = SecurityUtils.getLoginUser().getHospitalId();
+        if (hospitalId == null) {
+            log.warn("获取文书定义树形列表失败：当前登录用户未关联医院ID");
+            return R.fail("获取文书定义树形列表失败：当前用户未关联医院，请重新登录");
+        }
+
+        // 2. 数据库查询文书定义列表
+        List<DocDefinitionDto> docList = docDefinitionAppMapper.getDefinationList(
+                param.getUseRanges(),
+                param.getOrganizationId(),
+                hospitalId,
+                param.getName(),
+                param.getPrimaryMenuEnum()
+        );
+
+        // 3. 构建树形结构（空列表时返回空树，避免空指针）
+        List<DirectoryNode> treeNodes = new ArrayList<>();
+        if (docList != null && !docList.isEmpty()) {
+            treeNodes = DocumentDirectoryProcessor.buildDocumentDirectory(docList);
+            log.info("获取文书定义树形列表成功：医院ID={}, 文书数量={}, 树形节点数量={}",
+                    hospitalId, docList.size(), treeNodes.size());
+        } else {
+            log.info("获取文书定义树形列表成功：医院ID={}, 暂无匹配的文书定义", hospitalId);
+        }
+
+        return R.ok(treeNodes, "获取文书定义树形列表成功");
+    }
+
+    /**
+     * 根据ID获取文书定义详情（含已分配科室ID列表）
+     */
+    @Override
+    public R<?> getDefinitionDetailById(Long id) {
+        // 1. 参数校验
+        if (id == null) {
+            return R.fail("获取文书定义详情失败：文书ID不能为空");
+        }
+
+        // 2. 调用私有方法获取详情（含科室ID）
+        DocDefinitionDto docDto = getDefinitionById(id);
+        if (docDto == null) {
+            log.warn("获取文书定义详情失败：未找到ID={}的文书记录", id);
+            return R.fail("获取文书定义详情失败：未查询到对应的文书定义信息");
+        }
+
+        log.info("获取文书定义详情成功：ID={}, 名称={}, 业务编号={}",
+                id, docDto.getName(), docDto.getBusNo());
+        return R.ok(docDto, "获取文书定义详情成功");
+    }
+
+    /**
+     * 私有方法：根据ID查询文书定义（含已分配科室ID列表）
+     */
+    public DocDefinitionDto getDefinitionById(Long id) {
+        // 1. 查询文书定义主信息
+        DocDefinition doc = docDefinitionService.getById(id);
+        if (doc == null) {
+            log.debug("根据ID查询文书定义失败：ID={}的文书不存在", id);
+            return null;
+        }
+
+        // 2. 查询该文书已分配的科室ID列表
+        LambdaQueryWrapper<DocDefinitionOrganization> orgWrapper = new LambdaQueryWrapper<>();
+        orgWrapper.eq(DocDefinitionOrganization::getDefinitionId, id)
+                .eq(DocDefinitionOrganization::getBusNo, doc.getBusNo());
+        List<DocDefinitionOrganization> orgList = docDefinitionOrganizationService.list(orgWrapper);
+
+        // 3. 提取科室ID并封装DTO
+        List<Long> orgIdList = new ArrayList<>();
+        for (DocDefinitionOrganization org : orgList) {
+            orgIdList.add(org.getOrganizationId());
+        }
+
+        DocDefinitionDto docDto = new DocDefinitionDto();
+        BeanUtils.copyProperties(doc, docDto);
+        docDto.setOrganizationIds(orgIdList);
+
+        return docDto;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
new file mode 100644
index 00000000..e330a05d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
@@ -0,0 +1,173 @@
+package com.openhis.web.document.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.openhis.document.domain.DocDefinitionOrganization;
+import com.openhis.document.service.IDocDefinitionOrganizationService;
+import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService;
+import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+public class DocDefinitionOrganizationAppServiceImpl implements IDocDefinitionOrganizationAppService {
+
+    @Resource
+    private IDocDefinitionOrganizationService docDefinitionOrganizationService;
+
+    /**
+     * 新增文书分配科室列表
+     * 注：新增前未删除原有分配，若需"覆盖新增"请使用updateOrganization方法
+     */
+    @Override
+    public R<?> add(DocDefinitionOrganizationDto definitionOrganizationDto) {
+        // 1. 参数校验（明确错误原因，避免模糊提示）
+        if (definitionOrganizationDto == null) {
+            return R.fail("文书科室分配失败：请求参数不能为空");
+        }
+        if (definitionOrganizationDto.getOrganizationIds() == null || definitionOrganizationDto.getOrganizationIds().isEmpty()) {
+            return R.fail("文书科室分配失败：科室ID列表不能为空");
+        }
+        if (definitionOrganizationDto.getDefinitionId() == null || definitionOrganizationDto.getDefinitionId() == 0) {
+            return R.fail("文书科室分配失败：文书定义ID不能为空（或不能为0）");
+        }
+        if (definitionOrganizationDto.getBusNo() == null || definitionOrganizationDto.getBusNo().trim().isEmpty()) {
+            return R.fail("文书科室分配失败：业务编号不能为空（或不能为空白字符）");
+        }
+
+        // 2. DTO转实体（批量封装科室分配关系）
+        List<DocDefinitionOrganization> organizationList = new ArrayList<>();
+        for (Long orgId : definitionOrganizationDto.getOrganizationIds()) {
+            DocDefinitionOrganization docOrg = new DocDefinitionOrganization();
+            docOrg.setDefinitionId(definitionOrganizationDto.getDefinitionId());
+            docOrg.setBusNo(definitionOrganizationDto.getBusNo().trim()); // 去除业务编号前后空白
+            docOrg.setOrganizationId(orgId);
+            organizationList.add(docOrg);
+        }
+
+        // 3. 批量新增
+        boolean saveSuccess = docDefinitionOrganizationService.saveBatch(organizationList);
+        if (saveSuccess) {
+            return R.ok("文书科室分配成功");
+        } else {
+            log.error("文书科室分配新增失败：文书定义ID={}, 业务编号={}",
+                    definitionOrganizationDto.getDefinitionId(), definitionOrganizationDto.getBusNo());
+            return R.fail("文书科室分配失败：数据库新增操作异常");
+        }
+    }
+
+    /**
+     * 根据文书定义ID和业务编号，删除对应的科室分配关系
+     */
+    @Override
+    public R<?> delete(Long definitionId, String busNo) {
+        // 1. 参数校验
+        if (definitionId == null || definitionId == 0) {
+            return R.fail("文书科室分配删除失败：文书定义ID不能为空（或不能为0）");
+        }
+        if (busNo == null || busNo.trim().isEmpty()) {
+            return R.fail("文书科室分配删除失败：业务编号不能为空（或不能为空白字符）");
+        }
+
+        // 2. 构建查询条件（精准匹配文书+业务编号）
+        LambdaQueryWrapper<DocDefinitionOrganization> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DocDefinitionOrganization::getDefinitionId, definitionId)
+                .eq(DocDefinitionOrganization::getBusNo, busNo.trim()); // 去除业务编号前后空白
+
+        // 3. 执行删除
+        boolean deleteSuccess = docDefinitionOrganizationService.remove(queryWrapper);
+        if (deleteSuccess) {
+            return R.ok("文书科室分配删除成功");
+        } else {
+            log.warn("文书科室分配删除失败：未找到匹配的分配关系（文书定义ID={}, 业务编号={}）",
+                    definitionId, busNo);
+            return R.fail("文书科室分配删除失败：未找到对应的科室分配记录");
+        }
+    }
+
+    /**
+     * 根据文书定义ID和业务编号，查询已分配的科室ID列表
+     */
+    @Override
+    public R<?> getOrganizationIdlist(Long definitionId, String busNo) {
+        // 1. 参数校验
+        if (definitionId == null || definitionId == 0) {
+            return R.fail("文书科室分配查询失败：文书定义ID不能为空（或不能为0）");
+        }
+        if (busNo == null || busNo.trim().isEmpty()) {
+            return R.fail("文书科室分配查询失败：业务编号不能为空（或不能为空白字符）");
+        }
+
+        // 2. 构建查询条件
+        LambdaQueryWrapper<DocDefinitionOrganization> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DocDefinitionOrganization::getDefinitionId, definitionId)
+                .eq(DocDefinitionOrganization::getBusNo, busNo.trim());
+
+        // 3. 查询并提取科室ID（避免返回冗余字段）
+        List<DocDefinitionOrganization> orgList = docDefinitionOrganizationService.list(queryWrapper);
+        List<Long> orgIdList = new ArrayList<>();
+        for (DocDefinitionOrganization docOrg : orgList) {
+            orgIdList.add(docOrg.getOrganizationId());
+        }
+
+        log.info("文书科室分配查询成功：文书定义ID={}, 业务编号={}, 分配科室数量={}",
+                definitionId, busNo, orgIdList.size());
+        return R.ok(orgIdList, "文书科室分配查询成功");
+    }
+
+    /**
+     * 更新文书科室分配（先删除原有分配，再新增新分配，实现"全量覆盖"）
+     */
+    @Override
+    public R<?> updateOrganization(DocDefinitionOrganizationDto definitionOrganizationDto) {
+        // 1. 参数校验（与add方法保持一致的校验逻辑）
+        if (definitionOrganizationDto == null) {
+            return R.fail("文书科室分配更新失败：请求参数不能为空");
+        }
+        if (definitionOrganizationDto.getOrganizationIds() == null || definitionOrganizationDto.getOrganizationIds().isEmpty()) {
+            return R.fail("文书科室分配更新失败：科室ID列表不能为空");
+        }
+        if (definitionOrganizationDto.getDefinitionId() == null || definitionOrganizationDto.getDefinitionId() == 0) {
+            return R.fail("文书科室分配更新失败：文书定义ID不能为空（或不能为0）");
+        }
+        if (definitionOrganizationDto.getBusNo() == null || definitionOrganizationDto.getBusNo().trim().isEmpty()) {
+            return R.fail("文书科室分配更新失败：业务编号不能为空（或不能为空白字符）");
+        }
+
+        // 2. 先删除原有分配关系
+        LambdaQueryWrapper<DocDefinitionOrganization> deleteWrapper = new LambdaQueryWrapper<>();
+        deleteWrapper.eq(DocDefinitionOrganization::getDefinitionId, definitionOrganizationDto.getDefinitionId())
+                .eq(DocDefinitionOrganization::getBusNo, definitionOrganizationDto.getBusNo().trim());
+
+        boolean deleteSuccess = docDefinitionOrganizationService.remove(deleteWrapper);
+        if (!deleteSuccess) {
+            log.error("文书科室分配更新失败：删除原有分配记录异常（文书定义ID={}, 业务编号={}",
+                    definitionOrganizationDto.getDefinitionId(), definitionOrganizationDto.getBusNo());
+            return R.fail("文书科室分配更新失败：删除原有分配记录异常");
+        }
+
+        // 3. 再新增新的分配关系
+        List<DocDefinitionOrganization> newOrgList = new ArrayList<>();
+        for (Long orgId : definitionOrganizationDto.getOrganizationIds()) {
+            DocDefinitionOrganization docOrg = new DocDefinitionOrganization();
+            docOrg.setDefinitionId(definitionOrganizationDto.getDefinitionId());
+            docOrg.setBusNo(definitionOrganizationDto.getBusNo().trim());
+            docOrg.setOrganizationId(orgId);
+            newOrgList.add(docOrg);
+        }
+
+        boolean saveSuccess = docDefinitionOrganizationService.saveBatch(newOrgList);
+        if (saveSuccess) {
+            return R.ok("文书科室分配更新成功");
+        } else {
+            log.error("文书科室分配更新失败：新增新分配记录异常（文书定义ID={}, 业务编号={}",
+                    definitionOrganizationDto.getDefinitionId(), definitionOrganizationDto.getBusNo());
+            return R.fail("文书科室分配更新失败：新增新分配记录异常");
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
new file mode 100644
index 00000000..4ed11444
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
@@ -0,0 +1,456 @@
+package com.openhis.web.document.appservice.impl;
+
+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;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.common.enums.AdministrativeGender;
+import com.openhis.common.enums.DocStatusEnum;
+import com.openhis.common.enums.DocTypeEnum;
+import com.openhis.common.enums.EncounterClass;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.document.domain.DocRecord;
+import com.openhis.document.mapper.DocRecordMapper;
+import com.openhis.document.service.IDocRecordService;
+import com.openhis.web.document.appservice.IDocDefinitionAppService;
+import com.openhis.web.document.appservice.IDocRecordAppService;
+import com.openhis.web.document.dto.DocDefinitionDto;
+import com.openhis.web.document.dto.DocRecordDto;
+import com.openhis.web.document.dto.DocRecordPatientDto;
+import com.openhis.web.document.dto.DocRecordPatientQueryParam;
+import com.openhis.web.document.dto.DocRecordQueryParam;
+import com.openhis.web.document.mapper.DocRecordAppMapper;
+import com.openhis.web.document.util.PermissionProcessor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.*;
+
+@Slf4j
+@Service
+public class DocRecordAppServiceImpl implements IDocRecordAppService {
+
+    @Resource
+    private IDocRecordService docRecordService;
+    @Resource
+    private DocRecordMapper docRecordMapper;
+    @Resource
+    private IDocDefinitionAppService docDefinitionAppService;
+    @Resource
+    private DocRecordAppMapper docRecordAppMapper;
+    @Autowired
+    private JdbcTemplate jdbcTemplate; // 使用 JdbcTemplate 执行 SQL
+
+
+    /**
+     * 插入单条文档操作日志
+     *
+     * @param docRecord 原始文书记录
+     * @return 是否插入成功
+     */
+    private Boolean insertLog(DocRecord docRecord) {
+        if (docRecord == null) {
+            log.error("插入文档日志失败：原始文书记录不能为空");
+            return false;
+        }
+
+        try {
+            String sql = "INSERT INTO doc_record_log(" +
+                    "record_id, definition_id, definition_bus_no, content_json, " +
+                    "status_enum, organization_id, encounter_id, patient_id, record_time, " +
+                    "create_by, create_time, update_by, update_time, delete_flag, tenant_id" +
+                    ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+            Object[] params = {
+                    docRecord.getId(),
+                    docRecord.getDefinitionId(),
+                    docRecord.getDefinitionBusNo(),
+                    docRecord.getContentJson(),
+                    docRecord.getStatusEnum(),
+                    docRecord.getOrganizationId(),
+                    docRecord.getEncounterId(),
+                    docRecord.getPatientId(),
+                    new Timestamp(docRecord.getRecordTime().getTime()),
+                    SecurityUtils.getUsername(),
+                    new Timestamp(new Date().getTime()),
+                    null, // update_by
+                    null, // update_time
+                    0,    // delete_flag（未删除）
+                    docRecord.getTenantId()
+            };
+
+            int rowsAffected = jdbcTemplate.update(sql, params);
+            return rowsAffected > 0;
+        } catch (Exception e) {
+            log.error("插入文档操作日志失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    /**
+     * 批量插入文档操作日志
+     *
+     * @param docRecords 原始文书记录列表
+     * @return 是否插入成功
+     */
+    private Boolean insertBatchLog(List<DocRecord> docRecords) {
+        if (docRecords == null || docRecords.isEmpty()) {
+            log.error("批量插入文档日志失败：文书记录列表不能为空");
+            return false;
+        }
+
+        try {
+            String sql = "INSERT INTO doc_record_log(" +
+                    "record_id, definition_id, definition_bus_no, content_json, " +
+                    "status_enum, organization_id, encounter_id, patient_id, record_time, " +
+                    "create_by, create_time, update_by, update_time, delete_flag, tenant_id" +
+                    ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+            int[] results = jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    DocRecord docRecord = docRecords.get(i);
+                    ps.setLong(1, docRecord.getId());
+                    ps.setLong(2, docRecord.getDefinitionId());
+                    ps.setString(3, docRecord.getDefinitionBusNo());
+                    ps.setString(4, docRecord.getContentJson());
+                    ps.setInt(5, docRecord.getStatusEnum());
+                    ps.setLong(6, docRecord.getOrganizationId());
+                    ps.setLong(7, docRecord.getEncounterId());
+                    ps.setLong(8, docRecord.getPatientId());
+                    ps.setTimestamp(9, new Timestamp(docRecord.getRecordTime().getTime()));
+                    ps.setString(10, SecurityUtils.getUsername());
+                    ps.setTimestamp(11, new Timestamp(new Date().getTime()));
+                    ps.setObject(12, null); // update_by
+                    ps.setObject(13, null); // update_time
+                    ps.setInt(14, 0); // delete_flag
+                    ps.setLong(15, docRecord.getTenantId());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return docRecords.size();
+                }
+            });
+
+            // 校验所有日志是否插入成功
+            for (int result : results) {
+                if (result <= 0) {
+                    log.error("批量插入文档日志失败：部分记录插入无效");
+                    return false;
+                }
+            }
+            return true;
+        } catch (Exception e) {
+            log.error("批量插入文档操作日志失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    /**
+     * 初始化文书记录参数校验
+     *
+     * @param docRecordDto 文书记录DTO
+     * @return 校验失败信息（空字符串表示校验通过）
+     */
+    private String initRecordCheck(DocRecordDto docRecordDto) {
+        if (docRecordDto == null) {
+            return "文书记录不能为空";
+        }
+        if (docRecordDto.getDefinitionId() == null) {
+            return "文书记录：文书类型ID不能为空";
+        }
+        if (docRecordDto.getDefinitionBusNo() == null) {
+            return "文书记录：文书编号不能为空";
+        }
+        if (docRecordDto.getContentJson() == null) {
+            return "文书记录：记录内容不能为空";
+        }
+        if (docRecordDto.getEncounterId() == null) {
+            return "文书记录：就诊ID不能为空";
+        }
+        if (docRecordDto.getPatientId() == null) {
+            return "文书记录：患者ID不能为空";
+        }
+        // 2. 校验文书定义是否存在
+        DocDefinitionDto docDefinitionDto = docDefinitionAppService.getDefinitionById(docRecordDto.getDefinitionId());
+        if (docDefinitionDto == null) {
+            return "患者文书记录：对应文书不存在";
+        }
+        // 3. 权限校验
+        boolean hasPermission = PermissionProcessor.hasPermission(docDefinitionDto);
+        if (!hasPermission) {
+            return "患者文书记录：当前登录用户无权限新增/编辑该文书";
+        }
+        return "";
+    }
+
+    /**
+     * 新增记录
+     *
+     * @param docRecordDto 文书记录信息
+     * @return 返回结果 R对象
+     */
+    public R<?> addRecord(DocRecordDto docRecordDto) {
+        String checkMsg = initRecordCheck(docRecordDto);
+        if (!checkMsg.isEmpty()) {
+            return R.fail(checkMsg);
+        }
+        DocRecord docRecord = new DocRecord();
+        docRecord.setDefinitionId(docRecordDto.getDefinitionId());
+        docRecord.setDefinitionBusNo(docRecordDto.getDefinitionBusNo());
+        docRecord.setContentJson(docRecordDto.getContentJson());
+        // 状态默认设为草稿（修复原逻辑：原代码先判断再覆盖，导致默认值无效）
+        docRecord.setStatusEnum(docRecordDto.getStatusEnum() == null ? DocStatusEnum.DRAFT.getValue() : docRecordDto.getStatusEnum());
+        docRecord.setOrganizationId(SecurityUtils.getLoginUser().getOrgId());
+        docRecord.setEncounterId(docRecordDto.getEncounterId());
+        docRecord.setPatientId(docRecordDto.getPatientId());
+        docRecord.setRecordTime(docRecordDto.getRecordTime());
+        docRecord.setIsEdit(0);
+        boolean saveSuccess = docRecordService.save(docRecord);
+        if (saveSuccess) {
+            return R.ok("新增患者文书记录成功");
+        } else {
+            return R.fail("新增患者文书记录失败");
+        }
+    }
+
+    /**
+     * 修改记录（含日志留痕）
+     *
+     * @param docRecordDto 新文书记录DTO
+     * @return 返回结果 R对象
+     */
+    public R<?> updateRecord(DocRecordDto docRecordDto) {
+        String checkMsg = initRecordCheck(docRecordDto);
+        if (!checkMsg.isEmpty()) {
+            return R.fail(checkMsg);
+        }
+        // 1. 查询原文书记录
+        DocRecord docRecord = docRecordService.getById(docRecordDto.getId());
+        if (docRecord == null) {
+            return R.fail("修改患者文书记录失败：记录不存在");
+        }
+        // 2. 记录日志
+        // 深拷贝原数据用于日志
+        DocRecord logDocRecord = new DocRecord();
+        BeanUtils.copyProperties(docRecord, logDocRecord);
+
+        // 赋值新数据
+        docRecord.setDefinitionId(docRecordDto.getDefinitionId());
+        docRecord.setDefinitionBusNo(docRecordDto.getDefinitionBusNo());
+        docRecord.setContentJson(docRecordDto.getContentJson());
+        docRecord.setStatusEnum(docRecordDto.getStatusEnum());
+        docRecord.setOrganizationId(SecurityUtils.getLoginUser().getOrgId());
+        docRecord.setEncounterId(docRecordDto.getEncounterId());
+        docRecord.setPatientId(docRecordDto.getPatientId());
+        docRecord.setRecordTime(docRecordDto.getRecordTime());
+        docRecord.setIsEdit(0);
+
+        // 执行修改
+        boolean updateSuccess = docRecordService.updateById(docRecord);
+        if (updateSuccess) {
+            // 插入操作日志
+            boolean logSuccess = insertLog(logDocRecord);
+            if (!logSuccess) {
+                return R.fail("修改患者文书记录成功，但插入文档操作日志失败");
+            }
+            return R.ok("修改患者文书记录成功");
+        } else {
+            return R.fail("修改患者文书记录失败");
+        }
+    }
+
+    /**
+     * 根据患者ID/就诊ID获取文书记录列表（支持分页）
+     */
+    @Override
+    public R<?> getRecordByEncounterIdList(DocRecordQueryParam docRecordQueryParam, Integer isPage, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 1. 参数校验
+        if (docRecordQueryParam == null) {
+            return R.fail("患者文书记录：查询参数不能为空");
+        }
+        if (docRecordQueryParam.getPatientId() == null && docRecordQueryParam.getEncounterId() == null) {
+            return R.fail("患者文书记录：患者ID和就诊ID不能同时为空");
+        }
+        if (docRecordQueryParam.getDefinitionId() == null) {
+            return R.fail("患者文书记录：文书类型ID不能为空");
+        }
+
+        // 2. 分页查询逻辑
+        if (isPage != null && isPage == 1) {
+            QueryWrapper<DocRecord> queryWrapper = HisQueryUtils.buildQueryWrapper(
+                    docRecordQueryParam, null, null, request);
+            // 按记录时间倒序（最新记录在前）
+            queryWrapper.lambda().orderByDesc(DocRecord::getRecordTime);
+
+            Page<DocRecordDto> recordPage = HisPageUtils.selectPage(
+                    docRecordMapper, queryWrapper, pageNo, pageSize, DocRecordDto.class);
+            return R.ok(recordPage, "获取患者文书记录列表成功");
+        }
+        // 3. 不分页查询逻辑
+        else {
+            LambdaQueryWrapper<DocRecord> queryWrapper = new LambdaQueryWrapper<>();
+            // 患者ID查询条件
+            if (docRecordQueryParam.getPatientId() != null) {
+                queryWrapper.eq(DocRecord::getPatientId, docRecordQueryParam.getPatientId());
+            }
+            // 文书类型ID（必传）
+            queryWrapper.eq(DocRecord::getDefinitionId, docRecordQueryParam.getDefinitionId());
+            // 就诊ID查询条件（修复原逻辑：原代码字段匹配错误，用EncounterId匹配DefinitionBusNo）
+            if (docRecordQueryParam.getEncounterId() != null) {
+                queryWrapper.eq(DocRecord::getEncounterId, docRecordQueryParam.getEncounterId());
+            }
+            // 科室ID查询条件（修复原逻辑：原代码字段匹配错误，用OrganizationId匹配EncounterId）
+            if (docRecordQueryParam.getOrganizationId() != null) {
+                queryWrapper.eq(DocRecord::getOrganizationId, docRecordQueryParam.getOrganizationId());
+            }
+
+            // 实体转DTO
+            List<DocRecordDto> dtoList = new ArrayList<>();
+            List<DocRecord> recordList = docRecordService.list(queryWrapper);
+            for (DocRecord record : recordList) {
+                DocRecordDto dto = new DocRecordDto();
+                BeanUtils.copyProperties(record, dto);
+                dtoList.add(dto);
+            }
+            return R.ok(dtoList, "获取患者文书记录列表成功");
+        }
+    }
+
+    /**
+     * 查询患者文书记录列表（携带患者信息，支持分页）
+     */
+    @Override
+    public R<?> getRecordPageList(DocRecordPatientQueryParam docRecordPatientQueryParam, List<Integer> primaryMenuEnumList, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        if (docRecordPatientQueryParam == null) {
+            return R.fail("文书记录：查询参数不能为空");
+        }
+
+        // 构建查询条件（支持患者姓名搜索）
+        QueryWrapper<DocRecordPatientDto> queryWrapper = HisQueryUtils.buildQueryWrapper(
+                docRecordPatientQueryParam, searchKey, new HashSet<>(Arrays.asList("patient_name", "bus_no")), request);
+
+        // 分页查询
+        IPage<DocRecordPatientDto> pageResult = docRecordAppMapper.getRecordPageList(
+                new Page<>(pageNo, pageSize), primaryMenuEnumList, queryWrapper);
+
+        // 处理返回结果：枚举值转中文描述、计算患者年龄
+        if (pageResult != null && !pageResult.getRecords().isEmpty()) {
+            for (DocRecordPatientDto dto : pageResult.getRecords()) {
+                // 就诊类型枚举转描述（修复原逻辑：原代码用EncounterClass匹配所有枚举）
+                EncounterClass encounterClass = EncounterClass.getByValue(dto.getClassEnum());
+                dto.setClassEnumValue(encounterClass != null ? encounterClass.getInfo() : "");
+
+                // 性别枚举转描述
+                AdministrativeGender gender = AdministrativeGender.getByValue(dto.getGender());
+                dto.setGenderValue(gender != null ? gender.getInfo() : "");
+
+                // 文书类型枚举转描述
+                DocTypeEnum docType = DocTypeEnum.getByValue(dto.getPrimaryMenuEnum());
+                dto.setPrimaryMenuEnumValue(docType != null ? docType.getInfo() : "");
+
+                // 计算患者年龄
+                dto.setAge(AgeCalculatorUtil.getAge(dto.getBirthDate()));
+            }
+        }
+
+        return R.ok(pageResult, "获取患者文书记录列表成功");
+    }
+
+    /**
+     * 根据记录ID获取文书详情
+     */
+    @Override
+    public R<?> getRecordById(Long recordId) {
+        if (recordId == null) {
+            return R.fail("患者文书记录：文书记录ID不能为空");
+        }
+
+        DocRecord record = docRecordService.getById(recordId);
+        if (record == null) {
+            return R.fail("患者文书记录：对应记录不存在");
+        }
+
+        DocRecordDto dto = new DocRecordDto();
+        BeanUtils.copyProperties(record, dto);
+        return R.ok(dto, "获取患者文书记录成功");
+    }
+
+    @Override
+    public R<?> setIsEdit(Long recordId) {
+        if (recordId == null) {
+            return R.fail("患者文书记录：文书记录ID不能为空");
+        }
+        DocRecord record = docRecordService.getById(recordId);
+        if (record == null) {
+            return R.fail("患者文书记录：对应记录不存在");
+        }
+        if (record.getIsEdit() != null && record.getIsEdit() == 1) {
+            return R.ok("患者文书记录：记录已处于编辑中状态,请勿重复 editing");
+        }
+        record.setIsEdit(1);
+        boolean updateSuccess = docRecordService.updateById(record);
+        if (updateSuccess) {
+            return R.ok("设置患者文书记录为编辑中成功");
+        } else {
+            return R.fail("设置患者文书记录为编辑中失败");
+        }
+    }
+
+    /**
+     * 批量删除文书记录（含日志留痕）
+     */
+    @Override
+    public R<?> deleteRecord(List<Long> ids) {
+        // 1. 参数校验
+        if (ids == null || ids.isEmpty()) {
+            return R.fail("患者文书记录：删除的记录ID列表不能为空");
+        }
+
+        // 2. 校验记录是否存在
+        List<DocRecord> recordList = docRecordService.listByIds(ids);
+        if (recordList == null || recordList.isEmpty()) {
+            return R.fail("患者文书记录：待删除的记录不存在");
+        }
+
+        // 3. 权限校验：仅允许删除自己创建的记录
+        String currentUsername = SecurityUtils.getLoginUser().getUsername();
+        List<DocRecord> logRecordList = new ArrayList<>();
+        for (DocRecord record : recordList) {
+            if (!currentUsername.equals(record.getCreateBy())) {
+                return R.fail("患者文书记录：无权限删除他人创建的记录（记录ID：" + record.getId() + "）");
+            }
+            // 拷贝原记录用于日志
+            DocRecord logRecord = new DocRecord();
+            BeanUtils.copyProperties(record, logRecord);
+            logRecordList.add(logRecord);
+        }
+
+        // 4. 执行删除
+        boolean deleteSuccess = docRecordService.removeByIds(ids);
+        if (deleteSuccess) {
+            // 5. 批量插入删除日志
+            boolean logSuccess = insertBatchLog(logRecordList);
+            if (!logSuccess) {
+                return R.fail("删除患者文书记录成功，但插入文档操作日志失败");
+            }
+            return R.ok("删除患者文书记录成功");
+        } else {
+            return R.fail("删除患者文书记录失败");
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
new file mode 100644
index 00000000..ee906036
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
@@ -0,0 +1,71 @@
+package com.openhis.web.document.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.document.service.IDocStatisticsService;
+import com.openhis.web.document.appservice.IDocStatisticsAppService;
+import com.openhis.web.document.appservice.IDocTemplateAppService;
+import com.openhis.web.document.dto.DocStatisticsDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 文档模板 业务实现类
+ */
+@Slf4j
+@Service
+public class DocStatisticsAppServiceImpl implements IDocStatisticsAppService {
+
+    @Resource
+    private IDocStatisticsService docStatisticsService;
+
+    @Override
+    public R<?> createOrUpdte(List<DocStatisticsDto> docStatisticsList) {
+        if (docStatisticsList.size() == 0) {
+            return R.ok();
+        }
+        //根据recordId和statisticDefinitionId判断是否存在，存在则更新，不存在则新增
+        LambdaQueryWrapper<DocStatistics> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DocStatistics::getRecordId, docStatisticsList.get(0).getRecordId());
+        queryWrapper.eq(DocStatistics::getStatisticDefinitionId, docStatisticsList.get(0).getStatisticDefinitionId());
+        List<DocStatistics> docStatisticsOldList = docStatisticsService.list(queryWrapper);
+        if (docStatisticsOldList.size() > 0) {
+            //批量删除
+            docStatisticsService.removeByIds(docStatisticsOldList.stream().map(DocStatistics::getId).toList());
+        }
+        //批量新增
+        for (DocStatisticsDto docStatisticsDto : docStatisticsList) {
+            DocStatistics docStatistics = new DocStatistics();
+            docStatistics.setRecordId(docStatisticsDto.getRecordId());
+            docStatistics.setStatisticDefinitionId(docStatisticsDto.getStatisticDefinitionId());
+            docStatistics.setEncounterId(docStatisticsDto.getEncounterId());
+            docStatistics.setPatientId(docStatisticsDto.getPatientId());
+            docStatistics.setStatisticDefinitionCode(docStatisticsDto.getStatisticDefinitionCode());
+            docStatistics.setOrgnizationId(docStatisticsDto.getOrgnizationId());     //TODO: 待确定
+            docStatistics.setValue(docStatisticsDto.getValue());
+            docStatistics.setRecordingDate(docStatisticsDto.getRecordingDate());
+            docStatistics.setRecordingTime(docStatisticsDto.getRecordingTime());
+            docStatistics.setSource(docStatisticsDto.getSource());
+        }
+        return null;
+    }
+
+    @Override
+    public R<?> delete(List<Long> ids) {
+        return null;
+    }
+
+    @Override
+    public R<?> queryByRecordId(Long recordId) {
+        return null;
+    }
+
+    @Override
+    public R<?> queryByEncounterId(Long encounterId) {
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
new file mode 100644
index 00000000..4b824ca9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
@@ -0,0 +1,337 @@
+package com.openhis.web.document.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.document.domain.DocStatisticsDefinition;
+import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
+import com.openhis.document.service.IDocStatisticsDefinitionService;
+import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.openhis.web.document.appservice.IDocStatisticsDefinitionOptionAppService;
+import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
+import com.openhis.web.document.dto.DocStatisticsDefinitionOptionList;
+import com.openhis.web.document.dto.OptionDto;
+import com.openhis.web.document.mapper.DocStatisticsDefinitionAppMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 文档模板 业务实现类
+ */
+@Slf4j
+@Service
+public class DocStatisticsDefinitionAppServiceImpl implements IDocStatisticsDefinitionAppService {
+
+    @Resource
+    private IDocStatisticsDefinitionService iDocStatisticsDefinitionService;
+    @Resource
+    private IDocStatisticsDefinitionOptionAppService iDocStaticsDefinitionOptionAppService;
+    @Resource
+    private DocStatisticsDefinitionMapper docStatisticsDefinitionMapper;
+    @Resource
+    private DocStatisticsDefinitionAppMapper docStatisticsDefinitionAppMapper;
+
+    @Override
+    public R<?> createOrEdit(DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+        if (docStatisticsDefinitionDto == null) {
+            return R.fail("新增/编辑文档统计定义，参数不能为空");
+        }
+        if (docStatisticsDefinitionDto.getName() == null || docStatisticsDefinitionDto.getName().trim().length() == 0) {
+            return R.fail("新增/编辑文档统计定义，名称不能为空");
+        }
+        if (docStatisticsDefinitionDto.getTypeEnum() == null) {
+            return R.fail("新增/编辑文档统计定义，类型不能为空");
+        }
+        if (docStatisticsDefinitionDto.getCode() == null) {
+            return R.fail("新增/编辑文档统计定义，代码不能为空");
+        }
+        DocStatisticsDefinition docStatisticsDefinition = new DocStatisticsDefinition();
+        BeanUtils.copyProperties(docStatisticsDefinitionDto, docStatisticsDefinition);
+        // 新增时校验代码唯一性
+        if (!docStatisticsDefinitionDto.getCode().isEmpty() && docStatisticsDefinitionDto.getId() == null) {
+            LambdaQueryWrapper<DocStatisticsDefinition> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(DocStatisticsDefinition::getCode, docStatisticsDefinitionDto.getCode());
+            docStatisticsDefinition = iDocStatisticsDefinitionService.getOne(queryWrapper);
+            if (docStatisticsDefinition != null) {
+                return R.fail("文档统计定义代码已存在，请更换代码");
+            }
+        }
+        // 区分新增/编辑逻辑
+        return docStatisticsDefinitionDto.getId() == null ? add(docStatisticsDefinitionDto) : update(docStatisticsDefinitionDto);
+    }
+
+    @Override
+
+    public R<?> add(DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+        String checkResult = initCheck(docStatisticsDefinitionDto);
+        DocStatisticsDefinition docStatisticsDefinition = new DocStatisticsDefinition();
+        if (checkResult != null) {
+            return R.fail(checkResult);
+        }
+        if (!docStatisticsDefinitionDto.getCode().isEmpty()) {
+            LambdaQueryWrapper<DocStatisticsDefinition> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(DocStatisticsDefinition::getCode, docStatisticsDefinitionDto.getCode());
+            Long count = iDocStatisticsDefinitionService.count(queryWrapper);
+            if (count > 0) {
+                return R.fail("文档统计定义代码已存在，请更换代码");
+            }
+        }
+        // 赋值新增字段
+        docStatisticsDefinition.setName(docStatisticsDefinitionDto.getName());
+        docStatisticsDefinition.setCode(docStatisticsDefinitionDto.getCode());
+        docStatisticsDefinition.setTypeEnum(docStatisticsDefinitionDto.getTypeEnum());
+        docStatisticsDefinition.setRequired(docStatisticsDefinitionDto.getRequired());
+        docStatisticsDefinition.setRemark(docStatisticsDefinitionDto.getRemark());
+        docStatisticsDefinition.setIsStatistics(docStatisticsDefinitionDto.getIsStatistics());
+        docStatisticsDefinition.setDisplayOrder(docStatisticsDefinitionDto.getDisplayOrder());
+        docStatisticsDefinition.setUnit(docStatisticsDefinitionDto.getUnit());
+
+
+        boolean saveResult = iDocStatisticsDefinitionService.save(docStatisticsDefinition);
+        if (saveResult) {
+            // 同步保存选项列表（如有）
+            if (docStatisticsDefinitionDto.getOptionList() != null && !docStatisticsDefinitionDto.getOptionList().getOptions().isEmpty()) {
+                docStatisticsDefinitionDto.getOptionList().setDocStatisticsDefinitionId(docStatisticsDefinition.getId());
+                return iDocStaticsDefinitionOptionAppService.add(docStatisticsDefinitionDto.getOptionList());
+            }
+            return R.ok("文档统计定义新增成功");
+        } else {
+            return R.fail("文档统计定义新增失败");
+        }
+    }
+
+    @Override
+
+    public R<?> update(DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+        String checkResult = initCheck(docStatisticsDefinitionDto);
+        if (checkResult != null) {
+            return R.fail(checkResult);
+        }
+        // 校验待更新数据是否存在
+        DocStatisticsDefinition existingData = iDocStatisticsDefinitionService.getById(docStatisticsDefinitionDto.getId());
+        if (existingData == null) {
+            return R.fail("更新文档统计定义失败，目标数据不存在");
+        }
+        // 赋值更新字段
+        existingData.setName(docStatisticsDefinitionDto.getName());
+        existingData.setCode(docStatisticsDefinitionDto.getCode());
+        existingData.setTypeEnum(docStatisticsDefinitionDto.getTypeEnum());
+        existingData.setRequired(docStatisticsDefinitionDto.getRequired());
+        existingData.setRemark(docStatisticsDefinitionDto.getRemark());
+        existingData.setIsStatistics(docStatisticsDefinitionDto.getIsStatistics());
+        existingData.setDisplayOrder(docStatisticsDefinitionDto.getDisplayOrder());
+        existingData.setUnit(docStatisticsDefinitionDto.getUnit());
+        boolean updateResult = iDocStatisticsDefinitionService.updateById(existingData);
+        if (updateResult) {
+            // 同步更新选项列表
+            return iDocStaticsDefinitionOptionAppService.createOrEdit(docStatisticsDefinitionDto.getOptionList());
+        } else {
+            return R.fail("文档统计定义更新失败");
+        }
+    }
+
+    private String initCheck(DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+        if (docStatisticsDefinitionDto == null) {
+            return "新增/编辑文档统计定义，参数不能为空";
+        }
+        if (docStatisticsDefinitionDto.getName() == null || docStatisticsDefinitionDto.getName().trim().length() == 0) {
+            return "新增/编辑文档统计定义，名称不能为空";
+        }
+        if (docStatisticsDefinitionDto.getTypeEnum() == null) {
+            return "新增/编辑文档统计定义，类型不能为空";
+        }
+        if (docStatisticsDefinitionDto.getCode() == null) {
+            return "新增/编辑文档统计定义，代码不能为空";
+        }
+
+        return null;
+    }
+
+    /**
+     * 分页查询列表-不包含options（分页）
+     *
+     * @param pageNo    页码
+     * @param pageSize  每页条数
+     * @param searchKey 搜索关键词
+     * @param request   请求对象
+     * @return 分页结果
+     */
+    @Override
+    public R<?> getPageList(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 构建查询条件（支持多字段搜索）
+        QueryWrapper<DocStatisticsDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(
+                null, searchKey, new HashSet<>(Arrays.asList("name", "code")), request);
+        // 按记录时间倒序（最新记录在前）
+        queryWrapper.lambda().orderByDesc(DocStatisticsDefinition::getDisplayOrder);
+
+        Page<DocStatisticsDefinitionDto> recordPage = HisPageUtils.selectPage(
+                docStatisticsDefinitionMapper, queryWrapper, pageNo, pageSize, DocStatisticsDefinitionDto.class);
+        // 转换为分页结果
+        return R.ok(recordPage, "文档统计定义列表获取成功");
+    }
+
+    /**
+     * 获取文档统计定义列表（不分页）
+     *
+     * @param isStatistics 是否统计
+     * @return 文档统计定义列表
+     */
+    @Override
+    public List<DocStatisticsDefinitionDto> getList(Integer isStatistics) {
+        LambdaQueryWrapper<DocStatisticsDefinition> queryWrapper = new LambdaQueryWrapper<>();
+        if (isStatistics != null) {
+            queryWrapper.eq(DocStatisticsDefinition::getIsStatistics, isStatistics);
+        }
+        List<DocStatisticsDefinition> dataList = iDocStatisticsDefinitionService.list(queryWrapper);
+        List<DocStatisticsDefinitionDto> resultList = new ArrayList<>();
+        for (DocStatisticsDefinition data : dataList) {
+            DocStatisticsDefinitionDto dto = new DocStatisticsDefinitionDto();
+            BeanUtils.copyProperties(data, dto);
+            resultList.add(dto);
+        }
+        return resultList;
+    }
+
+    /**
+     * 获取文档统计定义选项列表并按指定格式返回
+     *
+     * @return 封装了处理结果的响应对象
+     */
+    @Override
+    public R<?> getOptionList() {
+        // 1. 从数据库查询所有选项数据
+        List<OptionDto> optionDtoList = docStatisticsDefinitionAppMapper.getOptionList(null, null, null);
+
+        // 2. 处理空数据场景
+        if (optionDtoList == null || optionDtoList.isEmpty()) {
+            return R.ok(new ArrayList<>(), "文档统计定义选项列表获取成功，查询结果为空");
+        }
+
+        // 3. 按code字段分组
+        Map<String, List<OptionDto>> groupCodeMap = optionDtoList.stream()
+                .collect(Collectors.groupingBy(OptionDto::getCode));
+
+        // 4. 准备最终返回的结果列表
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        // 5. 遍历每个code分组
+        for (Map.Entry<String, List<OptionDto>> entry : groupCodeMap.entrySet()) {
+            String code = entry.getKey();
+            List<OptionDto> optionDtos = entry.getValue();
+
+            Map<String, Object> resultMap = new HashMap<>();
+
+            // 设置名称和code
+            if (!optionDtos.isEmpty()) {
+                resultMap.put("name", optionDtos.get(0).getName());
+            }
+            resultMap.put("code", code);
+
+            // 动态生成列表键名
+            String listKey = code + "List";
+
+            // 检查分组中是否存在任何optionId为null的元素
+            boolean hasNullOptionId = optionDtos.stream()
+                    .anyMatch(dto -> dto.getOptionId() == null);
+
+            // 如果存在null的optionId，返回空集合；否则正常处理
+            List<Map<String, Object>> optionList;
+            if (hasNullOptionId) {
+                optionList = new ArrayList<>(); // 返回空集合
+            } else {
+                // 正常转换有效元素
+                optionList = optionDtos.stream()
+                        .map(dto -> {
+                            Map<String, Object> optionMap = new HashMap<>();
+                            optionMap.put("id", dto.getOptionId().toString());
+                            optionMap.put("option", dto.getOption());
+                            return optionMap;
+                        })
+                        .collect(Collectors.toList());
+            }
+
+            // 添加列表到结果中（即使是空集合）
+            resultMap.put(listKey, optionList);
+            resultList.add(resultMap);
+        }
+
+        return R.ok(resultList, "文档统计定义选项列表获取成功");
+    }
+
+
+    @Override
+    public R<?> deleteDocStatisticsDefinition(Long id) {
+        if (id == null) {
+            return R.fail("删除文档统计定义，参数ID不能为空");
+        }
+        boolean deleteResult = iDocStatisticsDefinitionService.removeById(id);
+        if (deleteResult) {
+            // 同步删除选项列表
+            iDocStaticsDefinitionOptionAppService.deleteDocStatisticsDefinitionOptionById(id);
+            return R.ok("文档统计定义删除成功");
+        } else {
+            return R.fail("文档统计定义删除失败");
+        }
+    }
+
+    /**
+     * 获取文档统计定义详情
+     *
+     * @param id 文档统计定义ID
+     * @return 封装了处理结果的响应对象
+     */
+    @Override
+    public R<?> getDocStatisticsDefinitionById(Long id) {
+        if (id == null) {
+            return R.fail("获取文档统计定义，参数ID不能为空");
+        }
+        DocStatisticsDefinition data = iDocStatisticsDefinitionService.getById(id);
+        if (data == null) {
+            return R.fail("获取文档统计定义失败，目标数据不存在");
+        }
+        // 转换为DTO返回
+        DocStatisticsDefinitionDto dto = new DocStatisticsDefinitionDto();
+        BeanUtils.copyProperties(data, dto);
+        DocStatisticsDefinitionOptionList optionList = iDocStaticsDefinitionOptionAppService.getDocStatisticsDefinitionOptionByDefinitionId(id);
+        dto.setOptionList(optionList);
+        return R.ok(dto, "文档统计定义获取成功");
+    }
+
+    /**
+     * 根据代码获取文档统计定义详情
+     *
+     * @param code 文档统计定义代码
+     * @return 封装了处理结果的响应对象
+     */
+    @Override
+    public R<?> getDocStatisticsDefinitionByCode(String code) {
+        if (code == null || code.trim().isEmpty()) {
+            return R.fail("获取文档统计定义，参数代码不能为空");
+        }
+        // 按代码查询
+        LambdaQueryWrapper<DocStatisticsDefinition> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DocStatisticsDefinition::getCode, code);
+        DocStatisticsDefinition data = iDocStatisticsDefinitionService.getOne(queryWrapper);
+        if (data == null) {
+            return R.fail("获取文档统计定义失败，目标数据不存在");
+        }
+        DocStatisticsDefinitionDto dto = new DocStatisticsDefinitionDto();
+        if (data != null) {
+            BeanUtils.copyProperties(data, dto);
+        }
+        DocStatisticsDefinitionOptionList optionList = iDocStaticsDefinitionOptionAppService.getDocStatisticsDefinitionOptionByDefinitionId(data.getId());
+        dto.setOptionList(optionList);
+        return R.ok(dto, "文档统计定义获取成功");
+    }
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionOptionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionOptionAppServiceImpl.java
new file mode 100644
index 00000000..1c199d8d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionOptionAppServiceImpl.java
@@ -0,0 +1,229 @@
+package com.openhis.web.document.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.AjaxResult;
+import com.core.common.core.domain.R;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.document.domain.DocStatisticsDefinitionOption;
+import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper;
+import com.openhis.document.service.IDocStatisticsDefinitionOptionService;
+import com.openhis.web.document.appservice.IDocStatisticsDefinitionOptionAppService;
+import com.openhis.web.document.dto.DocStatisticsDefinitionOptionDto;
+import com.openhis.web.document.dto.DocStatisticsDefinitionOptionList;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 文档统计定义选项 业务实现类
+ */
+@Slf4j
+@Service
+public class DocStatisticsDefinitionOptionAppServiceImpl implements IDocStatisticsDefinitionOptionAppService {
+
+    @Resource
+    private DocStatisticsDefinitionOptionMapper docStatisticsDefinitonOptionMapper;
+    @Resource
+    private IDocStatisticsDefinitionOptionService docStatisticsDefinitionOptionService;
+
+    /**
+     * 新增文档统计定义选项
+     *
+     * @param docStatisticsDefinitionOptionList 选项列表DTO
+     */
+    @Override
+    public R<?> add(DocStatisticsDefinitionOptionList docStatisticsDefinitionOptionList) {
+        // 参数校验
+        if (docStatisticsDefinitionOptionList == null) {
+            return R.fail("统计项选项列表为空，请选择统计项选项");
+        }
+        if (docStatisticsDefinitionOptionList.getOptions() == null || docStatisticsDefinitionOptionList.getOptions().isEmpty()) {
+            return R.fail("统计项选项不允许为空，请正确填写统计项选项");
+        }
+        if (docStatisticsDefinitionOptionList.getDocStatisticsDefinitionId() == null) {
+            return R.fail("统计项定义ID为空，请选择统计项定义ID");
+        }
+
+        // DTO转实体
+        List<DocStatisticsDefinitionOption> optionList = new ArrayList<>();
+        for (DocStatisticsDefinitionOptionDto dto : docStatisticsDefinitionOptionList.getOptions()) {
+            DocStatisticsDefinitionOption option = new DocStatisticsDefinitionOption();
+            option.setDocStatisticsDefinitionId(docStatisticsDefinitionOptionList.getDocStatisticsDefinitionId());
+            option.setOption(dto.getOption());
+            option.setDisplayOrder(dto.getDisplayOrder());
+            optionList.add(option);
+        }
+
+        // 批量新增
+        boolean saveSuccess = docStatisticsDefinitionOptionService.saveBatch(optionList);
+        if (saveSuccess) {
+            return R.ok(optionList, "统计项选项保存成功");
+        } else {
+            return R.fail("统计项选项保存失败");
+        }
+    }
+
+    /**
+     * 新增/编辑文档统计定义选项（区分增删改）
+     *
+     * @param docStatisticsDefinitionOptionList 选项列表DTO
+     */
+    @Override
+    public R<?> createOrEdit(DocStatisticsDefinitionOptionList docStatisticsDefinitionOptionList) {
+        // 参数校验
+        if (docStatisticsDefinitionOptionList == null) {
+            return R.fail("统计项选项列表为空，请选择统计项选项");
+        }
+        Long definitionId = docStatisticsDefinitionOptionList.getDocStatisticsDefinitionId();
+        if (definitionId == null) {
+            return R.fail("统计项定义ID为空，请选择统计项定义ID");
+        }
+
+        // 1. 查询原数据列表（按统计定义ID关联）
+        List<DocStatisticsDefinitionOption> oldList = docStatisticsDefinitonOptionMapper.selectList(
+                new LambdaQueryWrapper<DocStatisticsDefinitionOption>()
+                        .eq(DocStatisticsDefinitionOption::getDocStatisticsDefinitionId, definitionId));
+        oldList = oldList == null ? Collections.emptyList() : oldList;
+
+        // 2. 处理新数据列表（DTO转实体，避免空指针）
+        List<DocStatisticsDefinitionOption> newList = new ArrayList<>();
+        if (docStatisticsDefinitionOptionList.getOptions() != null && !docStatisticsDefinitionOptionList.getOptions().isEmpty()) {
+            for (DocStatisticsDefinitionOptionDto dto : docStatisticsDefinitionOptionList.getOptions()) {
+                DocStatisticsDefinitionOption option = new DocStatisticsDefinitionOption();
+                BeanUtils.copyProperties(dto, option); // 改用BeanUtils简化赋值
+                option.setDocStatisticsDefinitionId(definitionId); // 强制关联父ID，确保数据一致性
+                newList.add(option);
+            }
+        }
+        newList = newList == null ? Collections.emptyList() : newList;
+
+        // 3. 构建原数据ID映射（快速查找）
+        Map<Long, DocStatisticsDefinitionOption> oldIdMap = oldList.stream()
+                .filter(Objects::nonNull)
+                .filter(item -> item.getId() != null)
+                .collect(Collectors.toMap(DocStatisticsDefinitionOption::getId, item -> item));
+
+        // 4. 提取新数据中的有效ID集合
+        Set<Long> newIds = newList.stream()
+                .map(DocStatisticsDefinitionOption::getId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        // 5. 确定需要删除的项（原数据存在但新数据不存在）
+        List<Long> deleteIds = oldList.stream()
+                .map(DocStatisticsDefinitionOption::getId)
+                .filter(id -> !newIds.contains(id))
+                .collect(Collectors.toList());
+
+        // 6. 区分新增和修改的项
+        List<DocStatisticsDefinitionOption> addList = new ArrayList<>();
+        List<DocStatisticsDefinitionOption> updateList = new ArrayList<>();
+        for (DocStatisticsDefinitionOption newItem : newList) {
+            Long newItemId = newItem.getId();
+            if (newItemId != null && oldIdMap.containsKey(newItemId)) {
+                // 有ID且原数据存在 → 修改
+                updateList.add(newItem);
+            } else {
+                // 无ID或原数据不存在 → 新增
+                addList.add(newItem);
+            }
+        }
+
+        // 7. 执行删除操作
+        if (!deleteIds.isEmpty()) {
+            boolean deleteSuccess = docStatisticsDefinitionOptionService.removeByIds(deleteIds);
+            if (!deleteSuccess) {
+                return R.fail("统计项选项删除失败");
+            }
+        }
+
+        // 8. 执行修改操作
+        if (!updateList.isEmpty()) {
+            boolean updateSuccess = docStatisticsDefinitionOptionService.updateBatchById(updateList);
+            if (!updateSuccess) {
+                return R.fail("统计项选项更新失败");
+            }
+        }
+
+        // 9. 执行新增操作
+        if (!addList.isEmpty()) {
+            boolean addSuccess = docStatisticsDefinitionOptionService.saveBatch(addList);
+            if (!addSuccess) {
+                return R.fail("统计项选项新增失败");
+            }
+        }
+
+        return R.ok("统计项选项更新成功");
+    }
+
+    /**
+     * 删除单个统计项选项
+     *
+     * @param id 选项ID
+     */
+    @Override
+    public R<?> deleteDocStatisticsDefinitionOptionById(Long id) {
+        if (id == null) {
+            return R.fail("统计项选项ID为空，请选择要删除的统计项选项");
+        }
+
+        // 先校验数据是否存在
+        DocStatisticsDefinitionOption existingOption = docStatisticsDefinitionOptionService.getById(id);
+        if (existingOption == null) {
+            return R.fail("统计项选项不存在，删除失败");
+        }
+        // 执行删除
+        boolean deleteSuccess = docStatisticsDefinitionOptionService.removeById(id);
+        if (deleteSuccess) {
+            return R.ok("统计项选项删除成功");
+        } else {
+            return R.fail("统计项选项删除失败");
+        }
+    }
+
+    /**
+     * 根据统计定义ID查询选项列表
+     *
+     * @param docStatisticsDefinitionId 统计定义ID
+     */
+    @Override
+    public DocStatisticsDefinitionOptionList getDocStatisticsDefinitionOptionByDefinitionId(Long docStatisticsDefinitionId) {
+
+        // 修复原查询条件错误：原逻辑用ID查ID，改为用统计定义ID查关联选项
+        LambdaQueryWrapper<DocStatisticsDefinitionOption> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DocStatisticsDefinitionOption::getDocStatisticsDefinitionId, docStatisticsDefinitionId)
+                .orderByAsc(DocStatisticsDefinitionOption::getDisplayOrder); // 按显示顺序排序
+
+        List<DocStatisticsDefinitionOption> optionList = docStatisticsDefinitonOptionMapper.selectList(queryWrapper);
+        if (optionList == null || optionList.isEmpty()) {
+            return null;
+        }
+        // 实体转DTO
+        List<DocStatisticsDefinitionOptionDto> dtoList = new ArrayList<>();
+        for (DocStatisticsDefinitionOption option : optionList) {
+            DocStatisticsDefinitionOptionDto dto = new DocStatisticsDefinitionOptionDto();
+            dto.setId(option.getId());
+            dto.setOption(option.getOption());
+            dto.setDisplayOrder(option.getDisplayOrder());
+            dtoList.add(dto);
+        }
+
+        // 封装返回结果
+        DocStatisticsDefinitionOptionList resultList = new DocStatisticsDefinitionOptionList();
+        resultList.setDocStatisticsDefinitionId(docStatisticsDefinitionId);
+        resultList.setOptions(dtoList);
+
+        return resultList;
+    }
+
+    /**
+     * 获取文档模板 统计项选项列表
+     */
+    @Override
+    public AjaxResult getDocStatisticsDefinitionOptionList() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
new file mode 100644
index 00000000..dcc22608
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
@@ -0,0 +1,189 @@
+package com.openhis.web.document.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.enums.DocUseRangeEnum;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.document.domain.DocTemplate;
+import com.openhis.document.mapper.DocTemplateMapper;
+import com.openhis.document.service.IDocTemplateService;
+import com.openhis.web.document.appservice.IDocTemplateAppService;
+import com.openhis.web.document.dto.DocTemplateDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * 文档模板 业务实现类
+ */
+@Slf4j
+@Service
+public class DocTemplateAppServiceImpl implements IDocTemplateAppService {
+
+    @Resource
+    private IDocTemplateService docTemplateService;
+    @Resource
+    private DocTemplateMapper docTemplateMapper;
+
+
+    @Override
+    public R<?> add(DocTemplateDto docTemplateDto) {
+
+        String msg = initCheck(docTemplateDto);
+        if (msg != null) {
+            return R.fail(msg);
+        }
+        DocTemplate docTemplate = new DocTemplate();
+        docTemplate.setName(docTemplateDto.getName());
+        docTemplate.setDisplayOrder(docTemplateDto.getDisplayOrder());
+        docTemplate.setContextJson(docTemplateDto.getContextJson());
+        docTemplate.setDefinitionId(docTemplateDto.getDefinitionId());
+        if (docTemplateDto.getUseRange() == null) {
+            docTemplate.setUseRange(DocUseRangeEnum.ALL_HOSPITAL_USE.getValue());
+        }
+        if (docTemplateDto.getUseRange() == DocUseRangeEnum.DEPT_USE.getValue()) {
+            docTemplateDto.setOrganizationId(SecurityUtils.getLoginUser().getOrgId());
+        }
+        if (docTemplateDto.getUseRange() == DocUseRangeEnum.USE_BY_SELF.getValue()) {
+            docTemplateDto.setUserId(SecurityUtils.getLoginUser().getUserId());
+        }
+        docTemplate.setOrganizationId(docTemplateDto.getOrganizationId());
+        docTemplate.setId(docTemplateDto.getUserId());
+        docTemplate.setUseRange(docTemplateDto.getUseRange());
+        docTemplate.setRemark(docTemplateDto.getRemark());
+        docTemplateService.save(docTemplate);
+        return R.ok(" 添加成功");
+    }
+
+    private String initCheck(DocTemplateDto docTemplateDto) {
+        if (docTemplateDto == null) {
+            return "参数不能为空";
+        }
+        if (docTemplateDto.getName().isEmpty()) {
+            return "名称不能为空";
+        }
+        if (docTemplateDto.getContextJson().isEmpty()) {
+            return "内容不能为空";
+        }
+        if (docTemplateDto.getDefinitionId() == null) {
+            return "模板定义不能为空";
+        }
+        if (docTemplateDto.getUseRange() == null) {
+            return "使用范围不能为空";
+        }
+        if (docTemplateDto.getId() == null) {
+            //根据名称+定义查询模板是否存在
+            LambdaQueryWrapper<DocTemplate> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(DocTemplate::getName, docTemplateDto.getName());
+            queryWrapper.eq(DocTemplate::getDefinitionId, docTemplateDto.getDefinitionId());
+            DocTemplate docTemplate = docTemplateService.getOne(queryWrapper);
+            if (docTemplate != null) {
+                return "该模板已存在,请勿重复添加";
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public R<?> delete(Long id) {
+        if (id == null) {
+            return R.fail("模板ID不能为空");
+        }
+        boolean result = docTemplateService.removeById(id);
+        if (result) {
+            return R.ok("删除成功");
+        }
+        return R.fail("模板不存在");
+    }
+
+    @Override
+    public R<?> update(DocTemplateDto docTemplateDto) {
+        String msg = initCheck(docTemplateDto);
+        if (msg != null) {
+            return R.fail(msg);
+        }
+        if (docTemplateDto.getId() == null) {
+            return R.fail("模板ID不能为空");
+        }
+        DocTemplate docTemplate = docTemplateService.getById(docTemplateDto.getId());
+        if (docTemplate == null) {
+            return R.fail("模板不存在");
+        }
+        if (docTemplateDto.getUseRange() == DocUseRangeEnum.ALL_HOSPITAL_USE.getValue() || docTemplateDto.getUseRange() == DocUseRangeEnum.NO_IN_USE.getValue()) {
+            docTemplateDto.setOrganizationId(null);
+            docTemplateDto.setUserId(null);
+        }
+        if (docTemplateDto.getUseRange() == DocUseRangeEnum.DEPT_USE.getValue()) {
+            docTemplateDto.setOrganizationId(SecurityUtils.getLoginUser().getOrgId());
+            docTemplateDto.setUserId(null);
+        }
+        if (docTemplateDto.getUseRange() == DocUseRangeEnum.USE_BY_SELF.getValue()) {
+            docTemplate.setUserId(SecurityUtils.getLoginUser().getUserId());
+            docTemplateDto.setOrganizationId(null);
+        }
+        docTemplate.setName(docTemplateDto.getName());
+        docTemplate.setDisplayOrder(docTemplateDto.getDisplayOrder());
+        docTemplate.setContextJson(docTemplateDto.getContextJson());
+        docTemplate.setDefinitionId(docTemplateDto.getDefinitionId());
+        docTemplate.setUseRange(docTemplateDto.getUseRange());
+        docTemplate.setOrganizationId(docTemplateDto.getOrganizationId());
+        docTemplate.setUserId(docTemplateDto.getUserId());
+        docTemplate.setRemark(docTemplateDto.getRemark());
+        docTemplateService.save(docTemplate);
+        return R.ok("更新成功");
+    }
+
+    @Override
+    public R<?> getById(Long id) {
+        if (id == null) {
+            return R.fail("模板ID不能为空");
+        }
+        DocTemplateDto templateDto = new DocTemplateDto();
+        DocTemplate result = docTemplateService.getById(id);
+        BeanUtils.copyProperties(result, templateDto);
+        return R.ok(templateDto);
+    }
+
+    @Override
+    public R<?> getListByDefinitionId(Long definitionId) {
+        if (definitionId == null) {
+            return R.fail("模板定义ID不能为空");
+        }
+        LambdaQueryWrapper<DocTemplate> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DocTemplate::getDefinitionId, definitionId);
+        queryWrapper.orderByAsc(DocTemplate::getDisplayOrder);
+        List<DocTemplate> docTemplates = docTemplateService.list(queryWrapper);
+        List<DocTemplateDto> templateDtos = new ArrayList<>();
+        for (DocTemplate docTemplate : docTemplates) {
+            DocTemplateDto templateDto = new DocTemplateDto();
+            BeanUtils.copyProperties(docTemplate, templateDto);
+            templateDtos.add(templateDto);
+        }
+        return R.ok(templateDtos);
+    }
+
+    @Override
+    public R<?> getPageList(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 构建查询条件（支持多字段搜索）
+        QueryWrapper<DocTemplate> queryWrapper = HisQueryUtils.buildQueryWrapper(
+                null, searchKey, new HashSet<>(Arrays.asList("name")), request);
+        // 按记录时间倒序（最新记录在前）
+        queryWrapper.lambda().orderByDesc(DocTemplate::getDisplayOrder);
+
+        Page<DocTemplateDto> page = HisPageUtils.selectPage(
+                docTemplateMapper, queryWrapper, pageNo, pageSize, DocTemplateDto.class);
+        // 转换为分页结果
+        return R.ok(page, "获取成功");
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
new file mode 100644
index 00000000..6f2e8094
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
@@ -0,0 +1,97 @@
+package com.openhis.web.document.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.DocPermissionEnum;
+import com.openhis.common.enums.DocTypeEnum;
+import com.openhis.common.enums.DocUseRangeEnum;
+import com.openhis.web.document.appservice.IDocDefinitionAppService;
+import com.openhis.web.document.dto.DocDefinitionDto;
+import com.openhis.web.document.dto.DocDefinitonParam;
+import com.openhis.web.document.util.EnumUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 文书定义  controller
+ *
+ * @author wanghaiming
+ * @date 2025-08-12
+ */
+@RestController
+@RequestMapping("/document/definition")
+@Slf4j
+@AllArgsConstructor
+public class DocDefinitionController {
+    private final IDocDefinitionAppService iDocDefinitionAppService;
+
+    /**
+     * 初始化文书定义
+     *
+     * @return
+     */
+    @GetMapping("/init")
+    public R<?> init() {
+        Map<String, Object> map = new HashMap<>();
+
+        // 获取文档类型枚举列表
+        map.put("docTypes", EnumUtil.toMapList(DocTypeEnum.class));
+
+        // 获取权限枚举列表
+        map.put("permissions", EnumUtil.toMapList(DocPermissionEnum.class));
+        //使用范围枚举
+
+        map.put("useRanges", EnumUtil.toMapList(DocUseRangeEnum.class));
+        return R.ok(map);
+    }
+
+    /**
+     * 新增文书定义
+     *
+     * @param definitionDto
+     * @return
+     */
+    @PostMapping("/add")
+
+    public R<?> addDefinition(@RequestBody DocDefinitionDto definitionDto) {
+        return iDocDefinitionAppService.addDefinition(definitionDto);
+    }
+
+    /**
+     * 修改文书定义
+     *
+     * @param definitionDto
+     * @return
+     */
+    @PostMapping("/update")
+    public R<?> updateDefinition(@RequestBody DocDefinitionDto definitionDto) {
+        return iDocDefinitionAppService.updateDefinition(definitionDto);
+    }
+
+    /**
+     * 获取文书定义详情
+     *
+     * @param id 文书定义ID
+     * @return 文书定义详情
+     */
+    @GetMapping("/{id}")
+    public R<?> getDefinitionDetailById(@PathVariable Long id) {
+        log.info("获取文书定义详情 ID={}", id);
+        return iDocDefinitionAppService.getDefinitionDetailById(id);
+    }
+
+    /**
+     * 查询获取文书定义列表 树形结构
+     *
+     * @return
+     */
+    @GetMapping("/treeList")
+    public R<?> getTreeList(DocDefinitonParam docDefinitonParam) {
+        return iDocDefinitionAppService.getTreeList(docDefinitonParam);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java
new file mode 100644
index 00000000..92a74054
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java
@@ -0,0 +1,59 @@
+package com.openhis.web.document.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.document.appservice.IDocDefinitionAppService;
+import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService;
+import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 文书定义 - 科室分配  controller
+ *
+ * @author wanghaiming
+ * @date 2025-08-12
+ */
+@RestController
+@RequestMapping("/document/definition/Organization")
+@Slf4j
+@AllArgsConstructor
+public class DocDefinitionOrganizationController {
+
+    private final IDocDefinitionOrganizationAppService docDefinitionOrganizationAppService;
+
+    /**
+     * 新增文书分配科室列表
+     *
+     * @param organizationDto
+     * @return
+     */
+    @PostMapping("/add")
+    public R<?> add(@RequestBody DocDefinitionOrganizationDto organizationDto) {
+        return docDefinitionOrganizationAppService.add(organizationDto);
+    }
+
+    /**
+     * 删除文书分配科室列表
+     *
+     * @param definitionId
+     * @param busNo
+     * @return
+     */
+    @DeleteMapping("/delete")
+    public R<?> delete(@RequestParam("definitionId") Long definitionId, @RequestParam("busNo") String busNo) {
+        return docDefinitionOrganizationAppService.delete(definitionId, busNo);
+    }
+
+    /**
+     * 查询文书定义科室列表
+     *
+     * @param definitionId
+     * @param busNo
+     * @return
+     */
+    @GetMapping("/getOrganizationIdlist")
+    public R<?> getOrganizationIdlist(@RequestParam("definitionId") Long definitionId, @RequestParam("busNo") String busNo) {
+        return docDefinitionOrganizationAppService.getOrganizationIdlist(definitionId, busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
new file mode 100644
index 00000000..c7559484
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.document.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.DocStatusEnum;
+import com.openhis.common.enums.DocTypeEnum;
+import com.openhis.web.document.appservice.IDocRecordAppService;
+import com.openhis.web.document.dto.DocRecordDto;
+import com.openhis.web.document.dto.DocRecordPatientQueryParam;
+import com.openhis.web.document.dto.DocRecordQueryParam;
+import com.openhis.web.document.util.EnumUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文书记录  controller
+ *
+ * @author wanghaiming
+ */
+@RestController
+@RequestMapping("/document/record")
+@Slf4j
+@AllArgsConstructor
+public class DocRecordController {
+
+    private final IDocRecordAppService docRecordAppService;
+
+    /**
+     * 初始化文书定义
+     */
+    @GetMapping("/init")
+    public R<?> init() {
+        Map<String, Object> map = new HashMap<>();
+
+        // 获取文档状态枚举
+        map.put("doc_status_enums", EnumUtil.toMapList(DocStatusEnum.class));
+        map.put("doc_type_enums", EnumUtil.toMapList(DocTypeEnum.class));
+        return R.ok(map);
+    }
+
+    /**
+     * 新增记录
+     *
+     * @param docRecordDto 文书记录信息
+     * @return R
+     */
+    @PostMapping("/addRecord")
+    public R<?> addRecord(@RequestBody DocRecordDto docRecordDto) {
+        return docRecordAppService.addRecord(docRecordDto);
+    }
+
+    /**
+     * 编辑记录 修改前先设置文书为编辑状态
+     *
+     * @param docRecordDto 文书记录信息
+     * @return R
+     */
+    @PostMapping("/updateRecord")
+    public R<?> updateRecord(@RequestBody DocRecordDto docRecordDto) {
+        return docRecordAppService.updateRecord(docRecordDto);
+    }
+
+    /**
+     * 设置文书为编辑状态
+     *
+     * @param recordId 文书记录ID
+     * @return R
+     */
+    @PostMapping("/setIsEdit")
+    public R<?> setIsEdit(Long recordId) {
+        return docRecordAppService.setIsEdit(recordId);
+    }
+
+    /**
+     * 根据患者ID或就诊ID获取文书记录列表,只针对不需返回患者具体信息的列表，体温单除外，单独处理
+     * 需返回患者具体信息的列表，请使用getPatientRecordList
+     *
+     * @param docRecordQueryParam 文书记录查询参数
+     * @param pageNo              页码
+     * @param pageSize            页大小
+     * @param searchKey           搜索关键字
+     * @param request             请求
+     *                            1.IsPage 是否分页 0:不分页 1:分页
+     * @return R
+     */
+    @GetMapping("/getRecordByEncounterIdList")
+    R<?> getRecordByEncounterIdList(DocRecordQueryParam docRecordQueryParam,
+                                    @RequestParam(value = "IsPage", defaultValue = "1") Integer IsPage,
+                                    @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                    @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return docRecordAppService.getRecordByEncounterIdList(docRecordQueryParam, IsPage, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 文书记录列表
+     *
+     * @param docRecordPatientQueryParam 文书记录查询参数
+     * @param pageNo                     页码
+     * @param pageSize                   页大小
+     * @param searchKey                  搜索关键字
+     * @param request                    请求
+     * @return R
+     */
+    @GetMapping("/getRecordPageList")
+    R<?> getRecordPageList(DocRecordPatientQueryParam docRecordPatientQueryParam,
+                           @RequestParam(value = "primaryMenuEnumList", required = false) List<Integer> primaryMenuEnumList,
+                           @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                           @RequestParam(name = "searchKey", required = false) String searchKey,
+                           HttpServletRequest request) {
+        return docRecordAppService.getRecordPageList(docRecordPatientQueryParam, primaryMenuEnumList, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 根据文书记录ID获取文书记录信息
+     *
+     * @param recordId 文书记录ID
+     */
+    @GetMapping("/getRecordById")
+    R<?> getRecordById(@RequestParam(value = "recordId") Long recordId) {
+        return docRecordAppService.getRecordById(recordId);
+    }
+
+    /**
+     * 删除文书分配信息
+     *
+     * @param ids 删除文书分配信息ID列表
+     */
+    @DeleteMapping("/deleteRecord")
+    R<?> deleteRecord(@RequestBody List<Long> ids) {
+        return docRecordAppService.deleteRecord(ids);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
new file mode 100644
index 00000000..cd8fd45d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
@@ -0,0 +1,24 @@
+package com.openhis.web.document.controller;
+
+import com.openhis.web.document.appservice.IDocRecordAppService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 文档模板-病历另存为模板使用  controller
+ *
+ * @author wanghaiming
+ * @date 2025-08-12
+ */
+@RestController
+@RequestMapping("/document/template")
+@Slf4j
+@AllArgsConstructor
+public class DocStatisticsController {
+
+    private final IDocRecordAppService docRecordAppService;
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
new file mode 100644
index 00000000..d804e34e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
@@ -0,0 +1,129 @@
+package com.openhis.web.document.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.DocStatisticsDefinitionTypeEnum;
+import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
+import com.openhis.web.document.util.EnumUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 统计定义  controller
+ *
+ * @author wanghaiming
+ * @date 2025-08-12
+ */
+@RestController
+@RequestMapping("/document/statistics/definition")
+@Slf4j
+@AllArgsConstructor
+public class DocStatisticsDefinitionController {
+
+    private final IDocStatisticsDefinitionAppService docStatisticsDefinitionAppService;
+
+    /**
+     * 初始化页面数据
+     *
+     * @return
+     */
+    @GetMapping("/init")
+    public R<?> init() {
+        Map<String, Object> map = new HashMap<>();
+
+        // 获取文档状态枚举
+        map.put("doc_statistics_definition_type_enums", EnumUtil.toMapList(DocStatisticsDefinitionTypeEnum.class));
+        return R.ok(map);
+    }
+
+//    @PostMapping("/createOrEdit")
+//    public R<?> createOrEdit(@RequestBody DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+//        return docStatisticsDefinitionAppService.createOrEdit(docStatisticsDefinitionDto);
+//    }
+
+
+    /**
+     * 新增统计定义
+     *
+     * @param docStatisticsDefinitionDto
+     * @return
+     */
+    @PostMapping("/add")
+    public R<?> add(@RequestBody DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+        return docStatisticsDefinitionAppService.add(docStatisticsDefinitionDto);
+    }
+
+    /**
+     * 修改统计定义
+     *
+     * @param docStatisticsDefinitionDto
+     * @return
+     */
+    @PostMapping("/update")
+    public R<?> update(@RequestBody DocStatisticsDefinitionDto docStatisticsDefinitionDto) {
+        return docStatisticsDefinitionAppService.update(docStatisticsDefinitionDto);
+    }
+
+    /**
+     * 删除统计定义
+     *
+     * @param id
+     */
+    @DeleteMapping("/deleteDocStatisticsDefinition")
+    public R<?> deleteDocStatisticsDefinition(Long id) {
+        return docStatisticsDefinitionAppService.deleteDocStatisticsDefinition(id);
+    }
+
+    /**
+     * 根据id获取统计定义详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getDocStatisticsDefinitionById")
+    public R<?> getDocStatisticsDefinitionById(Long id) {
+        return docStatisticsDefinitionAppService.getDocStatisticsDefinitionById(id);
+    }
+
+    /**
+     * 根据code获取统计定义详情
+     *
+     * @param code
+     * @return
+     */
+    @GetMapping("/getDocStatisticsDefinitionByCode")
+    public R<?> getDocStatisticsDefinitionByCode(String code) {
+        return docStatisticsDefinitionAppService.getDocStatisticsDefinitionByCode(code);
+    }
+
+    /**
+     * 分页查询列表-不包含options
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param searchKey
+     * @param request
+     * @return
+     */
+    @GetMapping("/getPageList")
+    public R<?> getPageList(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                            @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return docStatisticsDefinitionAppService.getPageList(pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 获取文档统计定义选项列表并按指定格式返回
+     *
+     * @return
+     */
+    @GetMapping("/getOptionList")
+    public R<?> getOptionList() {
+        return docStatisticsDefinitionAppService.getOptionList();
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsOptionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsOptionController.java
new file mode 100644
index 00000000..10ee2955
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsOptionController.java
@@ -0,0 +1,25 @@
+package com.openhis.web.document.controller;
+
+import com.openhis.web.document.appservice.IDocRecordAppService;
+import com.openhis.web.document.appservice.IDocStatisticsDefinitionOptionAppService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 文文统计选项 controller
+ *
+ * @author wanghaiming
+ * @date 2025-08-12
+ */
+@RestController
+@RequestMapping("/document/statisticsOption")
+@Slf4j
+@AllArgsConstructor
+public class DocStatisticsOptionController {
+
+    private final IDocStatisticsDefinitionOptionAppService docStatisticsDefinitionOptionAppService;
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
new file mode 100644
index 00000000..813600f1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
@@ -0,0 +1,82 @@
+package com.openhis.web.document.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.openhis.web.document.dto.DocTemplateDto;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.DocTypeEnum;
+import com.openhis.common.enums.DocUseRangeEnum;
+import com.openhis.web.document.appservice.IDocTemplateAppService;
+import com.openhis.web.document.util.EnumUtil;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * DOC模板 controller
+ *
+ * @author wanghaiming
+ * @date 2025-08-12
+ */
+@RestController
+@RequestMapping("/document/template")
+@Slf4j
+@AllArgsConstructor
+public class DocTemplateController {
+
+    private final IDocTemplateAppService docTemplateAppService;
+
+    /**
+     * 初始化文书定义
+     *
+     * @return
+     */
+    @GetMapping("/init")
+    public R<?> init() {
+        Map<String, Object> map = new HashMap<>();
+
+        // 获取文档类型枚举列表
+        map.put("docTypes", EnumUtil.toMapList(DocTypeEnum.class));
+        // 使用范围枚举
+        map.put("useRanges", EnumUtil.toMapList(DocUseRangeEnum.class));
+        return R.ok(map);
+    }
+
+    @PostMapping("/add")
+    public R<?> add(@RequestBody DocTemplateDto docTemplateDto) {
+        return docTemplateAppService.add(docTemplateDto);
+    }
+
+    @DeleteMapping("/delete")
+    public R<?> delete(Long id) {
+        return docTemplateAppService.delete(id);
+    }
+
+    @PutMapping("/update")
+    public R<?> update(@RequestBody DocTemplateDto docTemplateDto) {
+        return docTemplateAppService.update(docTemplateDto);
+    }
+
+    @GetMapping("/getById")
+    public R<?> getById(Long id) {
+        return docTemplateAppService.getById(id);
+    }
+
+
+    @GetMapping("/getListByDefinitionId")
+    public R<?> getListByDefinitionId(Long definitionId) {
+        return docTemplateAppService.getListByDefinitionId(definitionId);
+    }
+
+    @GetMapping("/getPageList")
+    public R<?> getPageList(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                            @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return docTemplateAppService.getPageList(pageNo, pageSize, searchKey, request);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
new file mode 100644
index 00000000..81ab3728
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
@@ -0,0 +1,17 @@
+package com.openhis.web.document.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DirectoryNode {
+    private String name;
+    private int level;
+    private DocDefinitionDto document;
+    private List<DirectoryNode> children = new ArrayList<>();
+}
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
new file mode 100644
index 00000000..2d4f0968
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
@@ -0,0 +1,85 @@
+package com.openhis.web.document.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DocDefinitionDto {
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /**
+     * 文书名称
+     */
+    private String name;
+    /**
+     * 文书的版本号
+     */
+    private String version;
+    /**
+     * 文书类型 一级菜单 ，从枚举中获取 DocTypeEnum
+     */
+    private Integer primaryMenuEnum;
+    /**
+     * 文书类型 二级菜单，自定义
+     */
+    private String subMenu;
+    /**
+     * 文书编码 busNo，在新建时由系统自动生成
+     */
+    private String busNo;
+    /**
+     * vue路由地址
+     */
+    private String vueRouter;
+    /**
+     * 医院ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long hospitalId;
+    /**
+     * 是否有效 0-有效 1-无效
+     */
+    private Integer isValid;
+
+    /**
+     * 显示顺序
+     */
+    private Integer displayOrder;
+    /**
+     * 使用范围 0-暂不使用 1-全院使用 2-指定科室使用
+     */
+    private Integer useRangeEnum;
+    /**
+     * 医生权限 DocPermissionEnum
+     * 文书权限  0-不限制 1-查看 2- 编辑
+     */
+    private Integer doctorPermissionEnum;
+    /**
+     * 护士权限 DocPermissionEnum
+     * 文书权限 0-不限制 1-查看 2- 编辑
+     */
+    private Integer nursingPermissionEnum;
+    /**
+     * 医技权限 DocPermissionEnum
+     * 文书权限  0-不限制 1-查看 2- 编辑
+     */
+    private Integer medicalPermissionEnum;
+    /**
+     * 药剂师权限 DocPermissionEnum
+     * 文书权限  0-不限制 1-查看 2- 编辑
+     */
+    private Integer pharmacistPermissionEnum;
+    private List<Long> organizationIds;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
new file mode 100644
index 00000000..7e61e174
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
@@ -0,0 +1,24 @@
+package com.openhis.web.document.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DocDefinitionOrganizationDto {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+    private String busNo;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private List<Long> organizationIds;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
new file mode 100644
index 00000000..5773d410
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
@@ -0,0 +1,24 @@
+package com.openhis.web.document.dto;
+
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DocDefinitonParam {
+
+    private Integer primaryMenuEnum;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    private String name;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private List<Integer> useRanges;
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
new file mode 100644
index 00000000..9e876477
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
@@ -0,0 +1,56 @@
+package com.openhis.web.document.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class DocRecordDto {
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /**
+     * 文书定义ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    private String definitionBusNo;
+    /**
+     * 文档内容 存储为JSON格式
+     */
+
+    private String contentJson;
+    /**
+     * 记录状态 0草稿/暂存 1提交 2归档 3修改  DocStatusEnum 枚举类
+     * 0草稿/暂存 1提交 2归档 3修改
+     */
+    private Integer statusEnum;
+    /**
+     * 记录科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    /**
+     * 就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+    /**
+     * patientId 病人id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTime;
+    private String createBy;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
new file mode 100644
index 00000000..f841343d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
@@ -0,0 +1,74 @@
+package com.openhis.web.document.dto;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class DocRecordPatientDto extends DocRecordDto {
+
+    /**
+     * 科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    /**
+     * 病人住院号、门诊号（病历号）
+     */
+    private String busNo;
+    private String patientName;
+    private Integer gender;
+    private String genderValue;
+    private String age;
+    private String IdCard;
+    private String phone;
+    private String address;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthDate;
+    /**
+     * 入院 接诊时间/门诊 接诊时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date receptionTime;
+    /**
+     * 开始时间 encounter 入院登记时间/ 门诊 挂号时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    /**
+     * 结束时间 encounter 住院 出院登记时间/ 门诊就诊结束时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+    /**
+     * 就诊类型 encounter 就诊类型 1:门诊 2:住院
+     */
+    private Integer classEnum;
+    private String classEnumValue;
+    /**
+     * 病历名称
+     */
+    private String docName;
+
+    /**
+     * 主菜单枚举值/病历类型
+     */
+    private Integer primaryMenuEnum;
+
+    /**
+     * 主菜单名称 主菜单枚举值/病历类型名称
+     */
+    private String primaryMenuEnumValue;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
new file mode 100644
index 00000000..fdd91d9b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
@@ -0,0 +1,38 @@
+package com.openhis.web.document.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DocRecordPatientQueryParam {
+
+    /**
+     * 书写文书的组织机构ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    
+    /**
+     * 文书状态
+     */
+    private Integer statusEnum;
+    /**
+     * 对应 EncounterClass 枚举  | 就诊类型, 默认 2:门诊 1住院
+     */
+    private Integer classEnum;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTime;
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
new file mode 100644
index 00000000..9b1b8b09
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
@@ -0,0 +1,24 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 查询单个患者的文档记录参数
+ */
+@Data
+@Accessors(chain = true)
+public class DocRecordQueryParam {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
new file mode 100644
index 00000000..35769caf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
@@ -0,0 +1,56 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DocStatisticsDefinitionDto {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /*
+     属性名称
+    */
+    private String name;
+
+    /*
+     属性类型 Input 、 Date 、 Checkbox 、Radio 、 Select 、 Textarea
+    */
+    private Integer typeEnum;
+    /*
+     属性代码
+    */
+    private String code;
+
+    /*
+     是否必填  1必填 0 不必填
+    */
+    private Integer required;
+    /*
+     备注
+    */
+    private String remark;
+    /*
+     单位
+    */
+    private String unit;
+
+    /*
+    是否统计    0：不统计  1：统计
+     */
+    private Integer isStatistics;
+    /*
+     显示顺序
+    */
+    private Integer displayOrder;
+
+    /*
+     统计类型定义选项值
+    */
+    private DocStatisticsDefinitionOptionList optionList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
new file mode 100644
index 00000000..02d975e3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
@@ -0,0 +1,21 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class DocStatisticsDefinitionOptionDto {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /*
+     * 统计项编码
+     */
+//    private String busNo;
+    private String option;
+    private Integer displayOrder;
+
+}
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
new file mode 100644
index 00000000..f2089f72
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
@@ -0,0 +1,23 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DocStatisticsDefinitionOptionList {
+
+    /*
+     * 统计定义ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long docStatisticsDefinitionId;
+
+    List<DocStatisticsDefinitionOptionDto> options;
+
+}
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
new file mode 100644
index 00000000..503dfb1d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
@@ -0,0 +1,54 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class DocStatisticsDto {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /**
+     * 记录ID
+     */
+    private Long recordId;
+    /**
+     * 统计项定义ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long statisticDefinitionId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    /**
+     * 统计项编码
+     */
+    private String statisticDefinitionCode;
+    /**
+     * 记录科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgnizationId;
+    /**
+     * 统计值
+     */
+    private String value;
+    /**
+     * 记录日期 yyyy-MM-dd
+     */
+    private Date recordingDate;
+    /**
+     * 记录时间 yyyy-MM-dd HH:mm:ss
+     */
+    private Date recordingTime;
+    /**
+     * 记录来源
+     */
+    private String source;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
new file mode 100644
index 00000000..1419d391
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
@@ -0,0 +1,49 @@
+package com.openhis.web.document.dto;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class DocTemplateDto {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /**
+     * 模板名称
+     */
+    private String name;
+    /**
+     * 排序
+     */
+    private Integer displayOrder;
+    /**
+     * 模板内容
+     */
+    private String contextJson;
+
+    /**
+     * 文书定义ID
+     */
+    private Long definitionId;
+
+    /**
+     * 使用范围 0-全院 1-指定机构 2-指定用户
+     */
+    private Integer useRange;
+    /**
+     * 当useRange=1时，指定机构ID
+     */
+    private Long organizationId;
+    /**
+     * 当useRange=2时，指定用户ID
+     */
+    private Long userId;
+    /**
+     * 备注
+     */
+    private String remark;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
new file mode 100644
index 00000000..fc8e6215
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
@@ -0,0 +1,24 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 查询单个患者的文档记录参数
+ */
+@Data
+@Accessors(chain = true)
+public class DocTemplateQueryParam {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer useRang;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
new file mode 100644
index 00000000..06e8c301
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
@@ -0,0 +1,50 @@
+package com.openhis.web.document.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class OptionDto {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long optionId;
+    private String option;
+    private Integer displayOrder;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /*
+     属性名称
+    */
+    private String name;
+
+    /*
+     属性类型 Input 、 Date 、 Checkbox 、Radio 、 Select 、 Textarea
+    */
+    private Integer typeEnum;
+    /*
+     属性代码
+    */
+    private String code;
+
+    /*
+     是否必填  1必填 0 不必填
+    */
+    private Integer required;
+    /*
+     备注
+    */
+    private String remark;
+    /*
+    是否统计    0：不统计  1：统计
+     */
+    private Integer isStatistics;
+
+    private String unit;
+
+}
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
new file mode 100644
index 00000000..e39632db
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
@@ -0,0 +1,27 @@
+package com.openhis.web.document.mapper;
+
+import com.openhis.web.document.dto.DocDefinitionDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 文书分配信息Mapper
+ *
+ * @author wanghaiming
+ * @since 2025/04/08
+ */
+@Repository
+
+public interface DocDefinitionAppMapper {
+
+    /**
+     * 根据useRangeEnum获取文书分配信息列表
+     *
+     * @return 文书分配信息
+     */
+    List<DocDefinitionDto> getDefinationList(@Param("useRanges") List<Integer> useRanges, @Param("organizationId") Long organizationId,
+                                             @Param("hospitalId") Long hospitalId, @Param("name") String name, @Param("primaryMenuEnum") Integer primaryMenuEnum);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
new file mode 100644
index 00000000..02769f76
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
@@ -0,0 +1,26 @@
+package com.openhis.web.document.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.document.dto.DocRecordPatientDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 文书分配信息Mapper
+ *
+ * @author wanghaiming
+ * @since 2025/04/08
+ */
+@Repository
+
+public interface DocRecordAppMapper {
+
+    IPage<DocRecordPatientDto> getRecordPageList(@Param("page") Page<DocRecordPatientDto> page,
+                                                 @Param("primaryMenuEnumList") List<Integer> primaryMenuEnumList,
+                                                 @Param(Constants.WRAPPER) QueryWrapper<DocRecordPatientDto> queryWrapper);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
new file mode 100644
index 00000000..6055cee0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
@@ -0,0 +1,35 @@
+package com.openhis.web.document.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.document.dto.DocRecordPatientDto;
+import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
+import com.openhis.web.document.dto.OptionDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 文书分配信息Mapper
+ *
+ * @author wanghaiming
+ * @since 2025/04/08
+ */
+@Repository
+
+public interface DocStatisticsDefinitionAppMapper {
+
+    /**
+     * 获取统计定义列表
+     *
+     * @return 文书分配信息
+     */
+
+    IPage<DocStatisticsDefinitionDto> getDocStatisticsDefinitionPageList(@Param("page") Page<DocStatisticsDefinitionDto> page,
+                                                                         @Param(Constants.WRAPPER) QueryWrapper<DocStatisticsDefinitionDto> queryWrapper);
+
+    List<OptionDto> getOptionList(@Param("id") Long id, @Param("code") String code, @Param("name") String name);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
new file mode 100644
index 00000000..3ce9cbdd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
@@ -0,0 +1,156 @@
+package com.openhis.web.document.util;
+
+import com.openhis.common.enums.DocTypeEnum;
+import com.openhis.web.document.dto.DirectoryNode;
+import com.openhis.web.document.dto.DocDefinitionDto;
+
+import java.util.*;
+
+public class DocumentDirectoryProcessor {
+
+    /**
+     * 构建文档目录树
+     *
+     * @param documents 文档定义列表
+     * @return 目录节点列表（树形结构）
+     */
+    public static List<DirectoryNode> buildDocumentDirectory(List<DocDefinitionDto> documents) {
+        // 第一步：按一级菜单分组，使用LinkedHashMap保持插入顺序
+        Map<Object, List<DocDefinitionDto>> level1Groups = new LinkedHashMap<>();
+        for (DocDefinitionDto doc : documents) {
+            Object key = doc.getPrimaryMenuEnum() != null ? doc.getPrimaryMenuEnum() : doc.getName();
+            level1Groups.computeIfAbsent(key, k -> new ArrayList<>()).add(doc);
+        }
+
+        // 对一级节点进行排序，确保输出顺序符合预期
+        List<Object> sortedKeys = new ArrayList<>(level1Groups.keySet());
+        sortedKeys.sort((k1, k2) -> {
+            // 处理数字类型的键（primaryMenuEnum）
+            if (k1 instanceof Integer && k2 instanceof Integer) {
+                return Integer.compare((Integer) k1, (Integer) k2);
+            }
+            // 数字键排在前面，非数字键（如体温单）排在后面
+            if (k1 instanceof Integer) {
+                return -1;
+            }
+            if (k2 instanceof Integer) {
+                return 1;
+            }
+            // 都是非数字键，按名称排序
+            return k1.toString().compareTo(k2.toString());
+        });
+
+        // 按排序后的键重新组织分组
+        Map<Object, List<DocDefinitionDto>> sortedLevel1Groups = new LinkedHashMap<>();
+        for (Object key : sortedKeys) {
+            sortedLevel1Groups.put(key, level1Groups.get(key));
+        }
+
+        List<DirectoryNode> result = new ArrayList<>();
+
+        for (Map.Entry<Object, List<DocDefinitionDto>> entry : sortedLevel1Groups.entrySet()) {
+            Object level1Key = entry.getKey();
+            List<DocDefinitionDto> level1Docs = entry.getValue();
+
+            DirectoryNode level1Node = new DirectoryNode();
+            if (level1Key instanceof Integer) {
+                level1Node.setName(getMenuName((Integer) level1Key));
+            } else {
+                level1Node.setName(level1Key.toString());
+            }
+            level1Node.setLevel(1);
+
+            buildSubNodes(level1Node, level1Docs);
+
+            result.add(level1Node);
+        }
+
+        return result;
+    }
+
+    private static void buildSubNodes(DirectoryNode parentNode, List<DocDefinitionDto> documents) {
+        if (documents == null || documents.isEmpty()) {
+            return;
+        }
+
+        // 按下一级分组键分组（处理null键）
+        Map<String, List<DocDefinitionDto>> groups = new HashMap<>();
+        for (DocDefinitionDto doc : documents) {
+            String key = getNextLevelKey(parentNode, doc);
+            // 统一使用空字符串处理null键，避免分组异常
+            key = (key == null) ? "" : key;
+            groups.computeIfAbsent(key, k -> new ArrayList<>()).add(doc);
+        }
+
+        // 对分组键进行排序，确保子节点顺序一致
+        List<String> sortedGroupKeys = new ArrayList<>(groups.keySet());
+        sortedGroupKeys.sort(String::compareTo);
+
+        for (String groupKey : sortedGroupKeys) {
+            List<DocDefinitionDto> groupDocs = groups.get(groupKey);
+
+            if (groupKey.isEmpty()) {
+                // 分组键为空，直接添加文档节点
+                for (DocDefinitionDto doc : groupDocs) {
+                    parentNode.getChildren().add(createDocumentNode(doc));
+                }
+            } else {
+                // 创建目录节点
+                DirectoryNode childNode = new DirectoryNode();
+                childNode.setName(groupKey);
+                childNode.setLevel(parentNode.getLevel() + 1);
+
+                // 递归构建子节点
+                buildSubNodes(childNode, groupDocs);
+
+                // 添加子节点到父节点
+                parentNode.getChildren().add(childNode);
+            }
+        }
+    }
+
+    /**
+     * 获取下一级节点的分组键
+     * 关键优化：二级节点(level=2)不再进行分组，直接返回null
+     */
+    private static String getNextLevelKey(DirectoryNode parentNode, DocDefinitionDto doc) {
+        int parentLevel = parentNode.getLevel();
+        if (parentLevel == 1) {
+            return doc.getSubMenu(); // 一级节点的下一级是subMenu(二级菜单)
+        } else if (parentLevel == 2) {
+            return null; // 二级节点的下一级直接是文档，不进行分组
+        }
+        return null;
+    }
+
+    private static DirectoryNode createDocumentNode(DocDefinitionDto doc) {
+        DirectoryNode node = new DirectoryNode();
+        node.setName(doc.getName() + " (" + doc.getVersion() + ")");
+        node.setLevel(3);
+        node.setDocument(doc);
+        return node;
+    }
+
+    private static String getMenuName(Integer menuEnum) {
+        DocTypeEnum docType = DocTypeEnum.getByValue(menuEnum);
+        if (docType != null) {
+            return docType.getInfo();
+        }
+        return "其他文书";
+    }
+
+    /**
+     * 打印目录结构（优化缩进格式）
+     *
+     * @param nodes  节点列表
+     * @param indent 缩进级别（0表示无缩进）
+     */
+    public static void printDirectory(List<DirectoryNode> nodes, int indent) {
+        for (DirectoryNode node : nodes) {
+            // 打印缩进和节点信息
+            System.out.println("  ".repeat(indent) + node.getName() + " (" + node.getLevel() + ")");
+            // 递归打印子节点，缩进+1
+            printDirectory(node.getChildren(), indent + 1);
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
new file mode 100644
index 00000000..c8608696
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
@@ -0,0 +1,130 @@
+package com.openhis.web.document.util;
+
+import com.openhis.common.enums.HisEnumInterface;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 枚举工具类
+ */
+public class EnumUtil {
+
+    /**
+     * 将枚举转换为包含 value、code、info 的 Map 列表
+     *
+     * @param enumClass 枚举类
+     * @return 包含枚举属性的 Map 列表
+     */
+    public static List<Map<String, Object>> toMapList(Class<? extends HisEnumInterface> enumClass) {
+        if (enumClass == null || !enumClass.isEnum()) {
+            return Collections.emptyList();
+        }
+
+        return Arrays.stream(enumClass.getEnumConstants())
+                .map(EnumUtil::convertEnumToMap)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 将枚举项转换为 Map
+     *
+     * @param enumItem 枚举项
+     * @return 包含 value、code、info 的 Map
+     */
+    private static Map<String, Object> convertEnumToMap(HisEnumInterface enumItem) {
+        Map<String, Object> map = new HashMap<>(3);
+        map.put("value", enumItem.getValue());
+        map.put("code", enumItem.getCode());
+        map.put("info", enumItem.getInfo());
+        return map;
+    }
+
+    /**
+     * 获取枚举的所有 value 列表
+     *
+     * @param enumClass 枚举类
+     * @return value 列表
+     */
+    public static List<Object> getValues(Class<? extends HisEnumInterface> enumClass) {
+        if (enumClass == null || !enumClass.isEnum()) {
+            return Collections.emptyList();
+        }
+
+        return Arrays.stream(enumClass.getEnumConstants())
+                .map(HisEnumInterface::getValue)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取枚举的所有 code 列表
+     *
+     * @param enumClass 枚举类
+     * @return code 列表
+     */
+    public static List<String> getCodes(Class<? extends HisEnumInterface> enumClass) {
+        if (enumClass == null || !enumClass.isEnum()) {
+            return Collections.emptyList();
+        }
+
+        return Arrays.stream(enumClass.getEnumConstants())
+                .map(HisEnumInterface::getCode)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取枚举的所有 info 列表
+     *
+     * @param enumClass 枚举类
+     * @return info 列表
+     */
+    public static List<String> getInfos(Class<? extends HisEnumInterface> enumClass) {
+        if (enumClass == null || !enumClass.isEnum()) {
+            return Collections.emptyList();
+        }
+
+        return Arrays.stream(enumClass.getEnumConstants())
+                .map(HisEnumInterface::getInfo)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据 value 获取枚举项
+     *
+     * @param enumClass 枚举类
+     * @param value     枚举值
+     * @return 枚举项，未找到返回 null
+     */
+    public static <T extends HisEnumInterface> T getByValue(Class<T> enumClass, Object value) {
+        if (enumClass == null || !enumClass.isEnum() || value == null) {
+            return null;
+        }
+
+        return Arrays.stream(enumClass.getEnumConstants())
+                .filter(item -> value.equals(item.getValue()))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * 根据 code 获取枚举项
+     *
+     * @param enumClass 枚举类
+     * @param code      枚举编码
+     * @return 枚举项，未找到返回 null
+     */
+    public static <T extends HisEnumInterface> T getByCode(Class<T> enumClass, String code) {
+        if (enumClass == null || !enumClass.isEnum() || code == null) {
+            return null;
+        }
+
+        return Arrays.stream(enumClass.getEnumConstants())
+                .filter(item -> code.equals(item.getCode()))
+                .findFirst()
+                .orElse(null);
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
new file mode 100644
index 00000000..87e759f6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
@@ -0,0 +1,36 @@
+package com.openhis.web.document.util;
+
+import com.core.common.annotation.Excel;
+import com.core.common.core.domain.entity.SysRole;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.enums.DocPermissionEnum;
+import com.openhis.web.document.dto.DocDefinitionDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PermissionProcessor {
+    public static boolean hasPermission(DocDefinitionDto docDefinitionDto) {
+//肯定还得改
+        List<SysRole> roleList = SecurityUtils.getLoginUser().getRoleList();
+        boolean result = false;
+        for (SysRole role : roleList) {
+            if (role.getRoleKey().equals("admin")) {
+                return true;
+            }
+            if (role.getRoleKey().equals("doctor") && docDefinitionDto.getDoctorPermissionEnum() != DocPermissionEnum.VIEW.getValue()) {
+                return true;
+            }
+            if (role.getRoleKey().equals("nurse") && docDefinitionDto.getNursingPermissionEnum() != DocPermissionEnum.VIEW.getValue()) {
+                return true;
+            }
+            if (role.getRoleKey().equals("medicalSkill") && docDefinitionDto.getMedicalPermissionEnum() != DocPermissionEnum.VIEW.getValue()) {
+                return true;
+            }
+            if (role.getRoleKey().equals("pharmacist") && docDefinitionDto.getPharmacistPermissionEnum() != DocPermissionEnum.VIEW.getValue()) {
+                return true;
+            }
+        }
+        return result;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
new file mode 100644
index 00000000..67f30b70
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
@@ -0,0 +1,55 @@
+package com.openhis.web.inhospitalcharge.appservice;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 预交金管理 应用Service
+ */
+public interface IAdvancePaymentManageAppService {
+
+    /**
+     * 查询患者预交金基本信息
+     * 
+     * @param advancePaymentInfoDto 患者预交金基本信息dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 患者预交金基本信息
+     */
+    IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 查询预交金支付流水记录
+     *
+     * @param encounterId 住院就诊Id
+     * @return 预交金支付流水记录
+     */
+    List<AdvancePaymentFlowRecordDto> getAdvancePaymentFlowRecord(Long encounterId);
+
+    /**
+     * 预交金交款
+     *
+     * @param advancePaymentInAndOutDto 交款dto
+     * @return 结果
+     */
+    R<?> inAdvancePayment(AdvancePaymentInAndOutDto advancePaymentInAndOutDto);
+
+    /**
+     * 预交金退款
+     *
+     * @param advancePaymentInAndOutDto 退款dto
+     * @return 结果
+     */
+    R<?> outAdvancePayment(AdvancePaymentInAndOutDto advancePaymentInAndOutDto);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
new file mode 100644
index 00000000..f04497b1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
@@ -0,0 +1,86 @@
+package com.openhis.web.inhospitalcharge.appservice;
+
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalcharge.dto.*;
+
+/**
+ * 住院登记 应用Service
+ */
+public interface IInHospitalRegisterAppService {
+
+    /**
+     * 门诊医生开住院申请
+     *
+     * @param inHospitalRegisterDto 住院登记参数
+     * @return 结果
+     */
+    R<?> registerByDoctor(InHospitalRegisterDto inHospitalRegisterDto);
+
+    /**
+     * 查询住院登记信息
+     *
+     * @param inHospitalRegisterQueryDto 查询dto
+     * @param searchKey 模糊查询关键字
+     * @param registeredFlag 已登记标识,已登记传 1 ,待登记传 0
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 住院登记信息
+     */
+    IPage<InHospitalRegisterQueryDto> getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto,
+        String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 查询患者基本信息
+     *
+     * @param patientId 患者ID
+     * @return 患者基本信息
+     */
+    InHospitalPatientInfoDto getPatientInfo(Long patientId);
+
+    /**
+     * 查询住院就诊信息
+     *
+     * @param encounterId 住院就诊id
+     * @return 住院就诊信息
+     */
+    InHospitalInfoDto getInHospitalInfo(Long encounterId);
+
+    /**
+     * 根据病区号查询床位数
+     *
+     * @param wardBusNo 病区号
+     * @return 床位数
+     */
+    HashMap<String, Integer> getBedsNumByWardBusNo(String wardBusNo);
+
+    /**
+     * 更新患者信息
+     *
+     * @param patientUpdateDto 更新患者信息dto
+     * @return 结果
+     */
+    R<?> updatePatient(PatientUpdateDto patientUpdateDto);
+
+    /**
+     * 款台登记
+     *
+     * @param inHospitalInfoDto 登记dto
+     * @return 结果
+     */
+    R<?> registerByCashier(InHospitalInfoDto inHospitalInfoDto);
+
+    /**
+     * 无档登记
+     *
+     * @param noFilesRegisterDto 无档登记dto
+     * @return 结果
+     */
+    R<?> noFilesRegister(NoFilesRegisterDto noFilesRegisterDto);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
new file mode 100644
index 00000000..2ade3a43
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
@@ -0,0 +1,203 @@
+package com.openhis.web.inhospitalcharge.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.Account;
+import com.openhis.administration.service.IAccountService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbPayment;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.PaymentRecDetail;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.service.IPaymentRecDetailService;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+import com.openhis.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 预交金管理 应用实现类
+ */
+@Slf4j
+@Service
+public class AdvancePaymentManageAppServiceImpl implements IAdvancePaymentManageAppService {
+
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    AdvancePaymentManageAppMapper advancePaymentManageAppMapper;
+
+    @Resource
+    IPaymentReconciliationService iPaymentReconciliationService;
+
+    @Resource
+    IPaymentRecDetailService iPaymentRecDetailService;
+
+    @Resource
+    IAccountService iAccountService;
+
+    /**
+     * 查询患者预交金基本信息
+     *
+     * @param advancePaymentInfoDto 患者预交金基本信息dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 患者预交金基本信息
+     */
+    @Override
+    public IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<AdvancePaymentInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(advancePaymentInfoDto,
+            searchKey, new HashSet<>(Arrays.asList("bus_no", "patient_name", "inHospital_org_name")), request);
+
+        IPage<AdvancePaymentInfoDto> advancePaymentInfo = advancePaymentManageAppMapper.getAdvancePaymentInfo(
+            new Page<>(pageNo, pageSize), PaymentKind.HOSPITAL_DEPOSIT.getValue(), LocationForm.WARD.getValue(),
+            LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(), EncounterLocationStatus.ACTIVE.getValue(),
+            ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
+            ChargeItemStatus.REFUNDED.getValue(), EncounterClass.IMP.getValue(),
+            AccountType.PERSONAL_CASH_ACCOUNT.getCode(), queryWrapper);
+        advancePaymentInfo.getRecords().forEach(e -> {
+            // 性别
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
+        });
+
+        return advancePaymentInfo;
+    }
+
+    /**
+     * 查询预交金支付流水记录
+     *
+     * @param encounterId 住院就诊Id
+     * @return 预交金支付流水记录
+     */
+    @Override
+    public List<AdvancePaymentFlowRecordDto> getAdvancePaymentFlowRecord(Long encounterId) {
+        List<AdvancePaymentFlowRecordDto> advancePaymentFlowRecordList =
+            advancePaymentManageAppMapper.getAdvancePaymentFlowRecordList(encounterId);
+        advancePaymentFlowRecordList.forEach(e ->
+        // 付款类别
+        e.setPaymentEnum_enumText(EnumUtils.getInfoByValue(PaymentType.class, e.getPaymentEnum())));
+        return advancePaymentFlowRecordList;
+    }
+
+    /**
+     * 预交金交款
+     *
+     * @param advancePaymentInAndOutDto 交款dto
+     * @return 结果
+     */
+    @Override
+    public R<?> inAdvancePayment(AdvancePaymentInAndOutDto advancePaymentInAndOutDto) {
+        this.handleAdvancePayment(advancePaymentInAndOutDto, PaymentType.PAY.getValue());
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"预交金交款"}));
+    }
+
+    /**
+     * 预交金退款
+     *
+     * @param advancePaymentInAndOutDto 退款dto
+     * @return 结果
+     */
+    @Override
+    public R<?> outAdvancePayment(AdvancePaymentInAndOutDto advancePaymentInAndOutDto) {
+        this.handleAdvancePayment(advancePaymentInAndOutDto, PaymentType.UN_PAY.getValue());
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"预交金退款"}));
+    }
+
+    /**
+     * 处理 预交金交费/退费
+     *
+     * @param advancePaymentInAndOutDto 预交金dto
+     * @param paymentEnum 类别
+     */
+    private void handleAdvancePayment(AdvancePaymentInAndOutDto advancePaymentInAndOutDto, Integer paymentEnum) {
+        BigDecimal ammount;
+        // 交费
+        if (PaymentType.PAY.getValue().equals(paymentEnum)) {
+            ammount = advancePaymentInAndOutDto.getAmount();
+        }
+        // 退费
+        else {
+            ammount = advancePaymentInAndOutDto.getAmount().multiply(new BigDecimal("-1"));
+        }
+        // 保存支付信息
+        String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20); // 生成流水号
+        Date setlTime = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(setlTime);
+        calendar.add(Calendar.HOUR_OF_DAY, 24);
+        Date futureTime = calendar.getTime();
+
+        // 支付管理主表
+        PaymentReconciliation payment = new PaymentReconciliation();
+        payment.setStatusEnum(PaymentStatus.SUCCESS.getValue()); // 状态
+        payment.setPaymentNo(paymentNo); // 支付的业务标识符
+        payment.setPaymentEnum(paymentEnum); // 付款类别
+        payment.setPaymentReconciliationId(advancePaymentInAndOutDto.getPatientId()); // 付款实体ID
+        payment.setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()); // 发起支付的工作流程类别-住院存款
+        payment.setEntererId(SecurityUtils.getLoginUser().getPractitionerId()); // 收款员
+        payment.setPatientId(advancePaymentInAndOutDto.getPatientId()); // 患者ID
+        payment.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); // 请求支付责任人ID
+        payment.setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()); // 付款结果
+        payment.setLocationId(-99L); // 支付位置
+        payment.setExpirationDate(futureTime); // 到期时间
+        payment.setTenderedAmount(ammount); // 应收金额
+        payment.setDisplayAmount(ammount); // 付款总额
+        payment.setPrintCount(0); // 打印标识
+        payment.setEncounterId(advancePaymentInAndOutDto.getEncounterId()); // 住院就诊id
+        payment.setBillDate(setlTime); // 结算时间
+        iPaymentReconciliationService.save(payment);
+
+        // 支付管理子表
+        PaymentRecDetail paymentDetail = new PaymentRecDetail();
+        paymentDetail.setAccountId(advancePaymentInAndOutDto.getAccountId()); // 账户
+        paymentDetail.setPayEnum(YbPayment.SELF_CASH_PAY.getValue()); // 支付类型
+        paymentDetail.setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()); // 支付类型等级
+        paymentDetail.setAmount(ammount); // 金额
+        paymentDetail.setPayTransNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+        paymentDetail.setReconciliationId(payment.getId()); // 付款id
+
+        iPaymentRecDetailService.save(paymentDetail);
+
+        // 更新个人现金账户的预交金
+        Account account =
+            iAccountService.lambdaQuery().eq(Account::getTypeCode, AccountType.PERSONAL_CASH_ACCOUNT.getCode())
+                .eq(Account::getEncounterId, advancePaymentInAndOutDto.getEncounterId())
+                .select(Account::getId, Account::getBalanceAmount).one();
+        if (account == null) {
+            throw new RuntimeException("未找到对应的个人现金账户信息");
+        }
+        BigDecimal currentBalance = account.getBalanceAmount() != null ? account.getBalanceAmount() : BigDecimal.ZERO;
+        BigDecimal newBalance = currentBalance.add(ammount);
+        iAccountService.lambdaUpdate().set(Account::getBalanceAmount, newBalance).eq(Account::getId, account.getId())
+            .update();
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
new file mode 100644
index 00000000..c6070867
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
@@ -0,0 +1,453 @@
+package com.openhis.web.inhospitalcharge.appservice.impl;
+
+import java.util.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+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;
+import com.core.common.core.domain.R;
+import com.core.common.utils.*;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.service.*;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.service.IConditionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbIptDiseTypeCode;
+import com.openhis.common.enums.ybenums.YbPayment;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.PaymentRecDetail;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.service.IPaymentRecDetailService;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
+import com.openhis.web.inhospitalcharge.dto.*;
+import com.openhis.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper;
+import com.openhis.web.patientmanage.appservice.IPatientInformationService;
+import com.openhis.web.patientmanage.dto.PatientInformationDto;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 住院登记 应用实现类
+ */
+@Slf4j
+@Service
+public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppService {
+
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    InHospitalRegisterAppMapper inHospitalRegisterAppMapper;
+
+    @Resource
+    IEncounterService iEncounterService;
+
+    @Resource
+    IEncounterParticipantService iEncounterParticipantService;
+
+    @Resource
+    IConditionService iConditionService;
+
+    @Resource
+    IEncounterDiagnosisService iEncounterDiagnosisService;
+
+    @Resource
+    IEncounterLocationService iEncounterLocationService;
+
+    @Resource
+    IAccountService iAccountService;
+
+    @Resource
+    IPatientInformationService patientInformationService;
+
+    @Resource
+    IPaymentReconciliationService iPaymentReconciliationService;
+
+    @Resource
+    IPaymentRecDetailService iPaymentRecDetailService;
+
+    @Resource
+    IPatientService iPatientService;
+
+    /**
+     * 门诊医生开住院申请
+     *
+     * @param inHospitalRegisterDto 住院登记参数
+     * @return 结果
+     */
+    @Override
+    public R<?> registerByDoctor(InHospitalRegisterDto inHospitalRegisterDto) {
+        // 当前账号的参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 患者id
+        Long patientId = inHospitalRegisterDto.getPatientId();
+        // 门诊就诊id
+        Long ambEncounterId = inHospitalRegisterDto.getAmbEncounterId();
+        // 获取执行科室
+        LambdaQueryWrapper<Encounter> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Encounter::getAmbEncounterId, ambEncounterId);
+        if (iEncounterService.list(queryWrapper).size() > 0) {
+            return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
+        }
+
+        // 住院encounter
+        Encounter zYEncounter = new Encounter();
+        zYEncounter.setPatientId(patientId); // 患者id
+        zYEncounter.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ADMISSION_NUM.getPrefix(), 4));// 住院编号
+        zYEncounter.setPriorityEnum(inHospitalRegisterDto.getPriorityEnum()); // 优先级
+        zYEncounter.setStatusEnum(EncounterZyStatus.TO_BE_REGISTERED.getValue()); // 状态为待登记
+        zYEncounter.setClassEnum(EncounterClass.IMP.getValue()); // 类别为住院
+        zYEncounter.setYbClassEnum(inHospitalRegisterDto.getYbClassEnum()); // 医保类别
+        zYEncounter.setOrganizationId(inHospitalRegisterDto.getInHospitalOrgId()); // 住院科室id
+        zYEncounter.setAmbEncounterId(ambEncounterId); // 门诊就诊id
+        iEncounterService.save(zYEncounter);
+        Long zYEncounterId = zYEncounter.getId();// 住院就诊id
+
+        // 住院encounter的参与者
+        EncounterParticipant zYEncounterParticipant = new EncounterParticipant();
+        zYEncounterParticipant.setEncounterId(zYEncounterId); // 住院就诊id
+        zYEncounterParticipant.setTypeCode(ParticipantType.ADMITTER.getCode()); // 接诊医生
+        zYEncounterParticipant.setPractitionerId(practitionerId); // 参与者id
+        iEncounterParticipantService.save(zYEncounterParticipant);
+
+        // 住院诊断
+        Condition zYCondition = new Condition();
+        zYCondition.setVerificationStatusEnum(ConditionVerificationStatus.CONFIRMED.getValue()); // 验证状态
+        zYCondition.setPatientId(patientId); // 患者id
+        zYCondition.setDefinitionId(inHospitalRegisterDto.getDiagnosisDefinitionId()); // 诊断定义Id
+        zYCondition.setYbNo(inHospitalRegisterDto.getDiagnosisYbNo()); // 诊断对应的医保编码
+        zYCondition.setRecordedDatetime(new Date()); // 记录时间
+        zYCondition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
+        iConditionService.save(zYCondition);
+        Long conditionId = zYCondition.getId();// 诊断id
+
+        EncounterDiagnosis zYEncounterDiagnosis = new EncounterDiagnosis();
+        zYEncounterDiagnosis.setEncounterId(zYEncounterId); // 住院就诊id
+        zYEncounterDiagnosis.setConditionId(conditionId); // 诊断id
+        zYEncounterDiagnosis.setMaindiseFlag(Whether.YES.getValue()); // 主诊断
+        zYEncounterDiagnosis.setMedTypeCode(inHospitalRegisterDto.getMedTypeCode());// 医疗类型
+        zYEncounterDiagnosis.setDiagnosisDesc(inHospitalRegisterDto.getDiagnosisDesc()); // 诊断描述
+        zYEncounterDiagnosis.setIptDiseTypeCode(YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getValue()); // 住院患者疾病诊断类型代码
+        iEncounterDiagnosisService.save(zYEncounterDiagnosis);
+
+        // 病区
+        if (inHospitalRegisterDto.getWardLocationId() != null) {
+            EncounterLocation zYEncounterLocation = new EncounterLocation();
+            zYEncounterLocation.setEncounterId(zYEncounterId); // 住院就诊id
+            zYEncounterLocation.setLocationId(inHospitalRegisterDto.getWardLocationId()); // 病区id
+            zYEncounterLocation.setFormEnum(LocationForm.WARD.getValue()); // 物理形式枚举
+            iEncounterLocationService.save(zYEncounterLocation);
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"住院申请"}));
+    }
+
+    /**
+     * 查询住院登记信息
+     *
+     * @param inHospitalRegisterQueryDto 查询dto
+     * @param searchKey 模糊查询关键字
+     * @param registeredFlag 已登记标识,已登记传 1 ,待登记传 0
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 住院登记信息
+     */
+    @Override
+    public IPage<InHospitalRegisterQueryDto> getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto,
+        String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记
+        // 构建查询条件
+        QueryWrapper<InHospitalRegisterQueryDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey,
+                new HashSet<>(Arrays.asList("registrar", "source_name", "patient_name")), request);
+
+        IPage<InHospitalRegisterQueryDto> inHospitalRegisterInfo = inHospitalRegisterAppMapper
+            .getInHospitalRegisterInfo(new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), encounterStatus,
+                registeredFlag, LocationForm.WARD.getValue(), queryWrapper);
+        inHospitalRegisterInfo.getRecords().forEach(e -> {
+            // 性别
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
+        });
+
+        return inHospitalRegisterInfo;
+    }
+
+    /**
+     * 查询患者基本信息
+     *
+     * @param patientId 患者ID
+     * @return 患者基本信息
+     */
+    @Override
+    public InHospitalPatientInfoDto getPatientInfo(Long patientId) {
+        InHospitalPatientInfoDto patientInfo = inHospitalRegisterAppMapper.getPatientInfo(patientId);
+        // 性别
+        patientInfo
+            .setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, patientInfo.getGenderEnum()));
+        // 计算年龄
+        patientInfo
+            .setAge(patientInfo.getBirthDate() != null ? AgeCalculatorUtil.getAge(patientInfo.getBirthDate()) : "");
+        // 婚姻状态
+        patientInfo.setMaritalStatusEnum_enumText(
+            EnumUtils.getInfoByValue(MaritalStatus.class, patientInfo.getMaritalStatusEnum()));
+        // 职业
+        patientInfo.setPrfsEnum_enumText(EnumUtils.getInfoByValue(OccupationType.class, patientInfo.getPrfsEnum()));
+        return patientInfo;
+    }
+
+    /**
+     * 查询住院就诊信息
+     *
+     * @param encounterId 住院就诊id
+     * @return 住院就诊信息
+     */
+    @Override
+    public InHospitalInfoDto getInHospitalInfo(Long encounterId) {
+        InHospitalInfoDto inHospitalInfo = inHospitalRegisterAppMapper.getInHospitalInfo(encounterId,
+            LocationForm.WARD.getValue(), Whether.YES.getValue(), ParticipantType.ADMITTER.getCode(),
+            AccountType.PERSONAL_CASH_ACCOUNT.getCode());
+        // 优先级(患者病情)
+        inHospitalInfo
+            .setPriorityEnum_enumText(EnumUtils.getInfoByValue(PriorityLevel.class, inHospitalInfo.getPriorityEnum()));
+        // 病区号
+        String wardBusNo = inHospitalInfo.getWardBusNo();
+        if (!StringUtils.isEmpty(wardBusNo)) {
+            // 计算床位数
+            Integer totalBedsNum = inHospitalRegisterAppMapper.getTotalBedsNum(LocationForm.BED.getValue(),
+                LocationStatus.INACTIVE.getValue(), wardBusNo);
+            inHospitalInfo.setTotalBedsNum(totalBedsNum); // 当前病区总床位数
+            Integer idleBedsNum = inHospitalRegisterAppMapper.getIdleBedsNum(LocationForm.BED.getValue(),
+                LocationStatus.IDLE.getValue(), wardBusNo);
+            inHospitalInfo.setIdleBedsNum(idleBedsNum); // 当前病区空闲床位数
+        }
+        return inHospitalInfo;
+    }
+
+    /**
+     * 根据病区号查询床位数
+     *
+     * @param wardBusNo 病区号
+     * @return 床位数
+     */
+    @Override
+    public HashMap<String, Integer> getBedsNumByWardBusNo(String wardBusNo) {
+        HashMap<String, Integer> resMap = new HashMap<>();
+        // 当前病区总床位数
+        Integer totalBedsNum = inHospitalRegisterAppMapper.getTotalBedsNum(LocationForm.BED.getValue(),
+            LocationStatus.INACTIVE.getValue(), wardBusNo);
+        // // 当前病区空闲床位数
+        Integer idleBedsNum = inHospitalRegisterAppMapper.getIdleBedsNum(LocationForm.BED.getValue(),
+            LocationStatus.IDLE.getValue(), wardBusNo);
+        resMap.put("totalBedsNum", totalBedsNum);
+        resMap.put("idleBedsNum", idleBedsNum);
+        return resMap;
+    }
+
+    /**
+     * 更新患者信息
+     *
+     * @param patientUpdateDto 更新患者信息dto
+     * @return 结果
+     */
+    @Override
+    public R<?> updatePatient(PatientUpdateDto patientUpdateDto) {
+        Patient patient = new Patient();
+        patient.setId(patientUpdateDto.getPatientId());
+        patient.setName(patientUpdateDto.getName()); // 患者姓名
+        patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patientUpdateDto.getName())); // 拼音码
+        patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patientUpdateDto.getName())); // 五笔码
+        patient.setGenderEnum(patientUpdateDto.getGenderEnum()); // 性别编码
+        patient.setBirthDate(patientUpdateDto.getBirthDate()); // 生日
+        patient.setPhone(patientUpdateDto.getPhone()); // 电话
+        patient.setIdCard(patientUpdateDto.getIdCard()); // 身份证号
+
+        iPatientService.saveOrUpdate(patient);
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"患者信息"}));
+    }
+
+    /**
+     * 款台登记(门诊入口)
+     *
+     * @param inHospitalInfoDto 登记dto
+     * @return 结果
+     */
+    @Override
+    public R<?> registerByCashier(InHospitalInfoDto inHospitalInfoDto) {
+        this.handleRegister(inHospitalInfoDto, null); // 处理入院登记信息
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"住院登记"}));
+    }
+
+    /**
+     * 无档登记
+     *
+     * @param noFilesRegisterDto 无档登记dto
+     * @return 结果
+     */
+    @Override
+    public R<?> noFilesRegister(NoFilesRegisterDto noFilesRegisterDto) {
+        // 患者信息
+        PatientInformationDto patientInformation = noFilesRegisterDto.getPatientInformation();
+        // 新增患者
+        R<?> r = patientInformationService.addPatient(patientInformation);
+        if (r.getCode() == 200) {
+            Patient patient = (Patient)r.getData();
+            // 住院信息
+            InHospitalInfoDto inHospitalInfoDto = noFilesRegisterDto.getInHospitalInfo();
+            this.handleRegister(inHospitalInfoDto, patient); // 处理入院登记信息
+        } else {
+            R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"无档登记"}));
+    }
+
+    /**
+     * 处理入院登记信息
+     * 
+     * @param inHospitalInfoDto 住院信息dto
+     * @param patient 患者信息
+     */
+    private void handleRegister(InHospitalInfoDto inHospitalInfoDto, Patient patient) {
+        // 住院就诊id
+        Long encounterId = inHospitalInfoDto.getEncounterId();
+
+        // 处理住院就诊信息
+        Encounter encounterReg = new Encounter();
+        encounterReg.setId(encounterId);
+        if (encounterId == null) {
+            encounterReg.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ADMISSION_NUM.getPrefix(), 4));// 住院编号
+            encounterReg.setPatientId(patient.getId()); // 患者ID
+            encounterReg.setStatusEnum(EncounterZyStatus.REGISTERED.getValue()); // 状态已登记
+            encounterReg.setClassEnum(EncounterClass.IMP.getValue()); // 类别为住院
+            encounterReg.setYbClassEnum(inHospitalInfoDto.getYbClassEnum()); // 医保类别
+        }
+        encounterReg.setStatusEnum(EncounterZyStatus.REGISTERED.getValue()); // 已登记
+        encounterReg.setOrganizationId(inHospitalInfoDto.getInHospitalOrgId());// 住院科室id
+        encounterReg.setPriorityEnum(inHospitalInfoDto.getPriorityEnum()); // 优先级(患者病情)
+        encounterReg.setAdmitSourceCode(inHospitalInfoDto.getAdmitSourceCode()); // 入院类型
+        encounterReg.setInWayCode(inHospitalInfoDto.getInWayCode()); // 入院方式
+        encounterReg.setStartTime(inHospitalInfoDto.getStartTime()); // 入院日期
+        encounterReg.setRegistrarId(SecurityUtils.getLoginUser().getPractitionerId()); // 登记员id
+        iEncounterService.saveOrUpdate(encounterReg);
+
+        // 先查询当前就诊是否已经分配了病区
+        EncounterLocation encounterLocation = iEncounterLocationService.getOne(
+            new LambdaQueryWrapper<EncounterLocation>().eq(EncounterLocation::getEncounterId, encounterReg.getId())
+                .eq(EncounterLocation::getFormEnum, LocationForm.WARD.getValue()));
+        // 处理病区信息
+        EncounterLocation encounterLocationReg = new EncounterLocation();
+        if (encounterLocation != null) {
+            encounterLocationReg.setId(encounterLocation.getId());
+        }
+        encounterLocationReg.setEncounterId(encounterReg.getId()); // 住院就诊id
+        encounterLocationReg.setLocationId(inHospitalInfoDto.getWardLocationId()); // 病区id
+        encounterLocationReg.setFormEnum(LocationForm.WARD.getValue()); // 物理形式枚举
+        iEncounterLocationService.saveOrUpdate(encounterLocationReg);
+
+        // 处理账号预交金信息
+        String contractNo = inHospitalInfoDto.getContractNo();
+        // 自费标识
+        boolean selfFundedFlag = CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(contractNo);
+        // 生成个人现金账户的account记录用于存储预交金
+        Account accountPersonalCash = new Account();
+        accountPersonalCash.setTypeCode(AccountType.PERSONAL_CASH_ACCOUNT.getCode()); // 账户类型
+        accountPersonalCash.setPatientId(
+            inHospitalInfoDto.getPatientId() != null ? inHospitalInfoDto.getPatientId() : patient.getId()); // 患者id
+        accountPersonalCash.setEncounterId(encounterReg.getId()); // 住院就诊id
+        accountPersonalCash.setBalanceAmount(inHospitalInfoDto.getBalanceAmount()); // 账户余额
+        // 自费
+        if (selfFundedFlag) {
+            accountPersonalCash.setEncounterFlag(Whether.YES.getValue());
+        } else {
+            // 生成非自费的账号
+            Account accountNoSelfFunded = new Account();
+            accountNoSelfFunded.setTypeCode(inHospitalInfoDto.getTypeCoce()); // 账户类型
+            accountNoSelfFunded.setPatientId(
+                inHospitalInfoDto.getPatientId() != null ? inHospitalInfoDto.getPatientId() : patient.getId()); // 患者id
+            accountNoSelfFunded.setEncounterId(encounterReg.getId()); // 住院就诊id
+            accountNoSelfFunded.setContractNo(contractNo); // 合同编码
+            accountNoSelfFunded.setEncounterFlag(Whether.YES.getValue());
+            iAccountService.save(accountNoSelfFunded);
+
+            accountPersonalCash.setEncounterFlag(Whether.NO.getValue());
+        }
+        iAccountService.save(accountPersonalCash);
+
+        // 保存支付信息
+        String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20); // 生成流水号
+        Date setlTime = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(setlTime);
+        calendar.add(Calendar.HOUR_OF_DAY, 24);
+        Date futureTime = calendar.getTime();
+
+        // 支付管理主表
+        PaymentReconciliation payment = new PaymentReconciliation();
+        payment.setStatusEnum(PaymentStatus.SUCCESS.getValue()); // 状态
+        payment.setPaymentNo(paymentNo); // 支付的业务标识符
+        payment.setPaymentEnum(PaymentType.PAY.getValue()); // 付款类别
+        payment.setPaymentReconciliationId(accountPersonalCash.getPatientId()); // 付款实体ID
+        payment.setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()); // 发起支付的工作流程类别-住院存款
+        payment.setEntererId(SecurityUtils.getLoginUser().getPractitionerId()); // 收款员
+        payment.setPatientId(accountPersonalCash.getPatientId()); // 患者ID
+        payment.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); // 请求支付责任人ID
+        payment.setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()); // 付款结果
+        payment.setLocationId(-99L); // 支付位置
+        payment.setExpirationDate(futureTime); // 到期时间
+        payment.setTenderedAmount(inHospitalInfoDto.getBalanceAmount()); // 应收金额
+        payment.setDisplayAmount(inHospitalInfoDto.getBalanceAmount()); // 付款总额
+        payment.setPrintCount(0); // 打印标识
+        payment.setEncounterId(encounterReg.getId()); // 住院就诊id
+        payment.setBillDate(setlTime); // 结算时间
+        iPaymentReconciliationService.save(payment);
+
+        // 支付管理子表
+        PaymentRecDetail paymentDetail = new PaymentRecDetail();
+        paymentDetail.setAccountId(accountPersonalCash.getId()); // 账户
+        paymentDetail.setPayEnum(YbPayment.SELF_CASH_PAY.getValue()); // 支付类型
+        paymentDetail.setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()); // 支付类型等级
+        paymentDetail.setAmount(inHospitalInfoDto.getBalanceAmount()); // 金额
+        paymentDetail.setPayTransNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+        paymentDetail.setReconciliationId(payment.getId()); // 付款id
+
+        iPaymentRecDetailService.save(paymentDetail);
+
+        // 处理住院诊断(无档登记场景)
+        if (patient != null && inHospitalInfoDto.getDiagnosisDefinitionId() != null) {
+            // 住院诊断
+            Condition zYCondition = new Condition();
+            zYCondition.setVerificationStatusEnum(ConditionVerificationStatus.CONFIRMED.getValue()); // 验证状态
+            zYCondition.setPatientId(patient.getId()); // 患者id
+            zYCondition.setDefinitionId(inHospitalInfoDto.getDiagnosisDefinitionId()); // 诊断定义Id
+            zYCondition.setYbNo(inHospitalInfoDto.getDiagnosisYbNo()); // 诊断对应的医保编码
+            zYCondition.setRecordedDatetime(new Date()); // 记录时间
+            zYCondition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
+            iConditionService.save(zYCondition);
+            Long conditionId = zYCondition.getId();// 诊断id
+
+            EncounterDiagnosis zYEncounterDiagnosis = new EncounterDiagnosis();
+            zYEncounterDiagnosis.setEncounterId(encounterReg.getId()); // 住院就诊id
+            zYEncounterDiagnosis.setConditionId(conditionId); // 诊断id
+            zYEncounterDiagnosis.setMaindiseFlag(Whether.YES.getValue()); // 主诊断
+            zYEncounterDiagnosis.setMedTypeCode(inHospitalInfoDto.getMedTypeCode());// 医疗类型
+            zYEncounterDiagnosis.setDiagnosisDesc(inHospitalInfoDto.getDiagnosisDesc()); // 诊断描述
+            zYEncounterDiagnosis.setIptDiseTypeCode(YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getValue()); // 住院患者疾病诊断类型代码
+            iEncounterDiagnosisService.save(zYEncounterDiagnosis);
+        }
+
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java
new file mode 100644
index 00000000..839fd29c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalcharge.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 预交金管理 controller
+ */
+@RestController
+@RequestMapping("/inhospital-charge/advance-payment")
+@Slf4j
+@AllArgsConstructor
+public class AdvancePaymentManageController {
+
+    private final IAdvancePaymentManageAppService iAdvancePaymentManageAppService;
+
+    /**
+     * 查询患者预交金基本信息
+     *
+     * @param advancePaymentInfoDto 患者预交金基本信息dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 患者预交金基本信息
+     */
+    @GetMapping(value = "/advance-payment-info")
+    public R<?> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(iAdvancePaymentManageAppService.getAdvancePaymentInfo(advancePaymentInfoDto, searchKey, pageNo,
+            pageSize, request));
+    }
+
+    /**
+     * 查询预交金支付流水记录
+     *
+     * @param encounterId 住院就诊Id
+     * @return 预交金支付流水记录
+     */
+    @GetMapping(value = "/advance-payment-flow")
+    public R<?> getAdvancePaymentFlowRecord(@RequestParam Long encounterId) {
+        return R.ok(iAdvancePaymentManageAppService.getAdvancePaymentFlowRecord(encounterId));
+    }
+
+    /**
+     * 预交金交款
+     * 
+     * @param advancePaymentInAndOutDto 交款dto
+     * @return 结果
+     */
+    @PostMapping(value = "/in-advance-payment")
+    public R<?> inAdvancePayment(@RequestBody AdvancePaymentInAndOutDto advancePaymentInAndOutDto) {
+        return iAdvancePaymentManageAppService.inAdvancePayment(advancePaymentInAndOutDto);
+    }
+
+    /**
+     * 预交金退款
+     *
+     * @param advancePaymentInAndOutDto 退款dto
+     * @return 结果
+     */
+    @PostMapping(value = "/out-advance-payment")
+    public R<?> outAdvancePayment(@RequestBody AdvancePaymentInAndOutDto advancePaymentInAndOutDto) {
+        return iAdvancePaymentManageAppService.outAdvancePayment(advancePaymentInAndOutDto);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java
new file mode 100644
index 00000000..f5217c03
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalcharge.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.inhospitalcharge.dto.*;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 住院登记 controller
+ */
+@RestController
+@RequestMapping("/inhospital-charge/register")
+@Slf4j
+@AllArgsConstructor
+public class InHospitalRegisterController {
+
+    private final IInHospitalRegisterAppService iInHospitalRegisterAppService;
+
+    /**
+     * 门诊医生开住院申请
+     * 
+     * @param inHospitalRegisterDto 住院登记参数
+     * @return 结果
+     */
+    @PostMapping(value = "/by-doctor")
+    public R<?> registerByDoctor(@RequestBody InHospitalRegisterDto inHospitalRegisterDto) {
+        return iInHospitalRegisterAppService.registerByDoctor(inHospitalRegisterDto);
+    }
+
+    /**
+     * 查询住院登记信息
+     * 
+     * @param inHospitalRegisterQueryDto 查询dto
+     * @param searchKey 模糊查询关键字
+     * @param registeredFlag 已登记标识,已登记传 1 ,待登记传 0
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 住院登记信息
+     */
+    @GetMapping(value = "/register-info")
+    public R<?> getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "registeredFlag") String registeredFlag,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(iInHospitalRegisterAppService.getRegisterInfo(inHospitalRegisterQueryDto, searchKey, registeredFlag,
+            pageNo, pageSize, request));
+    }
+
+    /**
+     * 查询患者基本信息
+     * 
+     * @param patientId 患者ID
+     * @return 患者基本信息
+     */
+    @GetMapping(value = "/patient-info")
+    public R<?> getPatientInfo(@RequestParam Long patientId) {
+        return R.ok(iInHospitalRegisterAppService.getPatientInfo(patientId));
+    }
+
+    /**
+     * 查询住院就诊信息
+     * 
+     * @param encounterId 住院就诊id
+     * @return 住院就诊信息
+     */
+    @GetMapping(value = "/in-hospital-info")
+    public R<?> getInHospitalInfo(@RequestParam Long encounterId) {
+        return R.ok(iInHospitalRegisterAppService.getInHospitalInfo(encounterId));
+    }
+
+    /**
+     * 根据病区号查询床位数
+     * 
+     * @param wardBusNo 病区号
+     * @return 床位数
+     */
+    @GetMapping(value = "/beds-num")
+    public R<?> getBedsNumByWardBusNo(@RequestParam String wardBusNo) {
+        return R.ok(iInHospitalRegisterAppService.getBedsNumByWardBusNo(wardBusNo));
+    }
+
+    /**
+     * 更新患者信息
+     * 
+     * @param patientUpdateDto 更新患者信息dto
+     * @return 结果
+     */
+    @PutMapping(value = "/update-patient")
+    public R<?> updatePatient(@RequestBody PatientUpdateDto patientUpdateDto) {
+        return iInHospitalRegisterAppService.updatePatient(patientUpdateDto);
+    }
+
+    /**
+     * 款台登记
+     * 
+     * @param inHospitalInfoDto 登记dto
+     * @return 结果
+     */
+    @PostMapping(value = "/by-cashier")
+    public R<?> registerByCashier(@RequestBody InHospitalInfoDto inHospitalInfoDto) {
+        return iInHospitalRegisterAppService.registerByCashier(inHospitalInfoDto);
+    }
+
+    /**
+     * 无档登记
+     * 
+     * @param noFilesRegisterDto 无档登记dto
+     * @return 结果
+     */
+    @PostMapping(value = "/no-files")
+    public R<?> noFilesRegister(@RequestBody NoFilesRegisterDto noFilesRegisterDto) {
+        return iInHospitalRegisterAppService.noFilesRegister(noFilesRegisterDto);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
new file mode 100644
index 00000000..87a12b7f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
@@ -0,0 +1,44 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 预交金支付流水记录 dto
+ */
+@Data
+@Accessors(chain = true)
+public class AdvancePaymentFlowRecordDto {
+
+    /**
+     * 流水号
+     */
+    private String paymentNo;
+
+    /**
+     * 金额
+     */
+    private BigDecimal tenderedAmount;
+
+    /** 付款类别 */
+    private Integer paymentEnum;
+    private String paymentEnum_enumText;
+
+    /** 操作时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date operateTime;
+
+    /**
+     * 收款人
+     */
+    private String enterer;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
new file mode 100644
index 00000000..ae42b072
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
@@ -0,0 +1,41 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 预交金进出 dto
+ */
+@Data
+@Accessors(chain = true)
+public class AdvancePaymentInAndOutDto {
+
+    /**
+     * 住院就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 账号id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
new file mode 100644
index 00000000..102db051
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
@@ -0,0 +1,98 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 预交金信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class AdvancePaymentInfoDto {
+
+    /**
+     * 住院就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 住院号
+     */
+    private String busNo;
+
+    /**
+     * 患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 患者
+     */
+    private String patientName;
+
+    /**
+     * 性别编码
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 生日
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 病区
+     */
+    private String wardName;
+
+    /**
+     * 病房
+     */
+    private String houseName;
+
+    /**
+     * 床位
+     */
+    private String bedName;
+
+    /**
+     * 住院科室
+     */
+    private String inHospitalOrgName;
+
+    /**
+     * 账号id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+    /**
+     * 总额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 余额
+     */
+    private BigDecimal balanceAmount;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java
new file mode 100644
index 00000000..141058e6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java
@@ -0,0 +1,162 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class InHospitalInfoDto {
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 住院就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 类别医保编码
+     */
+    private Integer ybClassEnum;
+
+    /**
+     * 住院号
+     */
+    private String busNo;
+
+    /**
+     * 住院次数
+     */
+    private Integer inHospitalCount;
+
+    /**
+     * 住院科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inHospitalOrgId;
+
+    /**
+     * 住院科室
+     */
+    private String inHospitalOrgName;
+
+    /**
+     * 病区id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long wardLocationId;
+
+    /**
+     * 病区
+     */
+    private String wardName;
+
+    /**
+     * 病区号
+     */
+    private String wardBusNo;
+
+    /**
+     * 当前病区总床位数
+     */
+    private Integer totalBedsNum;
+
+    /**
+     * 当前病区空闲床位数
+     */
+    private Integer idleBedsNum;
+
+    /**
+     * 门诊就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long ambEncounterId;
+
+    /**
+     * 门诊医生id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long ambDoctorPractitionerId;
+
+    /**
+     * 门诊医生
+     */
+    private String ambDoctorPractitionerName;
+
+    /**
+     * 门诊诊断名称
+     */
+    private String ambDiagnosisName;
+
+    /** 优先级(患者病情) */
+    private Integer priorityEnum;
+    private String priorityEnum_enumText;
+
+    /**
+     * 入院类型
+     */
+    @Dict(dictCode = "admit_source_code")
+    private String admitSourceCode;
+    private String admitSourceCode_dictText;
+
+    /**
+     * 入院方式
+     */
+    @Dict(dictCode = "in_way_code")
+    private String inWayCode;
+    private String inWayCode_dictText;
+
+    /** 入院日期 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 费用性质(合同编码)
+     */
+    private String contractNo;
+
+    /**
+     * 账户类型编码
+     */
+    private String typeCoce;
+
+    /** 账户余额 */
+    private BigDecimal balanceAmount;
+
+    /**
+     * 诊断定义id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long diagnosisDefinitionId;
+
+    /**
+     * 诊断对应的医保编码
+     */
+    private String diagnosisYbNo;
+
+    /** 诊断的医疗类型 */
+    private String medTypeCode;
+
+    /**
+     * 诊断描述
+     */
+    private String diagnosisDesc;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
new file mode 100644
index 00000000..207cf033
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
@@ -0,0 +1,83 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院患者信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class InHospitalPatientInfoDto {
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 患者编码
+     */
+    private String busNo;
+
+    /**
+     * 患者
+     */
+    private String patientName;
+
+    /** 证件号 */
+    private String idCard;
+
+    /** 出生日期 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 性别编码
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /** 民族 */
+    @Dict(dictCode = "nationality_code")
+    private String nationalityCode;
+    private String nationalityCode_dictText;
+
+    /** 国家编码 */
+    private String countryCode;
+
+    /** 婚姻状态 */
+    private Integer maritalStatusEnum;
+    private String maritalStatusEnum_enumText;
+
+    /** 职业编码 */
+    private Integer prfsEnum;
+    private String prfsEnum_enumText;
+
+    /** 电话 */
+    private String phone;
+
+    /** 地址 */
+    private String address;
+
+    /** 籍贯 */
+    private String nativePlace;
+
+    /** 工作单位 */
+    private String workCompany;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java
new file mode 100644
index 00000000..ed004423
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java
@@ -0,0 +1,76 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院登记基础 dto
+ */
+@Data
+@Accessors(chain = true)
+public class InHospitalRegisterDto {
+
+    /**
+     * 住院就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 门诊就诊id | 门诊挂号转办理入院时使用
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long ambEncounterId;
+
+    /** 优先级 */
+    private Integer priorityEnum;
+
+    /**
+     * 类别医保编码
+     */
+    private Integer ybClassEnum;
+
+    /**
+     * 诊断定义id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long diagnosisDefinitionId;
+
+    /**
+     * 住院科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inHospitalOrgId;
+
+    /**
+     * 诊断对应的医保编码
+     */
+    private String diagnosisYbNo;
+
+    /** 诊断的医疗类型 */
+    private String medTypeCode;
+
+    /**
+     * 诊断描述
+     */
+    private String diagnosisDesc;
+
+    /**
+     * 病区id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long wardLocationId;
+
+    /** 账户余额 */
+    private BigDecimal balanceAmount;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
new file mode 100644
index 00000000..77b8a15b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
@@ -0,0 +1,82 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院登记查询 dto
+ */
+@Data
+@Accessors(chain = true)
+public class InHospitalRegisterQueryDto {
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 住院就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 门诊就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long ambEncounterId;
+
+    /**
+     * 申请时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date requestTime;
+
+    /**
+     * 记录员
+     */
+    private String registrar;
+
+    /**
+     * 挂号科室(来源)
+     */
+    private String sourceName;
+
+    /**
+     * 患者
+     */
+    private String patientName;
+
+    /**
+     * 性别编码
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 生日
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 病区
+     */
+    private String wardName;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java
new file mode 100644
index 00000000..2cbcaf17
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java
@@ -0,0 +1,25 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import com.openhis.web.patientmanage.dto.PatientInformationDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 无档登记 dto
+ */
+@Data
+@Accessors(chain = true)
+public class NoFilesRegisterDto {
+
+    /**
+     * 患者信息
+     */
+    private PatientInformationDto patientInformation;
+
+    /**
+     * 住院信息
+     */
+    private InHospitalInfoDto inHospitalInfo;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java
new file mode 100644
index 00000000..73078565
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java
@@ -0,0 +1,37 @@
+package com.openhis.web.inhospitalcharge.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 更新患者信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class PatientUpdateDto {
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /** 患者姓名 */
+    private String name;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+
+    /** 生日 */
+    private Date birthDate;
+
+    /** 电话 */
+    private String phone;
+
+    /** 身份证号 */
+    private String idCard;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
new file mode 100644
index 00000000..83adb7ed
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
@@ -0,0 +1,51 @@
+package com.openhis.web.inhospitalcharge.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
+import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+
+/**
+ * 预交金管理 应用Mapper
+ */
+@Repository
+public interface AdvancePaymentManageAppMapper {
+
+    /**
+     * 查询预交金基本信息
+     *
+     * @param kindEnum 住院存款
+     * @param wardEnum 病区
+     * @param houseEnum 病房
+     * @param bedEnum 床位
+     * @param encounterLocationStatus 使用状态
+     * @param status1 待结算
+     * @param status2 已收费
+     * @param status3 已退费
+     * @param classEnum 住院
+     * @param accountTypeCode 个人现金账号
+     * @return 预交金基本信息
+     */
+    IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(@Param("page") Page<AdvancePaymentInfoDto> page,
+        @Param("kindEnum") Integer kindEnum, @Param("wardEnum") Integer wardEnum, @Param("houseEnum") Integer houseEnum,
+        @Param("bedEnum") Integer bedEnum, @Param("encounterLocationStatus") Integer encounterLocationStatus,
+        @Param("status1") Integer status1, @Param("status2") Integer status2, @Param("status3") Integer status3,
+        @Param("classEnum") Integer classEnum, @Param("accountTypeCode") String accountTypeCode,
+        @Param(Constants.WRAPPER) QueryWrapper<AdvancePaymentInfoDto> queryWrapper);
+
+    /**
+     * 查询预交金支付流水记录
+     * 
+     * @param encounterId 住院就诊Id
+     * @return 预交金支付流水记录
+     */
+    List<AdvancePaymentFlowRecordDto> getAdvancePaymentFlowRecordList(@Param("encounterId") Long encounterId);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
new file mode 100644
index 00000000..e055fd7e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
@@ -0,0 +1,80 @@
+package com.openhis.web.inhospitalcharge.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inhospitalcharge.dto.InHospitalInfoDto;
+import com.openhis.web.inhospitalcharge.dto.InHospitalPatientInfoDto;
+import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
+
+/**
+ * 住院登记 应用Mapper
+ */
+@Repository
+public interface InHospitalRegisterAppMapper {
+
+    /**
+     * 查询住院登记信息
+     * 
+     * @param page 分页参数
+     * @param encounterClass 就诊类别
+     * @param encounterStatus 登记状态
+     * @param registeredFlag 已登记标识,已登记传 1 ,待登记传 0
+     * @param formEnum 物理位置
+     * @param queryWrapper 查询条件
+     * @return 住院登记信息
+     */
+    IPage<InHospitalRegisterQueryDto> getInHospitalRegisterInfo(@Param("page") Page<InHospitalRegisterQueryDto> page,
+        @Param("encounterClass") Integer encounterClass, @Param("encounterStatus") Integer encounterStatus,
+        @Param("registeredFlag") String registeredFlag, @Param("formEnum") Integer formEnum,
+        @Param(Constants.WRAPPER) QueryWrapper<InHospitalRegisterQueryDto> queryWrapper);
+
+    /**
+     * 查询患者基本信息
+     *
+     * @param patientId 患者ID
+     * @return 患者基本信息
+     */
+    InHospitalPatientInfoDto getPatientInfo(@Param("patientId") Long patientId);
+
+    /**
+     * 查询住院就诊信息
+     * 
+     * @param encounterId 住院就诊id
+     * @param formEnum 物理位置
+     * @param maindiseFlag 主诊断标识
+     * @param participantType 参与者类型
+     * @param accountType 账号类型
+     * @return 住院就诊信息
+     */
+    InHospitalInfoDto getInHospitalInfo(@Param("encounterId") Long encounterId, @Param("formEnum") Integer formEnum,
+        @Param("maindiseFlag") Integer maindiseFlag, @Param("participantType") String participantType,
+        @Param("accountType") String accountType);
+
+    /**
+     * 根据病区号获取总床位数
+     * 
+     * @param formEnum 物理位置
+     * @param status 状态
+     * @param wardBusNo 病区号
+     * @return 总床位数
+     */
+    Integer getTotalBedsNum(@Param("formEnum") Integer formEnum, @Param("status") Integer status,
+        @Param("wardBusNo") String wardBusNo);
+
+    /**
+     * 根据病区号获取空闲床位数
+     *
+     * @param formEnum 物理位置
+     * @param status 状态
+     * @param wardBusNo 病区号
+     * @return 空闲床位数
+     */
+    Integer getIdleBedsNum(@Param("formEnum") Integer formEnum, @Param("status") Integer status,
+        @Param("wardBusNo") String wardBusNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java
new file mode 100644
index 00000000..06e9c808
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
+
+/**
+ * 入出转管理 service
+ *
+ * @author zwh
+ * @date 2025-07-28
+ */
+public interface IATDManageAppService {
+
+    /**
+     * 入院患者分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 入院患者分页列表
+     */
+    R<?> getAdmissionPatientPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 入院患者床位信息分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 床位信息分页列表
+     */
+    R<?> getAdmissionBedPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize);
+
+    /**
+     * 入院患者详细信息
+     *
+     * @param encounterId 住院id
+     * @return 入院患者详细信息
+     */
+    R<?> getAdmissionPatientInfo(Long encounterId);
+
+    /**
+     * 入出转管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> atdManageInit();
+
+    /**
+     * 入科床位分配
+     *
+     * @param admissionPatientInfoDto 床位分配参数
+     * @return 结果
+     */
+    R<?> admissionBedAssignment(AdmissionPatientInfoDto admissionPatientInfoDto);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
new file mode 100644
index 00000000..24b23735
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.common.dto.PerformInfoDto;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+
+/**
+ * 护士站医嘱处理接口
+ *
+ * @author zwh
+ * @date 2025-08-07
+ */
+public interface IAdviceProcessAppService {
+
+    /**
+     * 住院患者分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 住院患者分页列表
+     */
+    R<?> getInpatientPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request);
+
+    /**
+     * 住院患者医嘱查询
+     *
+     * @param inpatientAdviceParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 住院患者医
+     */
+    R<?> getInpatientAdvicePage(InpatientAdviceParam inpatientAdviceParam, Integer pageNo, Integer pageSize);
+
+    /**
+     * 医嘱校对通过
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    R<?> adviceVerify(List<PerformInfoDto> performInfoList);
+
+    /**
+     * 医嘱退回
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    R<?> adviceReject(List<PerformInfoDto> performInfoList);
+
+    /**
+     * 医嘱执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    R<?> adviceExecute(List<PerformInfoDto> performInfoList);
+
+    /**
+     * 医嘱取消执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    R<?> adviceCancel(List<PerformInfoDto> performInfoList);
+
+    /**
+     * 医嘱不执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    R<?> adviceVoid(List<PerformInfoDto> performInfoList);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IInpatientMedicineCollectionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IInpatientMedicineCollectionAppService.java
new file mode 100644
index 00000000..55d1ea60
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IInpatientMedicineCollectionAppService.java
@@ -0,0 +1,72 @@
+package com.openhis.web.inhospitalnursestation.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.dto.InpatientMedicinePrescriptionInfoDto;
+import com.openhis.web.inhospitalnursestation.dto.InpatientMedicineSearchParam;
+import com.openhis.workflow.domain.InventoryItem;
+
+/**
+ * 住院领药 应用实现接口
+ *
+ * @author yuxj
+ * @date 2025/8/18
+ */
+public interface IInpatientMedicineCollectionAppService {
+
+    /**
+     * 分页查询在科病人列表
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    R<?> getEncounterInfoListPage(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 查询医嘱列表
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 处方单列表
+     */
+    R<?> getPrescriptionInfo(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 显示汇总发药单（生成之前的确认，此刻还没生成汇总单）
+     *
+     * @param searchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处理结果
+     */
+    R<?> showMedicineSummary(List<InpatientMedicineSearchParam> searchParam, Integer pageNo, Integer pageSize);
+
+    /**
+     * 生成汇总发药单
+     *
+     * @param prescriptionInfo 汇总发药单
+     * @return 处理结果
+     */
+    R<?> medicineSummary(List<InpatientMedicinePrescriptionInfoDto> prescriptionInfo);
+
+    /**
+     * 校验库存
+     *
+     * @param devDispenseId 耗材发放id
+     * @param medDispenseId 药品发放id
+     * @return 处理结果
+     */
+    R<?> checkInventoryItem(List<Long> devDispenseId, List<Long> medDispenseId);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
new file mode 100644
index 00000000..0b0045c5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.openhis.administration.domain.EncounterLocation;
+import com.openhis.administration.service.IEncounterLocationService;
+import com.openhis.administration.service.IEncounterParticipantService;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.inhospitalnursestation.appservice.IATDManageAppService;
+import com.openhis.web.inhospitalnursestation.dto.*;
+import com.openhis.web.inhospitalnursestation.mapper.ATDManageAppMapper;
+
+/**
+ * 入出转管理 实现类
+ *
+ * @author zwh
+ * @date 2025-07-28
+ */
+@Service
+public class ATDManageAppServiceImpl implements IATDManageAppService {
+
+    @Resource
+    private ATDManageAppMapper atdManageAppMapper;
+
+    @Resource
+    private IEncounterLocationService encounterLocationService;
+
+    @Resource
+    private IEncounterParticipantService encounterParticipantService;
+
+    @Resource
+    private ILocationService locationService;
+
+    @Resource
+    private IEncounterService encounterService;
+
+    /**
+     * 入出转管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> atdManageInit() {
+        ATDManageInitDto atdManageInitDto = new ATDManageInitDto();
+        // 住院状态
+        List<ATDManageInitDto.encounterStatusOption> encounterStatusOptions = new ArrayList<>();
+        encounterStatusOptions.add(new ATDManageInitDto.encounterStatusOption(EncounterZyStatus.REGISTERED.getValue(),
+            EncounterZyStatus.REGISTERED.getInfo()));
+        encounterStatusOptions
+            .add(new ATDManageInitDto.encounterStatusOption(EncounterZyStatus.ADMITTED_TO_THE_HOSPITAL.getValue(),
+                EncounterZyStatus.ADMITTED_TO_THE_HOSPITAL.getInfo()));
+        // 床位状态
+        List<ATDManageInitDto.bedStatusOption> bedStatusOptions = new ArrayList<>();
+        bedStatusOptions
+            .add(new ATDManageInitDto.bedStatusOption(LocationStatus.IDLE.getValue(), LocationStatus.IDLE.getInfo()));
+        bedStatusOptions.add(
+            new ATDManageInitDto.bedStatusOption(LocationStatus.OCCUPY.getValue(), LocationStatus.OCCUPY.getInfo()));
+        // 患者病情
+        List<ATDManageInitDto.priorityOption> priorityOptions = Stream.of(PriorityLevel.values())
+            .map(
+                priorityLevel -> new ATDManageInitDto.priorityOption(priorityLevel.getValue(), priorityLevel.getInfo()))
+            .collect(Collectors.toList());
+        atdManageInitDto.setBedStatusOptions(bedStatusOptions).setEncounterStatusOptions(encounterStatusOptions)
+            .setPriorityOptions(priorityOptions);
+        return R.ok(atdManageInitDto);
+    }
+
+    /**
+     * 入院患者分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 入院患者分页列表
+     */
+    @Override
+    public R<?> getAdmissionPatientPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<AdmissionPageParam> queryWrapper = HisQueryUtils.buildQueryWrapper(admissionPageParam, searchKey,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
+                CommonConstants.FieldName.PatientName, CommonConstants.FieldName.BusNo)),
+            request);
+        // 入院患者分页列表
+        Page<AdmissionPatientPageDto> admissionPatientPage = atdManageAppMapper.selectAdmissionPatientPage(
+            new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.IMP.getValue(),
+            EncounterZyStatus.TO_BE_REGISTERED.getValue(), EncounterLocationStatus.ACTIVE.getValue(),
+            LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue());
+        admissionPatientPage.getRecords().forEach(e -> {
+            // 性别枚举
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 病情
+            e.setPriorityEnum_enumText(EnumUtils.getInfoByValue(PriorityLevel.class, e.getPriorityEnum()));
+            // 计算年龄
+            if (e.getBirthDate() != null) {
+                e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            }
+            // 住院状态
+            e.setEncounterStatus_enumText(EnumUtils.getInfoByValue(EncounterZyStatus.class, e.getEncounterStatus()));
+        });
+        return R.ok(admissionPatientPage);
+    }
+
+    /**
+     * 入院患者床位信息分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 床位信息分页列表
+     */
+    @Override
+    public R<?> getAdmissionBedPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize) {
+        // 构建查询条件
+        QueryWrapper<AdmissionPageParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(admissionPageParam, null, null, null);
+        // 入院患者床位分页列表
+        Page<AdmissionBedPageDto> admissionBedPage =
+            atdManageAppMapper.selectAdmissionBadPage(new Page<>(pageNo, pageSize), queryWrapper,
+                EncounterLocationStatus.ACTIVE.getValue(), LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(),
+                LocationForm.BED.getValue(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
+                LocationStatus.INACTIVE.getValue(), ChargeItemStatus.BILLABLE.getValue(),
+                ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDED.getValue());
+        admissionBedPage.getRecords().forEach(e -> {
+            // 性别枚举
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 床位状态
+            e.setBedStatus_enumText(EnumUtils.getInfoByValue(LocationStatus.class, e.getBedStatus()));
+            // 计算年龄
+            if (e.getBirthDate() != null) {
+                e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            }
+            // 住院状态
+            e.setEncounterStatus_enumText(EnumUtils.getInfoByValue(EncounterZyStatus.class, e.getEncounterStatus()));
+        });
+        return R.ok(admissionBedPage);
+    }
+
+    /**
+     * 入院患者详细信息
+     *
+     * @param encounterId 住院id
+     * @return 入院患者详细信息
+     */
+    @Override
+    public R<?> getAdmissionPatientInfo(Long encounterId) {
+        // 查询住院患者详细信息
+        AdmissionPatientInfoDto admissionPatientInfoDto =
+            atdManageAppMapper.selectAdmissionPatientInfo(encounterId, EncounterLocationStatus.ACTIVE.getValue(),
+                LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(),
+                ParticipantType.PRIMARY_NURSE.getCode(), ParticipantType.ATTENDING_DOCTOR.getCode(),
+                ParticipantType.ADMITTING_DOCTOR.getCode(), ParticipantType.CHIEF_DOCTOR.getCode());
+        // 年龄
+        admissionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(admissionPatientInfoDto.getBirthDate()));
+        // 性别
+        admissionPatientInfoDto.setGenderEnum_enumText(
+            EnumUtils.getInfoByValue(AdministrativeGender.class, admissionPatientInfoDto.getGenderEnum()));
+        // 病情
+        admissionPatientInfoDto.setPriorityEnum_enumText(
+            EnumUtils.getInfoByValue(PriorityLevel.class, admissionPatientInfoDto.getPriorityEnum()));
+        return R.ok(admissionPatientInfoDto);
+    }
+
+    /**
+     * 入科床位分配
+     *
+     * @param admissionPatientInfoDto 床位分配参数
+     * @return 结果
+     */
+    @Override
+    public R<?> admissionBedAssignment(AdmissionPatientInfoDto admissionPatientInfoDto) {
+        // 住院id
+        Long encounterId = admissionPatientInfoDto.getEncounterId();
+        // 目标床位住院患者id
+        Long targetEncounterId = admissionPatientInfoDto.getTargetEncounterId();
+        // 入科时间
+        Date startTime = admissionPatientInfoDto.getStartTime();
+        // 患者床位id
+        Long oldBedId = admissionPatientInfoDto.getBedId();
+        // 目标床位id
+        Long targetBedId = admissionPatientInfoDto.getTargetBedId();
+
+        // 进入编辑患者信息，不更换床位
+        if (Whether.YES.getCode().equals(admissionPatientInfoDto.getEditFlag())) {
+            if (admissionPatientInfoDto.getPriorityEnum() != null) {
+                // 更新患者病情
+                encounterService.updatePriorityEnumById(encounterId, admissionPatientInfoDto.getPriorityEnum());
+                // 将之前的住院参与者更新为已完成
+                Integer result = encounterParticipantService.updateEncounterParticipantsStatus(encounterId);
+                if (result == 0) {
+                    return R.fail("患者信息更新失败，请联系管理员");
+                }
+                // 更新住院参与者
+                // 住院医生
+                encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                    admissionPatientInfoDto.getAdmittingDoctorId(), ParticipantType.ADMITTING_DOCTOR.getCode());
+                // 责任护士
+                encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                    admissionPatientInfoDto.getPrimaryNurseId(), ParticipantType.PRIMARY_NURSE.getCode());
+                if (admissionPatientInfoDto.getAttendingDoctorId() != null) {
+                    // 主治医生
+                    encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                        admissionPatientInfoDto.getAttendingDoctorId(), ParticipantType.ATTENDING_DOCTOR.getCode());
+                }
+                if (admissionPatientInfoDto.getChiefDoctorId() != null) {
+                    // 主任医生
+                    encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                        admissionPatientInfoDto.getChiefDoctorId(), ParticipantType.CHIEF_DOCTOR.getCode());
+                }
+            }
+            return R.ok("患者信息更新成功");
+        }
+
+        // 判断患者是否已经在床
+        if (oldBedId != null) {
+            // 判断目标床位是否已经被占用
+            if (targetEncounterId != null) {
+                List<EncounterLocation> locationList =
+                    encounterLocationService.getEncounterLocationInfo(targetEncounterId, null);
+                // 查询目标患者的入科时间
+                Date targetStartTime = null;
+                Optional<EncounterLocation> encounterLocationOptional =
+                    locationList.stream().filter(x -> x.getFormEnum().equals(LocationForm.BED.getValue()))
+                        .filter(x -> x.getStatusEnum().equals(EncounterLocationStatus.ACTIVE.getValue())).findFirst();
+                if (encounterLocationOptional.isPresent()) {
+                    EncounterLocation encounterLocation = encounterLocationOptional.get();
+                    targetStartTime = encounterLocation.getStartTime();
+                }
+                // 床位互换
+                Integer result = encounterLocationService.updateEncounterLocationStatus(encounterId, false);
+                Integer targetResult = encounterLocationService.updateEncounterLocationStatus(targetEncounterId, false);
+                if (result == 0 || targetResult == 0) {
+                    return R.fail("换床失败，请联系管理员");
+                }
+                // 保存住院位置(目标床位)
+                // 病房
+                encounterLocationService.creatEncounterLocation(encounterId, startTime,
+                    admissionPatientInfoDto.getTargetHouseId(), LocationForm.HOUSE.getValue());
+                // 病床
+                encounterLocationService.creatEncounterLocation(encounterId, startTime, targetBedId,
+                    LocationForm.BED.getValue());
+
+                // 保存住院位置(原床位)
+                // 病房
+                encounterLocationService.creatEncounterLocation(targetEncounterId, targetStartTime,
+                    admissionPatientInfoDto.getHouseId(), LocationForm.HOUSE.getValue());
+                // 病床
+                encounterLocationService.creatEncounterLocation(targetEncounterId, targetStartTime, oldBedId,
+                    LocationForm.BED.getValue());
+
+            } else {
+                // 更新旧病床状态：空闲
+                locationService.updateStatusById(oldBedId, LocationStatus.IDLE.getValue());
+
+                // 换床
+                Integer result = encounterLocationService.updateEncounterLocationStatus(encounterId, false);
+                if (result == 0) {
+                    return R.fail("换床失败，请联系管理员");
+                }
+                // 保存住院位置
+                // 病房
+                encounterLocationService.creatEncounterLocation(encounterId, startTime,
+                    admissionPatientInfoDto.getTargetHouseId(), LocationForm.HOUSE.getValue());
+                // 病床
+                encounterLocationService.creatEncounterLocation(encounterId, startTime, targetBedId,
+                    LocationForm.BED.getValue());
+                // 更新病床状态：占用
+                locationService.updateStatusById(targetBedId, LocationStatus.OCCUPY.getValue());
+            }
+        } else {
+            // 保存住院位置
+            // 病房
+            encounterLocationService.creatEncounterLocation(encounterId, startTime,
+                admissionPatientInfoDto.getTargetHouseId(), LocationForm.HOUSE.getValue());
+            // 病床
+            encounterLocationService.creatEncounterLocation(encounterId, startTime, targetBedId,
+                LocationForm.BED.getValue());
+            // 更新病床状态：占用
+            locationService.updateStatusById(targetBedId, LocationStatus.OCCUPY.getValue());
+
+            // 保存住院参与者
+            // 住院医生
+            encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                admissionPatientInfoDto.getAdmittingDoctorId(), ParticipantType.ADMITTING_DOCTOR.getCode());
+            // 责任护士
+            encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                admissionPatientInfoDto.getPrimaryNurseId(), ParticipantType.PRIMARY_NURSE.getCode());
+            if (admissionPatientInfoDto.getAttendingDoctorId() != null) {
+                // 主治医生
+                encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                    admissionPatientInfoDto.getAttendingDoctorId(), ParticipantType.ATTENDING_DOCTOR.getCode());
+            }
+            if (admissionPatientInfoDto.getChiefDoctorId() != null) {
+                // 主任医生
+                encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
+                    admissionPatientInfoDto.getChiefDoctorId(), ParticipantType.CHIEF_DOCTOR.getCode());
+            }
+        }
+        if (admissionPatientInfoDto.getPriorityEnum() != null) {
+            // 更新患者病情
+            encounterService.updatePriorityEnumById(encounterId, admissionPatientInfoDto.getPriorityEnum());
+        }
+        // 更新住院状态：已住院
+        Integer result =
+            encounterService.updateEncounterStatus(encounterId, EncounterZyStatus.ADMITTED_TO_THE_HOSPITAL.getValue());
+        if (result == 0) {
+            return R.fail("床位分配失败，请联系管理员");
+        }
+        return R.ok("床位分配成功");
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
new file mode 100644
index 00000000..7d32b76b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -0,0 +1,375 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.clinical.service.IProcedureService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.web.common.dto.PerformInfoDto;
+import com.openhis.web.common.dto.PerformRecordDto;
+import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto;
+import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto;
+import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
+import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
+import com.openhis.workflow.service.IServiceRequestService;
+
+/**
+ * 护士站医嘱处理实现类
+ *
+ * @author zwh
+ * @date 2025-08-07
+ */
+@Service
+public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
+
+    @Resource
+    private AdviceProcessAppMapper adviceProcessAppMapper;
+
+    @Resource
+    private IProcedureService procedureService;
+
+    @Resource
+    private OutpatientTreatmentAppMapper outpatientTreatmentAppMapper;
+
+    @Resource
+    private IMedicationRequestService medicationRequestService;
+
+    @Resource
+    private IServiceRequestService serviceRequestService;
+
+    @Resource
+    private IMedicationDispenseService medicationDispenseService;
+
+    /**
+     * 住院患者分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 住院患者分页列表
+     */
+    @Override
+    public R<?> getInpatientPage(AdmissionPageParam admissionPageParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<AdmissionPageParam> queryWrapper = HisQueryUtils.buildQueryWrapper(admissionPageParam, searchKey,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
+                CommonConstants.FieldName.PatientName, CommonConstants.FieldName.BusNo)),
+            request);
+        // 入院患者分页列表
+        Page<AdmissionPatientPageDto> admissionPatientPage =
+            adviceProcessAppMapper.selectInpatientPage(new Page<>(pageNo, pageSize), queryWrapper,
+                EncounterClass.IMP.getValue(), EncounterZyStatus.TO_BE_REGISTERED.getValue(),
+                EncounterZyStatus.REGISTERED.getValue(), EncounterLocationStatus.ACTIVE.getValue(),
+                LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue());
+        admissionPatientPage.getRecords().forEach(e -> {
+            // 性别枚举
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 病情
+            e.setPriorityEnum_enumText(EnumUtils.getInfoByValue(PriorityLevel.class, e.getPriorityEnum()));
+            // 计算年龄
+            if (e.getBirthDate() != null) {
+                e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            }
+            // 住院状态
+            e.setEncounterStatus_enumText(EnumUtils.getInfoByValue(EncounterZyStatus.class, e.getEncounterStatus()));
+        });
+        return R.ok(admissionPatientPage);
+    }
+
+    /**
+     * 住院患者医嘱查询
+     *
+     * @param inpatientAdviceParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 住院患者医
+     */
+    @Override
+    public R<?> getInpatientAdvicePage(InpatientAdviceParam inpatientAdviceParam, Integer pageNo, Integer pageSize) {
+        // 初始化查询参数
+        String encounterIds = inpatientAdviceParam.getEncounterIds();
+        inpatientAdviceParam.setEncounterIds(null);
+        Integer exeStatus = inpatientAdviceParam.getExeStatus();
+        inpatientAdviceParam.setExeStatus(null);
+        // 构建查询条件
+        QueryWrapper<InpatientAdviceParam> queryWrapper = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
+                CommonConstants.FieldName.PatientName, CommonConstants.FieldName.BusNo)),
+            null);
+
+        // 手动拼接住院患者id条件
+        if (encounterIds != null && !encounterIds.isEmpty()) {
+            List<Long> encounterIdList =
+                Arrays.stream(encounterIds.split(CommonConstants.Common.COMMA)).map(Long::parseLong).toList();
+            queryWrapper.in(CommonConstants.FieldName.EncounterId, encounterIdList);
+        }
+
+        // 入院患者分页列表
+        Page<InpatientAdviceDto> inpatientAdvicePage =
+            adviceProcessAppMapper.selectInpatientAdvicePage(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_SERVICE_REQUEST,
+                RequestStatus.DRAFT.getValue(), EncounterLocationStatus.ACTIVE.getValue(), LocationForm.BED.getValue(),
+                ParticipantType.ADMITTING_DOCTOR.getCode(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
+                ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
+                ChargeItemStatus.REFUNDED.getValue(), EncounterClass.IMP.getValue());
+        inpatientAdvicePage.getRecords().forEach(e -> {
+            // 是否皮试
+            e.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSkinTestFlag()));
+            // 是否为注射药物
+            e.setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getInjectFlag()));
+            // 医嘱类型
+            e.setTherapyEnum_enumText(EnumUtils.getInfoByValue(TherapyTimeType.class, e.getTherapyEnum()));
+            // 请求状态
+            e.setRequestStatus_enumText(EnumUtils.getInfoByValue(RequestStatus.class, e.getRequestStatus()));
+            // 性别枚举
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            if (e.getBirthDate() != null) {
+                e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            }
+        });
+
+        // 获取医嘱列表
+        List<InpatientAdviceDto> inpatientAdviceList = inpatientAdvicePage.getRecords();
+        // 获取请求ids
+        List<Long> reqIds = inpatientAdviceList.stream().map(InpatientAdviceDto::getRequestId).toList();
+        Map<Long, List<PerformRecordDto>> procedureRecordGroup = new HashMap<>();
+        if (!reqIds.isEmpty()) {
+            // 查询执行记录
+            List<PerformRecordDto> performRecordList = outpatientTreatmentAppMapper.selectPerformRecordList(reqIds);
+            if (performRecordList != null && !performRecordList.isEmpty()) {
+                // 根据服务请求id分组
+                procedureRecordGroup = performRecordList.stream()
+                    .collect(Collectors.groupingBy(PerformRecordDto::getRequestId, Collectors.toList()));
+            }
+        }
+
+        // 手动处理前端传来的执行条件
+        if (exeStatus != null) {
+            // 处理执行记录状态
+            for (InpatientAdviceDto inpatientAdvice : inpatientAdviceList) {
+                List<PerformRecordDto> performRecordList = procedureRecordGroup.get(inpatientAdvice.getRequestId());
+                List<PerformRecordDto> exePerformRecordList = new ArrayList<>();
+                List<PerformRecordDto> cancelPerformRecordList = new ArrayList<>();
+                List<PerformRecordDto> stopPerformRecordList = new ArrayList<>();
+                if (performRecordList != null && !performRecordList.isEmpty()) {
+                    // 按时间分组，处理每个时间点的多条记录
+                    Map<String, List<PerformRecordDto>> recordsByTime = performRecordList.stream()
+                        .collect(Collectors.groupingBy(record -> record.getOccurrenceTime().toString()));
+                    for (Map.Entry<String, List<PerformRecordDto>> entry : recordsByTime.entrySet()) {
+                        List<PerformRecordDto> records = entry.getValue();
+                        // 按操作顺序排序
+                        records.sort(Comparator.comparing(PerformRecordDto::getCreateTime));
+                        // 取最后一条记录,最终状态由最后一次操作决定
+                        PerformRecordDto lastRecord = records.get(records.size() - 1);
+                        if (EventStatus.COMPLETED.getValue().equals(lastRecord.getStatusEnum())) {
+                            exePerformRecordList.add(lastRecord);
+                        } else if (EventStatus.CANCEL.getValue().equals(lastRecord.getStatusEnum())) {
+                            cancelPerformRecordList.add(lastRecord);
+                        } else if (EventStatus.STOPPED.getValue().equals(lastRecord.getStatusEnum())) {
+                            stopPerformRecordList.add(lastRecord);
+                        }
+                    }
+                }
+                inpatientAdvice.setExePerformRecordList(exePerformRecordList)
+                    .setCancelPerformRecordList(cancelPerformRecordList)
+                    .setStopPerformRecordList(stopPerformRecordList);
+            }
+
+            // 根据执行状态过滤医嘱列表
+            List<InpatientAdviceDto> filteredList = new ArrayList<>();
+            if (EventStatus.COMPLETED.getValue().equals(exeStatus)) {
+                // 已执行 - 过滤出有执行记录的医嘱
+                filteredList = inpatientAdviceList.stream().filter(
+                    advice -> advice.getExePerformRecordList() != null && !advice.getExePerformRecordList().isEmpty())
+                    .collect(Collectors.toList());
+                // 更新分页数据
+                inpatientAdvicePage.setRecords(filteredList);
+                inpatientAdvicePage.setTotal(filteredList.size());
+            } else if (EventStatus.CANCEL.getValue().equals(exeStatus)) {
+                // 取消执行 - 过滤出有取消记录的医嘱
+                filteredList = inpatientAdviceList.stream().filter(advice -> advice.getCancelPerformRecordList() != null
+                    && !advice.getCancelPerformRecordList().isEmpty()).collect(Collectors.toList());
+                // 更新分页数据
+                inpatientAdvicePage.setRecords(filteredList);
+                inpatientAdvicePage.setTotal(filteredList.size());
+            } else if (EventStatus.STOPPED.getValue().equals(exeStatus)) {
+                // 不执行 - 过滤出有停止记录的医嘱
+                filteredList = inpatientAdviceList.stream().filter(
+                    advice -> advice.getStopPerformRecordList() != null && !advice.getStopPerformRecordList().isEmpty())
+                    .collect(Collectors.toList());
+                // 更新分页数据
+                inpatientAdvicePage.setRecords(filteredList);
+                inpatientAdvicePage.setTotal(filteredList.size());
+            }
+        }
+        return R.ok(inpatientAdvicePage);
+    }
+
+    /**
+     * 医嘱校对通过
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @Override
+    public R<?> adviceVerify(List<PerformInfoDto> performInfoList) {
+        // 分别创建两个列表来存储不同类型的请求
+        List<PerformInfoDto> serviceRequestList = new ArrayList<>();
+        List<PerformInfoDto> medRequestList = new ArrayList<>();
+        for (PerformInfoDto item : performInfoList) {
+            if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(item.getRequestTable())) {
+                serviceRequestList.add(item);
+            } else if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(item.getRequestTable())) {
+                medRequestList.add(item);
+            }
+        }
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        Date checkDate = new Date();
+        if (!serviceRequestList.isEmpty()) {
+            // 更新服务请求状态已完成
+            serviceRequestService.updateCompleteRequestStatus(
+                serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate);
+        }
+        if (!medRequestList.isEmpty()) {
+            // 更新药品请求状态已完成
+            medicationRequestService.updateCompletedStatusBatch(
+                medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate);
+        }
+        return R.ok(null, "校对成功");
+    }
+
+    /**
+     * 医嘱退回
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @Override
+    public R<?> adviceReject(List<PerformInfoDto> performInfoList) {
+        // 分别创建两个列表来存储不同类型的请求
+        List<PerformInfoDto> serviceRequestList = new ArrayList<>();
+        List<PerformInfoDto> medRequestList = new ArrayList<>();
+        for (PerformInfoDto item : performInfoList) {
+            if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(item.getRequestTable())) {
+                serviceRequestList.add(item);
+            } else if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(item.getRequestTable())) {
+                medRequestList.add(item);
+            }
+        }
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        Date checkDate = new Date();
+        if (!serviceRequestList.isEmpty()) {
+            // 更新服务请求状态待发送
+            serviceRequestService.updateDraftStatus(
+                serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate);
+        }
+        if (!medRequestList.isEmpty()) {
+            // 更新药品请求状态待发送
+            medicationRequestService.updateDraftStatusBatch(
+                medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate);
+        }
+        return R.ok(null, "退回成功");
+    }
+
+    /**
+     * 医嘱执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @Override
+    public R<?> adviceExecute(List<PerformInfoDto> performInfoList) {
+        // 分别创建两个列表来存储不同类型的请求
+        List<PerformInfoDto> serviceRequestList = new ArrayList<>();
+        List<PerformInfoDto> medRequestList = new ArrayList<>();
+        for (PerformInfoDto item : performInfoList) {
+            if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(item.getRequestTable())) {
+                serviceRequestList.add(item);
+            } else if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(item.getRequestTable())) {
+                medRequestList.add(item);
+            }
+        }
+        //分别处理长期/临时医嘱
+        // 执行项目列表（需过滤掉特殊医嘱，已经停嘱的医嘱，执行时间与出院时间/入院时间冲突的）
+        List<PerformInfoDto> executeList = performInfoList;
+        // 校验是否已经停嘱
+        // 校验患者是否在科，出院，死亡
+        // 处理药品医嘱
+        if (!medRequestList.isEmpty()) {
+            // 查询医嘱信息
+            List<Long> requestIdList = medRequestList.stream().map(PerformInfoDto::getRequestId).toList();
+            List<MedicationRequest> medicationRequestList = medicationRequestService.listByIds(requestIdList);
+            // 按每个药品分组校验库存
+            Map<Long, List<MedicationRequest>> medMap =
+                medicationRequestList.stream().collect(Collectors.groupingBy(MedicationRequest::getMedicationId));
+            for (Map.Entry<Long, List<MedicationRequest>> entry : medMap.entrySet()) {
+                List<MedicationRequest> medicationRequests = entry.getValue();
+            }
+            //校验库存是校验某个药在某个药房这一次执行的总数够不够，生成药品发放是按每个请求生成的
+            // 生成药品发放
+            // medicationDispenseService.handleMedicationDispense();
+        }
+        if (!serviceRequestList.isEmpty()) {
+            // todo:查询绑定的耗材
+            //生成执行记录
+        }
+        // 记录操作记录
+        for (PerformInfoDto execute : executeList) {
+            //生成账单（待结算）
+        }
+        return null;
+    }
+
+    /**
+     * 医嘱取消执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @Override
+    public R<?> adviceCancel(List<PerformInfoDto> performInfoList) {
+        return null;
+    }
+
+    /**
+     * 医嘱不执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @Override
+    public R<?> adviceVoid(List<PerformInfoDto> performInfoList) {
+        // 长期临时都可以不执行，长期不执行的是某一时间点，也可以不执行这一整个医嘱（更新serviceRequest状态为7）
+        // 已执行的时间点不能不执行，需要先取消
+        // 增加不执行记录
+        // 不执行的医嘱还可以再执行（暂时不做限制）
+        return null;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/InpatientMedicineCollectionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/InpatientMedicineCollectionAppServiceImpl.java
new file mode 100644
index 00000000..ae559bc0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/InpatientMedicineCollectionAppServiceImpl.java
@@ -0,0 +1,342 @@
+package com.openhis.web.inhospitalnursestation.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.constant.HttpStatus;
+import com.core.common.utils.*;
+import com.openhis.web.inhospitalnursestation.appservice.IInpatientMedicineCollectionAppService;
+import com.openhis.web.pharmacymanage.dto.InventoryDto;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbDrordType;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.web.inhospitalnursestation.dto.*;
+import com.openhis.web.inhospitalnursestation.mapper.InpatientMedicineCollectionMapper;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 住院领药 应用实现类
+ *
+ * @author yuxj
+ * @date 2025/8/18
+ */
+@Service
+public class InpatientMedicineCollectionAppServiceImpl implements IInpatientMedicineCollectionAppService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+
+    @Autowired
+    private InpatientMedicineCollectionMapper inpatientMedicineCollectionMapper;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private ISupplyDeliveryService supplyDeliveryService;
+    @Autowired
+    private ReturnMedicineMapper returnMedicineMapper;
+
+    /**
+     * 分页查询在科病人列表
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    @Override
+    public R<?> getEncounterInfoListPage(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+        // 参与者科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        searchParam.setOrganizationId(orgId);
+
+        // 构建查询条件
+        QueryWrapper<InpatientMedicineSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(searchParam, searchKey,
+                new HashSet<>(
+                    Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
+                        CommonConstants.FieldName.PatientName, CommonConstants.FieldName.InpatientBed)),
+                request);
+        queryWrapper.orderByDesc(CommonConstants.FieldName.EncounterId);
+
+        // 查询就诊病人列表
+        Page<InpatientMedicineEncounterInfoDto> encounterInfoPageDto = inpatientMedicineCollectionMapper
+            .selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.IMP.getValue());
+
+        // 个别项目设定
+        encounterInfoPageDto.getRecords().forEach(patientInfoDto -> {
+            // 性别
+            patientInfoDto.setGenderEnum_enumText(
+                EnumUtils.getInfoByValue(AdministrativeGender.class, patientInfoDto.getGenderEnum()));
+            // 年龄
+            patientInfoDto.setAge(AgeCalculatorUtil.getAge(patientInfoDto.getBirthDate()));
+        });
+
+        return R.ok(encounterInfoPageDto);
+    }
+
+    /**
+     * 查询医嘱列表
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 处方单列表
+     */
+    @Override
+    public R<?> getPrescriptionInfo(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 就诊id
+        List<Long> encounterIdList = searchParam.getEncounterIdList();
+        searchParam.setEncounterIdList(null);
+
+        // 构建查询条件
+        QueryWrapper<InpatientMedicineSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(searchParam, searchKey, null, request);
+        queryWrapper.orderByDesc(CommonConstants.FieldName.BusNo);
+        queryWrapper.le(CommonConstants.FieldName.PlannedDispenseTime, searchParam.getPlannedDispenseTime());
+        // queryWrapper.in(CommonConstants.FieldName.encounterId,encounterIdList);
+        searchParam.setPlannedDispenseTime(null);
+
+        // 查询医嘱列表
+        Page<InpatientMedicinePrescriptionInfoDto> prescriptionInfoPageDto =
+            inpatientMedicineCollectionMapper.selectPrescriptionInfoListPage(new Page<>(pageNo, pageSize), queryWrapper,
+                encounterIdList, DispenseStatus.IN_PROGRESS.getValue(),
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        // 个别项目设定
+        prescriptionInfoPageDto.getRecords().forEach(prescriptionInfo -> {
+            // 治疗类型
+            prescriptionInfo.setTherapyEnum_enumText(
+                EnumUtils.getInfoByValue(YbDrordType.class, prescriptionInfo.getTherapyEnum()));
+            // 状态
+            prescriptionInfo.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(DispenseStatus.class, prescriptionInfo.getStatusEnum()));
+        });
+
+        return R.ok(prescriptionInfoPageDto);
+    }
+
+    /**
+     * 显示汇总发药单（生成之前的确认，此刻还没生成汇总单）
+     *
+     * @param searchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处理结果
+     */
+    @Override
+    public R<?> showMedicineSummary(List<InpatientMedicineSearchParam> searchParam, Integer pageNo, Integer pageSize) {
+        // 药品发放id
+        List<Long> medDispenseId = searchParam.stream()
+            .filter(param -> param != null
+                && Objects.equals(param.getItemTable(), CommonConstants.TableName.MED_MEDICATION_DEFINITION))
+            .map(InpatientMedicineSearchParam::getDispenseId).collect(Collectors.toList());
+        // 耗材发放id
+        List<Long> devDispenseId = searchParam.stream()
+            .filter(param -> param != null
+                && Objects.equals(param.getItemTable(), CommonConstants.TableName.ADM_DEVICE_DEFINITION))
+            .map(InpatientMedicineSearchParam::getDispenseId).collect(Collectors.toList());
+
+        // 构建查询条件
+        QueryWrapper<InpatientMedicineSearchParam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(CommonConstants.FieldName.itemId);
+
+        // 查询汇总医嘱列表
+        Page<InpatientMedicinePrescriptionInfoDto> prescriptionSummaryInfoPageDto =
+            inpatientMedicineCollectionMapper.selectPrescriptionSummaryInfoListPage(new Page<>(pageNo, pageSize),
+                queryWrapper, medDispenseId, devDispenseId, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        // 个别项目设定
+        prescriptionSummaryInfoPageDto.getRecords().forEach(prescriptionInfo -> {
+            // 地点类型
+            prescriptionInfo.setLocationEnum_enumText(
+                EnumUtils.getInfoByValue(LocationForm.class, prescriptionInfo.getLocationEnum()));
+        });
+
+        return R.ok(prescriptionSummaryInfoPageDto);
+    }
+
+    /**
+     * 生成汇总发药单
+     *
+     * @param prescriptionInfo 汇总发药单
+     * @return 处理结果
+     */
+    @Override
+    public R<?> medicineSummary(List<InpatientMedicinePrescriptionInfoDto> prescriptionInfo) {
+        // 药品发放id
+        List<Long> medDispenseId = new ArrayList<>();
+        // 耗材发放id
+        List<Long> devDispenseId = new ArrayList<>();
+        // 供应申请
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        SupplyRequest supplyRequest;
+        // 供应发放
+        List<SupplyDelivery> supplyDeliveryList = new ArrayList<>();
+        SupplyDelivery supplyDelivery;
+        Date now = DateUtils.getNowDate();
+
+        // 校验库存
+        R<?> checkInventoryReturn = this.checkInventoryItem(devDispenseId, medDispenseId);
+        if (checkInventoryReturn.getCode() != HttpStatus.SUCCESS) {
+            return checkInventoryReturn;
+        }
+
+        // 单据号
+        String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.DISPENSING_ORDER.getPrefix(), 4);
+        if (prescriptionInfo.stream().map(InpatientMedicinePrescriptionInfoDto::getStatusEnum)
+            .anyMatch(x -> x.equals(DispenseStatus.SUMMARIZED.getValue()))) {
+            throw new ServiceException("药品已汇总，请勿重复汇总");
+        } else {
+            for (InpatientMedicinePrescriptionInfoDto item : prescriptionInfo) {
+                // 供应申请
+                supplyRequest = new SupplyRequest().setBusNo(busNo).setTypeEnum(SupplyType.DISPENSING_ORDER.getValue())
+                    .setStatusEnum(SupplyStatus.SEND.getValue())
+                    .setCategoryEnum(SupplyCategory.INPATIENT_PATIENT_SUMMARY_DISPENSING.getValue())
+                    .setItemTable(item.getItemTable()).setItemId(item.getItemId()).setUnitCode(item.getUnitCode())
+                    .setItemQuantity(new BigDecimal(item.getQuantity())).setLotNumber(item.getLotNumber())
+                    .setSourceTypeEnum(item.getLocationEnum()).setSourceLocationId(item.getLocationId())
+                    .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                    .setPurposeLocationId(SecurityUtils.getLoginUser().getOrgId())
+                    .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()).setApplyTime(now);
+                supplyRequestList.add(supplyRequest);
+
+                // 供应发放
+                supplyDelivery = new SupplyDelivery().setRequestId(supplyRequest.getId())
+                    .setStatusEnum(DispenseStatus.IN_PROGRESS.getValue()).setTypeEnum(supplyRequest.getTypeEnum())
+                    .setItemTable(supplyRequest.getItemTable()).setItemId(supplyRequest.getItemId())
+                    .setBasedOnIds(item.getDispenseIds()).setUnitCode(supplyRequest.getUnitCode())
+                    .setQuantity(supplyRequest.getItemQuantity()).setLotNumber(supplyRequest.getLotNumber())
+                    .setReceiverId(SecurityUtils.getLoginUser().getPractitionerId());
+                if (item.getItemTable().equals(CommonConstants.TableName.MED_MEDICATION_DEFINITION)) {
+                    // 设置供应发放信息
+                    supplyDelivery.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_DISPENSE);
+                    // 设置药品发放id
+                    medDispenseId.addAll(Arrays.stream(item.getDispenseIds().split(",")).map(String::trim) // 去除每个ID前后的空格
+                        .filter(s -> !s.isEmpty()) // 过滤空字符串
+                        .map(Long::parseLong) // 转换为Long类型
+                        .toList());
+                } else {
+                    // 设置供应发放信息
+                    supplyDelivery.setBasedOnTable(CommonConstants.TableName.WOR_DEVICE_DISPENSE);
+                    // 设置耗材发放id
+                    devDispenseId.addAll(Arrays.stream(item.getDispenseIds().split(",")).map(String::trim) // 去除每个ID前后的空格
+                        .filter(s -> !s.isEmpty()) // 过滤空字符串
+                        .map(Long::parseLong) // 转换为Long类型
+                        .toList());
+                }
+                supplyDeliveryList.add(supplyDelivery);
+            }
+            // 供应申请更新
+            boolean requestFlg = supplyRequestService.saveBatch(supplyRequestList);
+            if (!requestFlg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+            }
+            // 供应发放更新
+            boolean deliveryFlg = supplyDeliveryService.saveBatch(supplyDeliveryList);
+            if (!deliveryFlg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+            }
+            // 药品发放状态更新
+            medicationDispenseService.updateDispenseStatusSummarized(medDispenseId);
+            // 耗材发放状态更新
+            deviceDispenseService.updateDispenseStatusSummarized(devDispenseId);
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 校验库存
+     *
+     * @param devDispenseId 耗材发放id
+     * @param medDispenseId 药品发放id
+     * @return 处理结果
+     */
+    @Override
+    public R<?> checkInventoryItem(List<Long> devDispenseId, List<Long> medDispenseId) {
+
+        List<InventoryItem> inventoryItemList = new ArrayList<>();
+        // 获取库存信息
+        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseId, medDispenseId,
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        // 按每个药品分组
+        Map<Long, List<InventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        // 遍历每个分组校验库存状态
+        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<InventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+                .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
+                // 库存停供校验
+                return R.fail(groupItems.get(0).getItemName() + "库存已停供");
+            }
+        }
+        if (!inventoryList.isEmpty()) {
+            for (InventoryDto inventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(inventoryDto.getInventoryStatusEnum())) {
+                    InventoryItem inventoryItem = new InventoryItem();
+                    // 库存数量判定
+                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    } else {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
+                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    }
+                    inventoryItemList.add(inventoryItem);
+                }
+            }
+        }
+        return R.ok(inventoryItemList);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
new file mode 100644
index 00000000..013282e2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.controller;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.appservice.IATDManageAppService;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 入出转管理 controller
+ *
+ * @author zwh
+ * @date 2025-07-28
+ */
+@RestController
+@RequestMapping("/nurse-station/atd-manage")
+@Slf4j
+@AllArgsConstructor
+public class ATDManageController {
+
+    @Resource
+    private IATDManageAppService atdManageAppService;
+
+    /**
+     * 入出转管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> atdManageInit() {
+        return atdManageAppService.atdManageInit();
+    }
+
+    /**
+     * 入院患者分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 入院患者分页列表
+     */
+    @GetMapping(value = "/admission-patient")
+    public R<?> getAdmissionPatientPage(AdmissionPageParam admissionPageParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return atdManageAppService.getAdmissionPatientPage(admissionPageParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 入院患者床位信息分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 床位信息分页列表
+     */
+    @GetMapping(value = "/admission-bed")
+    public R<?> getAdmissionBedPage(AdmissionPageParam admissionPageParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return atdManageAppService.getAdmissionBedPage(admissionPageParam, pageNo, pageSize);
+    }
+
+    /**
+     * 入院患者详细信息
+     *
+     * @param encounterId 住院id
+     * @return 入院患者详细信息
+     */
+    @GetMapping(value = "/admission-patient-info")
+    public R<?> getAdmissionPatientInfo(Long encounterId) {
+        return atdManageAppService.getAdmissionPatientInfo(encounterId);
+    }
+
+    /**
+     * 入科床位分配
+     *
+     * @param admissionPatientInfoDto 床位分配参数
+     * @return 结果
+     */
+    @PostMapping(value = "/bed-assignment")
+    public R<?> admissionBedAssignment(@RequestBody AdmissionPatientInfoDto admissionPatientInfoDto) {
+        return atdManageAppService.admissionBedAssignment(admissionPatientInfoDto);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java
new file mode 100644
index 00000000..29e3ba58
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.common.dto.PerformInfoDto;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 护士站医嘱处理 controller
+ *
+ * @author zwh
+ * @date 2025-08-07
+ */
+@RestController
+@RequestMapping("/nurse-station/advice-process")
+@Slf4j
+@AllArgsConstructor
+public class AdviceProcessController {
+
+    @Resource
+    private IAdviceProcessAppService adviceProcessAppService;
+
+    /**
+     * 住院患者分页列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 住院患者分页列表
+     */
+    @GetMapping(value = "/inpatient")
+    public R<?> getInpatientPage(AdmissionPageParam admissionPageParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return adviceProcessAppService.getInpatientPage(admissionPageParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 住院患者医嘱查询
+     *
+     * @param inpatientAdviceParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 住院患者医
+     */
+    @GetMapping(value = "/inpatient-advice")
+    public R<?> getInpatientAdvicePage(InpatientAdviceParam inpatientAdviceParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return adviceProcessAppService.getInpatientAdvicePage(inpatientAdviceParam, pageNo, pageSize);
+    }
+
+    /**
+     * 医嘱校对通过
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @PutMapping(value = "/advice-verify")
+    public R<?> adviceVerify(List<PerformInfoDto> performInfoList) {
+        return adviceProcessAppService.adviceVerify(performInfoList);
+    }
+
+    /**
+     * 医嘱退回
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @PutMapping(value = "/advice-reject")
+    public R<?> adviceReject(List<PerformInfoDto> performInfoList) {
+        return adviceProcessAppService.adviceReject(performInfoList);
+    }
+
+    /**
+     * 医嘱执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @PostMapping(value = "/advice-execute")
+    public R<?> adviceExecute(List<PerformInfoDto> performInfoList) {
+        return adviceProcessAppService.adviceExecute(performInfoList);
+    }
+
+    /**
+     * 医嘱取消执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @PostMapping(value = "/advice-cancel")
+    public R<?> adviceCancel(List<PerformInfoDto> performInfoList) {
+        return adviceProcessAppService.adviceCancel(performInfoList);
+    }
+
+    /**
+     * 医嘱不执行
+     *
+     * @param performInfoList 医嘱信息集合
+     * @return 操作结果
+     */
+    @PostMapping(value = "/advice-void")
+    public R<?> adviceVoid(List<PerformInfoDto> performInfoList) {
+        return adviceProcessAppService.adviceVoid(performInfoList);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/InpatientMedicineCollectionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/InpatientMedicineCollectionController.java
new file mode 100644
index 00000000..67261f91
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/InpatientMedicineCollectionController.java
@@ -0,0 +1,91 @@
+package com.openhis.web.inhospitalnursestation.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.inhospitalnursestation.appservice.IInpatientMedicineCollectionAppService;
+import com.openhis.web.inhospitalnursestation.dto.InpatientMedicinePrescriptionInfoDto;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.dto.InpatientMedicineSearchParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 住院领药
+ *
+ * @author yuxj
+ * @date 2025/8/18
+ */
+@RestController
+@RequestMapping("/nurse-station/inpatient-medicine-collection")
+@Slf4j
+@AllArgsConstructor
+public class InpatientMedicineCollectionController {
+
+    @Resource
+    public IInpatientMedicineCollectionAppService medicineCollectionService;
+
+    /**
+     * 分页查询在科病人列表
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    @GetMapping("/encounter-list")
+    public R<?> getEncounterInfoList(InpatientMedicineSearchParam searchParam, String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return medicineCollectionService.getEncounterInfoListPage(searchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 医嘱查询
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     */
+    @GetMapping("/prescription-list")
+    public R<?> getPatientInfoList(InpatientMedicineSearchParam searchParam, String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return medicineCollectionService.getPrescriptionInfo(searchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 显示汇总发药单（生成之前的确认，此刻还没生成汇总单）
+     *
+     * @param searchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处理结果
+     */
+    @GetMapping("/show-medicine-summary")
+    public R<?> showMedicineSummary(@RequestBody List<InpatientMedicineSearchParam> searchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return medicineCollectionService.showMedicineSummary(searchParam, pageNo, pageSize);
+    }
+
+    /**
+     * 生成汇总发药单
+     *
+     * @param prescriptionInfo 汇总发药单
+     * @return 处理结果
+     */
+    @PostMapping("/medicine-summary")
+    public R<?> medicineSummary(@RequestBody List<InpatientMedicinePrescriptionInfoDto> prescriptionInfo) {
+        return medicineCollectionService.medicineSummary(prescriptionInfo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
new file mode 100644
index 00000000..31aee4cc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 入出转管理页面初始化dto
+ *
+ * @author zwh
+ * @date 2025-07-30
+ */
+@Data
+@Accessors(chain = true)
+public class ATDManageInitDto {
+
+    /**
+     * 住院状态
+     */
+    private List<ATDManageInitDto.encounterStatusOption> encounterStatusOptions;
+
+    /**
+     * 床位状态
+     */
+    private List<ATDManageInitDto.bedStatusOption> bedStatusOptions;
+
+    /**
+     * 患者病情
+     */
+    private List<ATDManageInitDto.priorityOption> priorityOptions;
+
+    /**
+     * 住院状态
+     */
+    @Data
+    public static class encounterStatusOption {
+        private Integer value;
+        private String label;
+
+        public encounterStatusOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    /**
+     * 床位状态
+     */
+    @Data
+    public static class bedStatusOption {
+        private Integer value;
+        private String label;
+
+        public bedStatusOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    /**
+     * 患者病情
+     */
+    @Data
+    public static class priorityOption {
+        private Integer value;
+        private String label;
+
+        public priorityOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
new file mode 100644
index 00000000..a0280243
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
@@ -0,0 +1,96 @@
+package com.openhis.web.inhospitalnursestation.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 入院床位 Dto
+ *
+ * @author zwh
+ * @date 2025/7/29
+ */
+@Data
+@Accessors(chain = true)
+public class AdmissionBedPageDto {
+
+    /**
+     * 入院ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 住院号
+     */
+    private String busNo;
+
+    /**
+     * 住院状态
+     */
+    private Integer encounterStatus;
+    private String encounterStatus_enumText;
+
+    /**
+     * 入院科室
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /** 患者姓名 */
+    private String patientName;
+
+    /** 病区ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long wardId;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /** 病房ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long houseId;
+
+    /**
+     * 病房名称
+     */
+    private String houseName;
+
+    /** 病床ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long bedId;
+
+    /**
+     * 病床名称
+     */
+    private String bedName;
+
+    /** 床位状态 */
+    private Integer bedStatus;
+    private String bedStatus_enumText;
+
+    /** 余额 */
+    private BigDecimal balanceAmount;
+
+    /** 总额 */
+    private BigDecimal totalAmount;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /** 生日 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /** 病人年龄 */
+    private String age;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
new file mode 100644
index 00000000..344f2064
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 入院分页查询条件
+ *
+ * @author zwh
+ * @date 2025-07-28
+ */
+@Data
+@Accessors(chain = true)
+public class AdmissionPageParam {
+
+    /**
+     * 入院科室
+     */
+    private Long organizationId;
+
+    /** 入院病区 */
+    private Long wardId;
+
+    /** 入院病房 */
+    private Long houseId;
+
+    /**
+     * 入院类型
+     */
+    private String admitSourceCode;
+
+    /**
+     * 住院状态
+     */
+    private Integer encounterStatus;
+
+    /** 床位状态 */
+    private Integer bedStatus;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
new file mode 100644
index 00000000..70e6e3b6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.openhis.common.enums.Whether;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 入院患者基本信息 dto
+ *
+ * @author zwh
+ * @date 2025-07-30
+ */
+@Data
+@Accessors(chain = true)
+public class AdmissionPatientInfoDto {
+
+    /**
+     * 入院ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 目标床位住院患者id
+     */
+    private Long targetEncounterId;
+
+    /**
+     * 住院号
+     */
+    private String busNo;
+
+    /**
+     * 入院时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inHosTime;
+
+    /**
+     * 入科时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 病情
+     */
+    private Integer priorityEnum;
+    private String priorityEnum_enumText;
+
+    /** 患者姓名 */
+    private String patientName;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /** 生日 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /** 病人年龄 */
+    private String age;
+
+    /** 电话 */
+    private String phone;
+
+    /** 位置ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 科室ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /**
+     * 科室名称
+     */
+    private String organizationName;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /** 病房ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long houseId;
+
+    /** 目标病房ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long targetHouseId;
+
+    /**
+     * 病房名称
+     */
+    private String houseName;
+
+    /** 病床ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long bedId;
+
+    /** 目标病床ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long targetBedId;
+
+    /**
+     * 病床名称
+     */
+    private String bedName;
+
+    /**
+     * 费别
+     */
+    private String contractName;
+
+    /**
+     * 住院医生id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long admittingDoctorId;
+
+    /**
+     * 主治医生id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long attendingDoctorId;
+
+    /**
+     * 主任医生id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chiefDoctorId;
+
+    /**
+     * 责任护士id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long primaryNurseId;
+
+    /**
+     * 住院医生
+     */
+    private String admittingDoctorName;
+
+    /**
+     * 主治医生
+     */
+    private String attendingDoctorName;
+
+    /**
+     * 主任医生
+     */
+    private String chiefDoctorName;
+
+    /**
+     * 责任护士
+     */
+    private String primaryNurseName;
+
+    /**
+     * 住院诊断
+     */
+    private String conditionNames;
+
+    /**
+     * 编辑标识
+     */
+    private String editFlag;
+
+    // TODO 体温单相关字段
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/PendingAdmissionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
similarity index 47%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/PendingAdmissionDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
index f92723fa..3d044e41 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/PendingAdmissionDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
@@ -1,113 +1,84 @@
-package com.openhis.web.nursestation.dto;
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
 /**
- * 待入科Dto
+ * 入院患者分页dto
  *
- * @author liuhr
- * @date 2025/4/14
+ * @author zwh
+ * @date 2025-07-28
  */
 @Data
 @Accessors(chain = true)
-public class PendingAdmissionDto {
-
-    /**
-     * ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /**
-     * 患者ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long patientId;
+public class AdmissionPatientPageDto {
 
     /**
-     * 群组ID
+     * 入院ID
      */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long groupId;
+    private Long encounterId;
 
     /**
-     * 就诊编码
+     * 住院号
      */
     private String busNo;
 
     /**
-     * 状态编码
+     * 住院状态
      */
-    private Integer statusEnum;
+    private Integer encounterStatus;
+    private String encounterStatus_enumText;
 
     /**
-     * 类别编码
+     * 入院时间
      */
-    private Integer classEnum;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
     /**
-     * 类别医保编码|费别
+     * 出院时间
      */
-    private Integer ybClassEnum;
-    private String ybClassEnum_enumText;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     /**
-     * 优先级编码
+     * 病情
      */
     private Integer priorityEnum;
+    private String priorityEnum_enumText;
 
     /**
-     * 就诊对象状态
+     * 入院类型
      */
-    private Integer subjectStatusEnum;
+    @Dict(dictCode = "admit_source_code")
+    private String admitSourceCode;
+    private String admitSourceCode_dictText;
 
     /**
-     * 开始时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    /**
-     * 机构id|入院科室
+     * 入院科室
      */
     @JsonSerialize(using = ToStringSerializer.class)
-    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
     private Long organizationId;
-    private String organizationId_dictText;
 
-    /** 入院病区ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "病区ID不能为空")
-    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
-    private Long wardLocationId;
-    private String wardLocationId_dictText;
+    /** 患者姓名 */
+    private String patientName;
 
-    /**
-     * 入院方式|入科来源
-     */
-    @Dict(dictCode = "in_way_code")
-    private String inWayCode;
-    private String inWayCode_dictText;
+    /** 患者拼音码 */
+    private String patientPyStr;
 
-    /** 患者姓名 */
-    private String name;
+    /** 患者五笔码 */
+    private String patientWbStr;
 
     /** 性别编码 */
     private Integer genderEnum;
@@ -117,17 +88,47 @@ public class PendingAdmissionDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date birthDate;
 
-    /** 身份证号 */
-    private String idCard;
-
     /** 病人年龄 */
-    private String ageString;
+    private String age;
+
+    /** 病区ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long wardId;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /** 病房ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long houseId;
 
-    /** 是否跨科收治 */
-    private Integer crossDeptStatus;
-    private String crossDeptStatus_enumText;
+    /**
+     * 病房名称
+     */
+    private String houseName;
 
-    /** 门诊诊断 */
-    private String descriptions;
+    /** 病床ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long bedId;
+
+    /**
+     * 病床名称
+     */
+    private String bedName;
 
+    /** 病床状态 */
+    private Integer bedStatus;
+    private String bedStatus_enumText;
+
+    /**
+     * 科室名称
+     */
+    private String organizationName;
+
+    /**
+     * 费别
+     */
+    private String contractName;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
new file mode 100644
index 00000000..f41a05d7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+import com.openhis.web.common.dto.PerformRecordDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院医嘱dto
+ *
+ * @author zwh
+ * @date 2025-08-21
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientAdviceDto {
+
+    /** 住院患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 医嘱所在表 */
+    private String adviceTable; // 1:药品 , 2: 耗材 , 3:项目
+    /**
+     * 请求人id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_practitioner", dictCode = "id", dictText = "name")
+    private Long requesterId;
+    private String requesterId_dictText;
+
+    /** 请求时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date requestTime;
+
+    /** 医嘱开始时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /** 医嘱结束时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /**
+     * 诊断定义名称
+     */
+    private String conditionDefinitionName;
+
+    /**
+     * 分组id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
+    /**
+     * 请求id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 医嘱名称 */
+    private String adviceName;
+
+    /**
+     * 医嘱项目id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long adviceId;
+
+    /**
+     * 规格
+     */
+    private String volume;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 请求数量 */
+    private Integer quantity;
+
+    /** 请求单位编码 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 请求状态 */
+    private Integer requestStatus;
+    private String requestStatus_enumText;
+
+    /** 是否皮试 */
+    private Integer skinTestFlag;
+    private String skinTestFlag_enumText;
+
+    /** 是否为注射药物 */
+    private Integer injectFlag;
+    private String injectFlag_enumText;
+
+    /**
+     * 用法
+     */
+    @Dict(dictCode = "method_code")
+    private String methodCode;
+    private String methodCode_dictText;
+
+    /**
+     * 使用频次
+     */
+    @Dict(dictCode = "rate_code")
+    private String rateCode;
+    private String rateCode_dictText;
+
+    /**
+     * 单次剂量
+     */
+    private BigDecimal dose;
+
+    /** 剂量单位 */
+    @Dict(dictCode = "unit_code")
+    private String doseUnitCode;
+    private String doseUnitCode_dictText;
+
+    /**
+     * 物理位置id | 可能是 发药药房id,耗材房id,执行科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long positionId;
+
+    /**
+     * 物理位置| 可能是 发药药房,耗材房,执行科室
+     */
+    private String positionName;
+
+    /** 用药天数 */
+    private Integer dispensePerDuration;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /**
+     * 中药付数
+     */
+    private Integer chineseHerbsDoseQuantity;
+
+    /**
+     * 代煎标识 | 0:否 , 1:是
+     */
+    private Integer sufferingFlag;
+
+    /**
+     * 排序号
+     */
+    private Integer sortNumber;
+
+    /**
+     * 频次时间点
+     */
+    private String dayTimes;
+
+    /**
+     * 执行时间点
+     */
+    private List<PerformRecordDto> exePerformRecordList;
+
+    /**
+     * 取消时间点
+     */
+    private List<PerformRecordDto> cancelPerformRecordList;
+
+    /**
+     * 停止时间点
+     */
+    private List<PerformRecordDto> stopPerformRecordList;
+
+    /** 医嘱类型 */
+    private Integer therapyEnum;
+    private String therapyEnum_enumText;
+
+    /** 总执行次数 */
+    private Integer executeNum;
+
+    /** 执行次数 */
+    private Integer executeCount;
+
+    /** 住院号 */
+    private String BusNo;
+
+    /** 患者名称 */
+    private String patientName;
+
+    /** 床位名称 */
+    private String badName;
+
+    /** 性别 */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 生日
+     */
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /** 费别 */
+    private String contractName;
+
+    /** 诊断 */
+    private String conditionNames;
+
+    /** 住院医生 */
+    private String admittingDoctorName;
+
+    /** 余额 */
+    private BigDecimal balanceAmount;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
new file mode 100644
index 00000000..3b11a4d8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院患者医嘱查询条件
+ *
+ * @author zwh
+ * @date 2025-08-21
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientAdviceParam {
+
+    /** 住院患者ids */
+    private String encounterIds;
+
+    /** 住院患者id */
+    private Long encounterId;
+
+    /** 医嘱类型 */
+    private Integer therapyEnum;
+
+    /** 执行状态 */
+    private Integer exeStatus;
+
+    /** 请求状态 */
+    private Integer requestStatus;
+
+    /** 截至时间 */
+    private String deadline;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java
similarity index 38%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalPatientInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java
index ebe8753a..7a4f4c91 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalPatientInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java
@@ -1,27 +1,48 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.openhis.web.inhospitalnursestation.dto;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 患者基本信息
+ * 就诊人员列表
  *
  * @author yuxj
- * @date 2025-04-11
+ * @date 2025-06-03
  */
 @Data
 @Accessors(chain = true)
-public class OutpatientDisposalPatientInfoDto {
+public class InpatientMedicineEncounterInfoDto {
+
+    /** 科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /** 科室 */
+    private String organizationName;
+
+    /** 就诊id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+    /** 住院号 */
+    private String busNo;
 
-    /** 姓名 */
+    /** 患者姓名 */
     private String patientName;
 
+    /** 拼音码 */
+    private String patientPyStr;
+
+    /** 五笔码 */
+    private String patientWbStr;
+
     /** 性别 */
     private Integer genderEnum;
     private String genderEnum_enumText;
@@ -32,18 +53,6 @@ public class OutpatientDisposalPatientInfoDto {
     /** 年龄 */
     private String age;
 
-    /** 证件号 */
-    private String idCard;
-
-    /** 就诊科室 */
-    private String organizationName;
-
-    /** 就诊日期 */
-    private String encounterDate;
-
-    /** 门诊诊断 */
-    private String conditionName;
-
-    /** 总金额 */
-    private BigDecimal totalPrice;
+    /** 床位 */
+    private String inpatientBed;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java
similarity index 42%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java
index e7cd377f..77586762 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionInitDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java
@@ -1,57 +1,55 @@
-package com.openhis.web.nursestation.dto;
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
 
 import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.administration.domain.Practitioner;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 待入科初始化Dto
+ *住院领药初期dto
  *
- * @author liuhr
- * @date 2025/4/15
+ * @author yuxj
+ * @date 2025-06-03
  */
 @Data
 @Accessors(chain = true)
-public class BedForAdmissionInitDto {
+public class InpatientMedicineInitDto {
 
-    // 入院科室列表
-    private List<exeOrganization> locationListOptions;
+    /** 科室列表 */
+    private List<LongOptions> departmentOptions;
+    /** 领药人列表 */
+    private List<Practitioner> applicantOptions;
 
-    //患者病情List
-    private List<statusEnumOption> priorityListOptions;
+    /** 发药状态 */
+    private List<IntegerOptions> dispenseStatusOptions;
 
-    /**
-     * 执行机构
-     */
     @Data
-    public static class exeOrganization {
-
+    public static class LongOptions {
         @JsonSerialize(using = ToStringSerializer.class)
         private Long value;
         private String label;
 
-        public exeOrganization(Long value, String label) {
+        public LongOptions(Long value, String label) {
             this.value = value;
             this.label = label;
         }
     }
 
-    /**
-     * 状态
-     */
     @Data
-    public static class statusEnumOption {
+    public static class IntegerOptions {
         private Integer value;
-        private String info;
+        private String label;
 
-        public statusEnumOption(Integer value, String info) {
+        public IntegerOptions(Integer value, String label) {
             this.value = value;
-            this.info = info;
+            this.label = label;
         }
     }
-
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java
new file mode 100644
index 00000000..634ec378
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医嘱列表
+ *
+ * @author yuxj
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicinePrescriptionInfoDto {
+
+    /**
+     * 药品发放id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /**
+     * 药品发放id
+     */
+    private String dispenseIds;
+
+    /**
+     * 治疗类型
+     */
+    private Integer therapyEnum;
+    private String therapyEnum_enumText;
+
+    /**
+     * 预定发药时间
+     */
+    private Date plannedDispenseTime;
+
+    /**
+     * 就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 发放状态
+     */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /**
+     * 项目表
+     */
+    private String itemTable;
+
+    /**
+     * 项目id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /**
+     * 项目名
+     */
+    private String itemName;
+
+    /**
+     * 请求数量
+     */
+    private Integer quantity;
+
+    /**
+     * 请求单位编码
+     */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /**
+     * 发放地点
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 发放地点
+     */
+    private String locationName;
+    /**
+     * 地点类型
+     */
+    private Integer locationEnum;
+    private String locationEnum_enumText;
+
+    /**
+     * 批号
+     */
+    private String lotNumber;
+    /**
+     * 规格
+     */
+    private String totalVolume;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineSearchParam.java
new file mode 100644
index 00000000..bdf0bd3b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineSearchParam.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 患者列表查询条件
+ *
+ * @author yuxj
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicineSearchParam implements Serializable {
+
+    /** 科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /** 医嘱类型 */
+    private Integer  therapyEnum;
+
+    /**
+     * 领药至哪天
+     * */
+    private Date plannedDispenseTime;
+
+    /** 就诊id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private List<Long> encounterIdList;
+
+    /** 发放id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /**
+     * 项目表
+     */
+    private String itemTable;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
new file mode 100644
index 00000000..a8cf7966
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionBedPageDto;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto;
+
+/**
+ * 入出转管理 appMapper
+ *
+ * @author zwh
+ * @date 2025-07-28
+ */
+@Repository
+public interface ATDManageAppMapper {
+
+    /**
+     * 入院患者分页列表
+     * 
+     * @param page 分页信息
+     * @param queryWrapper 查询条件
+     * @param imp 就诊类型：住院
+     * @param toBeRegistered 就诊状态：待登记
+     * @param active 住院位置状态：使用中
+     * @param ward 位置类型：病区
+     * @param house 位置类型：病房
+     * @param bed 位置类型：病床
+     * @return 入院患者分页列表
+     */
+    Page<AdmissionPatientPageDto> selectAdmissionPatientPage(@Param("page") Page<AdmissionPatientPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<AdmissionPageParam> queryWrapper, @Param("imp") Integer imp,
+        @Param("toBeRegistered") Integer toBeRegistered, @Param("active") Integer active, @Param("ward") Integer ward,
+        @Param("house") Integer house, @Param("bed") Integer bed);
+
+    /**
+     * 入院患者床位信息分页列表
+     *
+     * @param page 分页信息
+     * @param queryWrapper 查询条件
+     * @param active 住院位置状态：使用中
+     * @param ward 位置类型：病区
+     * @param house 位置类型：病房
+     * @param bed 位置类型：病床
+     * @param personalCashAccount 账户类型：个人现金账户
+     * @param inactive 床位状态：停用
+     * @param billable 收费状态：待结算
+     * @param billed 收费状态：已结算
+     * @param refunded 收费状态：已退费
+     * @return 患者床位信息分页列表
+     */
+    Page<AdmissionBedPageDto> selectAdmissionBadPage(@Param("page") Page<AdmissionBedPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<AdmissionPageParam> queryWrapper, @Param("active") Integer active,
+        @Param("ward") Integer ward, @Param("house") Integer house, @Param("bed") Integer bed,
+        @Param("personalCashAccount") String personalCashAccount, @Param("inactive") Integer inactive,
+        @Param("billable") Integer billable, @Param("billed") Integer billed, @Param("refunded") Integer refunded);
+
+    /**
+     * 查询住院患者详细信息
+     *
+     * @param encounterId 住院id
+     * @param active 住院位置状态：使用中
+     * @param ward 位置类型：病区
+     * @param house 位置类型：病房
+     * @param bed 位置类型：病床
+     * @param primaryNurse 住院参与人：责任护士
+     * @param attendingDoctor 住院参与人：主治医生
+     * @param admittingDoctor 住院参与人：住院医生
+     * @param chiefDoctor 住院参与人：主任医生
+     * @return 住院患者详细信息
+     */
+    AdmissionPatientInfoDto selectAdmissionPatientInfo(@Param("encounterId") Long encounterId,
+        @Param("active") Integer active, @Param("ward") Integer ward, @Param("house") Integer house,
+        @Param("bed") Integer bed, @Param("primaryNurse") String primaryNurse,
+        @Param("attendingDoctor") String attendingDoctor, @Param("admittingDoctor") String admittingDoctor,
+        @Param("chiefDoctor") String chiefDoctor);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
new file mode 100644
index 00000000..0d5766d6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto;
+import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto;
+import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+
+/**
+ * 护士站医嘱处理 mapper
+ *
+ * @author zwh
+ * @date 2025-08-07
+ */
+@Repository
+public interface AdviceProcessAppMapper {
+
+    /**
+     * 入院患者分页列表
+     *
+     * @param page 分页信息
+     * @param queryWrapper 查询条件
+     * @param imp 就诊类型：住院
+     * @param toBeRegistered 就诊状态：待登记
+     * @param registered 就诊状态：待入院
+     * @param active 住院位置状态：使用中
+     * @param ward 位置类型：病区
+     * @param house 位置类型：病房
+     * @param bed 位置类型：病床
+     * @return 入院患者分页列表
+     */
+    Page<AdmissionPatientPageDto> selectInpatientPage(@Param("page") Page<AdmissionPatientPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<AdmissionPageParam> queryWrapper, @Param("imp") Integer imp,
+        @Param("toBeRegistered") Integer toBeRegistered, @Param("registered") Integer registered,
+        @Param("active") Integer active, @Param("ward") Integer ward, @Param("house") Integer house,
+        @Param("bed") Integer bed);
+
+    /**
+     * 查询医嘱分页列表
+     * 
+     * @param page 分页信息
+     * @param queryWrapper 查询条件
+     * @param worServiceRequest 请求所在表:服务请求
+     * @param medMedicationRequest 请求所在表:药品请求
+     * @param draft 医嘱状态：待发送
+     * @param active 住院位置状态：使用中
+     * @param bed 位置类型：病床
+     * @param admittingDoctor 住院医生
+     * @param personalCashAccount 个人现金账户
+     * @param billable 收费状态：待结算
+     * @param billed 收费状态：已结算
+     * @param refunded 收费状态：已退费
+     * @param imp 患者状态：住院
+     * @return 医嘱分页列表
+     */
+    Page<InpatientAdviceDto> selectInpatientAdvicePage(@Param("page") Page<InpatientAdviceDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InpatientAdviceParam> queryWrapper,
+        @Param("medMedicationRequest") String medMedicationRequest,
+        @Param("worServiceRequest") String worServiceRequest, @Param("draft") Integer draft,
+        @Param("active") Integer active, @Param("bed") Integer bed, @Param("admittingDoctor") String admittingDoctor,
+        @Param("personalCashAccount") String personalCashAccount, @Param("billable") Integer billable,
+        @Param("billed") Integer billed, @Param("refunded") Integer refunded, @Param("imp") Integer imp);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/InpatientMedicineCollectionMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/InpatientMedicineCollectionMapper.java
new file mode 100644
index 00000000..ad0bc00e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/InpatientMedicineCollectionMapper.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inhospitalnursestation.dto.*;
+
+@Repository
+public interface InpatientMedicineCollectionMapper {
+
+    /**
+     * 就诊病人列表分页查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param amb 住院
+     * @return 就诊病人列表
+     */
+    Page<InpatientMedicineEncounterInfoDto> selectEncounterInfoListPage(
+        @Param("page") Page<InpatientMedicineEncounterInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InpatientMedicineSearchParam> queryWrapper, @Param("amb") Integer amb);
+
+    /**
+     * 医嘱列表查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param encounterIdList 就诊id
+     * @return 医嘱信息
+     */
+    Page<InpatientMedicinePrescriptionInfoDto> selectPrescriptionInfoListPage(
+        @Param("page") Page<InpatientMedicinePrescriptionInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InpatientMedicineSearchParam> queryWrapper,
+        @Param("encounterIdList") List<Long> encounterIdList,
+        @Param("statusEnum") Integer statusEnum,
+        @Param("medMedicationDefinition") String medMedicationDefinition,
+        @Param("admDeviceDefinition") String admDeviceDefinition);
+
+    /**
+     * 医嘱汇总列表查询
+     *
+     * @param page 分页
+     * @param medDispenseIdList 药品发放id
+     * @param medDispenseIdList 耗材发放id
+     * @return 医嘱信息
+     */
+    Page<InpatientMedicinePrescriptionInfoDto> selectPrescriptionSummaryInfoListPage(
+        @Param("page") Page<InpatientMedicinePrescriptionInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InpatientMedicineSearchParam> queryWrapper,
+        @Param("dispenseIdList") List<Long> medDispenseIdList,
+        @Param("dispenseIdList") List<Long> devDispenseIdList,
+        @Param("medMedicationDefinition") String medMedicationDispense,
+        @Param("admDeviceDefinition") String admDeviceDispense);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IAdmissionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IAdmissionAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IAdmissionAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IAdmissionAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
index 2d8bcb55..6c1a5f20 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.inpatientmanage.dto.DepositSearchParam;
-import com.openhis.web.paymentmanage.dto.PaymentDto;
+import com.openhis.yb.dto.PaymentDto;
 
 /**
  * 住院登记 应用实现
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java
new file mode 100644
index 00000000..1250f3ab
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java
@@ -0,0 +1,104 @@
+package com.openhis.web.inpatientmanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto;
+import com.openhis.web.inpatientmanage.dto.NursingRecordDto;
+import com.openhis.web.inpatientmanage.dto.NursingSearchParam;
+
+/**
+ * 护理记录单 应用实现
+ *
+ * @author gyy
+ * @since 2025/05/30
+ */
+public interface INursingRecordAppService {
+
+    /**
+     * 获取住院患者信息 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者信息
+     */
+    R<?> getPatientInfoPage(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request);
+
+    /**
+     * 获取患者护理记录单信息 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者护理记录单信息
+     */
+    R<?> getNursingPatientPage(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 保存护理记录单
+     *
+     * @param nursingRecordDto 入参
+     * @return 结果
+     */
+    R<?> saveRecord(NursingRecordDto nursingRecordDto);
+
+    /**
+     * 编辑护理记录单
+     *
+     * @param nursingRecordDto 入参
+     * @return 结果
+     */
+    R<?> updateRecord(NursingRecordDto nursingRecordDto);
+
+    /**
+     * 删除护理记录单
+     *
+     * @param recordList 记录单List
+     * @return 结果
+     */
+    R<?> delRecord(List<NursingRecordDto> recordList);
+
+    /**
+     * 获取电子病历模板列表 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 电子病历模板信息
+     */
+    R<?> getEmrTemplate(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request);
+
+    /**
+     * 保存病历模板
+     *
+     * @param emrTemplateDto 病历模板信息
+     * @return 结果
+     */
+    R<?> saveEmrTemplate(NursingEmrTemplateDto emrTemplateDto);
+
+    /**
+     * 删除病历模板
+     *
+     * @param idList 模板id
+     * @return 操作结果
+     */
+    R<?> deleteEmrTemplate(List<Long> idList);
+
+    /**
+     * 编辑病历模板
+     *
+     * @param emrTemplateDto 病历模板信息
+     * @return 操作结果
+     */
+    R<?> updateEmrTemplate(NursingEmrTemplateDto emrTemplateDto);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java
new file mode 100644
index 00000000..1577809c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java
@@ -0,0 +1,64 @@
+package com.openhis.web.inpatientmanage.appservice;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.chargemanage.dto.OrgMetadata;
+import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam;
+
+/**
+ * 患者首页 应用实现
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+public interface IPatientHomeAppService {
+
+    /**
+     * 获取患者首页信息初期数据列表
+     *
+     * @return 患者首页初期数据列表
+     */
+    R<?> getPatientInfoInit(PatientHomeSearchParam patientHomeSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 获取空床信息
+     *
+     * @return 空床信息
+     */
+    R<?> getEmptyBed(Long organizationId);
+
+    /**
+     * 转床保存
+     *
+     * @return 转床结果
+     */
+    R<?> saveBedTransfer(Long encounterLocationId, Long encounterId, Long oldLocationId, Long newLocationId);
+
+    /**
+     * 获取科室信息
+     *
+     * @return 科室列表
+     */
+    List<OrgMetadata> getCaty();
+
+    /**
+     * 转科保存
+     *
+     * @return 转科结果
+     */
+    R<?> saveDepartmentTransfer(Long encounterLocationId, Long patientId, Long encounterId, Long organizationId,
+        Date DepartmentTransferYmd);
+
+    /**
+     * 出院
+     *
+     * @return 出院
+     */
+    R<?> saveDischargeHospital(Long encounterLocationId, Long patientId, Long encounterId, Long locationId,
+        Date DischargeHospitalYmd);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java
new file mode 100644
index 00000000..a49d81ec
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java
@@ -0,0 +1,49 @@
+package com.openhis.web.inpatientmanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inpatientmanage.dto.VitalSignsDeleteDto;
+import com.openhis.web.inpatientmanage.dto.VitalSignsSaveDto;
+import com.openhis.web.inpatientmanage.dto.VitalSignsSearchParam;
+
+/**
+ * 三测单 应用实现
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+public interface IVitalSignsAppService {
+
+    /**
+     * 获取患者体温单信息数据列表
+     *
+     * @return 获取患者体温单信息数据列表
+     */
+    R<?> getVitalSignsInfo(VitalSignsSearchParam vitalSignsSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 体温单记录保存
+     *
+     * @return 体温单记录保存结果
+     */
+    R<?> saveVitalSigns(VitalSignsSaveDto vitalSignsSaveDto);
+
+    /**
+     * 体温单检索
+     *
+     * @return 体温单检索结果
+     */
+    R<?> searchVitalSigns(String startTime, String endTime);
+
+    /**
+     * 体温单记录删除
+     *
+     * @return 体温单记录删除结果
+     */
+    R<?> deleteVitalSigns(List<VitalSignsDeleteDto> vitalSignsDeleteDto);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java
similarity index 93%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java
index 06559b2c..47b18d39 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java
@@ -9,7 +9,6 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.web.nursestation.mapper.NurseStationPendAdmAppMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -17,7 +16,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Account;
@@ -64,9 +62,6 @@ public class AdmissionAppServiceImpl implements IAdmissionAppService {
     @Resource
     private IAccountService accountService;
 
-    @Resource
-    private NurseStationPendAdmAppMapper nurseStationPendAdmAppMapper;
-
     /**
      * 病获取住院信息初期数据列表
      *
@@ -119,13 +114,13 @@ public class AdmissionAppServiceImpl implements IAdmissionAppService {
 
         // 分页查询,查询住院
         IPage<AdmissionDto> admissionInfoPage = admissionMapper.getPage(new Page<>(pageNo, pageSize),
-            EncounterClass.IMP.getValue(), LocationForm.WARD.getValue(), queryWrapper);
+            EncounterClass.AMB.getValue(), LocationForm.WARD.getValue(), queryWrapper);
 
         admissionInfoPage.getRecords().forEach(e -> {
             // 性别枚举类回显赋值
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
             // 计算年龄
-            e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate()));
+//            e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate()));
 
         });
 
@@ -209,9 +204,9 @@ public class AdmissionAppServiceImpl implements IAdmissionAppService {
         Account account = new Account();
         account.setName(admissionUpDto.getName()).setPatientId(admissionUpDto.getPatientId())
             .setEncounterId(admissionUpDto.getId())
-            //账户状态是有效的
+            // 账户状态是有效的
             .setStatusEnum(AccountStatus.ACTIVE.getValue())
-            //结账状态是可用的
+            // 结账状态是可用的
             .setBillingStatusEnum(AccountBillingStatus.OPEN.getValue());
         boolean updateAccountSuccess = accountService.saveOrUpdateAccount(account);
 
@@ -241,12 +236,12 @@ public class AdmissionAppServiceImpl implements IAdmissionAppService {
             EncounterStatus.DISCHARGED.getValue(), LocationForm.BED.getValue(), LocationForm.WARD.getValue(),
             ParticipantType.ADMITTER.getCode(), LocationBedStatus.O.getValue(), id, tenantId);
 
-        //查询患者病情站诊断
-        List<String> descriptionList = nurseStationPendAdmAppMapper.getDescriptionList(id);
+        // 查询患者病情站诊断
+//        List<String> descriptionList = nurseStationPendAdmAppMapper.getDescriptionList(id);
         // 诊断病情拼接
-        if (descriptionList != null && !descriptionList.isEmpty()) {
-            admissionUpDto.setDescriptions(String.join(CommonConstants.Common.COMMA, descriptionList));
-        }
+//        if (descriptionList != null && !descriptionList.isEmpty()) {
+//            admissionUpDto.setDescriptions(String.join(CommonConstants.Common.COMMA, descriptionList));
+//        }
 
         return R.ok(admissionUpDto);
     }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
similarity index 89%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
index 95b4bf09..074e27ed 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
@@ -5,6 +5,8 @@ import java.util.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.yb.dto.PaymentDetailDto;
+import com.openhis.yb.dto.PaymentDto;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,8 +41,6 @@ import com.openhis.web.inpatientmanage.dto.DepositDetailDto;
 import com.openhis.web.inpatientmanage.dto.DepositInitPageDto;
 import com.openhis.web.inpatientmanage.dto.DepositSearchParam;
 import com.openhis.web.inpatientmanage.mapper.DepositMapper;
-import com.openhis.web.paymentmanage.dto.PaymentDetailDto;
-import com.openhis.web.paymentmanage.dto.PaymentDto;
 
 /**
  * 预交金管理 实现类
@@ -138,25 +138,25 @@ public class DepositAppServiceImpl implements IDepositAppService {
             .getOne(new LambdaQueryWrapper<Encounter>().eq(Encounter::getId, paymentDto.getEncounterId()));
 
         // 就诊账户管理只取回来一条数据？
-        //List<Account> accountList = iAccountService.list(new LambdaQueryWrapper<Account>()
-        //   .in(Account::getId, paymentDto.getPatientId()).eq(Account::getEncounterId, paymentDto.getEncounterId()));
+        // List<Account> accountList = iAccountService.list(new LambdaQueryWrapper<Account>()
+        // .in(Account::getId, paymentDto.getPatientId()).eq(Account::getEncounterId, paymentDto.getEncounterId()));
         Account account = new Account();
         Long accountId = null;
         boolean updateAccountSuccess = true;
-        //if (accountList.size() != 0) {
-        //    account.setBalanceAmount(accountList.get(0).getBalanceAmount().add(paymentDto.getDisplayAmount()))
-        //        .setPatientId(paymentDto.getPatientId()).setEncounterId(encounter.getId());
-        //    // 更新就诊账户管理
-        //    updateAccountSuccess = iAccountService.saveOrUpdateAccount(account);
-            // 账户ID
-        //    accountId = accountList.get(0).getId();
-        //} else {
-        //    // 插入就诊账户管理
-        //    account.setTypeCode(AccountType.PERSONAL_CASH_ACCOUNT.getInfo()).setPatientId(paymentDto.getPatientId())
-        //        .setEncounterId(encounter.getId()).setBalanceAmount(paymentDto.getDisplayAmount());
-        //    // 账户ID
-        //    accountId = iAccountService.saveAccountByRegister(account);
-        //}
+        // if (accountList.size() != 0) {
+        // account.setBalanceAmount(accountList.get(0).getBalanceAmount().add(paymentDto.getDisplayAmount()))
+        // .setPatientId(paymentDto.getPatientId()).setEncounterId(encounter.getId());
+        // // 更新就诊账户管理
+        // updateAccountSuccess = iAccountService.saveOrUpdateAccount(account);
+        // 账户ID
+        // accountId = accountList.get(0).getId();
+        // } else {
+        // // 插入就诊账户管理
+        // account.setTypeCode(AccountType.PERSONAL_CASH_ACCOUNT.getInfo()).setPatientId(paymentDto.getPatientId())
+        // .setEncounterId(encounter.getId()).setBalanceAmount(paymentDto.getDisplayAmount());
+        // // 账户ID
+        // accountId = iAccountService.saveAccountByRegister(account);
+        // }
 
         // 结算
         // 统一生成业务流水
@@ -181,7 +181,7 @@ public class DepositAppServiceImpl implements IDepositAppService {
             .setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()).setEntererId(enterId)
             .setPatientId(encounter.getPatientId()).setPractitionerId(enterId)
             .setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()).setLocationId(-99l).setExpirationDate(futureTime)
-            //.setBillDate(setlTime).setPrintCount(0).setTenderedAmount(paymentDto.getTenderedAmount())
+            // .setBillDate(setlTime).setPrintCount(0).setTenderedAmount(paymentDto.getTenderedAmount())
             .setEncounterId(encounter.getId());
         // 保存付款信息
         paymentReconciliationService.save(payment);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
new file mode 100644
index 00000000..1ea1cea5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
@@ -0,0 +1,394 @@
+package com.openhis.web.inpatientmanage.appservice.impl;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+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;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AdministrativeGender;
+import com.openhis.common.enums.EncounterClass;
+import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.document.domain.Emr;
+import com.openhis.document.domain.EmrTemplate;
+import com.openhis.document.domain.VitalSigns;
+import com.openhis.document.service.IEmrService;
+import com.openhis.document.service.IEmrTemplateService;
+import com.openhis.document.service.IVitalSignsService;
+import com.openhis.web.inpatientmanage.appservice.INursingRecordAppService;
+import com.openhis.web.inpatientmanage.dto.*;
+import com.openhis.web.inpatientmanage.mapper.NursingRecordAppMapper;
+
+/**
+ * 护理记录单 实现类
+ *
+ * @author gyy
+ * @since 2025/05/30
+ */
+@Service
+public class NursingRecordAppServiceImpl implements INursingRecordAppService {
+
+    @Resource
+    private NursingRecordAppMapper nursingRecordAppMapper;
+
+    @Resource
+    private IEmrService emrService;
+
+    @Resource
+    private IVitalSignsService vitalSignsService;
+
+    @Resource
+    private IPractitionerService practitionerService;
+
+    @Resource
+    private IEmrTemplateService emrTemplateService;
+
+    /**
+     * 获取住院患者信息 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者信息
+     */
+    @Override
+    public R<?> getPatientInfoPage(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<NursingSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(nursingSearchParam, searchKey,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo)),
+            request);
+
+        // 分页查询,查询患者信息
+        IPage<NursingPageDto> NursingInfoPage = nursingRecordAppMapper.getPatientPage(new Page<>(pageNo, pageSize),
+            EncounterClass.IMP.getValue(), LocationForm.BED.getValue(), LocationForm.WARD.getValue(),
+            EncounterLocationStatus.ACTIVE.getValue(), queryWrapper);
+
+        NursingInfoPage.getRecords().forEach(e -> {
+            // 性别枚举类回显赋值
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate()));
+        });
+
+        // 返回【住院患者信息列表DTO】分页
+        return R.ok(NursingInfoPage);
+    }
+
+    /**
+     * 获取患者护理记录单信息 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者护理记录单信息
+     */
+    @Override
+    public R<?> getNursingPatientPage(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<NursingSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(nursingSearchParam, searchKey,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientId)), request);
+
+        // 分页查询,查询患者护理记录单信息
+        IPage<NursingDetailDto> NursingPatientPage = nursingRecordAppMapper.getNursingPatientPage(
+            new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), LocationForm.BED.getValue(),
+            LocationForm.WARD.getValue(), EncounterLocationStatus.ACTIVE.getValue(), queryWrapper);
+
+        NursingPatientPage.getRecords().forEach(e -> {
+            // 性别枚举类回显赋值
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate()));
+        });
+
+        // 返回【住院患者护理记录单信息列表DTO】分页
+        return R.ok(NursingPatientPage);
+    }
+
+    /**
+     * 保存护理记录单
+     *
+     * @param nursingRecordDto 入参
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> saveRecord(NursingRecordDto nursingRecordDto) {
+        // 取得记录人员id
+        Long recorderId = SecurityUtils.getLoginUser().getPractitionerId();
+
+        Emr emr = new Emr();
+        // 病历信息
+        emr.setEncounterId(nursingRecordDto.getEncounterId()).setPatientId(nursingRecordDto.getPatientId())
+            .setRecordId(recorderId).setRecordTime(nursingRecordDto.getRecordingTime()).setClassEnum(1)
+            .setContextJson(nursingRecordDto.getContextJson());
+
+        // 病历（记录单）保存
+        boolean saveSuccess = emrService.save(emr);
+        // 是否同步到体征表
+        if (nursingRecordDto.getVitalSignsSyncFlag()) {
+            this.vitalSigns(nursingRecordDto, recorderId);
+        }
+
+        if (saveSuccess) {
+            return R.ok(nursingRecordDto,
+                MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"护理记录单"}));
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+    }
+
+    /**
+     * 编辑护理记录单
+     *
+     * @param nursingRecordDto 入参
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> updateRecord(NursingRecordDto nursingRecordDto) {
+        // 取得记录人员id
+        Long recordId = SecurityUtils.getLoginUser().getPractitionerId();
+
+        // 病历（记录单）保存
+        Emr emr = new Emr();
+        emr.setId(nursingRecordDto.getRecordId()).setEncounterId(nursingRecordDto.getEncounterId())
+            .setPatientId(nursingRecordDto.getPatientId()).setRecordId(recordId)
+            .setRecordTime(nursingRecordDto.getRecordingTime()).setClassEnum(1)
+            .setContextJson(nursingRecordDto.getContextJson());
+        boolean updateSuccess = emrService.updateById(emr);
+
+        // 是否同步到体征表
+        if (nursingRecordDto.getVitalSignsSyncFlag()) {
+            this.vitalSigns(nursingRecordDto, recordId);
+        } else {
+            // 编辑时不同步到体征单的场合，删除体征单之前的记录
+            this.deleteVitalSigns(nursingRecordDto);
+        }
+
+        if (updateSuccess) {
+            return R.ok(nursingRecordDto,
+                MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"护理记录单"}));
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+    }
+
+    /**
+     * 编辑时不同步到体征单的场合，删除体征单之前的记录
+     *
+     * @param nursingRecordDto
+     * @return 结果
+     */
+    private void deleteVitalSigns(NursingRecordDto nursingRecordDto) {
+        // 查询在体征表中是否存在数据
+        LambdaQueryWrapper<VitalSigns> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(VitalSigns::getEncounterId, nursingRecordDto.getEncounterId())
+            .eq(VitalSigns::getPatientId, nursingRecordDto.getPatientId())
+            .eq(VitalSigns::getTimePoint, nursingRecordDto.getRecordingTime());
+        List<VitalSigns> vitalSignsList = vitalSignsService.list(queryWrapper);
+        // 存在的场合删除记录
+        if (vitalSignsList.size() != 0) {
+            // 获取生命体征管理ID的List
+            List<Long> vitalSignsIdList = vitalSignsList.stream().map(VitalSigns::getId).collect(Collectors.toList());
+            // 删除记录
+            vitalSignsService.removeByIds(vitalSignsIdList);
+        }
+    }
+
+    /**
+     * 生命体征转换，同步到体征单
+     *
+     * @param nursingRecordDto
+     * @return 结果
+     */
+    private void vitalSigns(NursingRecordDto nursingRecordDto, long recorderId) {
+
+        // 取得记录人员姓名
+        Practitioner practitioner = practitionerService.getById(recorderId);
+        // 体征转换
+        NursingVitalSignsDto nursingVitalSigns =
+            JSONObject.parseObject(nursingRecordDto.getContextJson(), NursingVitalSignsDto.class);
+        // 体温
+        String tw = nursingVitalSigns.getTw();
+        // 脉搏
+        String mb = nursingVitalSigns.getMb();
+        // 呼吸
+        String hx = nursingVitalSigns.getHx();
+
+        if (tw != null && tw.length() > 0) {
+            // 体征表保存或更新（体温）
+            VitalSigns vitalSigns = new VitalSigns();
+            vitalSigns.setPatientId(nursingRecordDto.getPatientId()).setEncounterId(nursingRecordDto.getEncounterId())
+                .setRecordingDate(nursingRecordDto.getRecordingTime()).setTimePoint(nursingRecordDto.getRecordingTime())
+                .setRecorder(practitioner.getName()).setVitalSignsCode("007").setVitalSignsValues(tw);
+            vitalSignsService.saveOrUpdateVitalSigns(vitalSigns);
+        } else {
+            // 体温未录入时，体征表之前存储的体温数据删除
+            VitalSigns vitalSigns = new VitalSigns();
+            vitalSigns.setEncounterId(nursingRecordDto.getEncounterId())
+                .setTimePoint(nursingRecordDto.getRecordingTime()).setVitalSignsCode("007");
+            vitalSignsService.deleteVitalSigns(vitalSigns);
+        }
+        if (mb != null && mb.length() > 0) {
+            // 体征表保存或更新（脉搏）
+            VitalSigns vitalSigns = new VitalSigns();
+            vitalSigns.setPatientId(nursingRecordDto.getPatientId()).setEncounterId(nursingRecordDto.getEncounterId())
+                .setRecordingDate(nursingRecordDto.getRecordingTime()).setTimePoint(nursingRecordDto.getRecordingTime())
+                .setRecorder(practitioner.getName()).setVitalSignsCode("003").setVitalSignsValues(mb);
+            vitalSignsService.saveOrUpdateVitalSigns(vitalSigns);
+        } else {
+            // 脉搏未录入时，体征表之前存储的脉搏数据删除
+            VitalSigns vitalSigns = new VitalSigns();
+            vitalSigns.setEncounterId(nursingRecordDto.getEncounterId())
+                .setTimePoint(nursingRecordDto.getRecordingTime()).setVitalSignsCode("003");
+            vitalSignsService.deleteVitalSigns(vitalSigns);
+        }
+        if (hx != null && hx.length() > 0) {
+            // 体征表保存或更新（呼吸）
+            VitalSigns vitalSigns = new VitalSigns();
+            vitalSigns.setPatientId(nursingRecordDto.getPatientId()).setEncounterId(nursingRecordDto.getEncounterId())
+                .setRecordingDate(nursingRecordDto.getRecordingTime()).setTimePoint(nursingRecordDto.getRecordingTime())
+                .setRecorder(practitioner.getName()).setVitalSignsCode("006").setVitalSignsValues(hx);
+            vitalSignsService.saveOrUpdateVitalSigns(vitalSigns);
+        } else {
+            // 呼吸未录入时，体征表之前存储的呼吸数据删除
+            VitalSigns vitalSigns = new VitalSigns();
+            vitalSigns.setEncounterId(nursingRecordDto.getEncounterId())
+                .setTimePoint(nursingRecordDto.getRecordingTime()).setVitalSignsCode("006");
+            vitalSignsService.deleteVitalSigns(vitalSigns);
+        }
+    }
+
+    /**
+     * 删除护理记录单
+     *
+     * @param recordList 记录单list
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> delRecord(List<NursingRecordDto> recordList) {
+
+        for (NursingRecordDto record : recordList) {
+            // 病历（记录单）删除
+            emrService.removeById(record.getRecordId());
+            // 查询在体征表中是否存在数据
+            LambdaQueryWrapper<VitalSigns> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(VitalSigns::getEncounterId, record.getEncounterId())
+                .eq(VitalSigns::getPatientId, record.getPatientId())
+                .eq(VitalSigns::getTimePoint, record.getRecordingTime());
+            List<VitalSigns> vitalSignsList = vitalSignsService.list(queryWrapper);
+            // 存在的场合删除记录
+            if (vitalSignsList.size() != 0) {
+                // 获取生命体征管理ID的List
+                List<Long> vitalSignsIdList =
+                    vitalSignsList.stream().map(VitalSigns::getId).collect(Collectors.toList());
+                // 删除记录
+                vitalSignsService.removeByIds(vitalSignsIdList);
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 获取电子病历模板列表 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 电子病历模板信息
+     */
+    @Override
+    public R<?> getEmrTemplate(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<NursingSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(nursingSearchParam, searchKey,
+            new HashSet<>(Arrays.asList("template_name")), request);
+
+        // 分页查询,查询电子病历模板信息
+        IPage<NursingEmrTemplateDto> emrTemplatePage =
+            nursingRecordAppMapper.getEmrTemplate(new Page<>(pageNo, pageSize), "1", queryWrapper);
+
+        // 返回【电子病历模板】分页
+        return R.ok(emrTemplatePage);
+    }
+
+    /**
+     * 保存病历模板
+     *
+     * @param emrTemplateDto 病历模板信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> saveEmrTemplate(NursingEmrTemplateDto emrTemplateDto) {
+
+        EmrTemplate emrTemplate = new EmrTemplate();
+        // 保存病历模板信息
+        emrTemplate.setTemplateName(emrTemplateDto.getTemplateName()).setTemplateTypeCode("1")
+            .setUseScopeCode(emrTemplateDto.getUseScopeCode()).setUserId(emrTemplateDto.getUserId())
+            .setContextJson(emrTemplateDto.getContextJson());
+
+        return emrTemplateService.save(emrTemplate) ? R.ok() : R.fail();
+    }
+
+    /**
+     * 删除病历模板
+     *
+     * @param idList 模板id
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deleteEmrTemplate(List<Long> idList) {
+        return emrTemplateService.removeByIds(idList) ? R.ok() : R.fail();
+    }
+
+    /**
+     * 编辑病历模板
+     *
+     * @param emrTemplateDto 病历模板信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> updateEmrTemplate(NursingEmrTemplateDto emrTemplateDto) {
+
+        EmrTemplate emrTemplate = new EmrTemplate();
+        // 病历模板信息更新
+        emrTemplate.setId(emrTemplateDto.getId()).setTemplateName(emrTemplateDto.getTemplateName())
+            .setTemplateTypeCode("1").setUseScopeCode(emrTemplateDto.getUseScopeCode())
+            .setUserId(emrTemplateDto.getUserId()).setContextJson(emrTemplateDto.getContextJson());
+
+        return emrTemplateService.updateById(emrTemplate) ? R.ok() : R.fail();
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
new file mode 100644
index 00000000..96c13036
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
@@ -0,0 +1,288 @@
+package com.openhis.web.inpatientmanage.appservice.impl;
+
+import java.util.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.domain.EncounterLocation;
+import com.openhis.administration.domain.Organization;
+import com.openhis.administration.service.IEncounterLocationService;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.PriorityType;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.chargemanage.dto.OrgMetadata;
+import com.openhis.web.inpatientmanage.appservice.IPatientHomeAppService;
+import com.openhis.web.inpatientmanage.dto.PatientHomeDto;
+import com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto;
+import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam;
+import com.openhis.web.inpatientmanage.mapper.PatientHomeAppMapper;
+
+/**
+ * 患者首页 实现类
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+@Service
+public class PatientHomeAppServiceImpl implements IPatientHomeAppService {
+
+    @Resource
+    private PatientHomeAppMapper patientHomeAppMapper;
+
+    @Resource
+    private ILocationService locationService;
+
+    @Resource
+    private IEncounterLocationService encounterLocationService;
+
+    @Resource
+    private IOrganizationService iOrganizationService;
+
+    @Resource
+    private IEncounterService encounterService;
+
+    /**
+     * 患者首页信息初期数据列表
+     *
+     * @return 患者首页初期数据列表
+     */
+    @Override
+    public R<?> getPatientInfoInit(PatientHomeSearchParam patientHomeSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<PatientHomeDto> queryWrapper = HisQueryUtils.buildQueryWrapper(patientHomeSearchParam, searchKey,
+            new HashSet<>(Arrays.asList("inpatientNumber", "name", "responsibleDoctor", "responsibleNurse")), request);
+
+        // 分页查询,查询患者信息
+        IPage<PatientHomeDto> patientHomeInfoPage = patientHomeAppMapper.getPage(new Page<>(pageNo, pageSize),
+            patientHomeSearchParam.getStatusEnum(), patientHomeSearchParam.getPatientId(), searchKey, queryWrapper);
+
+        patientHomeInfoPage.getRecords().forEach(e -> {
+            // 护理级别
+            e.setPriorityEnum_enumText(EnumUtils.getInfoByValue(PriorityType.class, e.getPriorityEnum()));
+            // 费别
+            e.setTypeCode_dictText(EnumUtils.getInfoByValue(AccountType.class, e.getTypeCode()));
+            // 血型ABO
+            e.setBloodAbo_enumText(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo()));
+            // 血型RH
+            e.setBloodRh_enumText(EnumUtils.getInfoByValue(BloodTypeRH.class, e.getBloodRh()));
+            // 患者状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(EncounterStatus.class, e.getStatusEnum()));
+            // 职业
+            e.setPrfsEnum_enumText(EnumUtils.getInfoByValue(OccupationType.class, e.getPrfsEnum()));
+            // 联系人关系
+            e.setLinkRelationCode_codeText(
+                EnumUtils.getInfoByValue(FamilyRelationshipType.class, e.getLinkRelationCode()));
+            // 婚姻状态
+            e.setMaritalStatusEnum_enumText(EnumUtils.getInfoByValue(MaritalStatus.class, e.getMaritalStatusEnum()));
+            // 就诊类别
+            e.setClassEnum_enumText(EnumUtils.getInfoByValue(EncounterClass.class, e.getClassEnum()));
+            // 性别枚举类回显赋值
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            // 计算住院天数
+            if (e.getClassEnum() == EncounterClass.IMP.getValue()) {
+                // 截至时间,用于计算当前时刻下显示的住院天数
+                if (e.getAdmissionDate() != null) {
+                    Date endTime;
+                    if (e.getDischargeDate() == null) {
+                        endTime = DateUtils.getNowDate();
+                    } else {
+                        endTime = e.getDischargeDate();
+                    }
+
+                    int days = DateUtils.differentDaysByMillisecond(e.getAdmissionDate(), endTime);
+                    e.setHospitalizationDays(days);
+                }
+            }
+            // 手术状态
+            e.setSurgeryStatusEnum_enumText(EnumUtils.getInfoByValue(EventStatus.class, e.getSurgeryStatusEnum()));
+            // 计算术后天数
+            if (e.getSurgeryStatusEnum() == EventStatus.COMPLETED.getValue()) {
+                // 截至时间,用于计算当前时刻下显示的术后天数
+                if (e.getSurgeryStartTime() != null && e.getSurgeryEndTime() != null) {
+                    Date endTime = e.getSurgeryEndTime();
+                    int days = DateUtils.differentDaysByMillisecond(endTime, DateUtils.getNowDate());
+                    e.setPostoperativeDays(days);
+                }
+            }
+
+        });
+
+        // 返回【患者信息列表DTO】分页
+        return R.ok(patientHomeInfoPage);
+
+    }
+
+    /**
+     * 空床详细查询
+     *
+     * @param organizationId 科室ID
+     * @return 空床详细查询
+     */
+    @Override
+    public R<?> getEmptyBed(Long organizationId) {
+        // 查询科室空床
+        List<PatientHomeEmptyBedDto> emptyBedList = patientHomeAppMapper.getEmptyBedList(organizationId);
+
+        return R.ok(emptyBedList);
+
+    }
+
+    /**
+     * 转床确认
+     *
+     * @param encounterLocationId 就诊位置ID
+     * @param encounterId 就诊ID
+     * @param oldLocationId 旧位置ID
+     * @param newLocationId 新位置ID
+     * @return 转床结果
+     */
+    @Override
+    public R<?> saveBedTransfer(Long encounterLocationId, Long encounterId, Long oldLocationId, Long newLocationId) {
+
+        // 1.就诊位置ID变更
+        EncounterLocation encounterLocation = new EncounterLocation();
+        encounterLocation.setId(encounterLocationId)
+            // 设置就诊ID
+            .setEncounterId(encounterId)
+            // 设置位置ID
+            .setLocationId(newLocationId)
+            // 设置物理枚举为 8:病床
+            .setFormEnum(LocationForm.BED.getValue())
+            // 状态为使用中
+            .setStatusEnum(EncounterLocationStatus.ACTIVE.getValue());
+        encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);
+
+        // 2.位置表
+        // 旧病床状态变更（空闲）
+        locationService.updateStatusById(oldLocationId, LocationBedStatus.U.getValue());
+
+        // 新病床状态变更（占用）
+        locationService.updateStatusById(newLocationId, LocationBedStatus.O.getValue());
+        // 转床结果
+        return R.ok(null);
+    }
+
+    /**
+     * 科室信息
+     *
+     * @return 科室列表
+     */
+    @Override
+    public List<OrgMetadata> getCaty() {
+        List<Organization> list = iOrganizationService.getList(OrganizationType.DEPARTMENT.getValue(),
+            OrganizationClass.INPATIENT.getValue());
+        List<OrgMetadata> orgMetadataList = new ArrayList<>();
+        OrgMetadata orgMetadata;
+        for (Organization organization : list) {
+            orgMetadata = new OrgMetadata();
+            BeanUtils.copyProperties(organization, orgMetadata);
+            orgMetadataList.add(orgMetadata);
+        }
+        return orgMetadataList;
+    }
+
+    /**
+     * 转科确认
+     *
+     * @param encounterId 就诊ID
+     * @param organizationId 机构ID
+     * @return 转科结果
+     */
+    @Override
+    public R<?> saveDepartmentTransfer(Long encounterLocationId, Long patientId, Long encounterId, Long organizationId,
+        Date DepartmentTransferYmd) {
+
+        boolean encounterSuccess;
+        // 1.就诊管理表变更
+        // 科室变更
+        Encounter encounter = new Encounter();
+        // 就诊ID
+        encounter.setId(encounterId)
+            // 患者ID
+            .setPatientId(patientId)
+            // 机构ID
+            .setOrganizationId(organizationId);
+
+        encounterService.saveOrUpdateEncounter(encounter);
+
+        // 2.就诊位置表变更
+        // 就诊位置ID变更
+        EncounterLocation encounterLocation = new EncounterLocation();
+        encounterLocation.setId(encounterLocationId)
+            // 设置就诊ID
+            .setEncounterId(encounterId)
+            // 设置开始时间
+            .setStartTime(DepartmentTransferYmd)
+            // 设置物理枚举为 8:病床
+            .setFormEnum(LocationForm.BED.getValue());
+        encounterSuccess = encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);
+
+        // 转床结果
+        return R.ok(encounterSuccess);
+    }
+
+    /**
+     * 出院确认
+     *
+     * @param patientId 患者ID
+     * @param encounterId 就诊ID
+     * @return 转科结果
+     */
+    @Override
+    public R<?> saveDischargeHospital(Long encounterLocationId, Long patientId, Long encounterId, Long locationId,
+        Date DischargeHospitalYmd) {
+
+        // 出院
+        boolean encounterSuccess;
+        // 1.就诊管理表
+        Encounter encounter = new Encounter();
+        // 就诊ID
+        encounter.setId(encounterId)
+            // 患者ID
+            .setPatientId(patientId)
+            // 状态编码
+            .setStatusEnum(EncounterStatus.COMPLETED.getValue())
+            // 结束时间
+            .setEndTime(DischargeHospitalYmd);
+
+        encounterService.saveOrUpdateEncounter(encounter);
+
+        // 2.就诊位置表变更
+        // 就诊位置ID变更
+        EncounterLocation encounterLocation = new EncounterLocation();
+        encounterLocation.setId(encounterLocationId)
+            // 设置就诊ID
+            .setEncounterId(encounterId)
+            // 设置状态枚举
+            .setStatusEnum(EncounterLocationStatus.COMPLETED.getValue())
+            // 设置物理枚举为 8:病床
+            .setFormEnum(LocationForm.BED.getValue());
+        encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);
+
+        // 3.位置表
+        // 旧病床状态变更（空闲）
+        encounterSuccess = locationService.updateStatusById(locationId, LocationBedStatus.U.getValue());
+
+        // 转床结果
+        return R.ok(encounterSuccess);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
new file mode 100644
index 00000000..cceb5a18
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
@@ -0,0 +1,472 @@
+package com.openhis.web.inpatientmanage.appservice.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.function.BiConsumer;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.core.domain.entity.SysUser;
+import com.core.common.core.domain.model.LoginUser;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.TimeUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.EncounterClass;
+import com.openhis.common.enums.EventStatus;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.document.domain.VitalSigns;
+import com.openhis.document.service.IVitalSignsService;
+import com.openhis.web.inpatientmanage.appservice.IVitalSignsAppService;
+import com.openhis.web.inpatientmanage.dto.*;
+import com.openhis.web.inpatientmanage.mapper.VitalSignsAppMapper;
+
+/**
+ * 三测单 实现类
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Service
+public class VitalSignsAppServiceImpl implements IVitalSignsAppService {
+
+    @Resource
+    private VitalSignsAppMapper vitalSignsAppMapper;
+
+    @Resource
+    private IVitalSignsService vitalSignsService;
+
+    /**
+     * 三测单-患者信息查询
+     *
+     * @return 三测单-患者信息数据列表
+     */
+    @Override
+    public R<?> getVitalSignsInfo(VitalSignsSearchParam vitalSignsSearchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<VitalSignsDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(vitalSignsSearchParam, searchKey, new HashSet<>(), request);
+
+        // 分页查询,查询患者信息
+        IPage<VitalSignsDto> vitalSignsInfoPage = vitalSignsAppMapper.getVitalSignsInfo(new Page<>(pageNo, pageSize),
+            vitalSignsSearchParam.getPatientId(), searchKey, queryWrapper);
+
+        VitalSignsMedicalRecordDto medicalRecord = new VitalSignsMedicalRecordDto();
+
+        // 处理日期
+        if (!vitalSignsInfoPage.getRecords().isEmpty()) {
+            medicalRecord.setHospDate(vitalSignsInfoPage.getRecords().get(0).getRecordingDate());
+        }
+
+        // 处理生命体征数据
+        Map<Integer, VitalSignsTemperaturePulsesDto> groupMap = new HashMap<>();
+        List<VitalSignsDto> vitalSignsInfoPageList = vitalSignsInfoPage.getRecords();
+
+        vitalSignsInfoPageList.forEach(item -> {
+
+            // 就诊类别
+            item.setClassEnum_enumText(EnumUtils.getInfoByValue(EncounterClass.class, item.getClassEnum()));
+
+            // 手术状态
+            item.setSurgeryStatusEnum_enumText(
+                EnumUtils.getInfoByValue(EventStatus.class, item.getSurgeryStatusEnum()));
+
+            // 计算完整周数
+            if (item.getClassEnum() == EncounterClass.IMP.getValue()) {
+                // 转换为 LocalDate 进行日期计算
+                LocalDate admissionDate = TimeUtils.dateToLocalDate(item.getAdmissionDate());
+                LocalDate recordingDate = TimeUtils.dateToLocalDate(item.getRecordingDate());
+
+                // 计算天数差
+                long dayDiff = ChronoUnit.DAYS.between(admissionDate, recordingDate);
+                int hospitalizationDays = (int)(dayDiff + 1);
+                item.setHospitalizationDays(hospitalizationDays);
+
+                // 计算周数（向上取整）
+                int weekNo = (hospitalizationDays + 6) / 7;
+                item.setWeekNo(weekNo);
+            }
+
+            // 计算术后天数
+            // 手术已完成的患者
+            if (item.getSurgeryStatusEnum() == EventStatus.COMPLETED.getValue()) {
+                if (item.getSurgeryStartTime() != null && item.getSurgeryEndTime() != null) {
+                    // 手术结束时间的类型转换
+                    LocalDate endTime = TimeUtils.dateToLocalDate(item.getSurgeryEndTime());
+                    // 记录日期的类型转换
+                    LocalDate recordingtime = TimeUtils.dateToLocalDate(item.getRecordingDate());
+                    // 术后天数计算
+                    int surgeryDays = (int)ChronoUnit.DAYS.between(endTime, recordingtime);
+                    // 设置术后天数
+                    item.setPostoperativeDays(surgeryDays);
+                }
+            }
+            Integer weekNo = item.getWeekNo();
+            VitalSignsTemperaturePulsesDto group = groupMap.computeIfAbsent(weekNo, k -> {
+                VitalSignsTemperaturePulsesDto newGroup = new VitalSignsTemperaturePulsesDto();
+                newGroup.setWeekNo(weekNo);
+                return newGroup;
+            });
+
+            // 格式化时间
+            Date recordingDate = item.getRecordingDate();
+            String dateStr = TimeUtils.dateToDateString(recordingDate);
+            Date timePoint = item.getTimePoint();
+            String timeStr = TimeUtils.dateToTimeString(timePoint);
+
+            // 体温单列表做成
+            VitalSignsChartSmallDto chartSmall = new VitalSignsChartSmallDto();
+            chartSmall.setCollectionMode(2);
+            chartSmall.setDate(dateStr);
+            chartSmall.setTimes(timeStr);
+            chartSmall.setTypeCode(item.getVitalSignsCode());
+            chartSmall.setTypeValue(item.getVitalSignsValues());
+            chartSmall.setWeekNo(weekNo);
+            chartSmall.setPostoperativeDays(item.getPostoperativeDays());
+            group.getChartsSmalls().add(chartSmall);
+            group.setWeekNo(weekNo);
+        });
+
+        medicalRecord.setTemperaturePulses(new ArrayList<>(groupMap.values()));
+
+        // 返回【患者信息列表DTO】分页
+        return R.ok(medicalRecord);
+    }
+
+    /**
+     * 体温单记录保存
+     *
+     * @param vitalSignsSaveDto 患者体征信息
+     * @return 保存结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> saveVitalSigns(VitalSignsSaveDto vitalSignsSaveDto) {
+        // 参数校验
+        if (vitalSignsSaveDto == null) {
+            return R.fail("生命体征记录不能为空");
+        }
+
+        // 获取当前登录用户
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser == null) {
+            return R.fail("未获取到登录用户信息");
+        }
+        SysUser user = loginUser.getUser();
+        List<VitalSigns> vitalSignsList = new ArrayList<>();
+
+        // 解析时间点
+        LocalTime timePoint = TimeUtils.parseTime(vitalSignsSaveDto.getTimePoint());
+        if (timePoint == null) {
+            return R.fail("时间格式解析失败");
+        }
+
+        // 创建基础生命体征记录
+        VitalSigns baseRecord = new VitalSigns();
+        baseRecord.setPatientId(vitalSignsSaveDto.getPatientId()).setEncounterId(vitalSignsSaveDto.getEncounterId())
+            .setRecordingDate(vitalSignsSaveDto.getRecordingDate()).setTimePoint(TimeUtils.localTimeToDate(timePoint))
+            .setLocationId(vitalSignsSaveDto.getLocationId()).setRecorder(user.getUserName())
+            .setRemake(vitalSignsSaveDto.getRemake());
+
+        // 使用反射获取所有生命体征字段
+        Field[] fields = VitalSignsSaveDto.class.getDeclaredFields();
+        for (Field field : fields) {
+            // 通过注解判断是否为生命体征字段
+            VitalSignsField vitalSignsField = field.getAnnotation(VitalSignsField.class);
+            if (vitalSignsField == null) {
+                continue; // 跳过非生命体征字段
+            }
+
+            // 设置字段可访问
+            field.setAccessible(true);
+
+            try {
+                // 获取字段值
+                Object fieldValue = field.get(vitalSignsSaveDto);
+                if (fieldValue == null) {
+                    continue; // 跳过null值
+                }
+
+                String value;
+                if (fieldValue instanceof String) {
+                    value = (String)fieldValue;
+                    if (value.trim().isEmpty()) {
+                        continue; // 跳过空字符串
+                    }
+                } else {
+                    value = fieldValue.toString(); // 其他类型转换为字符串
+                }
+
+                // 校验生命体征编码
+                String code = vitalSignsField.code();
+                if (code == null || code.isEmpty()) {
+                    continue;
+                }
+
+                // 获取单位
+                String unit = vitalSignsField.unit();
+                if (unit == null || unit.isEmpty()) {
+                    continue;
+                }
+
+                // 构建生命体征记录
+                VitalSigns record = cloneVitalSignsRecord(baseRecord);
+                record.setVitalSignsCode(code);
+                record.setVitalSignsValues(value);
+                record.setUnits(unit);
+
+                vitalSignsList.add(record);
+
+            } catch (IllegalAccessException | ClassCastException e) {
+                return R.fail("生命体征数据格式错误");
+            }
+        }
+
+        if (vitalSignsList.isEmpty()) {
+            return R.fail("未检测到有效的生命体征数据");
+        }
+
+        // 检查记录是否已存在
+        boolean existingRecordCount = vitalSignsService.selectBatchVitalSigns(vitalSignsList);
+
+        // 存在
+        if (existingRecordCount) {
+            // 原纪录删除
+            vitalSignsAppMapper.deleteVitalSigns(vitalSignsList.get(0).getPatientId(),
+                vitalSignsList.get(0).getEncounterId(), vitalSignsList.get(0).getRecordingDate(),
+                vitalSignsList.get(0).getTimePoint());
+        }
+        boolean saveResult = vitalSignsService.saveOrUpdateBatchVitalSigns(vitalSignsList);
+
+        return saveResult ? R.ok("保存成功") : R.fail("保存失败");
+    }
+
+    /**
+     * 患者体温单检索
+     *
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 检索结果
+     */
+    @Override
+    public R<?> searchVitalSigns(String startTime, String endTime) {
+
+        // 基本信息查询
+        List<VitalSigns> vitalSignsList = vitalSignsAppMapper.searchVitalSigns(startTime, endTime);
+        // 判断查询结果是否为空
+        if (vitalSignsList.isEmpty()) {
+            return R.ok(Collections.emptyList());
+        }
+
+        // 创建属性映射表
+        Map<String, BiConsumer<VitalSignSearchRecordDto, String>> propertySetterMap =
+            createPropertySetterMapUsingReflection();
+
+        // 按日期时间分组处理数据
+        List<VitalSignSearchRecordDto> resultList = new ArrayList<>();
+        VitalSignSearchRecordDto currentRecord = null;
+        String currentDateTimeKey = null;
+
+        for (VitalSigns item : vitalSignsList) {
+            // 生成日期时间键
+            String dateStr = TimeUtils.dateToDateString(item.getRecordingDate());
+            String timeStr = TimeUtils.dateToTimeString(item.getTimePoint());
+            String dateTimeKey = dateStr + " " + timeStr;
+
+            // 如果日期时间变化，创建新记录
+            if (!dateTimeKey.equals(currentDateTimeKey)) {
+                if (currentRecord != null && isRecordValid(currentRecord)) {
+                    resultList.add(currentRecord);
+                }
+                currentRecord = new VitalSignSearchRecordDto();
+                currentDateTimeKey = dateTimeKey;
+
+                // 设置日期时间
+                currentRecord.setRecordingDate(dateStr);
+                currentRecord.setTimePoint(timeStr);
+            }
+
+            // 获取代码对应的字段
+            String fieldName =
+                AnnotationConverter.getFieldNameByCode(VitalSignSearchRecordDto.class, item.getVitalSignsCode());
+            // 设置生命体征值
+            BiConsumer<VitalSignSearchRecordDto, String> setter = propertySetterMap.get(fieldName);
+            if (setter != null) {
+                setter.accept(currentRecord, item.getVitalSignsValues());
+            }
+        }
+
+        // 添加最后一条记录
+        if (currentRecord != null && isRecordValid(currentRecord)) {
+            resultList.add(currentRecord);
+        }
+
+        return R.ok(resultList);
+    }
+
+    /**
+     * 体温单记录删除
+     *
+     * @param vitalSignsDeleteDto 患者体征信息
+     * @return 删除结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> deleteVitalSigns(List<VitalSignsDeleteDto> vitalSignsDeleteDto) {
+
+        List<VitalSigns> vitalSignsList = new ArrayList<>();
+
+        for (VitalSignsDeleteDto deleteDto : vitalSignsDeleteDto) {
+
+            // 记录日期的格式化
+            LocalDateTime recordDateTime = TimeUtils.parseDateTime(deleteDto.getRecordingDate());
+            Date date = Date.from(recordDateTime.atZone(ZoneId.systemDefault()).toInstant());
+
+            // 记录时间的格式化
+            LocalDateTime timePoint =
+                TimeUtils.parseDateTime(deleteDto.getRecordingDate().substring(0, 11) + deleteDto.getTimePoint());
+            Date time = Date.from(timePoint.atZone(ZoneId.systemDefault()).toInstant());
+
+            VitalSigns vitalSigns = new VitalSigns();
+            // 设置患者ID
+            vitalSigns.setPatientId(deleteDto.getPatientId())
+                // 设置就诊ID
+                .setEncounterId(deleteDto.getEncounterId())
+                // 设置记录日期
+                .setRecordingDate(date)
+                // 设置记录时间
+                .setTimePoint(time);
+
+            vitalSignsList.add(vitalSigns);
+            // 确认删除的数据是否存在
+            boolean existingRecord = vitalSignsService.selectBatchVitalSigns(vitalSignsList);
+
+            // 数据不存在
+            if (!existingRecord) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
+            } else {
+                // 数据存在(删除记录)
+                vitalSignsAppMapper.deleteVitalSigns(deleteDto.getPatientId(), deleteDto.getEncounterId(), date, time);
+            }
+        }
+        return R.ok(null);
+    }
+
+    // 克隆生命体征记录对象
+    private VitalSigns cloneVitalSignsRecord(VitalSigns baseRecord) {
+        try {
+            // 序列化方式实现深拷贝
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(baseRecord);
+
+            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            ObjectInputStream ois = new ObjectInputStream(bais);
+            return (VitalSigns)ois.readObject();
+        } catch (Exception e) {
+            // 浅拷贝作为降级方案
+            VitalSigns record = new VitalSigns();
+            BeanUtils.copyProperties(baseRecord, record);
+            return record;
+        }
+    }
+
+    // 使用反射自动生成属性映射表
+    private Map<String, BiConsumer<VitalSignSearchRecordDto, String>> createPropertySetterMapUsingReflection() {
+        Map<String, BiConsumer<VitalSignSearchRecordDto, String>> map = new HashMap<>();
+
+        // 获取所有方法
+        Method[] methods = VitalSignSearchRecordDto.class.getMethods();
+
+        // 遍历方法，筛选出符合条件的setter
+        for (Method method : methods) {
+            String methodName = method.getName();
+
+            // 判断是否为setter方法：以"set"开头，有一个参数
+            if (methodName.startsWith("set") && method.getParameterCount() == 1) {
+                // 获取属性名
+                String propertyName = methodName.substring(3); // 去掉"set"前缀
+                if (propertyName.length() > 0) {
+                    // 将属性名首字母小写
+                    propertyName = propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1);
+
+                    // 参数类型检查：确保参数类型是String或可以转换为String
+                    Class<?> paramType = method.getParameterTypes()[0];
+                    if (paramType == String.class) {
+                        // 使用方法引用创建BiConsumer
+                        BiConsumer<VitalSignSearchRecordDto, String> setter = (obj, value) -> {
+                            try {
+                                method.invoke(obj, value);
+                            } catch (Exception e) {
+                                throw new RuntimeException("设置属性值失败");
+                            }
+                        };
+
+                        map.put(propertyName, setter);
+                    }
+                }
+            }
+        }
+        return map;
+    }
+
+    // 转换工具类
+    public class AnnotationConverter {
+        // 根据代码查找对应的字段名
+        public static String getFieldNameByCode(Class<?> clazz, String code) {
+            for (Field field : clazz.getDeclaredFields()) {
+                VitalSignsField annotation = field.getAnnotation(VitalSignsField.class);
+                if (annotation != null && annotation.code().equals(code)) {
+                    return annotation.name();
+                }
+            }
+            return "未知代码";
+        }
+
+        // 根据字段名查找对应的代码
+        public static String getCodeByFieldName(Class<?> clazz, String fieldName) {
+            for (Field field : clazz.getDeclaredFields()) {
+                VitalSignsField annotation = field.getAnnotation(VitalSignsField.class);
+                if (annotation != null && annotation.name().equals(fieldName)) {
+                    return annotation.code();
+                }
+            }
+            return "未知名称";
+        }
+    }
+
+    // 有效性检查
+    private boolean isRecordValid(VitalSignSearchRecordDto record) {
+        // 检查所有可能的属性
+        return record.getSystolicPressure() != null || record.getDiastolicPressure() != null
+            || record.getTemperature() != null || record.getHeartRate() != null || record.getPulseRate() != null
+            || record.getBloodOxygen() != null || record.getBloodGlucose() != null
+            || record.getPhysicalCooling() != null || record.getCcuHeartRate() != null
+            || record.getNewbornsIncubator() != null || record.getBloodKetone() != null || record.getHeight() != null
+            || record.getWaistCircumference() != null || record.getStoolFrequency() != null
+            || record.getEnemaFrequency() != null || record.getSfAfterEnema() != null || record.getOutput() != null
+            || record.getInput() != null || record.getUrineVolume() != null || record.getStoolVolume() != null;
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/AdmissionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/AdmissionController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/AdmissionController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/AdmissionController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
index 91fd9216..c762c1b6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
@@ -3,7 +3,7 @@ package com.openhis.web.inpatientmanage.controller;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.web.paymentmanage.dto.PaymentDto;
+import com.openhis.yb.dto.PaymentDto;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
new file mode 100644
index 00000000..b7a36c17
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
@@ -0,0 +1,149 @@
+package com.openhis.web.inpatientmanage.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inpatientmanage.appservice.INursingRecordAppService;
+import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto;
+import com.openhis.web.inpatientmanage.dto.NursingRecordDto;
+import com.openhis.web.inpatientmanage.dto.NursingSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 护理记录单 controller
+ *
+ * @author gyy
+ * @date 2025-05-30
+ */
+@RestController
+@RequestMapping("/nursing-record")
+@Slf4j
+public class NursingRecordController {
+
+    @Resource
+    private INursingRecordAppService nursingRecordAppService;
+
+    /**
+     * 获取住院患者信息 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者信息
+     */
+    @GetMapping("/patient-page")
+    public R<?> getPatientInfoPage(NursingSearchParam nursingSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+
+        return nursingRecordAppService.getPatientInfoPage(nursingSearchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 获取患者护理记录单信息 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者护理记录单信息
+     */
+    @GetMapping("/nursing-patient-page")
+    public R<?> getNursingPatientPage(NursingSearchParam nursingSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+
+        return nursingRecordAppService.getNursingPatientPage(nursingSearchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 保存护理记录单
+     *
+     * @param nursingRecordDto 护理记录实体
+     */
+    @PostMapping("/save-nursing")
+    public R<?> saveRecord(@Validated @RequestBody NursingRecordDto nursingRecordDto) {
+        return nursingRecordAppService.saveRecord(nursingRecordDto);
+    }
+
+    /**
+     * 编辑护理记录单
+     *
+     * @param nursingRecordDto 护理记录实体
+     */
+    @PostMapping("/update-nursing")
+    public R<?> updateRecord(@Validated @RequestBody NursingRecordDto nursingRecordDto) {
+        return nursingRecordAppService.updateRecord(nursingRecordDto);
+    }
+
+    /**
+     * 删除护理记录单
+     *
+     * @param recordList 记录单List
+     */
+    @PostMapping("/delete-nursing")
+    public R<?> delRecord(@Validated @RequestBody List<NursingRecordDto> recordList) {
+        return nursingRecordAppService.delRecord(recordList);
+    }
+
+    /**
+     * 获取电子病历模板列表 分页显示
+     *
+     * @param nursingSearchParam 查询参数
+     * @param searchKey 模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 患者护理记录单信息
+     */
+    @GetMapping("/emr-template-page")
+    public R<?> getEmrTemplate(NursingSearchParam nursingSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+
+        return nursingRecordAppService.getEmrTemplate(nursingSearchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 保存病历模板
+     *
+     * @param emrTemplateDto 病历模板信息
+     */
+    @PostMapping("/emr-template-save")
+    public R<?> saveEmrTemplate(@Validated @RequestBody NursingEmrTemplateDto emrTemplateDto) {
+        return nursingRecordAppService.saveEmrTemplate(emrTemplateDto);
+    }
+
+    /**
+     * 删除病历模板
+     *
+     * @param idList 模板id
+     * @return 操作结果
+     */
+    @PostMapping("/emr-template-del")
+    public R<?> deleteEmrTemplate(@Validated @RequestBody List<Long> idList) {
+        return nursingRecordAppService.deleteEmrTemplate(idList);
+    }
+
+    /**
+     * 编辑病历模板
+     *
+     * @param emrTemplateDto 病历模板信息
+     * @return 操作结果
+     */
+    @PostMapping("/emr-template-update")
+    public R<?> updateEmrTemplate(@Validated @RequestBody NursingEmrTemplateDto emrTemplateDto) {
+        return nursingRecordAppService.updateEmrTemplate(emrTemplateDto);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java
new file mode 100644
index 00000000..0d626995
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java
@@ -0,0 +1,100 @@
+package com.openhis.web.inpatientmanage.controller;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inpatientmanage.appservice.IPatientHomeAppService;
+import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 患者首页 应用实现
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+@RestController
+@RequestMapping("/patient-home-manage")
+@Slf4j
+@AllArgsConstructor
+public class PatientHomeController {
+
+    @Resource
+    private IPatientHomeAppService patientHomeAppService;
+
+    /**
+     * 获取患者首页信息初期数据列表
+     *
+     * @return 患者首页初期数据列表
+     */
+    @GetMapping("/init")
+    public R<?> getPatientInfoInit(PatientHomeSearchParam patientHomeSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return patientHomeAppService.getPatientInfoInit(patientHomeSearchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 患者首页-病区的空病床信息
+     *
+     * @return 空病床列表
+     */
+    @GetMapping("/empty-bed")
+    public R<?> getEmptyBed(Long organizationId) {
+        return patientHomeAppService.getEmptyBed(organizationId);
+    }
+
+    /**
+     * 患者首页-转床保存
+     *
+     * @return 转床结果
+     */
+    @PutMapping("/bed-transfer")
+    public R<?> saveBedTransfer(Long encounterLocationId, Long encounterId, Long oldLocationId, Long newLocationId) {
+        return R
+            .ok(patientHomeAppService.saveBedTransfer(encounterLocationId, encounterId, oldLocationId, newLocationId));
+    }
+
+    /**
+     * 患者首页-科室信息
+     *
+     * @return 科室列表
+     */
+    @GetMapping("/caty")
+    public R<?> getCaty() {
+        return R.ok(patientHomeAppService.getCaty());
+    }
+
+    /**
+     * 患者首页-转科保存
+     *
+     * @return 转科结果
+     */
+    @PutMapping("/department-transfer")
+    public R<?> saveDepartmentTransfer(Long encounterLocationId, Long patientId, Long encounterId, Long organizationId,
+        @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date DepartmentTransferYmd) {
+        return R.ok(patientHomeAppService.saveDepartmentTransfer(encounterLocationId, patientId, encounterId,
+            organizationId, DepartmentTransferYmd));
+    }
+
+    /**
+     * 患者首页-出院信息
+     *
+     * @return 出院原因列表
+     */
+    @PutMapping("/discharge-from-hospital")
+    public R<?> saveDischargeHospital(Long encounterLocationId, Long patientId, Long encounterId, Long locationId,
+        @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date DischargeHospitalYmd) {
+        return R.ok(patientHomeAppService.saveDischargeHospital(encounterLocationId, patientId, encounterId, locationId,
+            DischargeHospitalYmd));
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java
new file mode 100644
index 00000000..ec39d9c3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java
@@ -0,0 +1,77 @@
+package com.openhis.web.inpatientmanage.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inpatientmanage.appservice.IVitalSignsAppService;
+import com.openhis.web.inpatientmanage.dto.VitalSignsDeleteDto;
+import com.openhis.web.inpatientmanage.dto.VitalSignsSaveDto;
+import com.openhis.web.inpatientmanage.dto.VitalSignsSearchParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 三测单 应用实现
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@RestController
+@RequestMapping("/vital-signs")
+@Slf4j
+@AllArgsConstructor
+public class VitalSignsController {
+
+    @Resource
+    private IVitalSignsAppService vitalSignsAppService;
+
+    /**
+     * 获取三测单-患者信息数据列表
+     *
+     * @return 患者信息数据列表
+     */
+    @GetMapping("/patient-message")
+    public R<?> getVitalSignsInfo(VitalSignsSearchParam vitalSignsSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "50") Integer pageSize, HttpServletRequest request) {
+        return vitalSignsAppService.getVitalSignsInfo(vitalSignsSearchParam, searchKey, pageNo, pageSize, request);
+    }
+
+    /**
+     * 体温单记录保存
+     *
+     * @return 体温单记录保存结果
+     */
+    @PutMapping("/record-saving")
+    public R<?> saveVitalSigns(@RequestBody VitalSignsSaveDto vitalSignsSaveDto) {
+        return R.ok(vitalSignsAppService.saveVitalSigns(vitalSignsSaveDto));
+    }
+
+    /**
+     * 体温单检索
+     *
+     * @return 体温单检索结果
+     */
+    @GetMapping("/record-search")
+    public R<?> searchVitalSigns(String startTime, String endTime) {
+        return R.ok(vitalSignsAppService.searchVitalSigns(startTime, endTime));
+    }
+
+    /**
+     * 体温单记录删除
+     *
+     * @return 体温单记录修改结果
+     */
+    @PutMapping("/record-delete")
+    public R<?> deleteVitalSigns(@RequestBody List<VitalSignsDeleteDto> vitalSignsDeleteDto) {
+        return R.ok(vitalSignsAppService.deleteVitalSigns(vitalSignsDeleteDto));
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionUpDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionUpDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionUpDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PrePaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java
similarity index 45%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PrePaymentDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java
index 8288faf7..8c6b17c5 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PrePaymentDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java
@@ -1,45 +1,45 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.openhis.web.inpatientmanage.dto;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
- * 预结算入参
+ * 预交金付款入参
  *
- * @author SunJQ
- * @date 2025-05-08
+ * @author gaoyy
+ * @date 2025-05-26
  */
 @Data
 @Accessors(chain = true)
-public class PrePaymentDto {
-
-    /** 收款员 */
-    private Long entererId;
+public class DepositPaymentDto {
 
     /** 支付的患者ID */
     @NotNull
     private Long patientId;
 
+    /** 付款总额 */
+    private BigDecimal displayAmount;
+
     /** 就诊ID */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
-    /** 收费项 */
-    @NotEmpty
-    private List<Long> chargeItemIds;//
+    /** 支付类型 */
+    @NotNull
+    private Integer payEnum;
 
-    /**
-     * 类型 医保挂号时使用
-     */
-    private String ybMdtrtCertType;//社保卡/身份证/电子医保码
+    /** 金额 */
+    @NotNull
+    private BigDecimal amount;
 
-    private String busiCardInfo;//社保卡号/身份证号/ecToken
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java
new file mode 100644
index 00000000..13a7f441
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java
@@ -0,0 +1,83 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院患者信息
+ *
+ * @author gaoyy
+ * @since 2025/05/30
+ */
+@Data
+@Accessors(chain = true)
+public class NursingDetailDto {
+
+    /** 就诊ID */
+    @NotNull(message = "就诊ID不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 患者ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /** 记录单ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long recordId;
+
+    /** 患者姓名 */
+    private String patientName;
+
+    /** 患者生日 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /** 患者年龄 */
+    private String ageString;
+
+    /** 记录人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    private Long recorderId;
+    private String recorderId_dictText;
+
+    /** 记录时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordingTime;
+
+    /** 病历信息 */
+    private String contextJson;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /** 入院日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date admissionDate;
+
+    /** 科室ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /** 床位号 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long bedLocationId;
+    private String bedLocationId_dictText;
+
+    /** 病区 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long wardLocationId;
+    private String wardLocationId_dictText;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java
new file mode 100644
index 00000000..c09b37a5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inpatientmanage.dto;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 病历模板Dto
+ *
+ * @author gaoyy
+ * @date 2025-06-06
+ */
+
+@Data
+@Accessors(chain = true)
+public class NursingEmrTemplateDto implements Serializable {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 模板名称 */
+    @NotBlank
+    private String templateName;
+
+    /** 模板类型 */
+    private String templateTypeCode;
+
+    /** 使用范围 */
+    @NotBlank
+    private String useScopeCode;
+
+    /** 使用范围文字 */
+    private String useScopeCodeText;
+
+    /** 个人/科室ID */
+    private Long userId;
+
+    /** 病历内容 */
+    private String contextJson;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
similarity index 46%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
index 4ae1ad2d..c4e910a0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/dto/BedForAdmissionDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
@@ -1,70 +1,70 @@
-package com.openhis.web.nursestation.dto;
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.Date;
 
 import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
-
 /**
- * 选床入科Dto
+ * 住院患者信息
  *
- * @author liuhr
- * @date 2025/4/14
+ * @author gaoyy
+ * @since 2025/05/30
  */
 @Data
 @Accessors(chain = true)
-public class BedForAdmissionDto {
+public class NursingPageDto {
 
     /** 就诊ID */
+    @NotNull(message = "就诊ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
+    private Long encounterId;
 
     /** 患者ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
-    /** 科室ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "科室ID不能为空")
-    private Long organizationId;
+    /** 患者姓名 */
+    private String patientName;
 
-    /** 病区ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "病区ID不能为空")
-    private Long wardLocationId;
+    /** 病历号 */
+    private String patientBusNo;
 
-    /** 病床ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "病床ID不能为空")
-    private Long bedLocationId;
+    /** 患者生日 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
 
-    /** 患者病情 */
-    private Integer priorityEnum;
+    /** 患者年龄 */
+    private String ageString;
 
-    /** 住院医生 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long attendingDoctorId;
+    /** 性别编码 */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
 
-    /** 主任医生 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long chiefDoctorId;
+    /** 入院日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date admissionDate;
 
-    /** 主治医生 */
+    /** 科室ID */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long principalDoctorId;
+    private Long orgId;
 
-    /** 责任护士 */
+    /** 床位号 */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long attenderId;
-
-    /** 入科时间 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long bedLocationId;
+    private String bedLocationId_dictText;
 
+    /** 病区 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long wardLocationId;
+    private String wardLocationId_dictText;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java
new file mode 100644
index 00000000..2f093743
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 护理记录单入参
+ *
+ * @author gaoyy
+ * @date 2025-05-30
+ */
+@Data
+@Accessors(chain = true)
+public class NursingRecordDto {
+
+    /** 记录单ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long recordId;
+
+    /** 就诊ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull
+    private Long encounterId;
+
+    /** 患者ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /** 记录时间 */
+    @NotNull
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordingTime;
+
+    /** 病历信息 */
+    private String contextJson;
+
+    /** 科室ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /** 是否同步到体温单 */
+    private Boolean vitalSignsSyncFlag;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java
new file mode 100644
index 00000000..9235f0e1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java
@@ -0,0 +1,26 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import lombok.Data;
+
+/**
+ * 护理记录单查询参数
+ *
+ * @author gaoyy
+ * @since 2025/05/30
+ */
+@Data
+public class NursingSearchParam {
+
+    /** 在院病区 */
+    private Long wardLocationId;
+
+    /** 床位号 */
+    private Long bedLocationId;
+
+    /** 科室ID */
+    private Long orgId;
+
+    /** 就诊ID */
+    private Long encounterId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java
new file mode 100644
index 00000000..848294fd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inpatientmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 护理记录单s生命体征转换
+ *
+ * @author gaoyy
+ * @date 2025-06-5
+ */
+@Data
+@Accessors(chain = true)
+public class NursingVitalSignsDto {
+
+    // 体温
+    private String tw;
+
+    // 脉搏
+    private String mb;
+
+    // 呼吸
+    private String hx;
+
+    // 无参构造函数
+    public NursingVitalSignsDto() {}
+
+    // getters 和 setters
+    public String getTw() {
+        return tw;
+    }
+
+    public void setTw(String tw) {
+        this.tw = tw;
+    }
+
+    // getters 和 setters
+    public String getMb() {
+        return mb;
+    }
+
+    public void setMb(String mb) {
+        this.mb = mb;
+    }
+
+    // getters 和 setters
+    public String getHx() {
+        return hx;
+    }
+
+    public void setHx(String hx) {
+        this.hx = hx;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java
new file mode 100644
index 00000000..439eb226
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java
@@ -0,0 +1,320 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 患者首页信息
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+@Data
+@Accessors(chain = true)
+public class PatientHomeDto {
+
+    /**
+     * ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String id;
+
+    /**
+     * 活动标记
+     */
+    private Integer activeFlag;
+
+    /**
+     * 临时标识
+     */
+    private Integer tempFlag;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者其他名称
+     */
+    private String nameJson;
+
+    /**
+     * 病历号
+     */
+    private String patientNo;
+
+    /**
+     * 住院号
+     */
+    private String hospitalNo;
+
+    /**
+     * 性别编码
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 生日
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 死亡时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deceasedDate;
+
+    /**
+     * 婚姻状态
+     */
+    private Integer maritalStatusEnum;
+    private String maritalStatusEnum_enumText;
+
+    /**
+     * 职业编码
+     */
+    private Integer prfsEnum;
+    private String prfsEnum_enumText;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 地址省
+     */
+    private String addressProvince;
+
+    /**
+     * 地址市
+     */
+    private String addressCity;
+
+    /**
+     * 地址区
+     */
+    private String addressDistrict;
+
+    /**
+     * 地址街道
+     */
+    private String addressStreet;
+
+    /**
+     * 患者其他地址
+     */
+    private String addressJson;
+
+    /**
+     * 民族
+     */
+    private String nationalityCode;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 拼音码
+     */
+    private String pyStr;
+
+    /**
+     * 五笔码
+     */
+    private String wbStr;
+
+    /**
+     * 血型ABO
+     */
+    private Integer bloodAbo;
+    private String bloodAbo_enumText;
+
+    /**
+     * 血型RH
+     */
+    private Integer bloodRh;
+    private String bloodRh_enumText;
+
+    /**
+     * 工作单位
+     */
+    private String workCompany;
+
+    /**
+     * 籍贯
+     */
+    private String nativePlace;
+
+    /**
+     * 国家编码
+     */
+    private String countryCode;
+
+    /**
+     * 联系人
+     */
+    private String linkName;
+
+    /**
+     * 联系人关系
+     */
+    private Integer linkRelationCode;
+    private String linkRelationCode_codeText;
+
+    /**
+     * 联系人电话
+     */
+    private String linkTelcom;
+
+    /**
+     * 其他联系人
+     */
+    private String linkJsons;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenanId;
+
+    /**
+     * 就诊ID
+     */
+    private String encounterId;
+
+    /**
+     * 病人年龄
+     */
+    private String ageString;
+
+    /**
+     * 护理级别
+     */
+    private Integer priorityEnum;
+    private String priorityEnum_enumText;
+
+    /**
+     * 患者状态
+     */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /**
+     * 入院科室
+     */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_organization")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    private String organizationId_dictText;
+
+    /**
+     * 入院日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date admissionDate;
+
+    /**
+     * 出院日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dischargeDate;
+
+    /**
+     * 责任医生
+     */
+    private String responsibleDoctor;
+
+    /**
+     * 就诊位置ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String encounterLocationId;
+
+    /**
+     * 责任护士
+     */
+    private String responsibleNurse;
+
+    /**
+     * 主要诊断
+     */
+    private String mainDiagnosis;
+
+    /**
+     * 费别
+     */
+    private Integer typeCode;
+    private String typeCode_dictText;
+
+    /**
+     * 住院天数
+     */
+    private Integer hospitalizationDays;
+
+    /**
+     * 就诊类别
+     */
+    private Integer classEnum;
+    private String classEnum_enumText;
+
+    /**
+     * 术后天数
+     */
+    private Integer postoperativeDays;
+
+    /**
+     * 手术开始日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date surgeryStartTime;
+
+    /**
+     * 手术结束日期日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date surgeryEndTime;
+
+    /**
+     * 手术状态
+     */
+    private Integer surgeryStatusEnum;
+    private String surgeryStatusEnum_enumText;
+
+    /**
+     * 过敏源类别
+     */
+    @Dict(dictCode = "aise_code")
+    private String categoryCode;
+    private String categoryCode_dictText;
+
+    /**
+     * 入院科室名称
+     */
+    private String caty;
+
+    /**
+     * 床位号
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long locationId;
+    private String locationId_dictText;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
new file mode 100644
index 00000000..f6ae679a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
@@ -0,0 +1,28 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 科室空床信息
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+@Data
+@Accessors(chain = true)
+public class PatientHomeEmptyBedDto {
+
+    /**
+     * 床位号
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long locationId;
+    private String locationId_dictText;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java
new file mode 100644
index 00000000..378871b3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java
@@ -0,0 +1,22 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 患者首页查询参数
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+@Data
+@Accessors(chain = true)
+public class PatientHomeSearchParam {
+
+    /** 状态编码 */
+    private Integer statusEnum;
+
+    /** 患者ID */
+    private Long patientId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
new file mode 100644
index 00000000..4f84589f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
@@ -0,0 +1,149 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VitalSignSearchRecordDto {
+
+    /**
+     * 记录日期
+     */
+    private String recordingDate;
+
+    /**
+     * 记录时间
+     */
+    private String timePoint;
+
+    /**
+     * 体温
+     */
+    @VitalSignsField(code = "001", name = "temperature", unit = "℃")
+    private String temperature;
+
+    /**
+     * 收缩压
+     */
+    @VitalSignsField(code = "002", name = "systolicPressure", unit = "mmHg")
+    private String systolicPressure;
+
+    /**
+     * 舒张压
+     */
+    @VitalSignsField(code = "003", name = "diastolicPressure", unit = "mmHg")
+    private String diastolicPressure;
+
+    /**
+     * 心率
+     */
+    @VitalSignsField(code = "004", name = "heartRate", unit = "次/分")
+    private String heartRate;
+
+    /**
+     * 脉搏
+     */
+    @VitalSignsField(code = "005", name = "pulseRate", unit = "次/分")
+    private String pulseRate;
+
+    /**
+     * 呼吸
+     */
+    @VitalSignsField(code = "006", name = "respirationRate", unit = "次/分")
+    private String respirationRate;
+
+    /**
+     * 血氧
+     */
+    @VitalSignsField(code = "007", name = "bloodOxygen", unit = "%")
+    private String bloodOxygen;
+
+    /**
+     * 血糖
+     */
+    @VitalSignsField(code = "008", name = "bloodGlucose", unit = "mmol/L")
+    private String bloodGlucose;
+
+    /**
+     * 物理降温
+     */
+    @VitalSignsField(code = "009", name = "physicalCooling", unit = "℃")
+    private String physicalCooling;
+
+    /**
+     * CCU心率
+     */
+    @VitalSignsField(code = "010", name = "ccuHeartRate", unit = "bpm")
+    private String ccuHeartRate;
+
+    /**
+     * 新生儿箱温
+     */
+    @VitalSignsField(code = "011", name = "newbornsIncubator", unit = "℃")
+    private String newbornsIncubator;
+
+    /**
+     * 血酮
+     */
+    @VitalSignsField(code = "012", name = "bloodKetone", unit = "mmol/L")
+    private String bloodKetone;
+
+    /**
+     * 身高
+     */
+    @VitalSignsField(code = "013", name = "height", unit = "cm")
+    private String height;
+
+    /**
+     * 腹围
+     */
+    @VitalSignsField(code = "014", name = "waistCircumference", unit = "cm")
+    private String waistCircumference;
+
+    /**
+     * 大便次数
+     */
+    @VitalSignsField(code = "015", name = "stoolFrequency", unit = "次/天")
+    private String stoolFrequency;
+
+    /**
+     * 灌肠次数
+     */
+    @VitalSignsField(code = "016", name = "enemaFrequency", unit = "次/天")
+    private String enemaFrequency;
+
+    /**
+     * 灌肠后大便次数
+     */
+    @VitalSignsField(code = "017", name = "sfAfterEnema", unit = "次/天")
+    private String sfAfterEnema;
+
+    /**
+     * 出量
+     */
+    @VitalSignsField(code = "018", name = "output", unit = "mL")
+    private String output;
+
+    /**
+     * 入量
+     */
+    @VitalSignsField(code = "019", name = "input", unit = "mL")
+    private String input;
+
+    /**
+     * 尿量
+     */
+    @VitalSignsField(code = "020", name = "urineVolume", unit = "mL")
+    private String urineVolume;
+
+    /**
+     * 大便量
+     */
+    @VitalSignsField(code = "021", name = "stoolVolume", unit = "g")
+    private String stoolVolume;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
new file mode 100644
index 00000000..8039cf5c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
@@ -0,0 +1,49 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 三测单信息
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Data
+@Accessors(chain = true)
+public class VitalSignsChartSmallDto {
+
+    private Integer collectionMode;
+
+    /**
+     * 记录日期
+     */
+    private String date;
+
+    /**
+     * 记录时间
+     */
+    private String times;
+
+    /**
+     * 生命体征编码
+     */
+    private String typeCode;
+
+    /**
+     * 生命体征值
+     */
+    private String typeValue;
+
+    /**
+     * 术后天数
+     */
+    private Integer postoperativeDays;
+
+    /**
+     * 周数
+     */
+    private Integer weekNo;
+    private String orderByDateTimes;
+    private String id;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java
new file mode 100644
index 00000000..352849b7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java
@@ -0,0 +1,37 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 生命体征管理
+ *
+ * @author SY
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class VitalSignsDeleteDto extends HisBaseEntity {
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊id
+     */
+    private Long encounterId;
+
+    /**
+     * 记录日期
+     */
+    private String recordingDate;
+
+    /**
+     * 记录时间
+     */
+    private String timePoint;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java
new file mode 100644
index 00000000..a89eb3ee
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java
@@ -0,0 +1,162 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 三测单信息
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Data
+@Accessors(chain = true)
+public class VitalSignsDto {
+
+    /**
+     * ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String id;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 就诊ID
+     */
+    private Long encounterId;
+
+    /**
+     * 记录日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date recordingDate;
+
+    /**
+     * 记录时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date timePoint;
+
+    /**
+     * 生命体征编码
+     */
+    private String vitalSignsCode;
+
+    /**
+     * 生命体征值
+     */
+    private String vitalSignsValues;
+
+    /**
+     * 单位
+     */
+    private String units;
+
+    /**
+     * 婴儿编号
+     */
+    private Integer babyNo;
+
+    /**
+     * 科室编码
+     */
+    private Integer locationId;
+
+    /**
+     * 记录人员
+     */
+    private String recorder;
+
+    /**
+     * 备注
+     */
+    private String remake;
+
+    /**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 入院科室
+     */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_organization")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    private String organizationId_dictText;
+
+    /**
+     * 床位号
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long bedLocationId;
+    private String bedLocationId_dictText;
+
+    /**
+     * 住院号
+     */
+    private String hospitalNo;
+
+    /**
+     * 入院日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date admissionDate;
+
+    /**
+     * 出院日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dischargeDate;
+
+    /**
+     * 住院天数
+     */
+    private Integer hospitalizationDays;
+
+    /**
+     * 手术开始日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date surgeryStartTime;
+
+    /**
+     * 手术结束日期日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date surgeryEndTime;
+
+    /**
+     * 手术状态
+     */
+    private Integer surgeryStatusEnum;
+    private String surgeryStatusEnum_enumText;
+
+    /**
+     * 术后天数
+     */
+    private Integer postoperativeDays;
+
+    /**
+     * 就诊类别
+     */
+    private Integer classEnum;
+    private String classEnum_enumText;
+
+    /**
+     * 周数
+     */
+    private Integer weekNo;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java
new file mode 100644
index 00000000..ece82cdb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java
@@ -0,0 +1,16 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface VitalSignsField {
+    String code(); // 生命体征代码
+
+    String name(); // 生命体征名称
+
+    String unit();// 单位（可选）
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
new file mode 100644
index 00000000..b1648e4a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
@@ -0,0 +1,53 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 三测单信息
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Data
+@Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+public class VitalSignsMedicalRecordDto {
+
+    /**
+     * 入院日期
+     */
+    private Date hospDate;
+
+    /**
+     * 手术日期
+     */
+    private String operaDate;
+
+    /**
+     * 出院日期
+     */
+    private String outdate;
+
+    /**
+     * ID
+     */
+    private List<VitalSignsTemperaturePulsesDto> temperaturePulses;
+
+    /**
+     * ID
+     */
+    private List<Object> others;
+
+    public VitalSignsMedicalRecordDto() {
+        this.temperaturePulses = new ArrayList<>();
+        this.others = new ArrayList<>();
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java
new file mode 100644
index 00000000..fa10a506
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java
@@ -0,0 +1,196 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.Date;
+
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 生命体征管理
+ *
+ * @author SY
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VitalSignsSaveDto extends HisBaseEntity {
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊id
+     */
+    private Long encounterId;
+
+    /**
+     * 记录日期
+     */
+    private Date recordingDate;
+
+    /**
+     * 记录时间
+     */
+    private String timePoint;
+
+    /**
+     * 体温
+     */
+    @VitalSignsField(code = "001", name = "temperature", unit = "℃")
+    private String temperature;
+
+    /**
+     * 收缩压
+     */
+    @VitalSignsField(code = "002", name = "systolicPressure", unit = "mmHg")
+    private String systolicPressure;
+
+    /**
+     * 舒张压
+     */
+    @VitalSignsField(code = "003", name = "diastolicPressure", unit = "mmHg")
+    private String diastolicPressure;
+
+    /**
+     * 心率
+     */
+    @VitalSignsField(code = "004", name = "heartRate", unit = "次/分")
+    private String heartRate;
+
+    /**
+     * 脉搏
+     */
+    @VitalSignsField(code = "005", name = "pulseRate", unit = "次/分")
+    private String pulseRate;
+
+    /**
+     * 呼吸
+     */
+    @VitalSignsField(code = "006", name = "respirationRate", unit = "次/分")
+    private String respirationRate;
+
+    /**
+     * 血氧
+     */
+    @VitalSignsField(code = "007", name = "bloodOxygen", unit = "%")
+    private String bloodOxygen;
+
+    /**
+     * 血糖
+     */
+    @VitalSignsField(code = "008", name = "bloodGlucose", unit = "mmol/L")
+    private String bloodGlucose;
+
+    /**
+     * 物理降温
+     */
+    @VitalSignsField(code = "009", name = "physicalCooling", unit = "℃")
+    private String physicalCooling;
+
+    /**
+     * CCU心率
+     */
+    @VitalSignsField(code = "010", name = "ccuHeartRate", unit = "bpm")
+    private String ccuHeartRate;
+
+    /**
+     * 新生儿箱温
+     */
+    @VitalSignsField(code = "011", name = "newbornsIncubator", unit = "℃")
+    private String newbornsIncubator;
+
+    /**
+     * 血酮
+     */
+    @VitalSignsField(code = "012", name = "bloodKetone", unit = "mmol/L")
+    private String bloodKetone;
+
+    /**
+     * 身高
+     */
+    @VitalSignsField(code = "013", name = "height", unit = "cm")
+    private String height;
+
+    /**
+     * 腹围
+     */
+    @VitalSignsField(code = "014", name = "waistCircumference", unit = "cm")
+    private String waistCircumference;
+
+    /**
+     * 大便次数
+     */
+    @VitalSignsField(code = "015", name = "stoolFrequency", unit = "次/天")
+    private String stoolFrequency;
+
+    /**
+     * 灌肠次数
+     */
+    @VitalSignsField(code = "016", name = "enemaFrequency", unit = "次/天")
+    private String enemaFrequency;
+
+    /**
+     * 灌肠后大便次数
+     */
+    @VitalSignsField(code = "017", name = "sfAfterEnema", unit = "次/天")
+    private String sfAfterEnema;
+
+    /**
+     * 出量
+     */
+    @VitalSignsField(code = "018", name = "output", unit = "mL")
+    private String output;
+
+    /**
+     * 入量
+     */
+    @VitalSignsField(code = "019", name = "input", unit = "mL")
+    private String input;
+
+    /**
+     * 尿量
+     */
+    @VitalSignsField(code = "020", name = "urineVolume", unit = "mL")
+    private String urineVolume;
+
+    /**
+     * 大便量
+     */
+    @VitalSignsField(code = "021", name = "stoolVolume", unit = "g")
+    private String stoolVolume;
+
+    /**
+     * 单位
+     */
+    private String units;
+
+    /**
+     * 婴儿编号
+     */
+    private Integer babyNo;
+
+    /**
+     * 科室编码
+     */
+    private Integer locationId;
+
+    /**
+     * 记录人员
+     */
+    private String recorder;
+
+    /**
+     * 备注
+     */
+    private String remake;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java
new file mode 100644
index 00000000..5488f2f8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java
@@ -0,0 +1,19 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 三测单查询参数
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Data
+@Accessors(chain = true)
+public class VitalSignsSearchParam {
+
+    /** 患者ID */
+    private Long patientId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
new file mode 100644
index 00000000..8da0d2d6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
@@ -0,0 +1,37 @@
+package com.openhis.web.inpatientmanage.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 三测单信息
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Data
+@Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+public class VitalSignsTemperaturePulsesDto {
+
+    /**
+     * 生命体征明细
+     */
+    private List<VitalSignsChartSmallDto> chartsSmalls;
+
+    /**
+     * 周数
+     */
+    private Integer weekNo;
+
+    // 构造函数、getter和setter方法
+    public VitalSignsTemperaturePulsesDto() {
+        this.chartsSmalls = new ArrayList<>();
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/AdmissionMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/AdmissionMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/AdmissionMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/AdmissionMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java
new file mode 100644
index 00000000..1a902d39
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java
@@ -0,0 +1,64 @@
+package com.openhis.web.inpatientmanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inpatientmanage.dto.NursingDetailDto;
+import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto;
+import com.openhis.web.inpatientmanage.dto.NursingPageDto;
+import com.openhis.web.inpatientmanage.dto.NursingSearchParam;
+
+/**
+ * 护理记录单
+ *
+ * @author gaoyy
+ * @since 2025/05/30
+ */
+@Repository
+public interface NursingRecordAppMapper {
+
+    /**
+     * 住院患者信息分页查询
+     *
+     * @param page 分页
+     * @param classEnum 类别编码(住院)
+     * @param bed 类别编码(床)
+     * @param ward 类别编码(病区)
+     * @param active 状态(正在用)
+     * @param queryWrapper 查询条件
+     * @return 患者信息
+     */
+    IPage<NursingPageDto> getPatientPage(@Param("page") Page<NursingPageDto> page,
+        @Param("classEnum") Integer classEnum, @Param("bed") Integer bed, @Param("ward") Integer ward,
+        @Param("active") Integer active, @Param(Constants.WRAPPER) QueryWrapper<NursingSearchParam> queryWrapper);
+
+    /**
+     * 患者护理记录单信息分页查询
+     *
+     * @param page 分页
+     * @param classEnum 类别编码(住院)
+     * @param bed 类别编码(床)
+     * @param ward 类别编码(病区)
+     * @param active 状态(正在用)
+     * @param queryWrapper 查询条件
+     * @return 患者护理记录单信息
+     */
+    IPage<NursingDetailDto> getNursingPatientPage(@Param("page") Page<NursingDetailDto> page,
+        @Param("classEnum") Integer classEnum, @Param("bed") Integer bed, @Param("ward") Integer ward,
+        @Param("active") Integer active, @Param(Constants.WRAPPER) QueryWrapper<NursingSearchParam> queryWrapper);
+
+    /**
+     * 电子病历模板列表信息分页查询
+     *
+     * @param page 分页
+     * @param nursing 护理单
+     * @param queryWrapper 查询条件
+     * @return 电子病历模板列表信息
+     */
+    IPage<NursingEmrTemplateDto> getEmrTemplate(@Param("page") Page<NursingDetailDto> page,
+        @Param("nursing") String nursing, @Param(Constants.WRAPPER) QueryWrapper<NursingSearchParam> queryWrapper);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java
new file mode 100644
index 00000000..1c3b2de6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java
@@ -0,0 +1,44 @@
+package com.openhis.web.inpatientmanage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inpatientmanage.dto.PatientHomeDto;
+import com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto;
+
+/**
+ * 患者首页
+ *
+ * @author SY
+ * @since 2025/05/19
+ */
+@Repository
+public interface PatientHomeAppMapper {
+
+    /**
+     * 患者首页信息分页查询
+     *
+     * @param page 分页
+     * @param statusEnum 状态编码
+     * @param patientId 患者ID
+     * @param searchKey 查询条件
+     * @return 住院登记信息
+     */
+    IPage<PatientHomeDto> getPage(@Param("page") Page<PatientHomeDto> page, @Param("statusEnum") Integer statusEnum,
+        @Param("patientId") Long patientId, @Param("searchKey") String searchKey,
+        @Param(Constants.WRAPPER) QueryWrapper<PatientHomeDto> queryWrapper);
+
+    /**
+     * 空床查询
+     *
+     * @param organizationId 查询条件
+     * @return 空床查询结果
+     */
+    List<PatientHomeEmptyBedDto> getEmptyBedList(@Param("organizationId") Long organizationId);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
new file mode 100644
index 00000000..c414464c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
@@ -0,0 +1,57 @@
+package com.openhis.web.inpatientmanage.mapper;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.document.domain.VitalSigns;
+import com.openhis.web.inpatientmanage.dto.PatientHomeDto;
+import com.openhis.web.inpatientmanage.dto.VitalSignsDto;
+
+/**
+ * 三测单
+ *
+ * @author SY
+ * @since 2025/05/29
+ */
+@Repository
+public interface VitalSignsAppMapper {
+
+    /**
+     * 三测单查询
+     *
+     * @param page 分页
+     * @param patientId 患者ID
+     * @param searchKey 查询条件
+     * @return 三测单信息
+     */
+    IPage<VitalSignsDto> getVitalSignsInfo(@Param("page") Page<PatientHomeDto> page, @Param("patientId") Long patientId,
+        @Param("searchKey") String searchKey, @Param(Constants.WRAPPER) QueryWrapper<VitalSignsDto> queryWrapper);
+
+    /**
+     * 查询记录
+     *
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 查询记录结果
+     */
+    List<VitalSigns> searchVitalSigns(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    /**
+     * 删除记录
+     *
+     * @param patientId 患者ID
+     * @param encounterId 就诊ID
+     * @param recordingDate 记录日期
+     * @param timePoint 记录时间
+     * @return 查询记录结果
+     */
+    boolean deleteVitalSigns(@Param("patientId") Long patientId, @Param("encounterId") Long encounterId,
+        @Param("recordingDate") Date recordingDate, @Param("timePoint") Date timePoint);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
similarity index 84%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
index 8644b0a7..2ce43aea 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
@@ -85,5 +85,16 @@ public interface ILossReportFormAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+    /**
+     * 报损单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java
similarity index 59%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java
index 830ac87d..6314a42e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java
@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.inventorymanage.dto.ProductDetailsSearchParam;
+import org.springframework.web.bind.annotation.PutMapping;
 
 /**
  * 库存商品明细 appService
@@ -33,6 +34,14 @@ public interface IProductDetailsAppService {
     R<?> getPage(ProductDetailsSearchParam productDetailsSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
 
+    /**
+     * 查询库存商品明细分页列表合计
+     *
+     * @param productDetailsSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @return 库存商品明细分页列表合计
+     */
+    R<?> getPageTotal(ProductDetailsSearchParam productDetailsSearchParam, String searchKey);
     /**
      * 操作：停供
      *
@@ -49,4 +58,16 @@ public interface IProductDetailsAppService {
      */
     R<?> cancelSupplyById(Long id);
 
+    /**
+     * 操作：效期预警
+     *
+     * @param productDetailsSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 操作结果
+     */
+    R<?> expirationWarning(ProductDetailsSearchParam productDetailsSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
similarity index 75%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
index 59507a4e..d1cb2913 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
@@ -10,6 +10,8 @@ import com.openhis.web.inventorymanage.dto.ProductStocktakingDto;
 import com.openhis.web.inventorymanage.dto.ProductStocktakingSearchParam;
 import com.openhis.web.inventorymanage.dto.ReceiptDetailDto;
 import com.openhis.web.inventorymanage.dto.StocktakingBatchSearchParam;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -77,7 +79,7 @@ public interface IProductStocktakingAppService {
      * @return 盘点单据分页列表
      */
     R<?> getBatchDetail(StocktakingBatchSearchParam stocktakingSearchParam, Integer pageNo, Integer pageSize,
-                        String searchKey, HttpServletRequest request);
+        String searchKey, HttpServletRequest request);
 
     /**
      * 保存批量盘点单
@@ -110,4 +112,33 @@ public interface IProductStocktakingAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+
+    /*
+    * 自动批量盘点
+     */
+    void autoStocktakingBatch();
+
+    /**
+     * 自动盘点单据详情
+     *
+     * @param locationId 库房id
+     * @param time 时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getAutoDetail(Long locationId, String time, Integer pageNo, Integer pageSize);
+
+    /**
+     * 盘点单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
similarity index 86%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
index 339386e2..6767f2ca 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
@@ -108,4 +108,17 @@ public interface IProductTransferAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+    /**
+     * 调拨单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param inOutFlg 调入调出flg
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime, Integer inOutFlg,Integer pageNo, Integer pageSize);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
index 79f089b4..0dcd7d65 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
@@ -85,4 +85,17 @@ public interface IPurchaseInventoryAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+
+    /**
+     * 采购入库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
similarity index 82%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
index 34f95147..be7ee6ee 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
@@ -79,4 +79,16 @@ public interface IPurchaseReturnAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+    /**
+     * 采购退货单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
similarity index 84%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
index 8b1a66fa..01541911 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
@@ -86,5 +86,16 @@ public interface IRequisitionIssueAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+    /**
+     * 领用出库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
index 5eb8c286..3bfe2566 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
@@ -85,4 +85,17 @@ public interface IReturnIssueAppService {
      */
     R<?> withdrawApproval(String busNo);
 
+
+    /**
+     * 领用退库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java
new file mode 100644
index 00000000..39e65d6e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.inventorymanage.dto.TraceNoInfoParam;
+import com.openhis.web.inventorymanage.dto.TraceNoSearchParam;
+
+/**
+ * 追溯码管理 appService
+ *
+ * @author yuxj
+ * @date 2025-07-07
+ */
+public interface ITraceNoAppService {
+
+    /**
+     * 追溯码管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> traceNoInit();
+
+    /**
+     * 追溯码管理列表
+     *
+     * @param traceNoSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return
+     */
+    R<?> getPage(TraceNoSearchParam traceNoSearchParam, Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request);
+
+    /**
+     * 添加追溯码信息
+     *
+     * @param traceNoInfoList 追溯码信息
+     * @return 操作结果
+     */
+    R<?> addTraceNoInfo(List<TraceNoInfoParam> traceNoInfoList);
+
+    /**
+     * 追加追溯码信息
+     *
+     * @param supplyItemDetailList 单据信息
+     * @param statusEnum 追溯码状态
+     * @param operationType 操作类型
+     * @return 操作结果
+     */
+    boolean addTraceNoManage(List<SupplyItemDetailDto> supplyItemDetailList, Integer statusEnum, Integer operationType);
+
+    /**
+     * 修改追溯码信息
+     *
+     * @param supplyItemDetailList 单据信息
+     * @param operationType 操作类型
+     * @return 操作结果
+     */
+    boolean updateTraceNoList(List<SupplyItemDetailDto> supplyItemDetailList, Integer operationType);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
similarity index 93%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
index b56a674a..8482ad89 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
@@ -145,7 +145,7 @@ public class LossReportFormAppServiceImpl implements ILossReportFormAppService {
     public R<?> lossReportNoInit() {
         LossReportFormInitDto initDto = new LossReportFormInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.LOSS_BUS_NO.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.LOSS_BUS_NO.getPrefix(), 4));
         return R.ok(initDto);
     }
 
@@ -320,4 +320,25 @@ public class LossReportFormAppServiceImpl implements ILossReportFormAppService {
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+    /**
+     * 报损单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize){
+
+        Page<ReceiptDetailDto> receiptDetailList = lossReportFormMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize),
+            locationId,startTime, endTime,ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,SupplyType.LOSS_REPORT_FORM.getValue(),
+            SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java
similarity index 51%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java
index 9cc1648a..70a2a2c8 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java
@@ -9,6 +9,7 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.web.inventorymanage.dto.ProductDetailsTotalDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +25,6 @@ import com.core.common.utils.SecurityUtils;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.InsuranceLevel;
 import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.LocationStatus;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.enums.ybenums.YbChrgitmLv;
 import com.openhis.common.utils.EnumUtils;
@@ -88,7 +88,7 @@ public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMappe
         // 项目类型
         Integer categoryCode = productDetailsSearchParam.getCategoryCode();
         productDetailsSearchParam.setCategoryCode(null);
-        // 库存范围
+        // 库存
         Integer warehouseScope = productDetailsSearchParam.getWarehouseScope();
         productDetailsSearchParam.setWarehouseScope(null);
         // 剩余过期天数
@@ -98,7 +98,7 @@ public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMappe
         // 构建查询条件
         QueryWrapper<ProductDetailsSearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(productDetailsSearchParam, searchKey,
-                new HashSet<>(Arrays.asList("medicine_name", "bus_no")), request);
+                new HashSet<>(Arrays.asList("medicine_name", "bus_no", "py_str", "supply_name")), request);
 
         // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
         if (categoryCode != null) {
@@ -109,12 +109,16 @@ public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMappe
                 queryWrapper.eq("item_type", "9");
             }
         }
-        // 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）
+        // 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）、数量小于等于20（4）、数量小于等于50（5）
         if (warehouseScope != null) {
             if (warehouseScope.equals(2)) {
                 queryWrapper.eq("quantity", 0);
             } else if (warehouseScope.equals(3)) {
                 queryWrapper.gt("quantity", 0);
+            } else if (warehouseScope.equals(4)) {
+                queryWrapper.le("quantity", 20);
+            } else if (warehouseScope.equals(5)) {
+                queryWrapper.le("quantity", 50);
             }
         }
         // 查询条件为剩余过期天数=0时
@@ -123,7 +127,7 @@ public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMappe
                 // 查询 <= 0天的数据
                 queryWrapper.le("remaining_days", 0);
             } else {
-                //查询 <= remainingDays天的数据
+                // 查询 <= remainingDays天的数据
                 queryWrapper.le("remaining_days", remainingDays);
             }
         }
@@ -150,6 +154,98 @@ public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMappe
         return R.ok(productDetailsPage);
     }
 
+    /**
+     * 查询库存商品明细分页列表合计
+     *
+     * @param productDetailsSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @return 库存商品明细分页列表合计
+     */
+    @Override
+    public R<?> getPageTotal(ProductDetailsSearchParam productDetailsSearchParam, String searchKey) {
+
+        String sqlWhere = "";
+        Integer itemType = 99;
+        if (searchKey != null) {
+            sqlWhere = " (T2.name like '%" + searchKey + "%' or T2.bus_no like '%" + searchKey
+                + "%' or T2.py_str like '%" + searchKey + "%' or T5.name like '%" + searchKey + "%') ";
+        }
+
+        // 项目类型
+        Integer categoryCode = productDetailsSearchParam.getCategoryCode();
+        // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
+        if (categoryCode != null) {
+            if (sqlWhere != "") {
+                sqlWhere = sqlWhere + " and ";
+            }
+            if (categoryCode.equals(1) || categoryCode.equals(2) || categoryCode.equals(3) || categoryCode.equals(4)) {
+                itemType = 0;
+                sqlWhere = sqlWhere + "T2.category_code = '" + categoryCode + "'";
+            } else if (categoryCode.equals(9)) {
+                itemType = 9;
+                sqlWhere = sqlWhere + "1 = 1";
+            } else {
+                sqlWhere = sqlWhere + "1 = 1";
+            }
+        }
+        // 库存
+        Integer warehouseScope = productDetailsSearchParam.getWarehouseScope();
+        // 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）、数量小于等于20（4）、数量小于等于50（5）
+        if (warehouseScope != null) {
+            if (sqlWhere != "") {
+                sqlWhere = sqlWhere + " and ";
+            }
+            if (warehouseScope.equals(2)) {
+                sqlWhere = sqlWhere + "T1.quantity = 0";
+            } else if (warehouseScope.equals(3)) {
+                sqlWhere = sqlWhere + "T1.quantity > 0";
+            } else if (warehouseScope.equals(4)) {
+                sqlWhere = sqlWhere + "T1.quantity <= 20";
+            } else if (warehouseScope.equals(5)) {
+                sqlWhere = sqlWhere + "T1.quantity <= 50";
+            } else {
+                sqlWhere = sqlWhere + "1 = 1";
+            }
+        }
+        // 剩余过期天数
+        Integer remainingDays = productDetailsSearchParam.getRemainingDays();
+        // 查询条件为剩余过期天数=0时
+        if (remainingDays != null) {
+            if (sqlWhere != "") {
+                sqlWhere = sqlWhere + " and ";
+            }
+            if (remainingDays.equals(0)) {
+                // 查询 <= 0天的数据
+                sqlWhere = sqlWhere + "(T1.expiration_date::date - CURRENT_DATE) = 0";
+            } else {
+                // 查询 <= remainingDays天的数据
+                sqlWhere = sqlWhere + "(T1.expiration_date::date - CURRENT_DATE) <= " + remainingDays;
+            }
+        }
+        // 医保等级
+        Integer chrgitmLv = productDetailsSearchParam.getChrgitmLv();
+        if (chrgitmLv != null) {
+            if (sqlWhere != "") {
+                sqlWhere = sqlWhere + " and ";
+            }
+            sqlWhere = sqlWhere + "T2.chrgitm_lv = " + chrgitmLv;
+        }
+
+        // 仓库药房
+        Long locationId = productDetailsSearchParam.getLocationId();
+        if (locationId != null) {
+            if (sqlWhere != "") {
+                sqlWhere = sqlWhere + " and ";
+            }
+            sqlWhere = sqlWhere + "T1.location_id = " + locationId;
+        }
+        // 查询库存商品明细分页列表
+        ProductDetailsTotalDto productDetailsTotal =
+            productDetailsMapper.selectProductDetailsPageTotal(sqlWhere, itemType);
+
+        return R.ok(productDetailsTotal);
+    }
+
     /**
      * 操作：停供
      *
@@ -197,4 +293,82 @@ public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMappe
         return updateCount > 0 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+
+    /**
+     * 操作：效期预警
+     *
+     * @param productDetailsSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 操作结果
+     */
+    @Override
+    public R<?> expirationWarning(ProductDetailsSearchParam productDetailsSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+
+        // 数据初始化，不使用eq条件拼接
+        // 项目类型
+        Integer categoryCode = productDetailsSearchParam.getCategoryCode();
+        productDetailsSearchParam.setCategoryCode(null);
+
+        // 有效期小于（月）
+        Integer remainingDays = productDetailsSearchParam.getRemainingDays();
+        productDetailsSearchParam.setRemainingDays(null);
+
+        //设置件数查询flg
+        String flg = productDetailsSearchParam.getFlg();
+        productDetailsSearchParam.setFlg(null);
+
+        // 构建查询条件
+        QueryWrapper<ProductDetailsSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(productDetailsSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("medicine_name", "bus_no", "py_str")), request);
+
+        // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
+        if (categoryCode != null) {
+            if (categoryCode.equals(1) || categoryCode.equals(2) || categoryCode.equals(3) || categoryCode.equals(4)) {
+                queryWrapper.eq("item_type", "0");
+                queryWrapper.eq("category_code", categoryCode.toString());
+            } else if (categoryCode.equals(9)) {
+                queryWrapper.eq("item_type", "9");
+            }
+        }
+
+        // 查询条件为有效期天数小于=180时
+        if (remainingDays != null) {
+//            if (remainingDays.equals(0)) {
+//                // 查询 <= 180天的数据
+//                queryWrapper.le("remaining_days", 180);
+//            } else {
+                // 查询 <= remainingMonth个月的数据
+                queryWrapper.le("remaining_days", remainingDays);
+//            }
+        } else {
+            // 查询 <= 180天的数据
+            queryWrapper.le("remaining_days", 180);
+        }
+
+        Page<ProductDetailsPageDto> productDetailsPage =
+            productDetailsMapper.selectExpirationWarning(new Page<>(pageNo, pageSize), queryWrapper, flg);
+
+        productDetailsPage.getRecords().forEach(e -> {
+            // 药品停用
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
+            // 停供状态
+            e.setInventoryStatusEnum_enumText(
+                EnumUtils.getInfoByValue(PublicationStatus.class, e.getInventoryStatusEnum()));
+            // 如果剩余天数小于0，显示为0
+            if (e.getRemainingDays() != null && e.getRemainingDays().compareTo(0) <= 0) {
+                e.setRemainingDays(0);
+            }
+            // 如果剩余月数小于0，显示为0
+            if (e.getRemainingMonth() != null && e.getRemainingMonth().compareTo(0) <= 0) {
+                e.setRemainingMonth(0);
+            }
+        });
+        return R.ok(productDetailsPage);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
similarity index 79%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
index 9a56077a..9f779da7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
@@ -10,6 +10,9 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.workflow.domain.SupplyRequestAuto;
+import com.openhis.workflow.service.ISupplyRequestAutoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +40,8 @@ import com.openhis.web.inventorymanage.dto.*;
 import com.openhis.web.inventorymanage.mapper.ProductStocktakingMapper;
 import com.openhis.workflow.domain.SupplyRequest;
 import com.openhis.workflow.service.ISupplyRequestService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 商品盘点 impl
@@ -59,6 +64,8 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS
 
     @Autowired
     private ILocationService locationService;
+    @Resource
+    private ISupplyRequestAutoService supplyRequestAutoService;
 
     /**
      * 商品盘点页面初始化
@@ -114,7 +121,7 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS
 
         ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.STOCKTAKING_NUM.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.STOCKTAKING_NUM.getPrefix(), 4));
 
         return R.ok(initDto);
     }
@@ -257,6 +264,7 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS
                 .setBusNo(productStocktakingDto.getBusNo()).setItemTable(productStocktakingDto.getItemTable())
                 .setItemId(productStocktakingDto.getItemId()).setUnitCode(productStocktakingDto.getUnitCode())
                 .setItemQuantity(productStocktakingDto.getItemQuantity()).setPrice(productStocktakingDto.getPrice())
+                .setTotalQuantity(productStocktakingDto.getTotalQuantity())
                 .setTotalPrice(productStocktakingDto.getTotalPrice())
                 .setOccurrenceTime(productStocktakingDto.getOccurrenceTime())
                 .setReason(productStocktakingDto.getReason()).setReasonCode(productStocktakingDto.getReasonCode())
@@ -368,6 +376,7 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS
                 .setBusNo(productStocktakingDto.getBusNo()).setItemTable(productStocktakingDto.getItemTable())
                 .setItemId(productStocktakingDto.getItemId()).setUnitCode(productStocktakingDto.getUnitCode())
                 .setItemQuantity(productStocktakingDto.getItemQuantity()).setPrice(productStocktakingDto.getPrice())
+                .setTotalQuantity(productStocktakingDto.getTotalQuantity())
                 .setTotalPrice(productStocktakingDto.getTotalPrice())
                 .setOccurrenceTime(productStocktakingDto.getOccurrenceTime())
                 .setReason(productStocktakingDto.getReason()).setReasonCode(productStocktakingDto.getReasonCode())
@@ -375,7 +384,8 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS
                 .setPurposeLocationId(productStocktakingDto.getPurposeLocationId())
                 .setPurposeLocationStoreId(productStocktakingDto.getPurposeLocationStoreId())
                 .setLotNumber(productStocktakingDto.getLotNumber()).setStartTime(productStocktakingDto.getStartTime())
-                .setEndTime(productStocktakingDto.getEndTime()).setSupplierId(productStocktakingDto.getSupplierId());
+                .setEndTime(productStocktakingDto.getEndTime()).setSupplierId(productStocktakingDto.getSupplierId())
+                .setTraceNo(productStocktakingDto.getTraceNo());
             // 生成商品批量调拨单据
             supplyRequest
                 // id
@@ -444,4 +454,95 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+
+    /*
+     * 自动批量盘点
+     */
+    @Override
+    public void autoStocktakingBatch() {
+        // 查询盘点商品信息
+        List<ProductStocktakingDto> productStocktakingDtoList =
+            productStocktakingMapper.selectAutoStocktakingBatch(CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION, PublicationStatus.ACTIVE.getValue());
+
+        // 单据号取得
+        String busNo = null;
+        R<?> busNoInfo = this.productStocktakingBusNoInit();
+        ProductStocktakingInitDto initDto;
+        if (ProductStocktakingInitDto.class.isAssignableFrom(busNoInfo.getData().getClass())) {
+            initDto = (ProductStocktakingInitDto)busNoInfo.getData();
+            busNo = initDto.getBusNo();
+        }
+        // 当前时间
+        Date now = DateUtils.getNowDate();
+        SupplyRequestAuto supplyRequest;
+        // 生成批量盘点单据
+        List<SupplyRequestAuto> supplyRequestAutoList = new ArrayList<>();
+        for (ProductStocktakingDto productStocktakingDto : productStocktakingDtoList) {
+            // 初始化盘点信息
+            supplyRequest = new SupplyRequestAuto().setBusNo(busNo).setItemTable(productStocktakingDto.getItemTable())
+                .setItemId(productStocktakingDto.getItemId()).setUnitCode(productStocktakingDto.getUnitCode())
+                .setItemQuantity(productStocktakingDto.getItemQuantity())
+                .setTotalQuantity(productStocktakingDto.getTotalQuantity()).setPrice(productStocktakingDto.getPrice())
+                .setTotalPrice(productStocktakingDto.getTotalPrice())
+                .setPurposeTypeEnum(productStocktakingDto.getPurposeTypeEnum())
+                .setPurposeLocationId(productStocktakingDto.getPurposeLocationId())
+                .setPurposeLocationStoreId(productStocktakingDto.getPurposeLocationStoreId())
+                .setSupplierId(productStocktakingDto.getSupplierId()).setStartTime(productStocktakingDto.getStartTime())
+                .setEndTime(productStocktakingDto.getEndTime()).setLotNumber(productStocktakingDto.getLotNumber())
+                .setTypeEnum(SupplyType.AUTO_STOCKTAKING.getValue()).setStatusEnum(SupplyStatus.AGREE.getValue())
+                .setOccurrenceTime(now).setApplyTime(now);
+
+            supplyRequestAutoList.add(supplyRequest);
+        }
+        // 插入数据
+        supplyRequestAutoService.saveOrUpdateBatch(supplyRequestAutoList);
+    }
+
+    /**
+     * 自动盘点单据详情
+     *
+     * @param locationId 库房id
+     * @param time 时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getAutoDetail(Long locationId, String time, Integer pageNo, Integer pageSize) {
+
+        Page<ReceiptDetailDto> receiptDetailList =
+            productStocktakingMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize), locationId, time, null,
+                ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                Arrays.asList(SupplyType.AUTO_STOCKTAKING.getValue()), SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+
+    }
+
+    /**
+     * 盘点单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime, Integer pageNo,
+        Integer pageSize) {
+
+        Page<ReceiptDetailDto> receiptDetailList =
+            productStocktakingMapper.getMonthlySettlementDetail(
+                new Page<>(pageNo, pageSize), locationId, startTime, endTime, ItemType.MEDICINE.getValue(),
+                ItemType.DEVICE.getValue(), CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION, Arrays
+                    .asList(SupplyType.PRODUCT_STOCKTAKING.getValue(), SupplyType.PRODUCT_BATCH_STOCKTAKING.getValue()),
+                SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
index 3638ccc9..977239a6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
@@ -108,7 +108,7 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     public R<?> productTransferNoInit() {
         ProductTransferInitDto initDto = new ProductTransferInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.TRANSFER_NUM.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.TRANSFER_NUM.getPrefix(), 4));
         return R.ok(initDto);
     }
 
@@ -312,7 +312,7 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
 
         // 单据号取得
         List<String> busNoList =
-                productTransferDtoList.stream().map(ProductTransferDto::getBusNo).collect(Collectors.toList());
+            productTransferDtoList.stream().map(ProductTransferDto::getBusNo).collect(Collectors.toList());
         // 请求数据取得
         List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
         if (!requestList.isEmpty()) {
@@ -329,16 +329,16 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
             BeanUtils.copyProperties(productTransferDto, supplyRequest);
             // 生成商品调拨单据
             supplyRequest
-                    // id
-                    .setId(null)
-                    // 单据分类：库存供应
-                    .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue())
-                    // 单据类型：商品调拨
-                    .setTypeEnum(SupplyType.PRODUCT_TRANSFER.getValue())
-                    // 制单人
-                    .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
-                    // 申请时间
-                    .setApplyTime(DateUtils.getNowDate());
+                // id
+                .setId(null)
+                // 单据分类：库存供应
+                .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue())
+                // 单据类型：商品调拨
+                .setTypeEnum(SupplyType.PRODUCT_TRANSFER.getValue())
+                // 制单人
+                .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
+                // 申请时间
+                .setApplyTime(DateUtils.getNowDate());
             supplyRequestList.add(supplyRequest);
 
         }
@@ -349,8 +349,7 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
         // 请求id取得
         List<SupplyRequest> supplyRequestIdList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
         // 返回请求id列表
-        List<Long> requestIdList =
-                supplyRequestIdList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+        List<Long> requestIdList = supplyRequestIdList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
         for (Long list : requestIdList) {
             idList.add(list.toString());
         }
@@ -442,4 +441,29 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
         }
         return tree;
     }
+
+    /**
+     * 调拨单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param inOutFlg 调入调出flg
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime, Integer inOutFlg,
+        Integer pageNo, Integer pageSize) {
+
+        Page<ReceiptDetailDto> receiptDetailList =
+            productTransferMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize), locationId, startTime,
+                endTime, inOutFlg, ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                Arrays.asList(SupplyType.PRODUCT_TRANSFER.getValue(), SupplyType.PRODUCT_BATCH_TRANSFER.getValue()),
+                SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
index 806565f8..ed2c7094 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
@@ -3,9 +3,8 @@
  */
 package com.openhis.web.inventorymanage.appservice.impl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -111,7 +110,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
     public R<?> purchaseNoInit() {
         PurchaseInventoryInitDto initDto = new PurchaseInventoryInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_NUM.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_NUM.getPrefix(), 4));
         return R.ok(initDto);
     }
 
@@ -137,9 +136,8 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
         QueryWrapper<InventorySearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request);
         // 查询入库单据分页列表
-        Page<ReceiptPageDto> inventoryReceiptPage =
-            purchaseInventoryMapper.selectInventoryReceiptPage(new Page<>(pageNo, pageSize), queryWrapper,
-                SupplyType.PURCHASE_INVENTORY.getValue());
+        Page<ReceiptPageDto> inventoryReceiptPage = purchaseInventoryMapper.selectInventoryReceiptPage(
+            new Page<>(pageNo, pageSize), queryWrapper, SupplyType.PURCHASE_INVENTORY.getValue());
 
         inventoryReceiptPage.getRecords().forEach(e -> {
             // 单据状态
@@ -178,7 +176,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
 
         // 校验(已经审批通过的单号(请求状态是同意),不能再重复编辑请求)
         boolean validation = supplyRequestService.supplyRequestValidation(purchaseInventoryDtoList.get(0).getBusNo());
-        if(validation){
+        if (validation) {
             throw new ServiceException("请勿重复审批");
         }
 
@@ -186,7 +184,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
 
         // 单据号取得
         List<String> busNoList =
-                purchaseInventoryDtoList.stream().map(PurchaseInventoryDto::getBusNo).collect(Collectors.toList());
+            purchaseInventoryDtoList.stream().map(PurchaseInventoryDto::getBusNo).collect(Collectors.toList());
         // 请求数据取得
         List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
         if (!requestList.isEmpty()) {
@@ -204,16 +202,16 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
 
             // 生成待发送的入库单据
             supplyRequest
-                    // id
-                    .setId(null)
-                    // 单据分类：非库存供应
-                    .setCategoryEnum(SupplyCategory.NON_STOCK.getValue())
-                    // 单据类型：采购入库
-                    .setTypeEnum(SupplyType.PURCHASE_INVENTORY.getValue())
-                    // 制单人
-                    .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
-                    // 申请时间
-                    .setApplyTime(DateUtils.getNowDate());
+                // id
+                .setId(null)
+                // 单据分类：非库存供应
+                .setCategoryEnum(SupplyCategory.NON_STOCK.getValue())
+                // 单据类型：采购入库
+                .setTypeEnum(SupplyType.PURCHASE_INVENTORY.getValue())
+                // 制单人
+                .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
+                // 申请时间
+                .setApplyTime(DateUtils.getNowDate());
             supplyRequestList.add(supplyRequest);
 
         }
@@ -224,8 +222,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
         // 请求id取得
         List<SupplyRequest> supplyRequestIdList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
         // 返回请求id列表
-        List<Long> requestIdList =
-                supplyRequestIdList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+        List<Long> requestIdList = supplyRequestIdList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
         for (Long list : requestIdList) {
             idList.add(list.toString());
         }
@@ -259,7 +256,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
 
         // 校验(已经审批通过的单号(请求状态是同意),不能再重复编辑请求)
         boolean validation = supplyRequestService.supplyRequestValidation(busNo);
-        if(validation){
+        if (validation) {
             throw new ServiceException("请勿重复审批");
         }
         // 单据提交审核
@@ -281,4 +278,27 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+
+    /**
+     * 采购入库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime, Integer pageNo,
+        Integer pageSize) {
+
+        Page<ReceiptDetailDto> receiptDetailList =
+            purchaseInventoryMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize), locationId, startTime,
+                endTime, ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                Arrays.asList(SupplyType.PURCHASE_INVENTORY.getValue()), SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
index e0bd3dce..4f12413c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -86,7 +87,7 @@ public class PurchaseReturnAppServiceImpl implements IPurchaseReturnAppService {
     public R<?> purchaseNoInit() {
         PurchaseInventoryInitDto initDto = new PurchaseInventoryInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.RETURN_BUS_NO.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.RETURN_BUS_NO.getPrefix(), 4));
         return R.ok(initDto);
     }
 
@@ -239,4 +240,27 @@ public class PurchaseReturnAppServiceImpl implements IPurchaseReturnAppService {
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+
+
+    /**
+     * 采购退货单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime,String endTime, Integer pageNo, Integer pageSize) {
+
+        Page<PurchaseReturnDetailDto> receiptDetailList = purchaseReturnMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize),
+            locationId,startTime, endTime,ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+            Arrays.asList(SupplyType.PRODUCT_RETURN.getValue()),
+            SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
similarity index 80%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
index 2becf197..75921bad 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -25,6 +24,7 @@ import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.ChargeItemDefDetail;
 import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.administration.service.ITraceNoManageService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
@@ -32,13 +32,12 @@ import com.openhis.common.enums.ybenums.YbInvChgType;
 import com.openhis.common.enums.ybenums.YbRxFlag;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.medication.domain.MedicationDispense;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
 import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
 import com.openhis.web.inventorymanage.dto.*;
 import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
-import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
@@ -61,6 +60,8 @@ import com.openhis.yb.service.YbManager;
 @Service
 public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService {
 
+    @Autowired
+    private ITraceNoAppService traceNoAppService;
     @Autowired
     private ISupplyRequestService supplyRequestService;
     @Autowired
@@ -79,6 +80,8 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
     private IDeviceDispenseService deviceDispenseService;
     @Autowired
     private IReceiptApprovalAppService receiptApprovalAppService;
+    @Autowired
+    private ITraceNoManageService traceNoManageService;
 
     /**
      * 单据审批页面初始化
@@ -143,7 +146,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
      */
     @Override
     public List<SupplyItemDetailDto> getSupplyItemDetail(String busNo) {
-        return receiptApprovalMapper.selectSupplyDetail(busNo, EventStatus.COMPLETED.getValue());
+        return receiptApprovalMapper.selectSupplyDetail(busNo, DispenseStatus.COMPLETED.getValue());
     }
 
     /**
@@ -216,7 +219,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             List<SupplyItemDetailDto> supplyList = new ArrayList<>();
 
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
-
                 // 根据项目id,产品批号，仓库id 查询仓库库存表信息
                 List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
                     supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
@@ -230,8 +232,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     // 新增库存信息
                     supplyList.add(supplyItemDetailDto);
                 } else {
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItemPurpose.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
 
@@ -248,14 +248,20 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
                     }
                     // 更新源仓库库存数量
-                    Boolean aBoolean = inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(),
-                        baseQuantity, minQuantity, now);
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
 
                     if (!aBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
                 }
             }
+            // 新增追溯码记录
+            boolean result = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.PURCHASE_INVENTORY.getValue());
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
 
             if (!supplyList.isEmpty()) {
                 // 将供应项目的详细信息装配为库存项目
@@ -268,8 +274,8 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
-                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, now);
-                if (uploadFailedNoList != null && !uploadFailedNoList.isEmpty()) {
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, now);
+                if (!uploadFailedNoList.isEmpty()) {
                     returnMsg = "3503商品采购上传错误，错误项目编码" + uploadFailedNoList;
                 } else {
                     returnMsg = "3503商品采购上传成功";
@@ -302,11 +308,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
 
         // 查询供应项目的详细信息
         List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
-        // 首次盘存列表
-        List<SupplyItemDetailDto> firstSupplyItemDetailList = new ArrayList<>();
-        // 药品/耗材发放列表
-        List<MedicationDispense> medicationDispenses = null;
-        List<DeviceDispense> deviceDispenses = null;
         // 返回信息
         String stocktakingReturnMsg = null;
         String changeReturnMsg = null;
@@ -325,24 +326,8 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
                     supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
                     supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
-                // 查看该批号的药品/耗材是否发放过(用于证明是否首次盘存)
-                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
-                    medicationDispenses = medicationDispenseService.list(new LambdaQueryWrapper<MedicationDispense>()
-                        .eq(MedicationDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
-                    if (medicationDispenses.isEmpty()) {
-                        firstSupplyItemDetailList.add(supplyItemDetailDto);
-                    }
-                } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
-                    deviceDispenses = deviceDispenseService.list(new LambdaQueryWrapper<DeviceDispense>()
-                        .in(DeviceDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
-                    if (deviceDispenses.isEmpty()) {
-                        firstSupplyItemDetailList.add(supplyItemDetailDto);
-                    }
-                }
                 if (!inventoryItemList.isEmpty()) {
                     InventoryItem inventoryItem = inventoryItemList.get(0);
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItem.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItem.getQuantity();
 
@@ -356,40 +341,34 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
                     }
                     // 更新库存数量
-                    Boolean aBoolean = inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), baseQuantity,
-                        minQuantity, now);
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
                     if (!aBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
                 }
-
-                String ybSwitch =
-                    SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
-                if (Whether.YES.getCode().equals(ybSwitch)) {
-                    // 如果首次盘点信息不为空
-                    if (!firstSupplyItemDetailList.isEmpty()) {
-                        // 调用医保盘存接口，盘盈
-                        List<String> uploadFailedNoList = this.ybInventoryIntegrated(firstSupplyItemDetailList,
-                            YbInvChgType.INVENTORY_GAIN, true, now);
-                        if (uploadFailedNoList != null && !uploadFailedNoList.isEmpty()) {
-                            stocktakingReturnMsg = "3501盘存上传错误，错误项目编码" + uploadFailedNoList;
-                        }
-                    }
-                    List<String> uploadFailedGainList = null;
-                    List<String> uploadFailedLossList = null;
-                    if (!positiveList.isEmpty()) {
-                        // 调用医保库存变更接口，盘盈
-                        uploadFailedGainList =
-                            this.ybInventoryIntegrated(positiveList, YbInvChgType.INVENTORY_GAIN, false, now);
-                    }
-                    if (!negativeList.isEmpty()) {
-                        // 调用医保库存变更接口，盘亏
-                        uploadFailedLossList =
-                            this.ybInventoryIntegrated(negativeList, YbInvChgType.INVENTORY_LOSS, false, now);
-                    }
-                    if (uploadFailedGainList != null || uploadFailedLossList != null) {
-                        changeReturnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedGainList + uploadFailedLossList;
-                    }
+            }
+            // 处理盘点追溯码
+            boolean result =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.PRODUCT_STOCKTAKING.getValue());
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedGainList = null;
+                List<String> uploadFailedLossList = null;
+                if (!positiveList.isEmpty()) {
+                    // 调用医保库存变更接口，盘盈
+                    uploadFailedGainList = this.ybInventoryIntegrated(positiveList, YbInvChgType.INVENTORY_GAIN, now);
+                }
+                if (!negativeList.isEmpty()) {
+                    // 调用医保库存变更接口，盘亏
+                    uploadFailedLossList = this.ybInventoryIntegrated(negativeList, YbInvChgType.INVENTORY_LOSS, now);
+                }
+                if (uploadFailedGainList != null || uploadFailedLossList != null) {
+                    changeReturnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedGainList + uploadFailedLossList;
                 }
             }
         }
@@ -424,25 +403,25 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
 
         if (!supplyItemDetailList.isEmpty()) {
-
             // 新增库存信息
             List<SupplyItemDetailDto> supplylList = new ArrayList<>();
 
-            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            // 分离出入库列表
+            List<SupplyItemDetailDto> inList = new ArrayList<>();
+            List<SupplyItemDetailDto> outList = new ArrayList<>();
 
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
                 // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
-                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
                     supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
                     supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
                 InventoryItem inventoryItemSource = new InventoryItem();
-                if (!inventoryItemList.isEmpty()) {
-                    inventoryItemSource = inventoryItemList.get(0);
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItemSource.getQuantity();
+                if (!inventoryItemSourceList.isEmpty()) {
+                    inventoryItemSource = inventoryItemSourceList.get(0);
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemSource.getQuantity();
 
-                    // 计算盘点后库存数量，结果取小单位
+                    // 计算调拨后库存数量，结果取小单位
                     // 供应申请的物品计量单位与包装单位相同
                     if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
                         if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
@@ -464,11 +443,16 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         }
                     }
                     // 更新源仓库库存数量
-                    Boolean aBoolean = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
-                        baseQuantity, minQuantity, now);
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
                     if (!aBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
+
+                    // 添加到出库列表
+                    outList.add(supplyItemDetailDto);
+                } else {
+                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                 }
 
                 // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
@@ -490,8 +474,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     // 新增库存信息
                     supplylList.add(supplyItemDetailDto);
                 } else {
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItemPurpose.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
 
@@ -507,13 +489,15 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
                     }
                     // 更新目的仓库库存数量
-                    Boolean bBoolean = inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(),
-                        baseQuantity, minQuantity, now);
+                    Boolean bBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
 
                     if (!bBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
                 }
+                // 添加到入库列表
+                inList.add(supplyItemDetailDto);
             }
 
             if (!supplylList.isEmpty()) {
@@ -522,6 +506,20 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 // 入库
                 inventoryItemService.stockIn(inventoryItemList);
             }
+
+            // 处理出库追溯码
+            boolean outResult = traceNoAppService.addTraceNoManage(outList, TraceNoStatus.OUT.getValue(),
+                SupplyType.PRODUCT_TRANSFER.getValue());
+            if (!outResult) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 处理入库追溯码
+            boolean inResult = traceNoAppService.addTraceNoManage(inList, TraceNoStatus.IN.getValue(),
+                SupplyType.PRODUCT_TRANSFER.getValue());
+            if (!inResult) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
         }
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
 
@@ -554,8 +552,8 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         // 返回信息
         String returnMsg = null;
         if (!supplyItemDetailList.isEmpty()) {
-            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
 
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
                 // 根据项目id,产品批号，目的仓库id 查询仓库库存表信息
                 List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
                     supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
@@ -563,9 +561,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 InventoryItem inventoryItemSource;
                 if (!inventoryItemList.isEmpty()) {
                     inventoryItemSource = inventoryItemList.get(0);
-
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItemSource.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemSource.getQuantity();
 
@@ -592,8 +587,8 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     }
 
                     // 更新仓库库存数量
-                    Boolean aBoolean = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
-                        baseQuantity, minQuantity, now);
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
 
                     if (!aBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
@@ -605,13 +600,18 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     }
                 }
             }
-
+            // 处理追溯码
+            boolean result = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.PRODUCT_RETURN.getValue());
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
             // 调用医保采购退货接口
             String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
-                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, now);
-                if (uploadFailedNoList != null && !uploadFailedNoList.isEmpty()) {
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, now);
+                if (!uploadFailedNoList.isEmpty()) {
                     returnMsg = "3504采购退货上传错误，错误项目编码" + uploadFailedNoList;
                 }
             }
@@ -644,6 +644,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         // 查询供应项目的详细信息
         List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
         if (!supplyItemDetailList.isEmpty()) {
+
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
                 // 根据id，产品批号，仓库 查询库存表信息
                 List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
@@ -652,9 +653,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 InventoryItem inventoryItem = new InventoryItem();
                 if (!inventoryItemList.isEmpty()) {
                     inventoryItem = inventoryItemList.get(0);
-
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItem.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItem.getQuantity();
 
@@ -663,7 +661,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
                         if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
                             // 库存数量不足
-                            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Inventory.M00002, null));
+                            return R.fail("操作失败,库存数量不足");
                         } else {
                             // 目的仓库库存-(报损数量*拆零比)
                             minQuantity = minQuantity.subtract(
@@ -672,7 +670,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
                         if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
                             // 库存数量不足
-                            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Inventory.M00002, null));
+                            return R.fail("操作失败,库存数量不足");
                         } else {
                             // 供应申请的物品计量单位与最小单位相同
                             // 目的仓库库存-报损数量
@@ -680,19 +678,27 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         }
                     }
                     // 更新库存数量
-                    Boolean aBoolean = inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), baseQuantity,
-                        minQuantity, now);
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
                     if (!aBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
                 }
             }
+            // 追溯码管理表数据追加
+            // 处理追溯码
+            boolean result = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.LOSS_REPORT_FORM.getValue());
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
             // 调用医保库存变更接口
             String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
-                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.DESTRUCTION, false, now);
-                if (uploadFailedNoList != null && !uploadFailedNoList.isEmpty()) {
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.DESTRUCTION, now);
+                if (!uploadFailedNoList.isEmpty()) {
                     returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
                 }
             }
@@ -727,7 +733,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         if (!supplyItemDetailList.isEmpty()) {
 
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
-
                 // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
                 List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
                     supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
@@ -735,9 +740,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 InventoryItem inventoryItemSource = new InventoryItem();
                 if (!inventoryItemList.isEmpty()) {
                     inventoryItemSource = inventoryItemList.get(0);
-
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItemSource.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemSource.getQuantity();
 
@@ -762,14 +764,31 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         }
                     }
                     // 更新源仓库库存数量
-                    Boolean aBoolean = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
-                        baseQuantity, minQuantity, now);
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
 
                     if (!aBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
                 }
             }
+            // 处理追溯码
+            boolean result = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.ISSUE_INVENTORY.getValue());
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 返回信息
+            String returnMsg = null;
+            // 调用医保库存变更接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.OTHER_OUT, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
         }
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
 
@@ -800,12 +819,10 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
 
         if (!supplyItemDetailList.isEmpty()) {
-
             // 新增库存信息
             List<SupplyItemDetailDto> supplylList = new ArrayList<>();
 
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
-
                 // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
                 List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
                     supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
@@ -819,8 +836,6 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     // 新增库存信息
                     supplylList.add(supplyItemDetailDto);
                 } else {
-                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-                    BigDecimal baseQuantity = inventoryItemPurpose.getQuantity();
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
 
@@ -836,8 +851,8 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                         minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
                     }
                     // 更新目的仓库库存数量
-                    Boolean bBoolean = inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(),
-                        baseQuantity, minQuantity, now);
+                    Boolean bBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
                     if (!bBoolean) {
                         return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
                     }
@@ -850,7 +865,23 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 // 入库
                 inventoryItemService.stockIn(inventoryItemList);
             }
-
+            // 处理追溯码
+            boolean result = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.RETURN_ISSUE.getValue());
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 返回信息
+            String returnMsg = null;
+            // 调用医保库存变更接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.OTHER_IN, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
         }
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
 
@@ -901,12 +932,11 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     break;
                 }
             }
-            if (shouldSkip) {
-                continue; // 跳过当前supplyRequest，不加入结果集
+            if (!shouldSkip) {
+                // 新增对应项目的价格定义子表
+                resultList.add(this.addChargeItemDefApp(supplyRequest.getLotNumber(), supplyRequest.getPrice(),
+                    details.get(0).getDefinitionId()));
             }
-            // 新增对应项目的价格定义子表
-            resultList.add(this.addChargeItemDefApp(supplyRequest.getLotNumber(), supplyRequest.getPrice(),
-                details.get(0).getDefinitionId()));
         }
         return resultList;
     }
@@ -923,7 +953,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
         chargeItemDefDetail
             // 命中条件：批号
-            .setConditionCode(ConditionCode.LOT_NUMBER.getCode())
+            .setConditionCode(ConditionCode.LOT_NUMBER_COST.getCode())
             // 命中值
             .setConditionValue(conditionValue)
             // 主表id
@@ -938,105 +968,46 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
      *
      * @param supplyItemDetailList 供应申请项目详细信息
      * @param ybInvChgType 库存变更类型
-     * @param firstFlag 首次盘存标识
-     * @param now 库存变更时间
-     * @return 上传失败的id集合
-     */
-    // @Async
-    // public List<String> ybInventoryIntegrated(List<SupplyItemDetailDto> supplyItemDetailList,
-    // YbInvChgType ybInvChgType, Boolean firstFlag, Date now) {
-    // List<String> uploadFailedNoList = new ArrayList<>();
-    // R<?> result;
-    // R<?> firstResult = R.ok();
-    // for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
-    // switch (ybInvChgType) {
-    // case ALLOCATION_IN:
-    // case ALLOCATION_OUT:
-    // case INVENTORY_GAIN:
-    // case INVENTORY_LOSS:
-    // case DESTRUCTION:
-    // case OTHER_IN:
-    // case OTHER_OUT:
-    // case DONATION_IN:
-    // case DONATION_RETURN_OUT:
-    // if (firstFlag) {
-    // firstResult = ybService.uploadInventoryCount(supplyItemDetailDto, now);
-    // }
-    // result = ybService.updateInventoryCount(supplyItemDetailDto, now, ybInvChgType.getDescription());
-    // if (result.getCode() != 200 || firstResult.getCode() != 200) {
-    // uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
-    // }
-    // break;
-    // case PURCHASE_IN:
-    // result = ybService.procurement(supplyItemDetailDto, now);
-    // if (result.getCode() != 200) {
-    // uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
-    // }
-    // case RETURN_OUT:
-    // result = ybService.cancelProcurement(supplyItemDetailDto, now);
-    // if (result.getCode() != 200) {
-    // uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
-    // }
-    // break;
-    // default:
-    // throw new IllegalArgumentException("未知的库存变更类型: " + ybInvChgType);
-    // }
-    // }
-    // return CompletableFuture.completedFuture(uploadFailedNoList);
-    // }
-
-    /**
-     * 医保库存相关进销存接口
-     *
-     * @param supplyItemDetailList 供应申请项目详细信息
-     * @param ybInvChgType 库存变更类型
-     * @param firstFlag 首次盘存标识
      * @param now 库存变更时间
      * @return 上传失败的id集合
      */
     private List<String> ybInventoryIntegrated(List<SupplyItemDetailDto> supplyItemDetailList,
-        YbInvChgType ybInvChgType, Boolean firstFlag, Date now) {
+        YbInvChgType ybInvChgType, Date now) {
         List<String> uploadFailedNoList = new ArrayList<>();
-        R<?> result;
-        R<?> firstResult = R.ok();
+        // 没有医保码的项目不调进销存
         for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
             if (supplyItemDetailDto.getYbNo() == null) {
                 continue;
             }
-            switch (ybInvChgType) {
-                case ALLOCATION_IN:
-                case ALLOCATION_OUT:
-                case INVENTORY_GAIN:
-                case INVENTORY_LOSS:
-                case DESTRUCTION:
-                case OTHER_IN:
-                case OTHER_OUT:
-                case DONATION_IN:
-                case DONATION_RETURN_OUT:
-                    if (firstFlag) {
-                        firstResult =
-                            ybService.uploadInventoryCount(getMedicalInventory3501Param(supplyItemDetailDto, now), now);
-                    }
-                    result = ybService.updateInventoryCount(
-                        getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
-                    if (result.getCode() != 200 || firstResult.getCode() != 200) {
-                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
-                    }
-                    break;
-                case PURCHASE_IN:
-                    result = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
-                    if (result.getCode() != 200) {
-                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
-                    }
-                    break;
-                case RETURN_OUT:
-                    result = ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
-                    if (result.getCode() != 200) {
-                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
-                    }
-                    break;
-                default:
-                    throw new IllegalArgumentException("未知的库存变更类型: " + ybInvChgType);
+            R<?> result;
+            // 跳过库存变更标识
+            boolean skipInventoryUpdate = false;
+
+            // 处理采购入库
+            if (ybInvChgType == YbInvChgType.PURCHASE_IN) {
+                R<?> purchaseResult = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
+                if (purchaseResult.getCode() != 200) {
+                    uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                    // 采购失败时跳过库存变更
+                    skipInventoryUpdate = true;
+                }
+                // 处理采购退货
+            } else if (ybInvChgType == YbInvChgType.RETURN_OUT) {
+                R<?> returnResult = ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
+                if (returnResult.getCode() != 200) {
+                    uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                    // 退货失败时跳过库存变更
+                    skipInventoryUpdate = true;
+                }
+            }
+
+            // 所有类型都需要调用库存变更（特殊类型失败时跳过）
+            if (!skipInventoryUpdate) {
+                result = ybService.updateInventoryCount(
+                    getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
+                if (result.getCode() != 200) {
+                    uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                }
             }
         }
         return uploadFailedNoList;
@@ -1109,19 +1080,24 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     minPrice = price.get().divide(supplyItemDetailDto.getPartPercent(), RoundingMode.HALF_UP);
                 }
             }
-            // 转换为JSON
+
             JSONArray medicalTraceNo = new JSONArray();
-            // 获取追溯码信息
-            if (supplyItemDetailDto.getTraceNo() != null) {
-                List<String> traceNoList =
-                    Arrays.stream(supplyItemDetailDto.getTraceNo().split(CommonConstants.Common.COMMA))
-                        .map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
-                for (String traceNo : traceNoList) {
+            List<String> inventoryTraceNoList = null;
+            if (!YbInvChgType.DESTRUCTION.getValue().equals(ybInvChgType)
+                || !YbInvChgType.INVENTORY_LOSS.getValue().equals(ybInvChgType)) {
+                // 获取同一批号下在库的追溯码信息
+                inventoryTraceNoList = traceNoManageService.getInventoryTraceNoList(supplyItemDetailDto.getItemId(),
+                    supplyItemDetailDto.getLotNumber());
+            }
+            // 转换成上传医保的格式
+            if (inventoryTraceNoList != null) {
+                for (String traceNo : inventoryTraceNoList) {
                     Map<String, String> traceNoMap = new HashMap<>();
                     traceNoMap.put("drug_trac_codg", traceNo);
                     medicalTraceNo.add(traceNoMap);
                 }
             }
+
             medicalInventory3502Param.setMedListCodg(supplyItemDetailDto.getYbNo()).setInvChgType(ybInvChgType)
                 .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
                 .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
index 66447ed1..c1b80a39 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
@@ -4,6 +4,7 @@
 package com.openhis.web.inventorymanage.appservice.impl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -99,7 +100,7 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
     public R<?> requisitionIssueNoInit() {
         IssueInitDto initDto = new IssueInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.REQUISITION_NUM.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.REQUISITION_NUM.getPrefix(), 4));
         return R.ok(initDto);
     }
 
@@ -261,4 +262,26 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+
+    /**
+     * 领用出库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime,String endTime, Integer pageNo, Integer pageSize) {
+
+        Page<IssueDetailDto> receiptDetailList = requisitionIssueMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize),
+            locationId,startTime, endTime,ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+            Arrays.asList(SupplyType.ISSUE_INVENTORY.getValue()),
+            SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
index ace9c7ba..683b86f9 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -108,7 +109,7 @@ public class ReturnIssueAppServiceImpl implements IReturnIssueAppService {
     public R<?> returnIssueNoInit() {
         IssueInitDto initDto = new IssueInitDto();
         // 单据号
-        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.RETURN_ISSUE_NUM.getPrefix(), 10));
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.RETURN_ISSUE_NUM.getPrefix(), 4));
         return R.ok(initDto);
     }
 
@@ -263,4 +264,26 @@ public class ReturnIssueAppServiceImpl implements IReturnIssueAppService {
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
+
+    /**
+     * 领用退库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @Override
+    public R<?> getMonthlySettlementDetail(Long locationId, String startTime,String endTime, Integer pageNo, Integer pageSize) {
+
+        Page<IssueDetailDto> receiptDetailList = ReturnIssueMapper.getMonthlySettlementDetail(new Page<>(pageNo, pageSize),
+            locationId,startTime, endTime,ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(),
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+            Arrays.asList(SupplyType.RETURN_ISSUE.getValue()),
+            SupplyStatus.AGREE.getValue());
+
+        return R.ok(receiptDetailList);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
new file mode 100644
index 00000000..e7e45ec2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.domain.TraceNoManage;
+import com.openhis.administration.mapper.TraceNoManageMapper;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.ITraceNoManageService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.ItemType;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.common.enums.TraceNoStatus;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.inventorymanage.dto.*;
+import com.openhis.web.inventorymanage.mapper.TraceNoAppMapper;
+
+/**
+ * 追溯码管理 impl
+ *
+ * @author yuxj
+ * @date 2025-07-07
+ */
+@Service
+public class TraceNoAppServiceImpl implements ITraceNoAppService {
+    @Autowired
+    private ITraceNoManageService traceNoManageService;
+    @Autowired
+    private ILocationService locationService;
+    @Resource
+    private TraceNoAppMapper traceNoAppMapper;
+    @Resource
+    private TraceNoManageMapper traceNoManageMapper;
+
+    /**
+     * 追溯码管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> traceNoInit() {
+
+        TraceNoInitDto initDto = new TraceNoInitDto();
+
+        // 药房,药库列表
+        List<Location> locationList = locationService.getPharmacyCabinetList();
+        // 药房，药库
+        List<TraceNoInitDto.locationOption> locationOptions = locationList.stream()
+            .map(location -> new TraceNoInitDto.locationOption(location.getId(), location.getName()))
+            .collect(Collectors.toList());
+
+        // 追溯码状态
+        List<TraceNoInitDto.itemTypeOption> traceNoStatusOptions = Stream.of(TraceNoStatus.values())
+            .map(itemType -> new TraceNoInitDto.itemTypeOption(itemType.getValue(), itemType.getInfo()))
+            .collect(Collectors.toList());
+
+        // 项目类型
+        List<TraceNoInitDto.itemTypeOption> itemTypeOptions = Stream.of(ItemType.values())
+            .map(itemType -> new TraceNoInitDto.itemTypeOption(itemType.getValue(), itemType.getInfo()))
+            .collect(Collectors.toList());
+
+        // 操作类型
+        List<TraceNoInitDto.itemTypeOption> operationTypeOptions = Stream.of(SupplyType.values())
+            .map(itemType -> new TraceNoInitDto.itemTypeOption(itemType.getValue(), itemType.getInfo()))
+            .collect(Collectors.toList());
+
+        initDto.setLocationOptions(locationOptions).setTraceNoStatusOptions(traceNoStatusOptions)
+            .setItemTypeOptions(itemTypeOptions).setOperationTypeOptions(operationTypeOptions);
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 追溯码管理列表
+     *
+     * @param traceNoSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return
+     */
+    @Override
+    public R<?> getPage(TraceNoSearchParam traceNoSearchParam, Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<TraceNoSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(traceNoSearchParam, searchKey,
+            new HashSet<>(Arrays.asList("name", "trace_no")), request);
+        // 设置排序
+        queryWrapper.orderByDesc("create_time");
+
+        // 查询退货出库单据分页列表
+        Page<TraceNoDetailsPageDto> traceNoDetailsPage =
+            traceNoAppMapper.selectDetailsPage(new Page<>(pageNo, pageSize), queryWrapper);
+        traceNoDetailsPage.getRecords().forEach(e -> {
+            // 追溯码状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(TraceNoStatus.class, e.getStatusEnum()));
+            // 操作类型
+            e.setOperationType_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getOperationType()));
+            // 项目类型
+            e.setItemType_enumText(EnumUtils.getInfoByValue(ItemType.class, e.getItemType()));
+        });
+
+        return R.ok(traceNoDetailsPage);
+    }
+
+    /**
+     * 添加追溯码信息
+     *
+     * @param traceNoInfoList 追溯码信息
+     * @return 操作结果
+     */
+    @Override
+    public R<?> addTraceNoInfo(List<TraceNoInfoParam> traceNoInfoList) {
+
+        List<TraceNoManage> traceNoManageList = new ArrayList<>();
+        for (TraceNoInfoParam item : traceNoInfoList) {
+            // 初始化单据信息
+            TraceNoManage traceNoManage = new TraceNoManage();
+            // 生成待发送的退货出库单据
+            traceNoManage
+                // 项目所属表
+                .setItemTable(item.getItemTable())
+                // 项目id
+                .setItemId(item.getItemId())
+                // 仓库类型
+                .setLocationTypeEnum(item.getLocationTypeEnum())
+                // 仓库
+                .setLocationId(item.getLocationId())
+                // 仓位
+                .setLocationStoreId(item.getLocationStoreId())
+                // 产品批号
+                .setLotNumber(item.getLotNumber())
+                // 追溯码
+                .setTraceNo(item.getTraceNo())
+                // 追溯码状态
+                .setStatusEnum(item.getStatusEnum())
+                // 追溯码单位
+                .setUnitCode(item.getUnitCode())
+                // 操作类型
+                .setOperationType(item.getOperationType());
+            traceNoManageList.add(traceNoManage);
+        }
+
+        // 保存
+        boolean flg = traceNoManageService.saveBatch(traceNoManageList);
+        if (!flg) {
+            return R.fail(PromptMsgConstant.Common.M00011);
+        }
+        // 返回请求id
+        return R.ok(PromptMsgConstant.Common.M00004);
+    }
+
+    /**
+     * 追加追溯码信息
+     *
+     * @param supplyItemDetailList 单据信息
+     * @param statusEnum 追溯码状态
+     * @param operationType 操作类型
+     * @return 操作结果
+     */
+    @Override
+    public boolean addTraceNoManage(List<SupplyItemDetailDto> supplyItemDetailList, Integer statusEnum,
+        Integer operationType) {
+        // 追溯码列表
+        List<TraceNoManage> traceNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
+        for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            // 使用逗号分割追溯码并转换为List
+            String[] traceNoList = supplyItemDetailDto.getTraceNo().split(CommonConstants.Common.COMMA);
+            for (String item : traceNoList) {
+                traceNoManage = new TraceNoManage();
+                // 追溯码处理
+                traceNoManage.setItemTable(supplyItemDetailDto.getItemTable())
+                    // 项目id
+                    .setItemId(supplyItemDetailDto.getItemId())
+                    // 产品批号
+                    .setLotNumber(supplyItemDetailDto.getLotNumber())
+                    // 追溯码
+                    .setTraceNo(item)
+                    // 追溯码状态
+                    .setStatusEnum(statusEnum)
+                    // 追溯码单位
+                    .setUnitCode(supplyItemDetailDto.getTraceNoUnitCode())
+                    // 操作类型
+                    .setOperationType(operationType);
+                // 追溯码[进]对应的是目的仓库，[出]对应源仓库
+                if (TraceNoStatus.IN.getValue().equals(statusEnum)) {
+                    if (supplyItemDetailDto.getPurposeTypeEnum() != null) {
+                        traceNoManage.setLocationTypeEnum(supplyItemDetailDto.getPurposeTypeEnum());
+                    }
+                    if (supplyItemDetailDto.getPurposeLocationId() != null) {
+                        traceNoManage.setLocationId(supplyItemDetailDto.getPurposeLocationId());
+                    }
+                    if (supplyItemDetailDto.getPurposeLocationStoreId() != null) {
+                        traceNoManage.setLocationStoreId(supplyItemDetailDto.getPurposeLocationStoreId());
+                    }
+                } else {
+                    if (supplyItemDetailDto.getSourceTypeEnum() != null) {
+                        traceNoManage.setLocationTypeEnum(supplyItemDetailDto.getSourceTypeEnum());
+                    }
+                    if (supplyItemDetailDto.getSourceLocationId() != null) {
+                        traceNoManage.setLocationId(supplyItemDetailDto.getSourceLocationId());
+                    }
+                    if (supplyItemDetailDto.getSourceLocationStoreId() != null) {
+                        traceNoManage.setLocationStoreId(supplyItemDetailDto.getSourceLocationStoreId());
+                    }
+                }
+                traceNoManageList.add(traceNoManage);
+            }
+        }
+        return traceNoManageService.saveBatch(traceNoManageList);
+    }
+
+    /**
+     * 修改追溯码信息
+     *
+     * @param supplyItemDetailList 单据信息
+     * @param operationType 操作类型
+     * @return 操作结果
+     */
+    @Override
+    public boolean updateTraceNoList(List<SupplyItemDetailDto> supplyItemDetailList, Integer operationType) {
+        // 追溯码列表
+        List<TraceNoManage> traceNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
+        for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            // 查询该商品都有什么追溯码
+            List<TraceNoManage> traceNoInfoItemList = traceNoManageMapper.getItemTraceNoInfo(
+                supplyItemDetailDto.getItemTable(), supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getPurposeLocationId(), supplyItemDetailDto.getLotNumber());
+            List<String> traceNoList = traceNoInfoItemList.stream().map(TraceNoManage::getTraceNo) // 提取 traceNo
+                .toList();
+            // 使用逗号分割追溯码并转换为List
+            List<String> traceNoAddList = Arrays.asList(supplyItemDetailDto.getTraceNo().split(","));
+
+            Set<String> add =
+                traceNoAddList.stream().filter(code -> !traceNoList.contains(code)).collect(Collectors.toSet());
+            Set<String> subtract =
+                traceNoList.stream().filter(code -> !traceNoAddList.contains(code)).collect(Collectors.toSet());
+
+            // 合并结果到一个映射中
+            Map<String, String> result = Stream
+                .concat(add.stream().collect(Collectors.toMap(code -> code, code -> "add")).entrySet().stream(),
+                    subtract.stream().collect(Collectors.toMap(code -> code, code -> "subtract")).entrySet().stream())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+            for (Map.Entry<String, String> entry : result.entrySet()) {
+                traceNoManage = new TraceNoManage();
+                // 追溯码处理
+                traceNoManage.setItemTable(supplyItemDetailDto.getItemTable())
+                    // 项目id
+                    .setItemId(supplyItemDetailDto.getItemId())
+                    // 仓库类型
+                    .setLocationTypeEnum(supplyItemDetailDto.getPurposeTypeEnum())
+                    // 仓库
+                    .setLocationId(supplyItemDetailDto.getPurposeLocationId())
+                    // 仓位
+                    .setLocationStoreId(supplyItemDetailDto.getPurposeLocationStoreId())
+                    // 产品批号
+                    .setLotNumber(supplyItemDetailDto.getLotNumber())
+                    // 追溯码
+                    .setTraceNo(entry.getKey())
+                    // 追溯码单位
+                    .setUnitCode(supplyItemDetailDto.getItemUnit())
+                    // 操作类型
+                    .setOperationType(operationType);
+                if (Objects.equals(entry.getValue(), "add")) {
+                    // 追溯码状态
+                    traceNoManage.setStatusEnum(TraceNoStatus.IN.getValue());
+                } else {
+                    // 追溯码状态
+                    traceNoManage.setStatusEnum(TraceNoStatus.OUT.getValue());
+                }
+                traceNoManageList.add(traceNoManage);
+            }
+        }
+
+        return traceNoManageService.saveBatch(traceNoManageList);
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
index a98bad73..e0830153 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
@@ -42,10 +42,6 @@ public class InventoryManageAssembler {
                 .setTraceNo(supplyItemDetailDto.getTraceNo())
                 // 供应商
                 .setSupplierId(supplyItemDetailDto.getSupplierId())
-                // 仓库
-                .setLocationId(supplyItemDetailDto.getPurposeLocationId())
-                // 库位
-                .setLocationStoreId(supplyItemDetailDto.getPurposeLocationStoreId())
                 // 过期日期
                 .setExpirationDate(supplyItemDetailDto.getEndTime())
                 // 生产日期
@@ -59,7 +55,11 @@ public class InventoryManageAssembler {
                 // 最小单位
                 .setUnitCode(supplyItemDetailDto.getMinUnitCode())
                 // 采购价格
-                .setPrice(supplyItemDetailDto.getPrice());
+                .setPrice(supplyItemDetailDto.getPrice())
+                // 仓库
+                .setLocationId(supplyItemDetailDto.getPurposeLocationId())
+                // 库位
+                .setLocationStoreId(supplyItemDetailDto.getPurposeLocationStoreId());
 
             if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
                 inventoryItem
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
new file mode 100644
index 00000000..3cd10c07
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
@@ -0,0 +1,109 @@
+///*
+// * Copyright ©2023 CJB-CNIT Team. All rights reserved
+// */
+//package com.openhis.web.inventorymanage.controller;
+//
+//import javax.servlet.http.HttpServletRequest;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import com.core.common.core.domain.R;
+//import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService;
+//import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+///**
+// * 库存相关明细查询 controller
+// *
+// * @author
+// * @date 2025-03-10
+// */
+//@RestController
+//@RequestMapping("/inventory-manage-details")
+//@Slf4j
+//public class InventoryDetailsController {
+//
+//    @Autowired
+//    private IInventoryDetailsAppService inventoryDetailsAppService;
+//
+//    /**
+//     * 采购入库明细查询
+//     *
+//     * @param inventoryDetailsSearchParam 查询条件
+//     * @param pageNo 当前页码
+//     * @param pageSize 查询条数
+//     * @param searchKey 模糊查询关键字
+//     * @param request 请求数据
+//     * @return 采购入库分页列表
+//     */
+//    @GetMapping(value = "/purchase-in")
+//    public R<?> purchaseInGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
+//        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+//        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+//        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+//        return inventoryDetailsAppService.purchaseInGetPage(inventoryDetailsSearchParam, pageNo, pageSize, searchKey,
+//            request);
+//    }
+//
+//    /**
+//     * 商品调拨明细查询
+//     *
+//     * @param inventoryDetailsSearchParam 查询条件
+//     * @param pageNo 当前页码
+//     * @param pageSize 查询条数
+//     * @param searchKey 模糊查询关键字
+//     * @param request 请求数据
+//     * @return 商品调拨分页列表
+//     */
+//    @GetMapping(value = "/inventory-transfer")
+//    public R<?> transferGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
+//        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+//        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+//        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+//        return inventoryDetailsAppService.transferGetPage(inventoryDetailsSearchParam, pageNo, pageSize, searchKey,
+//            request);
+//    }
+//
+//    /**
+//     * 领用出库明细查询
+//     *
+//     * @param inventoryDetailsSearchParam 查询条件
+//     * @param pageNo 当前页码
+//     * @param pageSize 查询条数
+//     * @param searchKey 模糊查询关键字
+//     * @param request 请求数据
+//     * @return 领用出库明细分页列表
+//     */
+//    @GetMapping(value = "/requisition-out")
+//    public R<?> requisitionOutGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
+//        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+//        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+//        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+//        return inventoryDetailsAppService.requisitionOutGetPage(inventoryDetailsSearchParam, pageNo, pageSize,
+//            searchKey, request);
+//    }
+//
+//    /**
+//     * 商品盘点明细查询
+//     *
+//     * @param inventoryDetailsSearchParam 查询条件
+//     * @param pageNo 当前页码
+//     * @param pageSize 查询条数
+//     * @param searchKey 模糊查询关键字
+//     * @param request 请求数据
+//     * @return 商品盘点分页列表
+//     */
+//    @GetMapping(value = "/inventory-stock-take")
+//    public R<?> inventoryStockGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
+//        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+//        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+//        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+//        return inventoryDetailsAppService.inventoryStockGetPage(inventoryDetailsSearchParam, pageNo, pageSize,
+//            searchKey, request);
+//    }
+//}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
index ec2bd814..f43649f4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
@@ -125,4 +125,20 @@ public class LossReportFormController {
         return lossReportFormAppService.withdrawApproval(busNo);
     }
 
+    /**
+     * 报损单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/loss-receipt-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return lossReportFormAppService.getMonthlySettlementDetail(locationId, startTime,endTime,pageNo,pageSize);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java
index ab96e48f..2e2a0051 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailsController.java
@@ -48,10 +48,22 @@ public class ProductDetailsController {
     @GetMapping(value = "/product-page")
     public R<?> getPage(ProductDetailsSearchParam productDetailsSearchParam,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "50") Integer pageSize,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
         @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
         return productDetailsAppService.getPage(productDetailsSearchParam, pageNo, pageSize, searchKey, request);
     }
+    /**
+     * 查询库存商品明细分页列表合计
+     *
+     * @param productDetailsSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @return 库存商品明细分页列表合计
+     */
+    @GetMapping(value = "/product-page-total")
+    public R<?> getPageTotal(ProductDetailsSearchParam productDetailsSearchParam,
+                        @RequestParam(name = "searchKey", required = false) String searchKey) {
+        return productDetailsAppService.getPageTotal(productDetailsSearchParam, searchKey );
+    }
 
     /**
      * 操作：停供
@@ -75,4 +87,23 @@ public class ProductDetailsController {
         return productDetailsAppService.cancelSupplyById(id);
     }
 
+    /**
+     * 操作：效期预警
+     *
+     * @param productDetailsSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 操作结果
+     */
+    @GetMapping("/expiration-warning")
+    public R<?> expirationWarning(ProductDetailsSearchParam productDetailsSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "50") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return productDetailsAppService.expirationWarning(productDetailsSearchParam, pageNo, pageSize, searchKey,
+            request);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
similarity index 80%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
index e5c1c69b..3c85b4df 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
@@ -161,4 +161,36 @@ public class ProductStocktakingController {
         return productStocktakingAppService.withdrawApproval(busNo);
     }
 
+    /**
+     * 自动盘点单据详情
+     *
+     * @param locationId 库房id
+     * @param time 时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/stocktaking-receipt-auto")
+    public R<?> getAutoDetail(@RequestParam Long locationId, @RequestParam String time,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return productStocktakingAppService.getAutoDetail(locationId, time,pageNo,pageSize);
+    }
+    /**
+     * 盘点单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/stocktaking-receipt-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return productStocktakingAppService.getMonthlySettlementDetail(locationId, startTime,endTime,pageNo,pageSize);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
similarity index 87%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
index 72c10da4..00d467fc 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
@@ -171,4 +171,23 @@ public class ProductTransferController {
     public R<?> withdrawApproval(@RequestBody String busNo) {
         return productTransferAppService.withdrawApproval(busNo);
     }
+
+    /**
+     * 调拨单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param inOutFlg 调入调出flg 1:调入，2：调出
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/transfer-receipt-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,
+        @RequestParam String endTime, @RequestParam Integer inOutFlg,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return productTransferAppService.getMonthlySettlementDetail(locationId, startTime, endTime,inOutFlg, pageNo, pageSize);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
index e6c2ecb1..c570161f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
@@ -124,4 +124,20 @@ public class PurchaseInventoryController {
     public R<?> withdrawApproval(@RequestBody String busNo) {
         return purchaseInventoryAppService.withdrawApproval(busNo);
     }
+    /**
+     * 采购入库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/inventory-receipt-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return purchaseInventoryAppService.getMonthlySettlementDetail(locationId, startTime,endTime,pageNo,pageSize);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
similarity index 81%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
index fdbdc604..09cf2ed2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
@@ -115,4 +115,20 @@ public class PurchaseReturnController {
         return purchaseReturnAppService.withdrawApproval(busNo);
     }
 
+    /**
+     * 采购退货单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/return-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return purchaseReturnAppService.getMonthlySettlementDetail(locationId, startTime,endTime,pageNo,pageSize);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
index b2e7cd28..47ee428d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
@@ -124,4 +124,21 @@ public class RequisitionIssueController {
     public R<?> withdrawApproval(@RequestBody String busNo) {
         return requisitionIssueAppService.withdrawApproval(busNo);
     }
+
+    /**
+     * 领用出库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/requisition-issue-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return requisitionIssueAppService.getMonthlySettlementDetail(locationId, startTime,endTime,pageNo,pageSize);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
similarity index 83%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
index 2b8f3058..daad89d0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
@@ -121,4 +121,22 @@ public class ReturnIssueController {
     public R<?> withdrawApproval(@RequestBody String busNo) {
         return returnIssueAppService.withdrawApproval(busNo);
     }
+
+    /**
+     * 领用退库单据详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    @GetMapping(value = "/return-issue-monthly-settlement")
+    public R<?> getMonthlySettlementDetail(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return returnIssueAppService.getMonthlySettlementDetail(locationId, startTime,endTime,pageNo,pageSize);
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java
new file mode 100644
index 00000000..d8e0d5a4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.inventorymanage.dto.TraceNoInfoParam;
+import com.openhis.web.inventorymanage.dto.TraceNoSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 追溯码管理 controller
+ *
+ * @author yuxj
+ * @date 2025-07-07
+ */
+@RestController
+@RequestMapping("/inventory-manage/traceNo")
+@Slf4j
+public class TraceNoManageController {
+
+    @Resource
+    private ITraceNoAppService traceNoAppService;
+
+    /**
+     * 追溯码管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> traceNoInit() {
+        return traceNoAppService.traceNoInit();
+    }
+
+    /**
+     * 追溯码管理列表
+     *
+     * @param traceNoSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return
+     */
+    @GetMapping(value = "/inventory-receipt-page")
+    public R<?> getPage(TraceNoSearchParam traceNoSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return traceNoAppService.getPage(traceNoSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 添加追溯码信息
+     *
+     * @param traceNoInfoList 追溯码信息
+     * @return 操作结果
+     */
+    @PutMapping("/inventory-receipt")
+    public R<?> addTraceNoInfo(@Validated @RequestBody List<TraceNoInfoParam> traceNoInfoList) {
+        return traceNoAppService.addTraceNoInfo(traceNoInfoList);
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
index 1af633a3..e66d9ba3 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
@@ -9,6 +9,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -151,7 +152,9 @@ public class IssueDetailDto {
 
     /** 备注 */
     private String remake;
-
+    /** 制单日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date occurrenceTime;
     /**
      * 单位列表
      */
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
index 288f30bf..bf0cd94c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
@@ -105,4 +105,8 @@ public class LossReportFormDto {
     /** 总价 */
     private BigDecimal totalPrice;
 
+    /** 制单日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date occurrenceTime;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java
similarity index 68%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java
index 68353507..5f76d0e2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java
@@ -30,6 +30,9 @@ public class ProductDetailsPageDto {
     /** 药品名称 */
     private String medicineName;
 
+    /** 药品拼音 */
+    private String pyStr;
+
     /** 规格 */
     private String totalVolume;
 
@@ -44,7 +47,9 @@ public class ProductDetailsPageDto {
     private String lotNumber;
 
     /** 药品类型 */
+    @Dict(dictCode = "med_category_code")
     private String categoryCode;
+    private String categoryCode_dictText;
 
     /** 药品单位（采购单位） */
     @Dict(dictCode = "unit_code")
@@ -54,6 +59,15 @@ public class ProductDetailsPageDto {
     /** 库存数量 */
     private BigDecimal quantity;
 
+    /** 规格库存数量 */
+    private BigDecimal  specificationQuantity;
+
+    /** 最小库存警戒数量 */
+    private BigDecimal  itemMinQuantity;
+
+    /** 最大库存警戒数量 */
+    private BigDecimal  itemMaxQuantity;
+
     /** 拆零比 */
     private BigDecimal partPercent;
 
@@ -97,12 +111,40 @@ public class ProductDetailsPageDto {
 
     /** 供应商 */
     @JsonSerialize(using = ToStringSerializer.class)
-    @Dict(dictTable = "adm_supplier", dictCode = "id", dictText = "name")
     private Long supplyId;
-    private String supplyId_dictText;
+    private String supplyName;
 
     /** 停供状态 */
     private Integer inventoryStatusEnum;
     private String inventoryStatusEnum_enumText;
 
+    /** 有效期小于（月） */
+    private Integer remainingMonth;
+
+    /** 剂型 */
+    @Dict(dictCode = "dose_form_code")
+    private Integer doseFormCode;
+    private String doseFormCode_dictText;
+
+    /** 批准文号/国药准字 */
+    private String approvalNumber;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 总零售价 */
+    private BigDecimal totalSalePrice;
+
+    /** 总进价 */
+    private BigDecimal totalPrice;
+
+    /** 追溯码入库数 */
+    private BigDecimal inCount;
+    /** 追溯码出库数 */
+    private BigDecimal outCount;
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+    private String itemTable;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java
index 8c695a97..cd53b69e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java
@@ -1,8 +1,12 @@
 package com.openhis.web.inventorymanage.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * 库存商品明细分页查询条件
  *
@@ -28,4 +32,13 @@ public class ProductDetailsSearchParam {
     /** 库存范围 */
     private Integer warehouseScope;
 
+    /** 有效期小于（月） */
+    private Integer remainingMonth;
+
+    /** 供应商 */
+    private String supplyName;
+
+    /** 查询flg */
+    private String flg;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsTotalDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsTotalDto.java
new file mode 100644
index 00000000..7678c159
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsTotalDto.java
@@ -0,0 +1,26 @@
+package com.openhis.web.inventorymanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 库存商品明细分页列表合计 dto
+ *
+ * @author yuxj
+ * @date 2025-07-16
+ */
+@Data
+@Accessors(chain = true)
+public class ProductDetailsTotalDto {
+    /** 总零售价 */
+    private BigDecimal totalSalePrice;
+    /** 总进价 */
+    private BigDecimal totalPurchasePrice;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
index 9003ac1b..ba5c39c6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
@@ -50,6 +50,10 @@ public class ProductStocktakingDto {
     @NotNull
     private BigDecimal itemQuantity;
 
+    /** 合计数量 */
+    @NotNull
+    private BigDecimal totalQuantity;
+
     /** 单价 */
     @NotNull
     private BigDecimal price;
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
index e7d80b2c..f0060619 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
@@ -9,6 +9,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -156,6 +157,10 @@ public class PurchaseReturnDetailDto {
     /** 追溯码包装层级 */
     private String packagingLevels;
 
+    /** 制单日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date occurrenceTime;
+
     /**
      * 单位列表
      */
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
similarity index 98%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
index 0f8ec4ba..9b202e2f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
@@ -35,7 +35,7 @@ public class ReceiptDetailDto {
     /** 单据号 */
     private String busNo;
 
-    /** 当前库存总数 */
+    /** 当前库存总数/实盘数量 */
     private BigDecimal totalQuantity;
 
     /** 数量 */
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
similarity index 90%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
index fc7496eb..6e98240a 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
@@ -35,6 +35,9 @@ public class SupplyItemDetailDto {
     /** 数量 */
     private BigDecimal itemQuantity;
 
+    /** 总数量 */
+    private BigDecimal totalQuantity;
+
     /** 项目单位 */
     private String itemUnit;
 
@@ -47,12 +50,18 @@ public class SupplyItemDetailDto {
     /** 审批人 */
     private Long approverId;
 
+    /** 源仓库类型 */
+    private Integer sourceTypeEnum;
+
     /** 源仓库 */
     private Long sourceLocationId;
 
     /** 源仓位 */
     private Long sourceLocationStoreId;
 
+    /** 目的仓库类型 */
+    private Integer purposeTypeEnum;
+
     /** 目的仓库 */
     private Long purposeLocationId;
 
@@ -74,6 +83,9 @@ public class SupplyItemDetailDto {
     /** 追溯码 */
     private String traceNo;
 
+    /** 追溯码单位 */
+    private String traceNoUnitCode;
+
     /** 发票码 */
     private String invoiceNo;
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalActivityInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java
similarity index 37%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalActivityInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java
index 697580d2..a8f2b0db 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalActivityInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java
@@ -1,85 +1,71 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
-
-import java.math.BigDecimal;
-import java.util.List;
+package com.openhis.web.inventorymanage.dto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-import com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
- * 诊疗列表
+ * 追溯码明细
  *
  * @author yuxj
- * @date 2025-04-11
+ * @date 2025-07-08
  */
 @Data
 @Accessors(chain = true)
-public class OutpatientDisposalActivityInfoDto {
+public class TraceNoDetailsPageDto{
 
-    /** id */
-    @JsonSerialize(using = ToStringSerializer.class)
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
-    /** 类型 */
-    private Integer type;
-
-    /** 申请状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-
-    /** 编码 */
-    private String busNo;
+    /** 药品名 */
+    private String name;
 
-    /** 诊疗id */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long activityId;
+    /** 药房药库 */
+    private Long locationId;
+    private String locationName;
 
     /** 产品批号 */
     private String lotNumber;
 
-    /** 单位 */
-    private String unitCode;
-
-    /** 拆零比 */
-    private BigDecimal partPercent;
-
-    /** 仓库 */
-    private Long locationId;
-
-    /** 分组编号 */
-    private String groupNo;
-
-    /** 项目名称 */
-    private String itemName;
-
-    /** 单价 */
-    private BigDecimal unitPrice;
+    /** 追溯码 */
+    private String traceNo;
 
-    /** 总价 */
-    private BigDecimal totalPrice;
+    /** 追溯码状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
 
-    /** 数量 */
-    private Integer quantity;
+    /** 追溯码单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
 
-    /** 次数 */
-    private Integer frequency;
+    /** 操作类型 */
+    private Integer operationType;
+    private String operationType_enumText;
 
-    /** 收费状态 */
-    private Integer chargeStatusEnum;
-    private String chargeStatusEnum_enumText;
+    /** 项目类型 */
+    private Integer itemType;
+    private String itemType_enumText;
 
-    /** 单位 */
-    @Dict(dictCode = "unit_code")
-    private String quantityUnit;
-    private String quantityUnit_dictText;
+    /** 进出时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    /** 诊疗耗材信息 */
-    List<OutpatientDisposalDeviceInfoDto> OutpatientDisposalDeviceInfoList;
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+    private String itemTable;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java
new file mode 100644
index 00000000..73de120d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 追溯码信息
+ *
+ * @author yuxj
+ * @date 2025-07-07
+ */
+@Data
+@Accessors(chain = true)
+public class TraceNoInfoParam {
+
+    /** 项目所属表 */
+    private String itemTable;
+
+    /** 项目id */
+    private Long itemId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+
+    /** 仓库 */
+    private Long locationId;
+
+    /** 仓位 */
+    private Long locationStoreId;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码状态 */
+    private Integer statusEnum;
+
+    /** 追溯码单位 */
+    private String unitCode;
+
+    /** 操作类型 */
+    private Integer operationType;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java
new file mode 100644
index 00000000..b20ed9df
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 追溯码初始化 dto
+ *
+ * @author yuxj
+ * @date 2025-07-08
+ */
+@Data
+@Accessors(chain = true)
+public class TraceNoInitDto {
+
+    /**
+     * 药房，药库
+     */
+    private List<TraceNoInitDto.locationOption> locationOptions;
+
+    /**
+     * 追溯码状态
+     */
+    private List<TraceNoInitDto.itemTypeOption> traceNoStatusOptions;
+
+    /**
+     * 项目类型
+     */
+    private List<TraceNoInitDto.itemTypeOption> itemTypeOptions;
+
+    /**
+     * 操作类型
+     */
+    private List<TraceNoInitDto.itemTypeOption> operationTypeOptions;
+
+    @Data
+    public static class itemTypeOption {
+        private Integer value;
+        private String label;
+
+        public itemTypeOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class locationOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public locationOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java
new file mode 100644
index 00000000..5e8581a7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 追溯码分页查询条件
+ *
+ * @author yuxj
+ * @date 2025-07-08
+ */
+@Data
+@Accessors(chain = true)
+public class TraceNoSearchParam {
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+    private String itemTable;
+
+    /** 药房药库 */
+    private Long locationId;
+
+    /** 药品名 */
+    private String name;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码状态 */
+    private Integer statusEnum;
+
+    /** 操作类型 */
+    private Integer operationType;
+
+    /** 项目类型 */
+    private Integer itemType;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
similarity index 61%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
index 880c6d51..8800028f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.mapper;
 
 import java.util.List;
 
+import com.openhis.web.inventorymanage.dto.ProductTransferDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -45,4 +46,26 @@ public interface LossReportFormMapper {
     List<ReceiptDetailDto> selectDetail(@Param("busNo") String busNo, @Param("medicine") Integer medicine,
         @Param("device") Integer device, @Param("medicationTableName") String medicationTableName,
         @Param("deviceTableName") String deviceTableName);
+
+    /**
+     * 查询报损单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<ReceiptDetailDto> getMonthlySettlementDetail(@Param("page") Page<ReceiptDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") Integer typeEnum, @Param("statusEnum") Integer statusEnum);;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java
similarity index 56%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java
index 7a4e5e01..382a84a4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.inventorymanage.mapper;
 
+import com.openhis.web.inventorymanage.dto.ProductDetailsTotalDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.inventorymanage.dto.ProductDetailsPageDto;
 import com.openhis.web.inventorymanage.dto.ProductDetailsSearchParam;
 
+import java.util.List;
+
 /**
  * 库存商品明细查询用 mapper
  *
@@ -30,5 +33,23 @@ public interface ProductDetailsMapper {
      */
     Page<ProductDetailsPageDto> selectProductDetailsPage(@Param("page") Page<ProductDetailsPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<ProductDetailsSearchParam> queryWrapper);
+    /**
+     * 查询库存商品明细分页列表
+     *
+     * @param sqlWhere 查询条件
+     * @param itemType 查询条件
+     * @return 库存商品明细分页列表
+     */
+    ProductDetailsTotalDto selectProductDetailsPageTotal(@Param("sqlWhere") String sqlWhere, @Param("itemType") Integer itemType);
+
+    /**
+     * 查询效期预警分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @return 库存商品明细分页列表
+     */
+    Page<ProductDetailsPageDto> selectExpirationWarning(@Param("page") Page<ProductDetailsPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<ProductDetailsSearchParam> queryWrapper, @Param("flg") String flg);
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
similarity index 64%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
index 415b8483..b5f6bad0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
@@ -63,4 +63,37 @@ public interface ProductStocktakingMapper {
         @Param("sourceLocationId") Long sourceLocationId, @Param("medicationTableName") String medicationTableName,
         @Param("deviceTableName") String deviceTableName, @Param("medicine") Integer medicine,
         @Param("device") Integer device, @Param("inventoryStatusEnum") Integer inventoryStatusEnum);
+
+    /**
+     * 定时任务生成批量盘点单
+     *
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param inventoryStatusEnum 库存状态
+     * @return 批量盘点列表
+     */
+    List<ProductStocktakingDto> selectAutoStocktakingBatch(@Param("medicationTableName") String medicationTableName,
+        @Param("deviceTableName") String deviceTableName, @Param("inventoryStatusEnum") Integer inventoryStatusEnum);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<ReceiptDetailDto> getMonthlySettlementDetail(@Param("page") Page<ReceiptDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") List<Integer> typeEnum, @Param("statusEnum") Integer statusEnum);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
similarity index 72%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
index 1d447dca..5161d3be 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
@@ -66,4 +66,26 @@ public interface ProductTransferMapper {
         @Param("busNo") String busNo, @Param("medicationTableName") String medicationTableName,
         @Param("deviceTableName") String deviceTableName, @Param("medicine") Integer medicine,
         @Param("device") Integer device);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param inOutFlg 调入调出flg
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<ReceiptDetailDto> getMonthlySettlementDetail(@Param("page") Page<ReceiptDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("inOutFlg") Integer inOutFlg, @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") List<Integer> typeEnum, @Param("statusEnum") Integer statusEnum);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
similarity index 59%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
index a0b214ca..c34db22c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.mapper;
 
 import java.util.List;
 
+import com.openhis.web.inventorymanage.dto.ProductTransferDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -44,4 +45,25 @@ public interface PurchaseInventoryMapper {
      * @return 单据详情
      */
     List<ReceiptDetailDto> selectDetail(@Param("busNo") String busNo);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<ReceiptDetailDto> getMonthlySettlementDetail(@Param("page") Page<ReceiptDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") List<Integer> typeEnum, @Param("statusEnum") Integer statusEnum);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
similarity index 61%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
index 869e1347..dc421cc7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
@@ -43,4 +43,25 @@ public interface PurchaseReturnMapper {
      */
     List<PurchaseReturnPageDto> selectGeneratedDetail(@Param("busNo") String busNo,
         @Param("purchaseReturn") Integer purchaseReturn);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<PurchaseReturnDetailDto> getMonthlySettlementDetail(@Param("page") Page<PurchaseReturnDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") List<Integer> typeEnum, @Param("statusEnum") Integer statusEnum);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
similarity index 64%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
index baa1deee..62e115c1 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
@@ -49,4 +49,25 @@ public interface RequisitionIssueMapper {
     List<IssueDetailDto> requisitionIssueDetail(@Param("busNo") String busNo,
         @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
         @Param("medicine") Integer medicine, @Param("device") Integer device);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<IssueDetailDto> getMonthlySettlementDetail(@Param("page") Page<IssueDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") List<Integer> typeEnum, @Param("statusEnum") Integer statusEnum);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
similarity index 64%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
index 86c5b3c3..0c966af6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
@@ -49,4 +49,25 @@ public interface ReturnIssueMapper {
     List<IssueDetailDto> returnIssueDetail(@Param("busNo") String busNo,
         @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
         @Param("medicine") Integer medicine, @Param("device") Integer device);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param medicine 药品
+     * @param device 耗材
+     * @param medicationTableName 药品表名
+     * @param deviceTableName 耗材表名
+     * @param typeEnum 类型
+     * @param statusEnum 状态
+     * @return 单据详情
+     */
+    Page<IssueDetailDto> getMonthlySettlementDetail(@Param("page") Page<IssueDetailDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("medicine") Integer medicine, @Param("device") Integer device,
+        @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
+        @Param("typeEnum") List<Integer> typeEnum, @Param("statusEnum") Integer statusEnum);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java
new file mode 100644
index 00000000..71d9002e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.inventorymanage.dto.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 追溯码 mapper
+ *
+ * @author yuxj
+ * @date 2025-07-08
+ */
+@Repository
+public interface TraceNoAppMapper {
+    /**
+     * 查询追溯码信息分页列表
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    Page<TraceNoDetailsPageDto> selectDetailsPage(@Param("page") Page<TraceNoDetailsPageDto> page,
+                                                  @Param(Constants.WRAPPER) QueryWrapper<TraceNoSearchParam> queryWrapper);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java
new file mode 100644
index 00000000..b77cd1c5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java
@@ -0,0 +1,56 @@
+package com.openhis.web.materialmanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 物资共通方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialCommonService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    MaterialInitDto init();
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    R<?> getPage(MaterialSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request,String locationFlg,Integer supplyType);
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> deleteOrder(String busNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
new file mode 100644
index 00000000..4660d39d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialProfitLossOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    R<?> addOrEditProfitLossOrder(List<MaterialDetailDto> profitLossOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
new file mode 100644
index 00000000..96dcbbb7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资订货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialPurchaseOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 订货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 订货单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑订货单
+     *
+     * @param purchaseOrderDtoList 订货信息
+     * @return 操作结果
+     */
+    R<?> addOrEditPurchaseOrder(List<MaterialDetailDto> purchaseOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
new file mode 100644
index 00000000..57550063
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
@@ -0,0 +1,106 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+
+/**
+ * 物资审批方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialReceiptApprovalService {
+
+    /**
+     * 采购单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> purchaseOrderAgreeApproval(String busNo);
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    List<SupplyItemDetailDto> getSupplyItemDetail(String busNo);
+
+    /**
+     * 获取物品的价格信息
+     *
+     * @param itemIdList 物品id
+     * @return 价格信息
+     */
+    List<ItemChargeDetailDto> getItemChargeDetail(List<Long> itemIdList);
+
+    /**
+     * 入库单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> purchaseInventoryApproved(String busNo);
+
+    /**
+     * 采购退货审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> purchaseReturnApproved(String busNo);
+
+
+     /**
+     * 领用出库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> requisitionIssueApproved(String busNo);
+
+     /**
+     * 领用退库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> returnIssueApproved(String busNo);
+
+
+     /**
+     * 报损单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> lossReportApproved(String busNo);
+
+     /**
+     * 盘点审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> productStocktakingApproved(String busNo);
+    /**
+     * 调入单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> transferInAgreeApproved(String busNo);
+
+    /**
+     * 调出单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> transferOutAgreeApproved(String busNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java
new file mode 100644
index 00000000..474d279f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资退货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialReturnOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 退货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退货单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑退货单
+     *
+     * @param returnOrderDtoList 退货信息
+     * @return 操作结果
+     */
+    R<?> addOrEditReturnOrder(List<MaterialDetailDto> returnOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
new file mode 100644
index 00000000..9e4dd56b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialReturnToWarehouseOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToWarehouseOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditReturnToWarehouseOrder(List<MaterialDetailDto> returnToWarehouseOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java
new file mode 100644
index 00000000..cfa6a6ba
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资进货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialStockInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 进货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 进货单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑进货单
+     *
+     * @param stockInOrderDtoList 进货信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStockInOrder(List<MaterialDetailDto> stockInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java
new file mode 100644
index 00000000..56240a52
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资出库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialStockOutOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 出库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 出库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑出库单
+     *
+     * @param stockOutOrderDtoList 出库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStockOutOrder(List<MaterialDetailDto> stockOutOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
new file mode 100644
index 00000000..1d30439c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialStocktakingOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStocktakingOrder(List<MaterialDetailDto> stocktakingOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java
new file mode 100644
index 00000000..044c58ca
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资调入单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialTransferInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑调入单
+     *
+     * @param transferInOrderDtoList 调入信息
+     * @return 操作结果
+     */
+    R<?> addOrEditTransferInOrder(List<MaterialDetailDto> transferInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
new file mode 100644
index 00000000..cdb210e3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.materialmanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+
+/**
+ * 物资调出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IMaterialTransferOutOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑调入单
+     *
+     * @param transferOutOrderDtoList 调入信息
+     * @return 操作结果
+     */
+    R<?> addOrEditTransferOutOrder(List<MaterialDetailDto> transferOutOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
new file mode 100644
index 00000000..a6722a04
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
@@ -0,0 +1,223 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.administration.domain.Organization;
+import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.enums.*;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.common.appservice.ICommonService;
+import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.dto.MaterialDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资共通
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialCommonServiceImpl implements IMaterialCommonService {
+
+    @Resource
+    private ISupplierService supplierService;
+
+    @Resource
+    private IPractitionerService practitionerService;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private MaterialCommonMapper materialCommonMapper;
+    @Resource
+    private ICommonService commonServiceImpl;
+    @Resource
+    private IOrganizationService organizationService;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public MaterialInitDto init() {
+        MaterialInitDto orderInitDto = new MaterialInitDto();
+
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 查询经手人列表
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 经手人信息
+        List<MaterialInitDto.LongOption> practitionerListOption = practitionerList.stream()
+            .map(practitioner -> new MaterialInitDto.LongOption(practitioner.getId(), practitioner.getName()))
+            .collect(Collectors.toList());
+        // 供应商信息
+        List<MaterialInitDto.SupplierOption> supplierListOption = supplierList.stream().map(
+            supplier -> new MaterialInitDto.SupplierOption(supplier.getId(), supplier.getName(), supplier.getPhone()))
+            .collect(Collectors.toList());
+        // 审批状态
+        List<MaterialInitDto.IntegerOption> supplyStatusOption = Stream.of(SupplyStatus.values())
+            .map(supplyStatus -> new MaterialInitDto.IntegerOption(supplyStatus.getValue(), supplyStatus.getInfo()))
+            .collect(Collectors.toList());
+
+        // 包装情况
+        List<MaterialInitDto.IntegerOption> packagingConditionOption = Stream.of(PackagingCondition.values())
+            .map(packagingCondition -> new MaterialInitDto.IntegerOption(packagingCondition.getValue(),
+                packagingCondition.getInfo()))
+            .collect(Collectors.toList());
+
+        // 验收结果
+        List<MaterialInitDto.IntegerOption> acceptanceResultOption = Stream.of(AcceptanceResult.values())
+            .map(acceptanceResult -> new MaterialInitDto.IntegerOption(acceptanceResult.getValue(),
+                acceptanceResult.getInfo()))
+            .collect(Collectors.toList());
+
+        // 仓库列表
+        List<LocationDto> warehouseList = commonServiceImpl.getWarehouseList();
+        // 科室列表
+        List<Organization> departmentList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
+
+        orderInitDto.setWarehouseListOptions(warehouseList).setDepartmentListOptions(departmentList)
+            .setSupplierOption(supplierListOption).setPractitionerOption(practitionerListOption)
+            .setSupplyStatusOptions(supplyStatusOption).setPackagingConditionOptions(packagingConditionOption)
+            .setAcceptanceResultoryOptions(acceptanceResultOption);
+
+        return orderInitDto;
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @Override
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+
+        Long locationId = purchaseOrderSearchParam.getLocationId();
+        purchaseOrderSearchParam.setLocationId(null);
+        Long supplierId = null;
+        // 为物资订货时，需要传参数supplierId
+        if (purchaseOrderSearchParam.getTypeEnum() != null
+            && purchaseOrderSearchParam.getTypeEnum().equals(SupplyType.MATERIAL_PURCHASE.getValue())) {
+            supplierId = purchaseOrderSearchParam.getSupplierId();
+            purchaseOrderSearchParam.setSupplierId(null);
+        }
+        // 构建查询条件
+        QueryWrapper<MaterialSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name, CommonConstants.FieldName.PyStr)), request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.Name);
+
+        Page<MaterialDeviceInfoDto> deviceInfoDto =
+            materialCommonMapper.getDeviceInfo(new Page<>(pageNo, pageSize), queryWrapper, locationId, supplierId);
+
+        for (MaterialDeviceInfoDto item : deviceInfoDto.getRecords()) {
+            List<MaterialDeviceInfoDto.Option> unitList = new ArrayList<>();
+            unitList.add(new MaterialDeviceInfoDto.Option(item.getUnitCode(), item.getUnitCode_dictText()));
+            unitList.add(new MaterialDeviceInfoDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(deviceInfoDto);
+    }
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    @Override
+    public R<?> getPage(MaterialSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request, String locationFlg, Integer supplyType) {
+        // 判断哪个画面使用
+        if (supplyType != null) {
+            purchaseOrderSearchParam.setTypeEnum(supplyType);
+        }
+        String originalBusNoFlg = purchaseOrderSearchParam.getOriginalBusNoFlg();
+        purchaseOrderSearchParam.setOriginalBusNoFlg(null);
+        // 构建查询条件
+        QueryWrapper<MaterialSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(
+                    Arrays.asList(CommonConstants.FieldName.SupplyBusNo, CommonConstants.FieldName.ApplicantName)),
+                request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.SupplyBusNo);
+        // 查询订货单分页列表
+        Page<MaterialDto> purchaseOrderDtoPage =
+            materialCommonMapper.getPage(new Page<>(pageNo, pageSize), queryWrapper, originalBusNoFlg, locationFlg);
+
+        purchaseOrderDtoPage.getRecords().forEach(e -> {
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        return R.ok(purchaseOrderDtoPage);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deleteOrder(String busNo) {
+        // 根据原始单据号查询信息
+        List<SupplyRequest> supplyRequest = supplyRequestService.getSupplyByOriginalBusNo(busNo);
+        if (!supplyRequest.isEmpty()) {
+            // 将原始单据号信息的原始单据号删除
+            boolean flg = supplyRequestService.updateByBusNo(supplyRequest.get(0).getBusNo());
+            if (!flg) {
+                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        // 删除单据
+        boolean result = supplyRequestService.removeByBusNo(busNo);
+        return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
new file mode 100644
index 00000000..458ea3a5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
@@ -0,0 +1,169 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialProfitLossOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialProfitLossOrderServiceImpl implements IMaterialProfitLossOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> profitLossOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        profitLossOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : profitLossOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(profitLossOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_PRPFITLOSS.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditProfitLossOrder(List<MaterialDetailDto> profitLossOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : profitLossOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.MATERIAL_PRPFITLOSS.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                    .setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                    .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                    .setReason(item.getReason()).setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue())
+                    .setPurposeLocationId(item.getPurposeLocationId())
+                    .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
new file mode 100644
index 00000000..29923db2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
@@ -0,0 +1,163 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialPurchaseOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资订货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialPurchaseOrderServiceImpl implements IMaterialPurchaseOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.PURCHASE_PLAN_GENERATION.getValue(),
+            SupplyCategory.PURCHASE_PLAN_GENERATION.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 订货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 订货单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> purchaseOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        purchaseOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : purchaseOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(purchaseOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_PURCHASE.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑订货单
+     *
+     * @param purchaseOrderDtoList 订货信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditPurchaseOrder(List<MaterialDetailDto> purchaseOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(purchaseOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        for (MaterialDetailDto item : purchaseOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.MATERIAL_PURCHASE.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue())
+                    .setPurposeLocationId(item.getPurposeLocationId()).setSupplierId(item.getSupplierId())
+                    .setApplicantId(item.getApplicantId()).setApplyTime(item.getApplyTime()).setReason(item.getReason())
+                    .setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
new file mode 100644
index 00000000..179c9a29
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
@@ -0,0 +1,1136 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbInvChgType;
+import com.openhis.common.enums.ybenums.YbRxFlag;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+import com.openhis.yb.dto.Medical3503Param;
+import com.openhis.yb.dto.MedicalInventory3501Param;
+import com.openhis.yb.dto.MedicalInventory3502Param;
+import com.openhis.yb.dto.MedicalPurchase3504Param;
+import com.openhis.yb.service.YbManager;
+
+/**
+ * 物资审批
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialReceiptApprovalServiceImpl implements IMaterialReceiptApprovalService {
+    @Autowired
+    private ITraceNoAppService traceNoAppService;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private ISupplyDeliveryService supplyDeliveryService;
+
+    @Autowired
+    private IChargeItemDefDetailService chargeItemDefAppService;
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+    @Autowired
+    private ReceiptApprovalMapper receiptApprovalMapper;
+    @Autowired
+    private YbManager ybService;
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+    @Autowired
+    private IReceiptApprovalAppService receiptApprovalAppService;
+
+    /**
+     * 采购单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> purchaseOrderAgreeApproval(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 进货单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> purchaseInventoryApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 获取审批通过后的供应请求id列表
+        List<Long> supplyReqIdList = agreedList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+
+        // 校验(已经审批通过的单号(发放状态是已完成),不能再重复审批通过)
+        boolean validation = supplyDeliveryService.supplyDeliveryValidation(supplyReqIdList);
+        if (validation) {
+            throw new ServiceException("请勿重复审批");
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 获取供应的物品
+        List<Long> itemIdList = supplyRequestService.getItem(agreedList);
+        // 获取项目价格相关信息
+        List<ItemChargeDetailDto> chargeDetailList = this.getItemChargeDetail(itemIdList);
+        List<ChargeItemDefDetail> chargeItemDefDetailList;
+        if (!chargeDetailList.isEmpty()) {
+            // 生成与之前定价不同的定价子表数据
+            chargeItemDefDetailList = this.creatChargeItemDetail(agreedList, chargeDetailList);
+            if (!chargeItemDefDetailList.isEmpty()) {
+                for (ChargeItemDefDetail chargeItemDefDetail : chargeItemDefDetailList) {
+                    // 增加项目定价子表数据
+                    chargeItemDefAppService.addChargeItemDefApp(chargeItemDefDetail);
+                }
+            }
+        }
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            InventoryItem inventoryItemPurpose = null;
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplyList = new ArrayList<>();
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplyList.add(supplyItemDetailDto);
+                } else {
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(调拨数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+调拨数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新源仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            if (!supplyList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplyList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.MATERIAL_STOCKIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保商品采购接口 todo 相关医保接口未对应
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3503商品采购上传错误，错误项目编码" + uploadFailedNoList;
+                } else {
+                    returnMsg = "3503商品采购上传成功";
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 退货单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> purchaseReturnApproved(String busNo) {
+        // // 根据原始单据号查询信息
+        // List<SupplyRequest> supplyRequest = supplyRequestService.getSupplyByOriginalBusNo(busNo);
+        // if (!supplyRequest.isEmpty()) {
+        // // 将原始单据号信息的状态改为已失效
+        // boolean flg = supplyRequestService.updateStatusEnumByBusNo(supplyRequest.get(0).getBusNo());
+        // if (!flg) {
+        // R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        // }
+        // }
+
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource;
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemSource = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算退货后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 仓库库存-(退货数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 仓库库存-退货数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+
+                    // 退货数量等于库存数量时，删除库存数据
+                    if (minQuantity.compareTo(BigDecimal.ZERO) == 0) {
+                        inventoryItemService.removeById(inventoryItemSource.getId());
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.MATERIAL_RETURN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保采购退货接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3504采购退货上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 出库单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> requisitionIssueApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
+                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource = new InventoryItem();
+                if (!inventoryItemSourceList.isEmpty()) {
+                    inventoryItemSource = inventoryItemSourceList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantitySource = inventoryItemSource.getQuantity();
+
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 源仓库库存-(领用数量*拆零比)
+                            minQuantitySource = minQuantitySource.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 源仓库库存-领用数量
+                            minQuantitySource = minQuantitySource.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+
+                    // 更新源仓库库存数量
+                    Boolean aBooleanSource = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
+                        minQuantitySource, now);
+
+                    if (!aBooleanSource) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.MATERIAL_STOCKOUT.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 退库单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> returnIssueApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplylList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemPurpose = null;
+                if (!inventoryItemPurposeList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemPurposeList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplylList.add(supplyItemDetailDto);
+                } else {
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantityPurpose = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(退库数量*拆零比)
+                        minQuantityPurpose = minQuantityPurpose
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+退库数量
+                        minQuantityPurpose = minQuantityPurpose.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanPurpose = inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(),
+                        minQuantityPurpose, now);
+                    if (!bBooleanPurpose) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            if (!supplylList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList =
+                    InventoryManageAssembler.assembleInventoryItem(supplylList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.MATERIAL_PRODUCT_RETURN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 损益单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> lossReportApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 返回信息
+        String returnMsg = null;
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItem = new InventoryItem();
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItem = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算报损后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 数量*拆零比
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity());
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 数量
+                        minQuantity = supplyItemDetailDto.getItemQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.MATERIAL_PRPFITLOSS.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保库存变更接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
+                    YbInvChgType.DESTRUCTION, false, false, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 盘点审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> productStocktakingApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 首次盘存列表
+        List<SupplyItemDetailDto> firstSupplyItemDetailList = new ArrayList<>();
+        // 药品/耗材发放列表
+        List<MedicationDispense> medicationDispenses = null;
+        List<DeviceDispense> deviceDispenses = null;
+        // 返回信息
+        String stocktakingReturnMsg = null;
+        String changeReturnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            // 获取盘盈列表（itemQuantity > 0）
+            List<SupplyItemDetailDto> positiveList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .collect(Collectors.toList());
+            // 获取盘亏列表（itemQuantity < 0）
+            List<SupplyItemDetailDto> negativeList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) < 0)
+                .collect(Collectors.toList());
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                // 查看该批号的药品/耗材是否发放过(用于证明是否首次盘存)
+                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    medicationDispenses = medicationDispenseService.list(new LambdaQueryWrapper<MedicationDispense>()
+                        .eq(MedicationDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (medicationDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    deviceDispenses = deviceDispenseService.list(new LambdaQueryWrapper<DeviceDispense>()
+                        .in(DeviceDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (deviceDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                }
+                if (!inventoryItemList.isEmpty()) {
+                    InventoryItem inventoryItem = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getTotalQuantity());
+                        // 供应申请的物品计量单位与最小单位相同
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        minQuantity = supplyItemDetailDto.getTotalQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+
+                String ybSwitch =
+                    SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+                if (Whether.YES.getCode().equals(ybSwitch)) {
+                    // 如果首次盘点信息不为空
+                    if (!firstSupplyItemDetailList.isEmpty()) {
+                        // 调用医保盘存接口，盘盈
+                        List<String> uploadFailedNoList = this.ybInventoryIntegrated(firstSupplyItemDetailList,
+                            YbInvChgType.INVENTORY_GAIN, true, false, false, now);
+                        if (!uploadFailedNoList.isEmpty()) {
+                            stocktakingReturnMsg = "3501盘存上传错误，错误项目编码" + uploadFailedNoList;
+                        }
+                    }
+                    List<String> uploadFailedGainList = null;
+                    List<String> uploadFailedLossList = null;
+                    if (!positiveList.isEmpty()) {
+                        // 调用医保库存变更接口，盘盈
+                        uploadFailedGainList = this.ybInventoryIntegrated(positiveList, YbInvChgType.INVENTORY_GAIN,
+                            false, false, false, now);
+                    }
+                    if (!negativeList.isEmpty()) {
+                        // 调用医保库存变更接口，盘亏
+                        uploadFailedLossList = this.ybInventoryIntegrated(negativeList, YbInvChgType.INVENTORY_LOSS,
+                            false, false, false, now);
+                    }
+                    if (uploadFailedGainList != null || uploadFailedLossList != null) {
+                        changeReturnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedGainList + uploadFailedLossList;
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.MATERIAL_STOCKTAKING.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(stocktakingReturnMsg + changeReturnMsg,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 调入单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> transferInAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+
+        if (!supplyItemDetailList.isEmpty()) {
+
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplylList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemPurpose = null;
+                if (!inventoryItemPurposeList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemPurposeList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplylList.add(supplyItemDetailDto);
+                } else {
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItemPurpose.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(退库数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+退库数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanPurpose =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+                    if (!bBooleanPurpose) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            if (!supplylList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList =
+                    InventoryManageAssembler.assembleInventoryItem(supplylList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.MATERIAL_TRANSFERIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 调出单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> transferOutAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource = null;
+                if (!inventoryItemSourceList.isEmpty()) {
+                    inventoryItemSource = inventoryItemSourceList.get(0);
+
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItemSource.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 源仓库库存-(退库数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 源仓库库存-退库数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanSource =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+                    if (!bBooleanSource) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.MATERIAL_TRANSFEROUT.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    @Override
+    public List<SupplyItemDetailDto> getSupplyItemDetail(String busNo) {
+        return receiptApprovalMapper.selectSupplyDetail(busNo, DispenseStatus.COMPLETED.getValue());
+    }
+
+    /**
+     * 获取物品的价格信息
+     *
+     * @param itemIdList 物品id
+     * @return 价格信息
+     */
+    @Override
+    public List<ItemChargeDetailDto> getItemChargeDetail(List<Long> itemIdList) {
+        // todo：未来会移到charge相关的service中
+        if (!itemIdList.isEmpty()) {
+            return receiptApprovalMapper.selectChargeDetail(itemIdList);
+        }
+        return null;
+    }
+
+    /**
+     * 入库项价格验证
+     *
+     * @param agreedList 供应单据
+     * @param chargeDetailList 项目价格
+     * @return 价格定义子表数据
+     */
+    private List<ChargeItemDefDetail> creatChargeItemDetail(List<SupplyRequest> agreedList,
+        List<ItemChargeDetailDto> chargeDetailList) {
+        List<ChargeItemDefDetail> resultList = new ArrayList<>();
+
+        // 将各个项目的定价信息按项目id分组
+        Map<Long, List<ItemChargeDetailDto>> chargeDetailGroup =
+            chargeDetailList.stream().collect(Collectors.groupingBy(ItemChargeDetailDto::getInstanceId));
+
+        for (SupplyRequest supplyRequest : agreedList) {
+            Long itemId = supplyRequest.getItemId();
+            // 通过供应项目id匹配项目定价
+            List<ItemChargeDetailDto> details = chargeDetailGroup.get(itemId);
+            if (details == null)
+                continue;
+
+            boolean shouldSkip = false;
+            for (ItemChargeDetailDto detail : details) {
+                // 如果入库项的批次与定价中的批次相同
+                if (detail.getConditionValue().equals(supplyRequest.getLotNumber())) {
+                    // 无论价格是否相同都跳过这条记录
+                    shouldSkip = true;
+                    break;
+                }
+            }
+            if (!shouldSkip) {
+                // 新增对应项目的价格定义子表
+                resultList.addAll(this.addChargeItemDefApp(supplyRequest.getLotNumber(), supplyRequest.getPrice(),
+                    supplyRequest.getRetailPrice(), details.get(0).getDefinitionId()));
+            }
+        }
+        return resultList;
+    }
+
+    /**
+     * 添加项目定价子表信息
+     *
+     * @param conditionValue 命中值
+     * @param price 进价
+     * @param retailPrice 售价
+     * @param definitionId 主表id
+     * @return 子表信息
+     */
+    private List<ChargeItemDefDetail> addChargeItemDefApp(String conditionValue, BigDecimal price,
+        BigDecimal retailPrice, Long definitionId) {
+        List<ChargeItemDefDetail> chargeItemDefDetailList = new ArrayList<>();
+        ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
+        chargeItemDefDetail
+            // 命中条件：批号
+            .setConditionCode(ConditionCode.LOT_NUMBER_COST.getCode())
+            // 命中值
+            .setConditionValue(conditionValue)
+            // 主表id
+            .setDefinitionId(definitionId)
+            // 进价
+            .setAmount(price);
+        chargeItemDefDetailList.add(chargeItemDefDetail);
+        chargeItemDefDetail = new ChargeItemDefDetail();
+        chargeItemDefDetail
+            // 命中条件：批号
+            .setConditionCode(ConditionCode.LOT_NUMBER_PRICE.getCode())
+            // 命中值
+            .setConditionValue(conditionValue)
+            // 主表id
+            .setDefinitionId(definitionId)
+            // 售价
+            .setAmount(retailPrice);
+        chargeItemDefDetailList.add(chargeItemDefDetail);
+
+        return chargeItemDefDetailList;
+    }
+
+    /**
+     * 医保库存相关进销存接口
+     *
+     * @param supplyItemDetailList 供应申请项目详细信息
+     * @param ybInvChgType 库存变更类型
+     * @param firstFlag 首次盘存标识
+     * @param now 库存变更时间
+     * @return 上传失败的id集合
+     */
+    private List<String> ybInventoryIntegrated(List<SupplyItemDetailDto> supplyItemDetailList,
+        YbInvChgType ybInvChgType, Boolean firstFlag, Boolean purchaseFlag, Boolean returnFlag, Date now) {
+        List<String> uploadFailedNoList = new ArrayList<>();
+        R<?> result;
+        R<?> firstResult = R.ok();
+        R<?> returnResult = R.ok();
+        R<?> purchaseResult = R.ok();
+        for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            if (supplyItemDetailDto.getYbNo() == null) {
+                continue;
+            }
+            switch (ybInvChgType) {
+                case ALLOCATION_IN:
+                case ALLOCATION_OUT:
+                case INVENTORY_GAIN:
+                case INVENTORY_LOSS:
+                case DESTRUCTION:
+                case OTHER_IN:
+                case OTHER_OUT:
+                case DONATION_IN:
+                case DONATION_RETURN_OUT:
+                case PURCHASE_IN:
+                case RETURN_OUT:
+                    if (firstFlag) {
+                        firstResult =
+                            ybService.uploadInventoryCount(getMedicalInventory3501Param(supplyItemDetailDto, now), now);
+                        if (firstResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (returnFlag) {
+                        returnResult =
+                            ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
+                        if (returnResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (purchaseFlag) {
+                        purchaseResult = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
+                        if (purchaseResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    result = ybService.updateInventoryCount(
+                        getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
+                    if (result.getCode() != 200) {
+                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                    }
+                    break;
+                default:
+                    throw new IllegalArgumentException("未知的库存变更类型: " + ybInvChgType);
+            }
+        }
+        return uploadFailedNoList;
+    }
+
+    private MedicalPurchase3504Param getMedicalPurchase3504Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        MedicalPurchase3504Param medicalPurchase3504Param = new MedicalPurchase3504Param();
+        medicalPurchase3504Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setPurcInvoNo(supplyItemDetailDto.getInvoiceNo())
+            .setManuDate(supplyItemDetailDto.getStartTime()).setExpyEnd(supplyItemDetailDto.getEndTime())
+            .setPurcRetnCnt(supplyItemDetailDto.getItemQuantity()).setPurcRetnStoinTime(now)
+            .setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+        return medicalPurchase3504Param;
+    }
+
+    private Medical3503Param getMedical3503Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        Medical3503Param medical3503Param = new Medical3503Param();
+        medical3503Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setManuLotnum(supplyItemDetailDto.getLotNumber())
+            .setProdentpName(supplyItemDetailDto.getManufacturerText())
+            .setAprvno(supplyItemDetailDto.getApprovalNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+            .setExpyEnd(supplyItemDetailDto.getEndTime()).setPurcRetnCnt(supplyItemDetailDto.getItemQuantity())
+            .setPurcRetnStoinTime(now).setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+
+        return medical3503Param;
+    }
+
+    private MedicalInventory3502Param getMedicalInventory3502Param(SupplyItemDetailDto supplyItemDetailDto, Date now,
+        String ybInvChgType) {
+        MedicalInventory3502Param medicalInventory3502Param = new MedicalInventory3502Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        // 查询商品价格信息
+        List<ItemChargeDetailDto> itemChargeDetailList =
+            receiptApprovalAppService.getItemChargeDetail(List.of(supplyItemDetailDto.getItemId()));
+        if (!inventoryItemList.isEmpty() && !itemChargeDetailList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            // 最小单位售卖价格
+            BigDecimal minPrice = BigDecimal.ZERO;
+            Optional<BigDecimal> price = itemChargeDetailList.stream()
+                .filter(x -> x.getConditionValue().equals(supplyItemDetailDto.getLotNumber()))
+                .map(ItemChargeDetailDto::getSellPrice).findFirst();
+            if (price.isPresent()) {
+                if (supplyItemDetailDto.getPartPercent().compareTo(BigDecimal.ZERO) > 0) {
+                    minPrice = price.get().divide(supplyItemDetailDto.getPartPercent(), RoundingMode.HALF_UP);
+                }
+            }
+            // 转换为JSON
+            JSONArray medicalTraceNo = new JSONArray();
+            // 获取追溯码信息
+            if (supplyItemDetailDto.getTraceNo() != null) {
+                List<String> traceNoList =
+                    Arrays.stream(supplyItemDetailDto.getTraceNo().split(CommonConstants.Common.COMMA))
+                        .map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
+                for (String traceNo : traceNoList) {
+                    Map<String, String> traceNoMap = new HashMap<>();
+                    traceNoMap.put("drug_trac_codg", traceNo);
+                    medicalTraceNo.add(traceNoMap);
+                }
+            }
+            medicalInventory3502Param.setMedListCodg(supplyItemDetailDto.getYbNo()).setInvChgType(ybInvChgType)
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setPric(minPrice).setCnt(totalQuantity)
+                .setInvChgTime(now).setDrugtracinfo(medicalTraceNo);
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3502Param;
+    }
+
+    private MedicalInventory3501Param getMedicalInventory3501Param(SupplyItemDetailDto supplyItemDetailDto, Date date) {
+        MedicalInventory3501Param medicalInventory3501Param = new MedicalInventory3501Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        if (!inventoryItemList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            medicalInventory3501Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable()).setInvdate(date).setInvCnt(totalQuantity)
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+                .setExpyEnd(supplyItemDetailDto.getEndTime());
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3501Param;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
new file mode 100644
index 00000000..5c328002
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
@@ -0,0 +1,173 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReturnOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialReturnOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资退货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialReturnOrderServiceImpl implements IMaterialReturnOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 退货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退货单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> returnOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        returnOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : returnOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(returnOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_RETURN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑退货单
+     *
+     * @param returnOrderDtoList 退货信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditReturnOrder(List<MaterialDetailDto> returnOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(returnOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnOrderDtoList.get(0).getOriginalBusNo(), returnOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : returnOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.MATERIAL_RETURN.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                    .setOccurrenceTime(item.getOccurrenceTime()).setEndTime(item.getEndTime())
+                    .setLotNumber(item.getLotNumber()).setInvoiceNo(item.getInvoiceNo()).setTraceNo(item.getTraceNo())
+                    .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                    .setReason(item.getReason()).setSourceTypeEnum(LocationForm.WAREHOUSE.getValue())
+                    .setSourceLocationId(item.getSourceLocationId()).setApplicantId(item.getApplicantId())
+                    .setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
new file mode 100644
index 00000000..31e21df5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
@@ -0,0 +1,178 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialReturnToWarehouseOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialReturnToWarehouseOrderServiceImpl implements
+    IMaterialReturnToWarehouseOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> returnToWarehouseOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        returnToWarehouseOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : returnToWarehouseOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(returnToWarehouseOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_PRODUCT_RETURN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToWarehouseOrderDtoList 退库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditReturnToWarehouseOrder(List<MaterialDetailDto> returnToWarehouseOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToWarehouseOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(returnToWarehouseOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnToWarehouseOrderDtoList.get(0).getOriginalBusNo(), returnToWarehouseOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : returnToWarehouseOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.MATERIAL_PRODUCT_RETURN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                .setEndTime(item.getEndTime()).setPractitionerId(item.getPractitionerId())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
new file mode 100644
index 00000000..136dc888
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
@@ -0,0 +1,185 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialStockInOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资进货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialStockInOrderServiceImpl implements IMaterialStockInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption
+            .add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+                SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(
+            SupplyCategory.PRESENT.getValue(), SupplyCategory.PRESENT.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 进货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 进货单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> stockInOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stockInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+            // 包装情况
+            e.setPackagingConditionEnum_enumText(
+                EnumUtils.getInfoByValue(PackagingCondition.class, e.getPackagingConditionEnum()));
+            // 验收结果
+            e.setAcceptanceResultEnum_enumText(
+                EnumUtils.getInfoByValue(AcceptanceResult.class, e.getAcceptanceResultEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : stockInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stockInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_STOCKIN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑进货单
+     *
+     * @param stockInOrderDtoList 进货信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStockInOrder(List<MaterialDetailDto> stockInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(stockInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(stockInOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockInOrderDtoList.get(0).getOriginalBusNo(), stockInOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : stockInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.MATERIAL_STOCKIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setBatchInventory(item.getBatchInventory()).setSpecificationInventory(item.getSpecificationInventory())
+                .setPrice(item.getPrice()).setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                .setTotalRetailPrice(item.getTotalRetailPrice()).setStartTime(item.getStartTime())
+                .setEndTime(item.getEndTime()).setPractitionerId(item.getPractitionerId())
+                .setLotNumber(item.getLotNumber()).setInvoiceNo(item.getInvoiceNo()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId()).setPackagingConditionEnum(item.getPackagingConditionEnum())
+                .setAcceptanceResultEnum(item.getAcceptanceResultEnum()).setSupplierId(item.getSupplierId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setReason(item.getReason())
+                .setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
new file mode 100644
index 00000000..2925a3c2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
@@ -0,0 +1,181 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialStockOutOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialStockOutOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资出库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(),
+            SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(),
+            SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.OPTICAL_MATERIALS.getValue(),
+            SupplyCategory.OPTICAL_MATERIALS.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 出库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 出库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> stockOutOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stockOutOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+
+        });
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : stockOutOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(stockOutOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_STOCKOUT.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑出库单
+     *
+     * @param stockOutOrderDtoList 出库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStockOutOrder(List<MaterialDetailDto> stockOutOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(stockOutOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(stockOutOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockOutOrderDtoList.get(0).getOriginalBusNo(), stockOutOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : stockOutOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.MATERIAL_STOCKOUT.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                .setEndTime(item.getEndTime()).setPractitionerId(item.getPractitionerId())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
new file mode 100644
index 00000000..134a5ce8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
@@ -0,0 +1,167 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialStocktakingOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialStocktakingOrderServiceImpl implements IMaterialStocktakingOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(
+            SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(
+            SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> stocktakingOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stocktakingOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : stocktakingOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stocktakingOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_STOCKTAKING.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStocktakingOrder(List<MaterialDetailDto> stocktakingOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(stocktakingOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : stocktakingOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.MATERIAL_STOCKTAKING.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setTotalQuantity(item.getTotalQuantity()).setPrice(item.getPrice()).setTotalPrice(item.getTotalPrice())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setBatchInventory(item.getBatchInventory()).setLotNumber(item.getLotNumber()).setSupplierId(item.getSupplierId())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setReasonCode(item.getReasonCode()).setReason(item.getReason())
+                .setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
new file mode 100644
index 00000000..459a4851
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
@@ -0,0 +1,165 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialTransferInOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialTransferInOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资调入单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialTransferInOrderServiceImpl implements IMaterialTransferInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> transferInOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        transferInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : transferInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(transferInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_TRANSFERIN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑调入单
+     *
+     * @param transferInOrderDtoList 调入信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditTransferInOrder(List<MaterialDetailDto> transferInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : transferInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.MATERIAL_TRANSFERIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setRetailPrice(item.getPrice())
+                .setTotalRetailPrice(item.getTotalPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setEndTime(item.getEndTime())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
new file mode 100644
index 00000000..c09ccd81
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
@@ -0,0 +1,165 @@
+package com.openhis.web.materialmanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialInitDto;
+import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
+import com.openhis.web.materialmanage.mapper.MaterialTransferOutOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 物资调出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class MaterialTransferOutOrderServiceImpl implements IMaterialTransferOutOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private MaterialCommonMapper materialCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        MaterialInitDto purchaseOrderInitDto = materialCommonService.init();
+
+        // 单据分类
+        List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<MaterialDetailDto> transferOutOrderDtoDetailPage =
+            materialCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        transferOutOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<MaterialDetailDto.Option> unitList;
+        for (MaterialDetailDto item : transferOutOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(transferOutOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MATERIAL_TRANSFEROUT.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑调入单
+     *
+     * @param transferOutOrderDtoList 调入信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditTransferOutOrder(List<MaterialDetailDto> transferOutOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferOutOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (MaterialDetailDto item : transferOutOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.MATERIAL_TRANSFEROUT.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue())
+                .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setRetailPrice(item.getPrice())
+                .setTotalRetailPrice(item.getTotalPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setEndTime(item.getEndTime())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.WAREHOUSE.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java
new file mode 100644
index 00000000..1b9be264
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资损益单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/profitLoss-order")
+@Slf4j
+public class MaterialProfitLossOrderController {
+
+    @Autowired
+    private IMaterialProfitLossOrderService materialProfitLossOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+    /**
+     * 损益单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialProfitLossOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 损益单单据列表
+     *
+     * @param profitLossOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 损益单据分页列表
+     */
+    @GetMapping(value = "/profitLoss-order-page")
+    public R<?> getPage(MaterialSearchParam profitLossOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(profitLossOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.MATERIAL_PRPFITLOSS.getValue());
+    }
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @GetMapping(value = "/profitLoss-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialProfitLossOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialProfitLossOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-profitLossOrder")
+    public R<?> addOrEditProfitLossOrder(@Validated @RequestBody List<MaterialDetailDto> profitLossOrderDtoList) {
+        return materialProfitLossOrderService.addOrEditProfitLossOrder(profitLossOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-profitLossOrder")
+    public R<?> deleteProfitLossOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.lossReportApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java
new file mode 100644
index 00000000..43333084
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资订货单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/purchase-order")
+@Slf4j
+public class MaterialPurchaseOrderController {
+
+    @Autowired
+    private IMaterialPurchaseOrderService materialPurchaseOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+    /**
+     * 订货单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialPurchaseOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 订货单单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 订货单据分页列表
+     */
+    @GetMapping(value = "/purchase-order-page")
+    public R<?> getPage(MaterialSearchParam purchaseOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.MATERIAL_PURCHASE.getValue());
+    }
+    /**
+     * 订货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 订货单单据详情
+     */
+    @GetMapping(value = "/purchase-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialPurchaseOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialPurchaseOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑订货单
+     *
+     * @param purchaseOrderDtoList 订货信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-purchaseOrder")
+    public R<?> addOrEditPurchaseOrder(@Validated @RequestBody List<MaterialDetailDto> purchaseOrderDtoList) {
+        return materialPurchaseOrderService.addOrEditPurchaseOrder(purchaseOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-purchaseOrder")
+    public R<?> deletePurchaseOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.purchaseOrderAgreeApproval(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java
new file mode 100644
index 00000000..76d1882c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialReturnOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资退货单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/return-order")
+@Slf4j
+public class MaterialReturnOrderController {
+
+    @Autowired
+    private IMaterialReturnOrderService materialReturnOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+
+    /**
+     * 退货单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialReturnOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 退货单单据列表
+     *
+     * @param returnOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 退货单据分页列表
+     */
+    @GetMapping(value = "/return-order-page")
+    public R<?> getPage(MaterialSearchParam returnOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(returnOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.MATERIAL_RETURN.getValue());
+    }
+
+    /**
+     * 退货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退货单单据详情
+     */
+    @GetMapping(value = "/return-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialReturnOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialReturnOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param returnOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-returnOrder")
+    public R<?> addOrEditReturnOrder(@Validated @RequestBody List<MaterialDetailDto> returnOrderDtoList) {
+        return materialReturnOrderService.addOrEditReturnOrder(returnOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-returnOrder")
+    public R<?> deleteReturnOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.purchaseReturnApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
new file mode 100644
index 00000000..49932ed3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资退库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/returnToWarehouse-order")
+@Slf4j
+public class MaterialReturnToWarehouseOrderController {
+
+    @Autowired
+    private IMaterialReturnToWarehouseOrderService materialReturnToWarehouseOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+    /**
+     * 退库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialReturnToWarehouseOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 退库单单据列表
+     *
+     * @param returnToWarehouseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 退库单据分页列表
+     */
+    @GetMapping(value = "/returnToWarehouse-order-page")
+    public R<?> getPage(MaterialSearchParam returnToWarehouseOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(returnToWarehouseOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.MATERIAL_PRODUCT_RETURN.getValue());
+    }
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @GetMapping(value = "/returnToWarehouse-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialReturnToWarehouseOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialReturnToWarehouseOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToWarehouseOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-returnToWarehouseOrder")
+    public R<?> addOrEditReturnToWarehouseOrder(@Validated @RequestBody List<MaterialDetailDto> returnToWarehouseOrderDtoList) {
+        return materialReturnToWarehouseOrderService.addOrEditReturnToWarehouseOrder(returnToWarehouseOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-returnToWarehouseOrder")
+    public R<?> deleteReturnToWarehouseOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.returnIssueApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java
new file mode 100644
index 00000000..267fda5c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资进货单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/stockIn-order")
+@Slf4j
+public class MaterialStockInOrderController {
+
+    @Autowired
+    private IMaterialStockInOrderService materialStockInOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+    /**
+     * 进货单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialStockInOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 进货单单据列表
+     *
+     * @param stockInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 进货单据分页列表
+     */
+    @GetMapping(value = "/stockIn-order-page")
+    public R<?> getPage(MaterialSearchParam stockInOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(stockInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.MATERIAL_STOCKIN.getValue());
+    }
+    /**
+     * 进货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 进货单单据详情
+     */
+    @GetMapping(value = "/stockIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialStockInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialStockInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑进货单
+     *
+     * @param stockInOrderDtoList 进货信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stockInOrder")
+    public R<?> addOrEditStockInOrder(@Validated @RequestBody List<MaterialDetailDto> stockInOrderDtoList) {
+        return materialStockInOrderService.addOrEditStockInOrder(stockInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stockInOrder")
+    public R<?> deleteStockInOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.purchaseInventoryApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java
new file mode 100644
index 00000000..f91ab064
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialStockOutOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资出库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/stockOut-order")
+@Slf4j
+public class MaterialStockOutOrderController {
+
+    @Autowired
+    private IMaterialStockOutOrderService materialStockOutOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+    /**
+     * 出库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialStockOutOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 出库单单据列表
+     *
+     * @param stockOutOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 出库单据分页列表
+     */
+    @GetMapping(value = "/stockOut-order-page")
+    public R<?> getPage(MaterialSearchParam stockOutOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(stockOutOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.MATERIAL_STOCKOUT.getValue());
+    }
+    /**
+     * 出库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 出库单单据详情
+     */
+    @GetMapping(value = "/stockOut-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialStockOutOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialStockOutOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑出库单
+     *
+     * @param stockOutOrderDtoList 出库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stockOutOrder")
+    public R<?> addOrEditStockOutOrder(@Validated @RequestBody List<MaterialDetailDto> stockOutOrderDtoList) {
+        return materialStockOutOrderService.addOrEditStockOutOrder(stockOutOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stockOutOrder")
+    public R<?> deleteStockOutOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.requisitionIssueApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java
new file mode 100644
index 00000000..d6e75045
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资盘点单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/stocktaking-order")
+@Slf4j
+public class MaterialStocktakingOrderController {
+
+    @Autowired
+    private IMaterialStocktakingOrderService materialStocktakingOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+    /**
+     * 盘点单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialStocktakingOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 盘点单单据列表
+     *
+     * @param stocktakingOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 盘点单据分页列表
+     */
+    @GetMapping(value = "/stocktaking-order-page")
+    public R<?> getPage(MaterialSearchParam stocktakingOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(stocktakingOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.MATERIAL_STOCKTAKING.getValue());
+    }
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @GetMapping(value = "/stocktaking-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialStocktakingOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialStocktakingOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stocktakingOrder")
+    public R<?> addOrEditStocktakingOrder(@Validated @RequestBody List<MaterialDetailDto> stocktakingOrderDtoList) {
+        return materialStocktakingOrderService.addOrEditStocktakingOrder(stocktakingOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stocktakingOrder")
+    public R<?> deleteStocktakingOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.productStocktakingApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java
new file mode 100644
index 00000000..e97a05af
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialTransferInOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资调入单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/transferIn-order")
+@Slf4j
+public class MaterialTransferInOrderController {
+
+    @Autowired
+    private IMaterialTransferInOrderService materialTransferInOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+
+    /**
+     * 调入单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialTransferInOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 调入单单据列表
+     *
+     * @param transferInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 调入单据分页列表
+     */
+    @GetMapping(value = "/transferIn-order-page")
+    public R<?> getPage(MaterialSearchParam transferInOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(transferInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.MATERIAL_TRANSFERIN.getValue());
+    }
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    @GetMapping(value = "/transferIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialTransferInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialTransferInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferInOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-transferInOrder")
+    public R<?> addOrEditTransferInOrder(@Validated @RequestBody List<MaterialDetailDto> transferInOrderDtoList) {
+        return materialTransferInOrderService.addOrEditTransferInOrder(transferInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-transferInOrder")
+    public R<?> deleteTransferInOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.transferInAgreeApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java
new file mode 100644
index 00000000..59b18ef5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.materialmanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
+import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderService;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物资调出单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/material/transferOut-order")
+@Slf4j
+public class MaterialTransferOutOrderController {
+
+    @Autowired
+    private IMaterialTransferOutOrderService materialTransferOutOrderService;
+
+    @Autowired
+    private IMaterialCommonService materialCommonService;
+
+    @Autowired
+    private IMaterialReceiptApprovalService materialReceiptApprovalService;
+
+    /**
+     * 调出单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return materialTransferOutOrderService.init();
+    }
+
+    /**
+     * 获取器材
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 器材信息
+     */
+    @GetMapping(value = "/device-info")
+    public R<?> getDeviceInfo(MaterialSearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getDeviceInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 调出单单据列表
+     *
+     * @param transferOutOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 调出单据分页列表
+     */
+    @GetMapping(value = "/transferOut-order-page")
+    public R<?> getPage(MaterialSearchParam transferOutOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return materialCommonService.getPage(transferOutOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.MATERIAL_TRANSFEROUT.getValue());
+    }
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    @GetMapping(value = "/transferOut-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return materialTransferOutOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return materialTransferOutOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferOutOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-transferOutOrder")
+    public R<?> addOrEditTransferOutOrder(@Validated @RequestBody List<MaterialDetailDto> transferOutOrderDtoList) {
+        return materialTransferOutOrderService.addOrEditTransferOutOrder(transferOutOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-transferOutOrder")
+    public R<?> deleteTransferOutOrder(@RequestParam String busNo) {
+        return materialCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return materialReceiptApprovalService.transferOutAgreeApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java
new file mode 100644
index 00000000..c7930b2a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.materialmanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据详细信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class MaterialDetailDto implements Serializable {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 再生成单据号 */
+    private String originalBusNo;
+
+    /** 药品编码 */
+    private String itemBusNo;
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 物品名称 */
+    private String itemName;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 选择单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 常规单位 */
+    @Dict(dictCode = "unit_code")
+    private String maxUnitCode;
+    private String maxUnitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private String partPercent;
+
+    /** 数量 */
+    private BigDecimal itemQuantity;
+
+    /** 合计数量 */
+    private BigDecimal totalQuantity;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 零价金额 */
+    private BigDecimal totalRetailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 备注 */
+    private String remake;
+
+    /** 理由类型 */
+    private String  reasonCode;
+
+    /** 摘要（理由） */
+    private String  reason;
+
+    /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 源仓库类型 */
+    private Integer sourceTypeEnum;
+    /** 源仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+
+    /** 目的仓库类型 */
+    private Integer purposeTypeEnum;
+    /** 目的仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long purposeLocationId;
+
+    /** 采购员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+
+    /** 审批人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 单据分类 */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+
+    /** 供应商联系人 */
+    private String phone;
+
+    /** 仓库员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long  practitionerId;
+
+    /** 发票号 */
+    private String invoiceNo;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 生产日期 */
+    private Date startTime;
+
+    /** 失效日期 */
+    private Date endTime;
+
+    /** 追溯码*/
+    private String traceNo;
+
+    /** 追溯码单位 */
+    @Dict(dictCode = "unit_code")
+    private String traceNoUnitCode;
+    private String traceNoUnitCode_dictText;
+
+    /** 包装情况 */
+    private Integer packagingConditionEnum;
+    private String packagingConditionEnum_enumText;
+
+    /** 验收结果 */
+    private Integer acceptanceResultEnum;
+    private String acceptanceResultEnum_enumText;
+
+    /** 禁用日期 */
+    private Date occurrenceTime;
+
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+        public Option() {
+        }
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java
new file mode 100644
index 00000000..2251dc66
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.materialmanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 物资信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class MaterialDeviceInfoDto implements Serializable {
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 物品编号 */
+    private String busNo;
+
+    /** 物品名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 包装单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+
+//    /** 价格单位 */
+//    @Dict(dictCode = "unit_code")
+//    private String conditionUnitCode;
+//    private String conditionUnitCode_dictText;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 库存最小警戒线 */
+    private BigDecimal itemMinQuantity;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 生产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date productionDate;
+
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date expirationDate;
+
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java
new file mode 100644
index 00000000..0dc23df7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.materialmanage.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class MaterialDto implements Serializable {
+    /** 单据号 */
+    private String supplyBusNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    private String locationTypeEnum_enumText;
+
+    /** 仓库 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_location")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 采购员 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+    private String applicantId_dictText;
+
+    /** 审批人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java
new file mode 100644
index 00000000..435ae04c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.materialmanage.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.administration.domain.Organization;
+import com.openhis.web.common.dto.LocationDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据初期信息
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class MaterialInitDto implements Serializable {
+
+    /**
+     * 单据号
+     */
+    private String busNo;
+
+    /**
+     * 库房类型列表
+     */
+    private List<WarehouseOption> warehouseTypeOption;
+
+    /**
+     * 库房列表
+     */
+    private List<LongOption> warehouseOption;
+
+    /**
+     * 供应商列表
+     */
+     private List<SupplierOption> supplierOption;
+
+    /**
+     * 人员列表
+     */
+    private List<LongOption> practitionerOption;
+    /**
+     * 审批状态
+     */
+    private List<IntegerOption> supplyStatusOptions;
+
+    /**
+     * 单据类型
+     */
+    private List<IntegerOption> supplyTypeOptions;
+
+    /**
+     * 单据分类
+     */
+    private List<IntegerOption> supplyCategoryOptions;
+    /**
+     * 包装情况
+     */
+    private List<IntegerOption> packagingConditionOptions;
+    /**
+     * 包装情况
+     */
+    private List<IntegerOption> acceptanceResultoryOptions;
+
+    /**
+     * 仓库
+     */
+    private List<LocationDto> WarehouseListOptions;
+    /**
+     * 科室
+     */
+    private  List<Organization> departmentListOptions;
+
+    @Data
+    public static class LongOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public LongOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class SupplierOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+        private String phone;
+
+        public SupplierOption(Long value, String label, String phone) {
+            this.value = value;
+            this.label = label;
+            this.phone = phone;
+        }
+    }
+
+    @Data
+    public static class IntegerOption {
+        private Integer value;
+        private String label;
+
+        public IntegerOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class WarehouseOption {
+        private Integer value;
+        private String label;
+        private List<LocationDto> locationOption;
+        private List<WarehouseItemOption> orderOption;
+
+        public WarehouseOption(Integer value, String label,List<LocationDto> locationOption,List<WarehouseItemOption> orderOption) {
+            this.value = value;
+            this.label = label;
+            this.locationOption = locationOption;
+            this.orderOption = orderOption;
+        }
+    }
+
+    @Data
+    public static class WarehouseItemOption {
+        private Integer value;
+        private String label;
+
+        public WarehouseItemOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java
new file mode 100644
index 00000000..c4ff0bc3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.materialmanage.dto;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据查询条件
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class MaterialSearchParam implements Serializable {
+
+    /** id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /** 单据号 */
+    private String busNo;
+
+    /** 采购员 */
+    private String applicantName;
+
+    /** 项目名 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 供应商id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+    /** 单据状态 */
+    private Integer statusEnum;
+
+
+    /** 再生成单据号flg */
+    private String originalBusNoFlg;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java
new file mode 100644
index 00000000..e1b9b61a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java
@@ -0,0 +1,57 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.openhis.web.materialmanage.dto.MaterialDto;
+import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
+import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+
+/**
+ * 物资共通 mapper
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialCommonMapper {
+    /**
+     * 根据供应商获取器材
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param locationId 仓库id
+     * @return 药品信息
+     */
+
+    Page<MaterialDeviceInfoDto> getDeviceInfo(
+        @Param("page") Page<MaterialDeviceInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<MaterialSearchParam> queryWrapper,
+        @Param("locationId") Long locationId,@Param("supplierId") Long supplierId);
+
+    /**
+     * 查询订货单分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param originalBusNoFlg 再生成单据号flg
+     * @param locationFlg 仓库flg
+     * @return 订货单分页列表
+     */
+    Page<MaterialDto> getPage(@Param("page") Page<MaterialDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<MaterialSearchParam> queryWrapper, @Param("originalBusNoFlg") String originalBusNoFlg, @Param("locationFlg") String locationFlg);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    Page<MaterialDetailDto> getDetailPage(@Param("page") Page<MaterialDetailDto> page,
+        @Param("busNo") String busNo);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
new file mode 100644
index 00000000..c6cd1e30
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资损益单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialProfitLossOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
new file mode 100644
index 00000000..b32c6919
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资订货单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialPurchaseOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java
new file mode 100644
index 00000000..88990439
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资进货单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialReturnOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
new file mode 100644
index 00000000..4bda715b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资退库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialReturnToWarehouseOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java
new file mode 100644
index 00000000..305a7c2b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资进货单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialStockInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
new file mode 100644
index 00000000..2d4ebccd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资出库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialStockOutOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
new file mode 100644
index 00000000..53bbeaa1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资盘点单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialStocktakingOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
new file mode 100644
index 00000000..1ece77e9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资调入单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialTransferInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
new file mode 100644
index 00000000..658aa494
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.materialmanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 物资调出单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface MaterialTransferOutOrderMapper {
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientDisposalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
similarity index 37%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientDisposalService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
index f11d6d14..2f6bdac2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientDisposalService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
@@ -1,12 +1,13 @@
 package com.openhis.web.outpatientmanage.appservice;
 
-import com.core.common.core.domain.R;
-import com.openhis.web.outpatientmanage.dto.OutpatientDisposalActivityInfoDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientDisposalExecuteInfoDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.openhis.web.common.dto.PerformInfoDto;
 
 /**
  * 门诊处置
@@ -14,7 +15,7 @@ import java.util.List;
  * @author yuxj
  * @date 2025/4/10
  */
-public interface IOutpatientDisposalService {
+public interface IOutpatientTreatmentAppService {
 
     /**
      * 获取门诊处置初期数据列表
@@ -26,49 +27,48 @@ public interface IOutpatientDisposalService {
     /**
      * 分页查询就诊病人列表
      *
-     * @param encounterInfoSearchParam 查询条件
+     * @param outpatientTreatmentEncounterDto 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
      * @param searchKey 模糊查询关键字
      * @param request 请求数据
      * @return 就诊病人分页列表
      */
-    R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam, Integer pageNo, Integer pageSize,
-        String searchKey, HttpServletRequest request);
+    R<?> getEncounterInfoListPage(OutpatientTreatmentEncounterDto outpatientTreatmentEncounterDto, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request);
+
     /**
-     * 查询诊疗单列表
+     * 处置单查询
      *
-     * @param encounterId 就诊号
-     * @return 诊疗单列表
+     * @param outpatientTreatmentInfoDto 处置信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处置单
      */
-    R<?> getDisposalInfoList(Long encounterId);
+    R<?> getOutpatientTreatmentInfo(OutpatientTreatmentInfoDto outpatientTreatmentInfoDto, Integer pageNo,
+        Integer pageSize);
 
     /**
-     * 查询执行列表
+     * 诊疗执行记录查询
      *
-     * @param busNo 编码
-     * @param activityId 诊疗Id
-     * @param type 类型
-     * @return 执行列表
+     * @param reqId 请求项目id
+     * @return 执行记录列表
      */
-    R<?> getExecuteInfoList(String busNo, Long activityId, Integer type);
+    R<?> getPerformRecord(Long reqId);
 
     /**
-     * 执行
+     * 诊疗执行
      *
-     * @param itemId 诊疗id
-     * @param itemId 诊疗id
+     * @param performInfoList 执行信息列表
      * @return 执行结果
      */
-    R<?> execute(Long itemId, Integer type);
+    R<?> perform(List<PerformInfoDto> performInfoList);
 
     /**
-     * 取消
+     * 取消执行
      *
-     * @param busNo 编码
-     * @param activityId 诊疗Id
-     * @param type 类型
-     * @return 执行结果
+     * @param performInfoList 执行信息列表
+     * @return 取消结果
      */
-    R<?> cancel(String busNo, Long activityId, Integer type);
+    R<?> cancelPerform(List<PerformInfoDto> performInfoList);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
index 677c9872..7d6cabe1 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
@@ -24,9 +24,9 @@ import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionAppService;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionInitDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientStationInitDto;
 import com.openhis.web.outpatientmanage.mapper.OutpatientInfusionAppMapper;
 import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.mapper.ServiceRequestMapper;
@@ -61,14 +61,14 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS
      */
     @Override
     public R<?> init() {
-        OutpatientInfusionInitDto initDto = new OutpatientInfusionInitDto();
+        OutpatientStationInitDto initDto = new OutpatientStationInitDto();
         // 执行状态
-        List<OutpatientInfusionInitDto.ServiceStatus> serviceStatusOptions = new ArrayList<>();
-        serviceStatusOptions.add(new OutpatientInfusionInitDto.ServiceStatus(RequestStatus.COMPLETED.getValue(),
+        List<OutpatientStationInitDto.ServiceStatus> serviceStatusOptions = new ArrayList<>();
+        serviceStatusOptions.add(new OutpatientStationInitDto.ServiceStatus(RequestStatus.COMPLETED.getValue(),
             RequestStatus.COMPLETED.getInfo()));
-        serviceStatusOptions.add(new OutpatientInfusionInitDto.ServiceStatus(RequestStatus.IN_PROGRESS.getValue(),
-            RequestStatus.IN_PROGRESS.getInfo()));
-        serviceStatusOptions.add(new OutpatientInfusionInitDto.ServiceStatus(RequestStatus.CANCELLED.getValue(),
+        // serviceStatusOptions.add(new OutpatientStationInitDto.ServiceStatus(RequestStatus.IN_PROGRESS.getValue(),
+        // RequestStatus.IN_PROGRESS.getInfo()));
+        serviceStatusOptions.add(new OutpatientStationInitDto.ServiceStatus(RequestStatus.CANCELLED.getValue(),
             RequestStatus.CANCELLED.getInfo()));
         initDto.setServiceStatusOptions(serviceStatusOptions);
         return R.ok(initDto);
@@ -96,8 +96,8 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS
         // 查询输液患者列表
         IPage<OutpatientInfusionPatientDto> outpatientInfusionPatientPage =
             outpatientInfusionAppMapper.getOutpatientInfusionPatient(new Page<>(pageNo, pageSize), queryWrapper,
-                RequestStatus.IN_PROGRESS.getValue(), RequestStatus.COMPLETED.getValue(),
-                RequestStatus.CANCELLED.getValue(), CommonConstants.TableName.MED_MEDICATION_REQUEST);
+                RequestStatus.ACTIVE.getValue(), RequestStatus.COMPLETED.getValue(), RequestStatus.CANCELLED.getValue(),
+                CommonConstants.TableName.MED_MEDICATION_REQUEST);
         outpatientInfusionPatientPage.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
@@ -184,7 +184,8 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS
         // 新增一条执行记录
         for (ServiceRequest serviceRequest : serviceRequestList) {
             serviceRequest.setBasedOnId(serviceRequest.getId()).setStatusEnum(RequestStatus.COMPLETED.getValue())
-                .setOccurrenceEndTime(now).setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10))
+                .setOccurrenceEndTime(now)
+                .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4))
                 .setBasedOnTable(CommonConstants.TableName.WOR_SERVICE_REQUEST).setPerformerId(practitionerId)
                 .setOrgId(orgId).setGroupId(null).setId(null);
             serviceRequestService.save(serviceRequest);
@@ -257,7 +258,7 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS
             }
             boolean result = serviceRequestService.updateCancelledStatus(serviceReqId, now, practitionerId, orgId);
             // 更新主服务请求状态为待执行
-            serviceRequestService.updatePreparationStatus(List.of(serviceRequest.getBasedOnId()));
+            serviceRequestService.updateDraftStatus(List.of(serviceRequest.getBasedOnId()), null, null);
             if (result) {
                 // 判断是否全部取消执行
                 boolean exists = serviceRequestMapper.exists(new LambdaQueryWrapper<ServiceRequest>()
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
new file mode 100644
index 00000000..348b3ddc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
@@ -0,0 +1,591 @@
+package com.openhis.web.outpatientmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+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;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.*;
+import com.openhis.clinical.domain.Procedure;
+import com.openhis.clinical.service.IProcedureService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.web.common.dto.PerformInfoDto;
+import com.openhis.web.common.dto.PerformRecordDto;
+import com.openhis.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
+import com.openhis.web.outpatientmanage.dto.OutpatientStationInitDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
+import com.openhis.web.pharmacymanage.appservice.impl.IReturnMedicineAppServiceImpl;
+import com.openhis.web.pharmacymanage.appservice.impl.IWesternMedicineDispenseAppServiceImpl;
+import com.openhis.web.pharmacymanage.dto.InventoryDto;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.DeviceRequest;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IDeviceRequestService;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.IServiceRequestService;
+
+import cn.hutool.core.lang.Pair;
+
+/**
+ * 门诊处置
+ *
+ * @author yuxj
+ * @date 2025/4/10
+ */
+@Service
+public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAppService {
+
+    @Resource
+    private OutpatientTreatmentAppMapper outpatientTreatmentAppMapper;
+
+    @Resource
+    private IServiceRequestService serviceRequestService;
+
+    @Resource
+    private IMedicationRequestService medicationRequestService;
+
+    @Resource
+    private IDeviceDispenseService deviceDispenseService;
+
+    @Resource
+    private IDeviceRequestService deviceRequestService;
+
+    @Resource
+    private IInventoryItemService inventoryItemService;
+
+    @Resource
+    private IProcedureService procedureService;
+
+    @Resource
+    private ReturnMedicineMapper returnMedicineMapper;
+
+    @Resource
+    private IWesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppServiceImpl;
+
+    @Resource
+    private IReturnMedicineAppServiceImpl returnedMedicineAppServiceImpl;
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 获取门诊处置初期数据列表
+     *
+     * @return 获取门诊处置初期数据列表
+     */
+    @Override
+    public R<?> init() {
+        OutpatientStationInitDto initDto = new OutpatientStationInitDto();
+        // 执行状态
+        List<OutpatientStationInitDto.ServiceStatus> serviceStatusOptions = new ArrayList<>();
+        // serviceStatusOptions.add(new OutpatientStationInitDto.ServiceStatus(RequestStatus.COMPLETED.getValue(),
+        // RequestStatus.COMPLETED.getInfo()));
+        // serviceStatusOptions.add(new OutpatientStationInitDto.ServiceStatus(RequestStatus.IN_PROGRESS.getValue(),
+        // RequestStatus.IN_PROGRESS.getInfo()));
+        // serviceStatusOptions.add(new OutpatientStationInitDto.ServiceStatus(RequestStatus.CANCELLED.getValue(),
+        // RequestStatus.CANCELLED.getInfo()));
+        initDto.setServiceStatusOptions(serviceStatusOptions);
+        return R.ok(initDto);
+    }
+
+    /**
+     * 分页查询就诊病人列表
+     *
+     * @param outpatientTreatmentEncounterDto 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 就诊病人列表
+     */
+    @Override
+    public R<?> getEncounterInfoListPage(OutpatientTreatmentEncounterDto outpatientTreatmentEncounterDto,
+        Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+
+        // 设置模糊查询的字段名
+        HashSet<String> searchFields = new HashSet<>();
+        searchFields.add(CommonConstants.FieldName.PatientName);
+        searchFields.add(CommonConstants.FieldName.idCard);
+        searchFields.add(CommonConstants.FieldName.PatientPyStr);
+        searchFields.add(CommonConstants.FieldName.PatientWbStr);
+        // 构建查询条件
+        QueryWrapper<OutpatientTreatmentEncounterDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(outpatientTreatmentEncounterDto, searchKey, searchFields, request);
+
+        // 查询就诊病人列表
+        Page<OutpatientTreatmentEncounterDto> encounterInfoPageDto = outpatientTreatmentAppMapper
+            .selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.AMB.getValue());
+        encounterInfoPageDto.getRecords().forEach(prescriptionPatientInfoDto -> {
+            // 性别
+            prescriptionPatientInfoDto.setGenderEnum_enumText(
+                EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.getGenderEnum()));
+            // 计算年龄
+            prescriptionPatientInfoDto.setAge(prescriptionPatientInfoDto.getBirthDate() != null
+                ? AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirthDate()) : "");
+        });
+        return R.ok(encounterInfoPageDto);
+    }
+
+    /**
+     * 处置单查询
+     *
+     * @param outpatientTreatmentInfoDto 处置信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处置单
+     */
+    @Override
+    public R<?> getOutpatientTreatmentInfo(OutpatientTreatmentInfoDto outpatientTreatmentInfoDto, Integer pageNo,
+        Integer pageSize) {
+        // 构建查询条件
+        QueryWrapper<OutpatientTreatmentInfoDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(outpatientTreatmentInfoDto, null, null, null);
+
+        // 查询处置单
+        IPage<OutpatientTreatmentInfoDto> treatmentInfo = outpatientTreatmentAppMapper.selectTreatmentInfoPage(
+            new Page<>(pageNo, pageSize), queryWrapper, RequestStatus.COMPLETED.getValue(),
+            DispenseStatus.DRAFT.getValue(), CommonConstants.TableName.WOR_SERVICE_REQUEST,
+            CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.TableName.MED_MEDICATION_REQUEST);
+        List<OutpatientTreatmentInfoDto> treatmentList = treatmentInfo.getRecords();
+
+        // 获取请求ids
+        List<Long> reqIds =
+            treatmentList.stream().map(OutpatientTreatmentInfoDto::getRequestId).collect(Collectors.toList());
+        Map<Long, List<Procedure>> procedureRecordGroup = new HashMap<>();
+        if (!reqIds.isEmpty()) {
+            // 查询执行记录
+            List<Procedure> procedureRecords = procedureService.getProcedureRecords(reqIds, null);
+
+            if (procedureRecords != null && !procedureRecords.isEmpty()) {
+                // 根据服务请求id分组
+                procedureRecordGroup = procedureRecords.stream()
+                    .collect(Collectors.groupingBy(Procedure::getRequestId, Collectors.toList()));
+            }
+        }
+
+        // 为每个治疗项设置执行状态统计
+        for (OutpatientTreatmentInfoDto treatment : treatmentList) {
+            // 初始化计数器
+            int performCount = 0;
+            int cancelCount = 0;
+            if (!procedureRecordGroup.isEmpty()) {
+                // 安全获取执行记录
+                List<Procedure> records = procedureRecordGroup.get(treatment.getRequestId());
+                if (records != null && !records.isEmpty()) {
+                    // 统计状态数量
+                    for (Procedure record : records) {
+                        if (EventStatus.COMPLETED.getValue().equals(record.getStatusEnum())) {
+                            performCount++;
+                        } else if (EventStatus.CANCEL.getValue().equals(record.getStatusEnum())) {
+                            cancelCount++;
+                        }
+                    }
+                }
+            }
+            // 设置统计结果
+            treatment.setPerformCount(performCount);
+            treatment.setCancelCount(cancelCount);
+
+            // 发放状态
+            if (treatment.getDispenseStatus() != null) {
+                treatment.setDispenseStatus_enumText(
+                    EnumUtils.getInfoByValue(DispenseStatus.class, treatment.getDispenseStatus()));
+            }
+            // 收费状态
+            if (treatment.getChargeStatus() != null) {
+                treatment.setChargeStatus_enumText(
+                    EnumUtils.getInfoByValue(ChargeItemStatus.class, treatment.getChargeStatus()));
+            }
+        }
+        return R.ok(treatmentInfo);
+    }
+
+    /**
+     * 诊疗执行记录查询
+     *
+     * @param reqId 请求项目id
+     * @return 执行记录列表
+     */
+    @Override
+    public R<?> getPerformRecord(Long reqId) {
+        // 查询执行记录
+        List<PerformRecordDto> performRecordList = outpatientTreatmentAppMapper.selectPerformRecordList(List.of(reqId));
+        performRecordList.forEach(performRecordDto -> {
+            // 获取执行状态
+            performRecordDto
+                .setStatusEnum_enumText(EnumUtils.getInfoByValue(EventStatus.class, performRecordDto.getStatusEnum()));
+        });
+        return R.ok(performRecordList);
+    }
+
+    /**
+     * 诊疗执行
+     *
+     * @param performInfoList 执行信息列表
+     * @return 执行结果
+     */
+    @Override
+    public R<?> perform(List<PerformInfoDto> performInfoList) {
+
+        // 分别创建两个列表来存储不同类型的请求
+        List<PerformInfoDto> serviceMedPerformList = new ArrayList<>();
+        List<PerformInfoDto> devicePerformList = new ArrayList<>();
+        for (PerformInfoDto item : performInfoList) {
+            if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(item.getRequestTable())
+                || CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(item.getRequestTable())) {
+                serviceMedPerformList.add(item);
+            } else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(item.getRequestTable())) {
+                devicePerformList.add(item);
+            }
+        }
+        // 分别处理诊疗/药品执行和耗材发放
+        if (!serviceMedPerformList.isEmpty()) {
+            // 处理诊疗执行
+            for (PerformInfoDto performInfoDto : serviceMedPerformList) {
+                Long groupId = performInfoDto.getGroupId();
+                Long encounterId = null;
+                Long requestId = null;
+                Long patientId = null;
+                Integer exeCount = 0;
+                if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(performInfoDto.getRequestTable())) {
+                    ServiceRequest serviceRequest = serviceRequestService.getById(performInfoDto.getRequestId());
+                    if (serviceRequest != null) {
+                        encounterId = serviceRequest.getEncounterId();
+                        requestId = serviceRequest.getId();
+                        patientId = serviceRequest.getPatientId();
+                        exeCount = serviceRequest.getQuantity();
+                    }
+                } else if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(performInfoDto.getRequestTable())) {
+                    MedicationRequest medicationRequest =
+                        medicationRequestService.getById(performInfoDto.getRequestId());
+                    if (medicationRequest != null) {
+                        encounterId = medicationRequest.getEncounterId();
+                        requestId = medicationRequest.getId();
+                        patientId = medicationRequest.getPatientId();
+                        exeCount = medicationRequest.getExecuteNum();
+                    }
+                }
+                // 根据请求id查询执行记录
+                List<Procedure> procedureRecordList = procedureService
+                    .getProcedureRecords(List.of(performInfoDto.getRequestId()), performInfoDto.getRequestTable());
+                if (procedureRecordList != null && !procedureRecordList.isEmpty()) {
+                    // 初始化计数器
+                    int performCount = 0;
+                    int cancelCount = 0;
+                    // 统计状态数量
+                    for (Procedure record : procedureRecordList) {
+                        if (EventStatus.COMPLETED.getValue().equals(record.getStatusEnum())) {
+                            performCount++;
+                        } else if (EventStatus.CANCEL.getValue().equals(record.getStatusEnum())) {
+                            cancelCount++;
+                        }
+                    }
+                    // 判断该项目是否已经执行了
+                    if (performCount - cancelCount < exeCount) {
+                        // 未执行则新增执行记录
+                        boolean result = procedureService.addProcedureRecord(encounterId, patientId, requestId,
+                            performInfoDto.getRequestTable(), EventStatus.COMPLETED,
+                            ProcedureCategory.OUTPATIENT_ADVICE, null, groupId, null);
+                        if (!result) {
+                            throw new ServiceException("执行失败，请联系管理员");
+                        }
+                    }
+                } else {
+                    // 新增执行记录
+                    boolean result = procedureService.addProcedureRecord(encounterId, patientId, requestId,
+                        performInfoDto.getRequestTable(), EventStatus.COMPLETED, ProcedureCategory.OUTPATIENT_ADVICE,
+                        null, groupId, null);
+                    if (!result) {
+                        throw new ServiceException("执行失败，请联系管理员");
+                    }
+                }
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 返回信息
+        String returnMsg = null;
+        if (!devicePerformList.isEmpty()) {
+            // 耗材请求id列表
+            List<Long> devRequestIdList = devicePerformList.stream().map(PerformInfoDto::getRequestId).toList();
+            // 获取耗材发放id列表
+            List<Long> devDispenseIdList = performInfoList.stream().map(PerformInfoDto::getDispenseId).toList();
+            // 获取库存信息
+            List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+            // 按每个耗材分组
+            Map<Long, List<InventoryDto>> groupedByItemId =
+                inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+            // 遍历每个分组校验库存状态
+            for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
+                List<InventoryDto> groupItems = entry.getValue();
+                if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+                    .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
+                    // 库存停供校验
+                    return R.fail(groupItems.get(0).getItemName() + "库存已停供");
+                }
+            }
+            List<InventoryItem> inventoryItemList = new ArrayList<>();
+            if (!inventoryList.isEmpty()) {
+                for (InventoryDto inventoryDto : inventoryList) {
+                    if (PublicationStatus.ACTIVE.getValue().equals(inventoryDto.getInventoryStatusEnum())) {
+                        InventoryItem inventoryItem = new InventoryItem();
+                        // 库存数量判定
+                        if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                            // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                            BigDecimal quantity =
+                                inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                            // 库存数量判定
+                            if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                                // 库存数量不足
+                                return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            } else {
+                                inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            }
+                        } else {
+                            // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                            BigDecimal quantity = inventoryDto.getInventoryQuantity()
+                                .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                            // 库存数量判定
+                            if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                                // 库存数量不足
+                                return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            } else {
+                                inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            }
+                        }
+                        inventoryItemList.add(inventoryItem);
+                    }
+                }
+            }
+            // 发耗材信息查询
+            List<DeviceDispense> dispenseList = deviceDispenseService
+                .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+            if (dispenseList != null) {
+                for (DeviceDispense deviceDispense : dispenseList) {
+                    if (deviceDispense.getStatusEnum().equals(DispenseStatus.PREPARATION.getValue())) {
+                        // 耗材发放状态
+                        deviceDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                        // 发药数量
+                        deviceDispense.setDispenseQuantity(deviceDispense.getQuantity());
+                        // 发药时间
+                        deviceDispense.setDispenseTime(DateUtils.getNowDate());
+                        // 发药人
+                        deviceDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId());
+                        // 根据数量设置追溯码
+                        deviceDispense.setTraceNo(String.join(CommonConstants.Common.COMMA,
+                            Collections.nCopies(deviceDispense.getQuantity(), CommonConstants.Common.DEV_TRACE_NO)));
+                    }
+                }
+                // 药品发放更新
+                deviceDispenseService.updateBatchById(dispenseList);
+            } else {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 库存更新
+            inventoryItemService.updateBatchById(inventoryItemList);
+            // 更新请求状态为已完成
+            deviceRequestService.updateCompletedStatusBatch(devRequestIdList);
+
+            // 调用医保商品销售接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+            // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    westernMedicineDispenseAppServiceImpl.ybMedicineIntegrated(null, devDispenseIdList);
+                if (uploadFailedNoList != null) {
+                    returnMsg = "3505商品销售上传错误，错误项目编码" + uploadFailedNoList;
+                } else {
+                    returnMsg = "3505商品销售上传成功";
+                }
+            }
+        }
+        return R.ok(returnMsg, "执行成功");
+    }
+
+    /**
+     * 取消执行
+     *
+     * @param performInfoList 执行信息列表
+     * @return 取消结果
+     */
+    @Override
+    public R<?> cancelPerform(List<PerformInfoDto> performInfoList) {
+        // 分别创建两个列表来存储不同类型的请求
+        List<PerformInfoDto> serviceMedCancelList = new ArrayList<>();
+        List<PerformInfoDto> deviceCancelList = new ArrayList<>();
+        for (PerformInfoDto item : performInfoList) {
+            if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(item.getRequestTable())
+                || CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(item.getRequestTable())) {
+                serviceMedCancelList.add(item);
+            } else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(item.getRequestTable())) {
+                deviceCancelList.add(item);
+            }
+        }
+        // 分别处理诊疗执行和耗材发放
+        if (!serviceMedCancelList.isEmpty()) {
+            // 处理诊疗取消执行
+            for (PerformInfoDto performInfoDto : serviceMedCancelList) {
+                // 根据请求id查询执行记录
+                List<Procedure> procedureRecordList = procedureService
+                    .getProcedureRecords(List.of(performInfoDto.getRequestId()), performInfoDto.getRequestTable());
+                if (procedureRecordList != null && !procedureRecordList.isEmpty()) {
+                    Procedure procedure = procedureRecordList.get(0);
+                    // 初始化计数器
+                    int performCount = 0;
+                    int cancelCount = 0;
+                    // 统计状态数量
+                    for (Procedure record : procedureRecordList) {
+                        if (EventStatus.COMPLETED.getValue().equals(record.getStatusEnum())) {
+                            performCount++;
+                        } else if (EventStatus.CANCEL.getValue().equals(record.getStatusEnum())) {
+                            cancelCount++;
+                        }
+                    }
+                    // 判断该项目是否已经执行了
+                    if (performCount - cancelCount > 0) {
+                        // 已执行则新增取消执行记录
+                        boolean result = procedureService.addProcedureRecord(procedure.getEncounterId(),
+                            procedure.getPatientId(), procedure.getRequestId(), procedure.getRequestTable(),
+                            EventStatus.CANCEL, ProcedureCategory.OUTPATIENT_ADVICE, performInfoDto.getLocationId(),
+                            performInfoDto.getGroupId(), null);
+                        if (!result) {
+                            throw new ServiceException("取消执行失败，请联系管理员");
+                        }
+                    }
+                }
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 返回信息
+        String returnMsg = null;
+        if (!deviceCancelList.isEmpty()) {
+            // 待退的耗材请求id列表
+            List<Long> devRefundRequestIdList = new ArrayList<>();
+            // 耗材请求id和待退的耗材请求id
+            List<Pair<Long, Long>> devRequestIdPairList = new ArrayList<>();
+            // 耗材发放id列表
+            List<Long> devDispenseIdList = deviceCancelList.stream().map(PerformInfoDto::getDispenseId).toList();
+            for (PerformInfoDto performInfoDto : deviceCancelList) {
+                // 查询耗材请求
+                DeviceRequest deviceRequest = deviceRequestService.getById(performInfoDto.getRequestId());
+                Long requestId = deviceRequest.getId();
+                // 查询待退的耗材请求
+                DeviceRequest deviceRefundRequest = deviceRequestService.getOne(new LambdaQueryWrapper<DeviceRequest>()
+                    .eq(DeviceRequest::getRefundDeviceId, performInfoDto.getRequestId())
+                    .eq(DeviceRequest::getDeleteFlag, DelFlag.NO.getCode()));
+                if (deviceRefundRequest != null) {
+                    if (deviceRefundRequest.getStatusEnum().equals(EventStatus.CANCEL.getValue())) {
+                        // 获取待退的耗材请求id
+                        devRefundRequestIdList.add(deviceRefundRequest.getId());
+                        devRequestIdPairList.add(new Pair<>(requestId, deviceRefundRequest.getId()));
+                    }
+                } else {
+                    // 生成退耗材请求
+                    deviceRequest.setId(null); // 耗材请求id
+                    deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4)); // 耗材请求编码
+                    deviceRequest.setQuantity(deviceRequest.getQuantity() * (-1)); // 请求数量
+                    deviceRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
+                    deviceRequest.setRefundDeviceId(deviceRequest.getId()); // 退药id
+                    deviceRequestService.save(deviceRequest);
+                    // 获取生成的退耗材请求的id
+                    devRefundRequestIdList.add(deviceRequest.getId());
+                    devRequestIdPairList.add(new Pair<>(requestId, deviceRequest.getId()));
+                }
+            }
+            // 退耗材处理
+            // 退耗材单列表
+            List<DeviceDispense> devRefundList = new ArrayList<>();
+            if (!devDispenseIdList.isEmpty()) {
+                // 耗材已发放信息查询
+                List<DeviceDispense> deviceDispenseList = deviceDispenseService
+                    .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+                // 根据发药单对应生成退药单
+                for (DeviceDispense deviceDispense : deviceDispenseList) {
+                    // 耗材发放编码
+                    deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
+                    // 退耗材的耗材请求id
+                    for (Pair<Long, Long> pair : devRequestIdPairList) {
+                        if (deviceDispense.getDeviceReqId().equals(pair.getKey())) {
+                            deviceDispense.setDeviceReqId(pair.getValue());
+                        }
+                    }
+                    // 退药时间
+                    deviceDispense.setDispenseTime(DateUtils.getNowDate());
+                    // 退药状态
+                    deviceDispense.setStatusEnum(DispenseStatus.REFUNDED.getValue());
+                    deviceDispense.setId(null);
+                    devRefundList.add(deviceDispense);
+                }
+                deviceDispenseService.saveBatch(devRefundList);
+                // 药品退药请求状态变更(待退药→已完成)
+                deviceRequestService.updateCompletedStatusBatch(devRefundRequestIdList);
+            }
+
+            List<InventoryItem> inventoryItemList = new ArrayList<>();
+            // 获取库存信息
+            List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+            if (inventoryList != null && !inventoryList.isEmpty()) {
+                // 设置库存数量
+                for (InventoryDto inventory : inventoryList) {
+                    // 库存表项目设定
+                    InventoryItem inventoryItem = new InventoryItem();
+                    // id
+                    inventoryItem.setId(inventory.getInventoryId());
+                    // 库存数量
+                    if (inventory.getDispenseUnit().equals(inventory.getInventoryUnitCode())) {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)+待退数量
+                        inventoryItem
+                            .setQuantity(inventory.getInventoryQuantity().add(inventory.getDispenseQuantity()));
+                    } else {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)+退药数量（拆零比×待退数量）
+                        inventoryItem.setQuantity(inventory.getInventoryQuantity()
+                            .add(inventory.getPartPercent().multiply(inventory.getDispenseQuantity())));
+                    }
+                    inventoryItemList.add(inventoryItem);
+                }
+            }
+            // 库存更新
+            inventoryItemService.updateBatchById(inventoryItemList);
+            // 调用医保商品销售退货接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                if (!devRefundList.isEmpty()) {
+                    List<String> uploadFailedNoList =
+                        returnedMedicineAppServiceImpl.ybReturnIntegrated(new ArrayList<>(), devDispenseIdList);
+                    if (uploadFailedNoList != null) {
+                        returnMsg = "3506商品销售退货上传错误，错误项目编码" + uploadFailedNoList;
+                    } else {
+                        returnMsg = "3506商品销售退货上传成功";
+                    }
+                }
+            }
+        }
+        return R.ok(returnMsg, "取消执行成功");
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientDisposalController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java
similarity index 33%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientDisposalController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java
index f0308f30..58bdd0be 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientDisposalController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java
@@ -1,24 +1,21 @@
 package com.openhis.web.outpatientmanage.controller;
 
-import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
-import com.openhis.web.outpatientmanage.dto.OutpatientDisposalActivityInfoDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientDisposalExecuteInfoDto;
-import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.common.dto.PerformInfoDto;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.outpatientmanage.appservice.IOutpatientDisposalService;
+import com.openhis.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 门诊处置
  *
@@ -26,16 +23,13 @@ import java.util.List;
  * @date 2025/4/10
  */
 @RestController
-@RequestMapping("/outpatient-manage/disposal")
+@RequestMapping("/outpatient-manage/treatment")
 @Slf4j
 @AllArgsConstructor
-public class OutpatientDisposalController {
-
-    @Resource
-    private IOutpatientDisposalService outpatientDisposalService;
+public class OutpatientTreatmentController {
 
     @Resource
-    public IWesternMedicineDispenseAppService iWesternMedicineDispenseService;
+    private IOutpatientTreatmentAppService outpatientTreatmentAppService;
 
     /**
      * 门诊处置初期数据
@@ -43,14 +37,14 @@ public class OutpatientDisposalController {
      * @return 初始化信息
      */
     @GetMapping("/init")
-    public R<?> outpatientDisposalInit() {
-        return outpatientDisposalService.init();
+    public R<?> outpatientTreatmentInit() {
+        return outpatientTreatmentAppService.init();
     }
 
     /**
      * 分页查询就诊病人列表
      *
-     * @param encounterInfoSearchParam 查询条件
+     * @param outpatientTreatmentEncounterDto 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
      * @param searchKey 模糊查询关键字
@@ -58,58 +52,59 @@ public class OutpatientDisposalController {
      * @return 就诊病人列表
      */
     @GetMapping("/encounter-list")
-    public R<?> getEncounterInfoList(EncounterInfoSearchParam encounterInfoSearchParam,
+    public R<?> getEncounterInfoList(OutpatientTreatmentEncounterDto outpatientTreatmentEncounterDto,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
         @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return outpatientDisposalService.getEncounterInfoListPage(encounterInfoSearchParam, pageNo, pageSize,
+        return outpatientTreatmentAppService.getEncounterInfoListPage(outpatientTreatmentEncounterDto, pageNo, pageSize,
             searchKey, request);
     }
 
     /**
-     * 诊疗单查询
+     * 处置单查询
      *
-     * @param encounterId 就诊Id
+     * @param outpatientTreatmentInfoDto 处置信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处置单
      */
-    @GetMapping("/disposal-list")
-    public R<?> getDisposalInfoList(@RequestParam(value = "encounterId") Long encounterId) {
-        return outpatientDisposalService.getDisposalInfoList(encounterId);
+    @GetMapping("/treatment-list")
+    public R<?> getOutpatientTreatmentInfo(OutpatientTreatmentInfoDto outpatientTreatmentInfoDto,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize) {
+        return outpatientTreatmentAppService.getOutpatientTreatmentInfo(outpatientTreatmentInfoDto, pageNo, pageSize);
     }
 
     /**
-     * 执行单查询
+     * 诊疗执行记录查询
      *
-     * @param busNo 编码
-     * @param activityId 诊疗Id
-     * @param type 类型
+     * @param reqId 请求项目id
+     * @return 执行记录列表
      */
-    @GetMapping("/execute-list")
-    public R<?> getExecuteInfoList(@RequestParam(value = "busNo") String busNo,
-        @RequestParam(value = "activityId") Long activityId, @RequestParam(value = "type") Integer type) {
-        return outpatientDisposalService.getExecuteInfoList(busNo, activityId, type);
+    @GetMapping(value = "/perform-record")
+    public R<?> getPerformRecord(@RequestParam Long reqId) {
+        return outpatientTreatmentAppService.getPerformRecord(reqId);
     }
 
     /**
-     * 执行
+     * 诊疗执行
      *
-     * @param itemId 诊疗id
-     * @param type 诊疗类型
+     * @param performInfoList 执行信息列表
+     * @return 执行结果
      */
-    @PutMapping("/execute")
-    public R<?> execute(@RequestParam(value = "itemId") Long itemId, @RequestParam(value = "type") Integer type) {
-        return outpatientDisposalService.execute(itemId, type);
+    @PutMapping("/perform")
+    public R<?> perform(@RequestBody List<PerformInfoDto> performInfoList) {
+        return outpatientTreatmentAppService.perform(performInfoList);
     }
 
     /**
-     * 取消
+     * 取消执行
      *
-     * @param busNo 编码
-     * @param activityId 诊疗Id
-     * @param type 类型
+     * @param performInfoList 执行信息列表
+     * @return 取消结果
      */
-    @PutMapping("/cancel")
-    public R<?> cancel(@RequestParam(value = "busNo") String busNo, @RequestParam(value = "activityId") Long activityId,
-        @RequestParam(value = "type") Integer type) {
-        return outpatientDisposalService.cancel(busNo, activityId, type);
+    @PutMapping(value = "/cancel-perform")
+    public R<?> cancelPerform(@RequestBody List<PerformInfoDto> performInfoList) {
+        return outpatientTreatmentAppService.cancelPerform(performInfoList);
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java
similarity index 79%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java
index b5dfdafc..1c2fc38f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionInitDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java
@@ -9,17 +9,17 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 门诊输液初始化dto
+ * 门诊工作站初始化dto
  *
  * @author zwh
  * @date 2025-05-19
  */
 @Data
 @Accessors(chain = true)
-public class OutpatientInfusionInitDto {
+public class OutpatientStationInitDto {
 
     /** 执行状态 */
-    private List<OutpatientInfusionInitDto.ServiceStatus> serviceStatusOptions;
+    private List<OutpatientStationInitDto.ServiceStatus> serviceStatusOptions;
 
     /** 执行状态 */
     @Data
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalEncounterInfoPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
similarity index 55%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalEncounterInfoPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
index f1d19816..04166be1 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalEncounterInfoPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
@@ -3,12 +3,15 @@
  */
 package com.openhis.web.outpatientmanage.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 就诊人员列表
  *
@@ -17,22 +20,42 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class OutpatientDisposalEncounterInfoPageDto {
+public class OutpatientTreatmentEncounterDto {
 
     /** 就诊ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
-    /** 科室 */
-    private String departmentName;
+    /** 就诊号 */
+    private String encounterNo;
 
     /** 患者姓名 */
     private String patientName;
 
+    /** 拼音码 */
+    private String patientPyStr;
+
+    /** 五笔码 */
+    private String patientWbStr;
+
     /** 性别 */
     private Integer genderEnum;
     private String genderEnum_enumText;
 
     /** 就诊日期 */
-    private String encounterDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String receptionTime;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 生日
+     */
+    private Date birthDate;
+
+    /** 执行状态 */
+    private Integer statusEnum;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalTempInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
similarity index 33%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalTempInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
index 5d88bf96..b0645c71 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalTempInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
@@ -4,7 +4,6 @@
 package com.openhis.web.outpatientmanage.dto;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -14,50 +13,52 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 列表
+ * 处方信息
  *
  * @author yuxj
  * @date 2025-04-11
  */
 @Data
 @Accessors(chain = true)
-public class OutpatientDisposalTempInfoDto {
+public class OutpatientTreatmentInfoDto {
 
-    /** id */
+    /** 就诊ID */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
+    private Long encounterId;
 
-    /** 类型 */
-    private Integer type;
+    /** 请求id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
 
-    /** 申请状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
+    /** 请求状态 */
+    private Integer serviceStatus;
+    private String serviceStatus_enumText;
 
-    /** 编码 */
-    private String busNo;
-
-    /** 诊疗id */
+    /** 发放ID */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long activityId;
+    private Long dispenseId;
 
-    /** 产品批号 */
-    private String lotNumber;
+    /** 发放状态 */
+    private Integer dispenseStatus;
+    private String dispenseStatus_enumText;
 
-    /** 单位 */
-    private String unitCode;
+    /** 执行次数 */
+    private Integer executeNum;
 
-    /** 拆零比 */
-    private BigDecimal partPercent;
+    /** 数量 */
+    private Integer quantity;
 
-    /** 仓库 */
-    private Long locationId;
+    /** 单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
 
-    /** 分组编号 */
-    private String groupNo;
+    /** 编码 */
+    private String busNo;
 
-    /** 项目名称 */
-    private String itemName;
+    /** 收费状态 */
+    private Integer chargeStatus;
+    private String chargeStatus_enumText;
 
     /** 单价 */
     private BigDecimal unitPrice;
@@ -65,70 +66,48 @@ public class OutpatientDisposalTempInfoDto {
     /** 总价 */
     private BigDecimal totalPrice;
 
-    /** 数量 */
-    private Integer quantity;
-
-    /** 次数 */
-    private Integer frequency;
+    /** 请求所在表名 */
+    private String requestTable;
 
-    /** 收费状态 */
-    private Integer chargeStatusEnum;
-    private String chargeStatusEnum_enumText;
-
-    /** 单位 */
-    @Dict(dictCode = "unit_code")
-    private String quantityUnit;
-    private String quantityUnit_dictText;
-
-    /** 诊疗耗材信息 */
-    /** 器材请求id */
-    private Long deviceRequestId;
-
-    /** 器材发放Id */
-    private Long deviceDispenseId;
-
-    /** 编码 */
-    private String deviceBusNo;
-
-    /** 耗材id */
-    private Long deviceId;
+    /** 诊疗类型 */
+    @Dict(dictCode = "activity_category_code")
+    private String serviceCategory;
+    private String serviceCategory_dictText;
 
-    /** 产品批号 */
-    private String deviceLotNumber;
+    /** 耗材类型 */
+    @Dict(dictCode = "device_category_code")
+    private String deviceCategory;
+    private String deviceCategory_dictText;
 
-    /** 单位 */
-    private String deviceUnitCode;
+    /** 药品类型 */
+    @Dict(dictCode = "med_category_code")
+    private String medCategory;
+    private String medCategory_dictText;
 
-    /** 拆零比 */
-    private BigDecimal devicePartPercent;
+    /** 五笔码 */
+    private String wbStr;
 
-    /** 仓库 */
-    private Long deviceLocationId;
+    /** 拼音码 */
+    private String pyStr;
 
-    /** 分组编号 */
-    private String deviceGroupNo;
+    /** 项目名 */
+    private String itemName;
 
-    /** 项目名称 */
-    private String deviceItemName;
+    /** 规格 */
+    private String size;
 
-    /** 单价 */
-    private BigDecimal deviceUnitPrice;
+    /** 组号 */
+    private Long groupId;
 
-    /** 总价 */
-    private BigDecimal deviceTotalPrice;
+    /** 药品数量 */
+    private Integer medQuantity;
 
-    /** 数量 */
-    private Integer deviceQuantity;
+    /** 排序号 */
+    private Integer sortNumber;
 
-    /** 次数 */
-    private Integer deviceFrequency;
+    /** 执行次数 */
+    private Integer performCount;
 
-    /** 收费状态 */
-    private Integer deviceStatusEnum;
-    private String deviceStatusEnum_enumText;
-
-    /** 单位 */
-    @Dict(dictCode = "unit_code")
-    private String deviceQuantityUnit;
-    private String deviceQuantityUnit_dictText;
+    /** 取消执行次数 */
+    private Integer cancelCount;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
new file mode 100644
index 00000000..efbc9647
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.outpatientmanage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.openhis.web.common.dto.PerformRecordDto;
+
+@Repository
+public interface OutpatientTreatmentAppMapper {
+
+    /**
+     * 就诊病人列表分页查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param amb 就诊类型：门诊
+     * @return 就诊病人列表
+     */
+    Page<OutpatientTreatmentEncounterDto> selectEncounterInfoListPage(
+        @Param("page") Page<OutpatientTreatmentEncounterDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<OutpatientTreatmentEncounterDto> queryWrapper,
+        @Param("amb") Integer amb);
+
+    /**
+     * 处置项目查询
+     * 
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param reqCompleted 请求状态:已完成
+     * @param draft 发放状态:草稿
+     * @param worServiceRequest 请求所在表:服务请求
+     * @param worDeviceRequest 请求所在表:耗材请求
+     * @param medMedicationRequest 请求所在表:药品请求
+     * @return 处置单
+     */
+    Page<OutpatientTreatmentInfoDto> selectTreatmentInfoPage(@Param("page") Page<OutpatientTreatmentInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<OutpatientTreatmentInfoDto> queryWrapper,
+        @Param("reqCompleted") Integer reqCompleted, @Param("draft") Integer draft,
+        @Param("worServiceRequest") String worServiceRequest, @Param("worDeviceRequest") String worDeviceRequest,
+        @Param("medMedicationRequest") String medMedicationRequest);
+
+    /**
+     * 查询执行记录
+     *
+     * @param reqIds 项目ids
+     * @return 执行记录列表
+     */
+    List<PerformRecordDto> selectPerformRecordList(@Param("reqIds") List<Long> reqIds);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
similarity index 77%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
index f8c7dcfc..fc275d0c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
@@ -1,16 +1,11 @@
 package com.openhis.web.patientmanage.appservice.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +13,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.Patient;
@@ -31,6 +28,7 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.common.utils.IdCardUtil;
 import com.openhis.web.patientmanage.appservice.IPatientInformationService;
 import com.openhis.web.patientmanage.dto.PatientInfoInitDto;
 import com.openhis.web.patientmanage.dto.PatientInfoSearchParam;
@@ -50,15 +48,15 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     PatientManageMapper patientManageMapper;
 
     @Autowired
-    PatientMapper patientMapper;
+    private PatientMapper patientMapper;
 
     @Autowired
-    IPatientService patientService;
+    private IPatientService patientService;
     @Autowired
-    IPatientIdentifierService patientIdentifierService;
+    private IPatientIdentifierService patientIdentifierService;
 
     @Autowired(required = false)
-    AssignSeqUtil assignSeqUtil;
+    private AssignSeqUtil assignSeqUtil;
 
     /**
      * 获取病人信息记录初期数据列表
@@ -107,9 +105,11 @@ public class PatientInformationServiceImpl implements IPatientInformationService
         initDto.setFamilyRelationshipType(familyRelationshipType);
 
         // 获取是/否状态
-        List<PatientInfoInitDto.statusEnumOption> whetherOptions = Stream.of(Whether.values())
-            .map(status -> new PatientInfoInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
+        List<PatientInfoInitDto.statusEnumOption> whetherOptions = new ArrayList<>();
+        whetherOptions.add(new PatientInfoInitDto.statusEnumOption(PublicationStatus.ACTIVE.getValue(),
+            PublicationStatus.ACTIVE.getInfo()));
+        whetherOptions.add(new PatientInfoInitDto.statusEnumOption(PublicationStatus.RETIRED.getValue(),
+            PublicationStatus.RETIRED.getInfo()));
         initDto.setWhetherStatus(whetherOptions);
 
         return initDto;
@@ -164,7 +164,13 @@ public class PatientInformationServiceImpl implements IPatientInformationService
      */
     @Override
     public R<?> editPatient(PatientInformationDto patientInformationDto) {
-
+        // 如果患者没有输入身份证号则根据年龄自动生成
+        String idCard = patientInformationDto.getIdCard();
+        if (idCard == null || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
+            idCard = IdCardUtil.generateIdByAge(patientInformationDto.getAge());
+            Date birthday = IdCardUtil.extractBirthdayFromIdCard(idCard);
+            patientInformationDto.setIdCard(idCard).setBirthDate(birthday);
+        }
         Patient patient = new Patient();
         BeanUtils.copyProperties(patientInformationDto, patient);
 
@@ -184,16 +190,24 @@ public class PatientInformationServiceImpl implements IPatientInformationService
         if (patientIdentifier == null) {
             PatientIdentifier newIdentifier = new PatientIdentifier();
             newIdentifier.setPatientId(patient.getId()).setTypeCode(patientInformationDto.getTypeCode())
+                .setIdentifierNo(patientInformationDto.getIdentifierNo())
+                // 标识状态默认：常规
+                .setStateEnum(IdentifierStatusEnum.USUAL.getValue());
+            resPatId = patientIdentifierService.save(newIdentifier);
+        } else if (patientIdentifier.getIdentifierNo() != null
+            && !patientIdentifier.getIdentifierNo().equals(patientInformationDto.getIdentifierNo())) {
+            // resPatId =
+            // patientIdentifierService.updateTypeByPatientId(patient.getId(), patientInformationDto.getTypeCode());
+            PatientIdentifier newIdentifier = new PatientIdentifier();
+            newIdentifier.setPatientId(patient.getId()).setTypeCode(patientInformationDto.getTypeCode())
+                .setIdentifierNo(patientInformationDto.getIdentifierNo())
                 // 标识状态默认：常规
                 .setStateEnum(IdentifierStatusEnum.USUAL.getValue());
             resPatId = patientIdentifierService.save(newIdentifier);
-        } else if (patientIdentifier.getTypeCode() != patientInformationDto.getTypeCode()) {
-            resPatId =
-                patientIdentifierService.updateTypeByPatientId(patient.getId(), patientInformationDto.getTypeCode());
         }
 
         return resPatient && resPatId
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"}))
+            ? R.ok(idCard, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"}))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
 
     }
@@ -205,9 +219,16 @@ public class PatientInformationServiceImpl implements IPatientInformationService
      */
     @Override
     public R<?> addPatient(PatientInformationDto patientInformationDto) {
-
+        // 如果患者没有输入身份证号则根据年龄自动生成
+        String idCard = patientInformationDto.getIdCard();
+        if (idCard == null || idCard.isEmpty() || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
+            idCard = IdCardUtil.generateIdByAge(patientInformationDto.getAge());
+            Date birthday = IdCardUtil.extractBirthdayFromIdCard(idCard);
+            patientInformationDto.setIdCard(idCard).setBirthDate(birthday);
+        }
         Patient patient = new Patient();
         BeanUtils.copyProperties(patientInformationDto, patient);
+        patient.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.PATIENT_NUM.getPrefix(), 10));
         // 当死亡时间不为空，检查死亡时间
         if (patient.getDeceasedDate() != null) {
             // 检验死亡时间未来时报错
@@ -217,18 +238,19 @@ public class PatientInformationServiceImpl implements IPatientInformationService
         }
         // 调用服务层，添加病人
         boolean resPatient = patientService.addPatient(patient);
-        if(!resPatient){
+        if (!resPatient) {
             throw new ServiceException("身份证号已存在");
         }
         // 调用服务层，添加病人标识
         PatientIdentifier patientIdentifier = new PatientIdentifier();
         patientIdentifier.setPatientId(patient.getId()).setTypeCode(patientInformationDto.getTypeCode())
+            .setIdentifierNo(patientInformationDto.getIdentifierNo())
             // 标识状态默认：常规
             .setStateEnum(IdentifierStatusEnum.USUAL.getValue());
         boolean resPatId = patientIdentifierService.save(patientIdentifier);
 
         return resPatient && resPatId
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"}))
+            ? R.ok(patient, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"}))
             : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00003, new Object[] {"病人信息"}));
     }
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
index d57ecce5..aabf4458 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
@@ -36,7 +36,6 @@ public class PatientInformationController {
      */
     @GetMapping("/init")
     public R<?> getPatientInfoInit() {
-
         return R.ok(patientInformationService.getPatientInfoInit());
     }
 
@@ -75,8 +74,8 @@ public class PatientInformationController {
         @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-
-        return R.ok(patientInformationService.getPatientInfo(patientInfoSearchParam, searchKey, pageNo, pageSize,request));
+        return R
+            .ok(patientInformationService.getPatientInfo(patientInfoSearchParam, searchKey, pageNo, pageSize, request));
     }
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
index 225dcfed..7476e7c2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
@@ -10,8 +10,8 @@ import javax.validation.constraints.Size;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import com.openhis.common.annotation.Dict;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,9 +29,6 @@ public class PatientInformationDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 活动标记 */
-    private Integer activeFlag;
-
     /** 临时标识 */
     private Integer tempFlag;
 
@@ -67,7 +64,7 @@ public class PatientInformationDto {
     private String prfsEnum_enumText;
 
     /** 电话 */
-//    @NotBlank(message = "电话不能为空")
+    // @NotBlank(message = "电话不能为空")
     @Size(min = 11, max = 11, message = "电话长度必须为11位")
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "电话格式不正确")
     private String phone;
@@ -94,9 +91,6 @@ public class PatientInformationDto {
     private String nationalityCode;
 
     /** 证件号码 */
-    @NotBlank(message = "证件号码不能为空")
-//    @Size(min = 18, max = 18, message = "身份证号必须是18位")
-//    @Pattern(regexp = "^[0-9Xx]{18}$", message = "身份证号格式不正确")
     private String idCard;
 
     /** 证件类型 */
@@ -104,6 +98,9 @@ public class PatientInformationDto {
     private String typeCode;
     private String typeCode_dictText;
 
+    /** 标识号 */
+    private String identifierNo;
+
     /** 拼音码 */
     private String pyStr;
 
@@ -152,4 +149,7 @@ public class PatientInformationDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    /** 年龄 */
+    private Integer age;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
similarity index 40%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
index 7c0b261d..65e61fa3 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
@@ -1,13 +1,9 @@
 package com.openhis.web.paymentmanage.appservice;
 
-import com.core.common.core.domain.R;
-import com.openhis.web.paymentmanage.dto.PaymentSettleDto;
-import com.openhis.web.paymentmanage.dto.ReportVo;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Date;
 import java.util.Map;
 
+import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
+
 public interface IChargeBillService {
     /**
      *
@@ -21,5 +17,24 @@ public interface IChargeBillService {
      * @param
      * @return
      */
-    Map getTotal(String startTime, String endTime, Long entererId);
+    Map getTotal(String startTime, String endTime, Long entererId, String contractNo);
+
+    Map getTotalCcu(String startTime, String endTime, Long entererId);
+
+    Map getTotalCommen(String startTime, String endTime, Long entererId);
+
+    /**
+     *
+     * @param paymentId
+     * @return
+     */
+    Map getMedicalExpenseCoverageSummary(Long paymentId);
+
+    /**
+     *
+     * @param chargeSummaryDto
+     * @return
+     */
+    Map getChargeItemByOrg(ChargeSummaryDto chargeSummaryDto);
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
similarity index 63%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
index 43904697..296ae89d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
@@ -3,15 +3,21 @@
  */
 package com.openhis.web.paymentmanage.appservice;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
-import com.openhis.web.paymentmanage.dto.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
+import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
+import com.openhis.web.paymentmanage.dto.InpatientPreSettleResultDto;
+import com.openhis.web.paymentmanage.dto.PaymentVO;
+import com.openhis.yb.dto.PaymentDetailDto;
+import com.openhis.yb.dto.PaymentDto;
+import com.openhis.yb.dto.PaymentInpatientDto;
+import com.openhis.yb.dto.PrePaymentDto;
 
 /**
  * 付款应用层Service
@@ -53,7 +59,8 @@ public interface IPaymentRecService {
      * @param request 请求参数
      * @return 结果
      */
-    IPage<PaymentVO> getPage(String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
+    IPage<PaymentVO> getPage(String searchKey, Integer kingEnum, Integer pageNo, Integer pageSize,
+        HttpServletRequest request);
 
     /**
      * 获取支付详情
@@ -65,6 +72,7 @@ public interface IPaymentRecService {
 
     /**
      * 预结算
+     * 
      * @param prePaymentDto 预结算入参
      * @return 预结算结果
      */
@@ -72,6 +80,7 @@ public interface IPaymentRecService {
 
     /**
      * 挂号预结算
+     * 
      * @param outpatientRegistrationAddParam 挂号参数
      * @return 预结算结果
      */
@@ -79,15 +88,42 @@ public interface IPaymentRecService {
 
     /**
      * 挂号结算
+     * 
      * @param outpatientRegistrationSettleParam 挂号参数
      * @return 预结算结果
      */
-    R<?> regPay(OutpatientRegistrationSettleParam outpatientRegistrationSettleParam, String chrgBchno, List<PaymentDetailDto> paymentDetails);
+    R<?> regPay(OutpatientRegistrationSettleParam outpatientRegistrationSettleParam, String chrgBchno,
+        List<PaymentDetailDto> paymentDetails);
 
     /**
      * 取消预结算
+     * 
      * @param encounterId 就诊id
-     * @return
+     * @return 操作结果
      */
     R<?> unPrePayment(Long encounterId);
+
+    /**
+     * 住院预结算
+     * 
+     * @param prePaymentDto 预结算参数
+     * @return 预结算结果
+     */
+    InpatientPreSettleResultDto inpatientPreSettle(PrePaymentDto prePaymentDto);
+
+    /**
+     * 住院结算
+     * 
+     * @param paymentDto 住院结算参数
+     * @return 操作结果
+     */
+    R<?> inpatientSettle(PaymentInpatientDto paymentDto);
+
+    /**
+     * 【取消住院结算】
+     *
+     * @param paymentId 付款id
+     * @return 操作结果
+     */
+    R<?> inpatientUnPay(Long paymentId);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
similarity index 92%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
index 1fa52e28..72782595 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.paymentmanage.appservice.impl;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.charset.Charset;
@@ -19,10 +20,14 @@ import javax.annotation.Resource;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.core.common.exception.ServiceException;
 import com.openhis.administration.domain.*;
 import com.openhis.administration.service.*;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.enums.ybenums.YbEncounterClass;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.entity.ContentType;
 import org.apache.http.util.EntityUtils;
 
 import com.alibaba.fastjson2.JSONArray;
@@ -49,6 +54,8 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -69,7 +76,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Component
 @Slf4j
 public class EleInvoiceServiceImpl implements IEleInvoiceService {
-
+    Logger logger = LoggerFactory.getLogger(EleInvoiceServiceImpl.class);
     @Resource
     EleInvoiceMapper eleInvoiceMapper;
     @Resource
@@ -106,9 +113,8 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
     public R<?> invoiceReissue(Long paymentId, Long encounterId) {
         // 获取付款信息
         PaymentReconciliation paymentReconciliation = paymentReconciliationService.getById(paymentId);
-        List<Long> idList = Arrays.stream(paymentReconciliation.getChargeItemIds().split(","))
-            .map(String::trim)  // 去除可能的空格
-            .map(Long::parseLong)  // 转换为 Long
+        List<Long> idList = Arrays.stream(paymentReconciliation.getChargeItemIds().split(",")).map(String::trim) // 去除可能的空格
+            .map(Long::parseLong) // 转换为 Long
             .collect(Collectors.toList());
         // 获取费用项信息
         List<ChargeItem> chargeItem = chargeItemService.getChargeItemInfo(idList);
@@ -116,17 +122,17 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         for (ChargeItem item : chargeItem) {
             // 号源表
             if (Objects.equals(item.getServiceTable(), CommonConstants.TableName.ADM_HEALTHCARE_SERVICE)) {
-                //挂号发票
+                // 挂号发票
                 return R.ok(YbEncounterClass.REG.getValue());
             }
         }
-        //获取就诊信息
+        // 获取就诊信息
         Encounter encounter = encounterService.getById(encounterId);
         if (Objects.equals(encounter.getClassEnum(), EncounterClass.AMB.getValue())) {
-            //门诊发票
+            // 门诊发票
             return R.ok(YbEncounterClass.AMB.getValue());
         } else if (Objects.equals(encounter.getClassEnum(), EncounterClass.IMP.getValue())) {
-            //住院发票
+            // 住院发票
             return R.ok(YbEncounterClass.IMP.getValue());
         }
 
@@ -164,7 +170,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                 EncounterClass.AMB.getValue(), OrganizationClass.CLINIC.getValue());
             // 获取付款信息
             EleInvoicePaymentInfoDto paymentInfo = eleInvoiceMapper.getPaymentInfo(paymentId, encounterId,
-                YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_CASH_PAY.getValue(),
+                YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_CASH_VALUE.getValue(),
                 YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
                 YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue(),
                 YbPayment.OTHER_PAY.getValue(), YbPayment.SELF_YB_ZH_GJ_VALUE.getValue());
@@ -301,7 +307,12 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String srcmsg;
 
             System.out.println(JSON.toJSONString(bill));
-            JSONObject resobj = PreInvoicePost(bill, "api/medical/invEBillRegistration");
+            JSONObject resobj;
+            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+                resobj = PreInvoicePostForward(bill, "api/medical/invEBillRegistration");
+            }else{
+                resobj = PreInvoicePost(bill, "api/medical/invEBillRegistration");
+            }
             if (resobj.getBooleanValue("success")) {
                 JSONObject rejson = resobj.getJSONObject("result");
 
@@ -310,7 +321,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                     redata64 = rejson.getString("message").toString();
                     srcdata = new String(Base64.getDecoder().decode(redata64), StandardCharsets.UTF_8);
                     redata = JSONObject.parseObject(srcdata);
-
+                    logger.info("挂号信息："+JSON.toJSONString(redata));
                     // 获取发票管理表信息
                     Invoice invoice = invoiceService.getById(paymentInfo.getInvoiceId());
                     // 状态
@@ -392,7 +403,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                 EncounterClass.AMB.getValue(), OrganizationClass.CLINIC.getValue());
             // 获取付款信息
             EleInvoicePaymentInfoDto paymentInfo = eleInvoiceMapper.getPaymentInfo(paymentId, encounterId,
-                YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_CASH_PAY.getValue(),
+                YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_CASH_VALUE.getValue(),
                 YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
                 YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue(),
                 YbPayment.OTHER_PAY.getValue(), YbPayment.SELF_YB_ZH_GJ_VALUE.getValue());
@@ -583,7 +594,12 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String srcdata;
             String srcmsg;
             System.out.println(JSON.toJSONString(bill));
-            JSONObject resobj = PreInvoicePost(bill, "api/medical/invoiceEBillOutpatient");
+            JSONObject resobj;
+            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+                resobj = PreInvoicePostForward(bill, "api/medical/invoiceEBillOutpatient");
+            }else{
+                resobj = PreInvoicePost(bill, "api/medical/invoiceEBillOutpatient");
+            }
             if (resobj.getBooleanValue("success")) {
                 JSONObject rejson = resobj.getJSONObject("result");
                 if (rejson.getString("result").equals("S0000")) {
@@ -591,7 +607,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                     redata64 = rejson.getString("message").toString();
                     srcdata = new String(Base64.getDecoder().decode(redata64), StandardCharsets.UTF_8);
                     redata = JSONObject.parseObject(srcdata);
-
+                    logger.info("门诊信息："+JSON.toJSONString(redata));
                     // 获取发票管理表信息
                     Invoice invoice = invoiceService.getById(paymentInfo.getInvoiceId());
                     // 状态
@@ -676,7 +692,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                 EncounterClass.IMP.getValue(), OrganizationClass.INPATIENT.getValue());
             // 获取付款信息
             EleInvoicePaymentInfoDto paymentInfo = eleInvoiceMapper.getPaymentInfo(paymentId, encounterId,
-                YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_CASH_PAY.getValue(),
+                YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_CASH_VALUE.getValue(),
                 YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
                 YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue(),
                 YbPayment.OTHER_PAY.getValue(), YbPayment.SELF_YB_ZH_GJ_VALUE.getValue());
@@ -878,7 +894,13 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String redata64;
             String srcdata;
             String srcmsg;
-            JSONObject resobj = PreInvoicePost(bill, "api/medical/invEBillHospitalized");
+            //JSONObject resobj = PreInvoicePostForward(bill, "api/medical/invEBillHospitalized");
+            JSONObject resobj;
+            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+                resobj = PreInvoicePostForward(bill, "api/medical/invEBillHospitalized");
+            }else{
+                resobj = PreInvoicePost(bill, "api/medical/invEBillHospitalized");
+            }
             if (resobj.getBooleanValue("success")) {
                 JSONObject rejson = resobj.getJSONObject("result");
                 if (rejson.getString("result").equals("S0000")) {
@@ -886,7 +908,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                     redata64 = rejson.getString("message").toString();
                     srcdata = new String(Base64.getDecoder().decode(redata64), StandardCharsets.UTF_8);
                     redata = JSONObject.parseObject(srcdata);
-
+                    logger.info("住院信息："+JSON.toJSONString(redata));
                     // 获取发票管理表信息
                     Invoice invoice = invoiceService.getById(paymentInfo.getInvoiceId());
                     // 状态
@@ -972,15 +994,15 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         // payer 患者姓名 String 100 是
         bill.put("payer", patientInfo.getPayer());
         // busDateTime 业务发生时间 String 17 是 格式：yyyyMMddHHmmssSSS
-        //Date parse = inputFormat.parse(paymentInfo.getBillDate());
-        //String format = sdf.format(parse);
-        //ZonedDateTime parse1 = ZonedDateTime.parse(paymentInfo.getBillDate(), inputFormatter);
-        //String format = parse1.format(outputFormatter);
+        // Date parse = inputFormat.parse(paymentInfo.getBillDate());
+        // String format = sdf.format(parse);
+        // ZonedDateTime parse1 = ZonedDateTime.parse(paymentInfo.getBillDate(), inputFormatter);
+        // String format = parse1.format(outputFormatter);
         String replace = paymentInfo.getBillDate().replace("+08", "");
         Date date = DateUtils.parseDate(replace.split("\\.")[0]);
 
-        bill.put("busDateTime", DateUtils.parseDateToStr("yyyyMMddHHmmssSSS",date));
-        //bill.put("busDateTime", DateUtils.parseDate(paymentInfo.getBillDate(),"yyyyMMddHHmmssSSS"));
+        bill.put("busDateTime", DateUtils.parseDateToStr("yyyyMMddHHmmssSSS", date));
+        // bill.put("busDateTime", DateUtils.parseDate(paymentInfo.getBillDate(),"yyyyMMddHHmmssSSS"));
         // placeCode 开票点编码 String 50 是
         bill.put("placeCode", user.getKpdCode());
         // payee 收费员 String 50 是
@@ -1306,7 +1328,14 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String srcdata;
             String srcmsg;
 
-            JSONObject resobj = PreInvoicePost(bill, "api/medical/writeOffEBill");
+            //JSONObject resobj = PreInvoicePostForward(bill, "api/medical/writeOffEBill");
+            JSONObject resobj;
+            logger.info("冲红信息入参："+JSON.toJSONString(bill));
+            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+                resobj = PreInvoicePostForward(bill, "api/medical/writeOffEBill");
+            }else{
+                resobj = PreInvoicePost(bill, "api/medical/writeOffEBill");
+            }
             if (resobj.getBooleanValue("success")) {
                 JSONObject rejson = resobj.getJSONObject("result");
                 if (rejson.getString("result").equals("S0000")) {
@@ -1314,7 +1343,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                     redata64 = rejson.getString("message").toString();
                     srcdata = new String(Base64.getDecoder().decode(redata64), StandardCharsets.UTF_8);
                     redata = JSONObject.parseObject(srcdata);
-
+                    logger.info("冲红信息："+JSON.toJSONString(redata));
                     // 修改发票管理表数据
                     // 状态
                     invoice.setStatusEnum(InvoiceStatus.CANCELLED);
@@ -1323,11 +1352,22 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                     if (!flgUpdate) {
                         return R.fail(PromptMsgConstant.Common.M00011);
                     }
+                    // 查询退款的支付id
+                    List<PaymentReconciliation> paymentReconciliation =
+                        paymentReconciliationService.list(new LambdaQueryWrapper<PaymentReconciliation>()
+                            .eq(PaymentReconciliation::getRelationId, paymentId)
+                            .in(PaymentReconciliation::getStatusEnum,
+                                Arrays.asList(PaymentStatus.REFUND_ALL.getValue(),
+                                    PaymentStatus.REFUND_PART.getValue()))
+                            .eq(PaymentReconciliation::getDeleteFlag, '0').last("LIMIT 1"));
+                    if (paymentReconciliation == null) {
+                        return R.fail(PromptMsgConstant.invoice.M00009);
+                    }
 
                     // 向发票管理表中插入数据
                     Invoice invoiceAdd = new Invoice();
                     // 发票号
-                    invoiceAdd.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.INVOICE_NUM.getPrefix(), 10));
+                    invoiceAdd.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.INVOICE_NUM.getPrefix(), 4));
                     // 患者ID
                     invoiceAdd.setPatientId(invoice.getPatientId());
                     // 状态
@@ -1347,7 +1387,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                     // 开票员
                     invoiceAdd.setInvoicingStaffId(invoice.getInvoicingStaffId());
                     // 支付id
-                    invoiceAdd.setReconciliationId(invoice.getReconciliationId());
+                    invoiceAdd.setReconciliationId(paymentReconciliation.get(0).getId());
                     // 电子票据代码 电子红票票据代码
                     invoiceAdd.setBillBatchCode(redata.getString("eScarletBillBatchCode"));
                     // 电子票据号码 电子红票票据号码
@@ -1391,6 +1431,56 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         }
     }
 
+    public static JSONObject PreInvoicePostForward(JSONObject bill, String endpoint) {
+        String resultString = "";
+        //JSONObject result = new JSONObject();
+        // 获取当前租户的option信息
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String baseUrl = optionJson.getString(CommonConstants.Option.URL);
+        String appID = optionJson.getString(CommonConstants.Option.APP_ID);
+        String appKey = optionJson.getString(CommonConstants.Option.KEY);
+
+        EleInvioceBillDto eleInvioceBillDto = new EleInvioceBillDto();
+        eleInvioceBillDto.setBaseUrl(baseUrl);
+        eleInvioceBillDto.setEndpoint(endpoint);
+        eleInvioceBillDto.setAppKey(appKey);
+        eleInvioceBillDto.setAppID(appID);
+        eleInvioceBillDto.setJsonObject(bill);
+
+        // 创建Http请求
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000).setConnectionRequestTimeout(30000)
+                .setSocketTimeout(30000).build();
+        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
+        CloseableHttpResponse response = null;
+        // 发送请求
+        try {
+            HttpPost httpPost = new HttpPost(optionJson.getString("invoiceUrl")+"/eleInvoice/forward");
+            System.out.println(optionJson.getString("invoiceUrl")+"/eleInvoice/forward");
+            StringEntity stringEntity = new StringEntity(com.alibaba.fastjson2.JSON.toJSONString(eleInvioceBillDto), ContentType.APPLICATION_JSON);
+            httpPost.setEntity(stringEntity);
+            // 执行http请求
+            response = httpClient.execute(httpPost);
+            if(response==null){
+                throw new ServiceException("Http请求异常，未接受返回参数");
+            }
+            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException("Http请求异常，请稍后再试。");
+        }
+        finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    //logger.error("关闭响应异常", e);
+                    throw new ServiceException("未关闭系统资源："+e.getStackTrace());
+                }
+            }
+        }
+        return JSONObject.parseObject(resultString);
+    }
+
     /**
      * 发送请求
      *
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
new file mode 100644
index 00000000..f7d166f0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
@@ -0,0 +1,1880 @@
+package com.openhis.web.paymentmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.core.common.enums.DeleteFlag;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.dto.ChargeItemDefInfo;
+import com.openhis.administration.dto.EncounterAccountDto;
+import com.openhis.administration.service.*;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.clinical.service.IConditionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbMedChrgItmType;
+import com.openhis.common.enums.ybenums.YbPayment;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.domain.PaymentRecDetail;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.model.PaymentRecDetailAccountResult;
+import com.openhis.financial.service.IContractService;
+import com.openhis.financial.service.IPaymentRecDetailService;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.medication.service.IMedicationDefinitionService;
+import com.openhis.web.paymentmanage.appservice.IChargeBillService;
+import com.openhis.web.paymentmanage.dto.*;
+import com.openhis.web.paymentmanage.mapper.ChargeBillMapper;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.yb.domain.ClinicSettle;
+import com.openhis.yb.domain.ClinicUnSettle;
+import com.openhis.yb.domain.InfoPerson;
+import com.openhis.yb.service.*;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Component
+@Slf4j
+public class IChargeBillServiceImpl implements IChargeBillService {
+
+    @Resource
+    private IAccountService iAccountService;
+    @Resource
+    private IEncounterService iEncounterService;
+    @Resource
+    private IContractService iContractService;
+    @Resource
+    private IInvoiceService iInvoiceService;
+    @Resource
+    private IPaymentReconciliationService paymentReconciliationService;
+    @Resource
+    private IPaymentRecDetailService paymentRecDetailService;
+    @Resource
+    private IContractService contractService;
+    @Resource
+    private IChargeItemService chargeItemService;
+    @Resource
+    private IPatientService iPatientService;
+    @Autowired
+    private IChargeItemDefinitionService iChargeItemDefinitionService;
+    @Autowired
+    private IPerinfoService iPerinfoService;
+    @Autowired
+    private IEncounterDiagnosisService iEncounterDiagnosisService;
+    @Autowired
+    private IOrganizationService iOrganizationService;
+    @Autowired
+    private IConditionDefinitionService iConditionDefinitionService;
+    @Autowired
+    private IConditionService iConditionService;
+    @Autowired
+    private ChargeBillMapper chargeBillMapper;
+    @Autowired
+    private IMedicationDefinitionService iMedicationDefinitionService;
+    @Autowired
+    private IDeviceDefinitionService iDeviceDefinitionService;
+    @Autowired
+    private IActivityDefinitionService iActivityDefinitionService;
+    @Autowired
+    private IPractitionerService iPractitionerService;
+    @Autowired
+    private IHealthcareServiceService iHealthcareServiceService;
+    @Autowired
+    private IClinicSettleService iClinicSettleService;
+    @Autowired
+    private IClinicUnRegService iClinicUnRegService;
+    @Autowired
+    private IRegService iRegService;
+    @Autowired
+    private IClinicUnSettleService iClinicUnSettleService;
+
+    @Override
+    public Map getDetail(Long paymentId) {
+
+        Map<String, Object> map = new HashMap<>();
+        // 查询
+        PaymentReconciliation paymentReconciliation = paymentReconciliationService.getById(paymentId);
+        if (paymentReconciliation == null) {
+            throw new ServiceException("未查询到付款信息");
+        }
+        map.put("paymentId", paymentReconciliation.getPaymentNo());// 结算id
+        map.put("paymentAmount", paymentReconciliation.getTenderedAmount());// 应收金额
+        Practitioner practitioner = iPractitionerService.getById(paymentReconciliation.getEntererId());
+        map.put("paymentAmount", practitioner == null ? "" : practitioner.getName());// 收费员
+        map.put("chargeTime", paymentReconciliation.getBillDate());// 收费时间
+        Patient patient = iPatientService.getById(paymentReconciliation.getPatientId());
+        if (patient == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+        map.put("patientName", patient.getName());// 患者姓名
+
+        map.put("sex", patient.getGenderEnum());// 性别
+        map.put("idCardNo", patient.getIdCard());// 身份证号
+        map.put("birthDay", patient.getBirthDate());// 出生日期
+
+        List<PaymentRecDetail> paymentRecDetails = paymentRecDetailService
+            .list(new LambdaQueryWrapper<PaymentRecDetail>().eq(PaymentRecDetail::getReconciliationId, paymentId));
+
+        if (paymentRecDetails.isEmpty()) {
+            throw new ServiceException("未查询到付款信息");
+        }
+        map.put("detail", paymentRecDetails);// 支付详细
+
+        Invoice invoice = iInvoiceService.getOne(new LambdaQueryWrapper<Invoice>()
+            .eq(Invoice::getReconciliationId, paymentId).eq(Invoice::getStatusEnum, InvoiceStatus.ISSUED.getValue())
+            .orderByDesc(Invoice::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (invoice != null) {
+            map.put("invoiceNo", invoice.getBillNo());// 支付详细
+            map.put("pictureUrl", invoice.getPictureUrl());// 图片
+        }
+
+        List<Long> chargeItemIdList = Arrays.stream(paymentReconciliation.getChargeItemIds().split(","))
+            .map(Long::parseLong).collect(Collectors.toList());
+
+        List<ChargeItem> chargeItemList = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+            .in(ChargeItem::getId, chargeItemIdList).eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
+        List<ChargeItemDetailVO> chargeItemDetailList = new ArrayList<>();
+        ChargeItemDetailVO chargeItemDetailVO;
+        for (ChargeItem chargeItem : chargeItemList) {
+            chargeItemDetailVO = new ChargeItemDetailVO();
+            BeanUtils.copyProperties(chargeItem, chargeItemDetailVO);
+            if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(chargeItem.getProductTable())) {
+                MedicationDefinition medication = iMedicationDefinitionService.getById(chargeItem.getProductId());
+                chargeItemDetailVO.setDirClass(medication.getYbNo()).setChargeItemName(medication.getName())
+                    .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
+                    .setQuantityValue(chargeItem.getQuantityValue());
+            } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(chargeItem.getProductTable())) {
+                DeviceDefinition device = iDeviceDefinitionService.getById(chargeItem.getProductId());
+                chargeItemDetailVO.setDirClass(device.getYbNo()).setChargeItemName(device.getName())
+                    .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
+                    .setQuantityValue(chargeItem.getQuantityValue());
+            } else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(chargeItem.getProductTable())) {
+                ActivityDefinition activity = iActivityDefinitionService.getById(chargeItem.getProductId());
+                chargeItemDetailVO.setDirClass(activity.getYbNo()).setChargeItemName(activity.getName())
+                    .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
+                    .setQuantityValue(chargeItem.getQuantityValue());
+            } else {
+                HealthcareService healthcareService = iHealthcareServiceService.getById(chargeItem.getServiceId());
+                chargeItemDetailVO.setDirClass(healthcareService.getYbNo())
+                    .setChargeItemName(healthcareService.getName()).setTotalPrice(chargeItem.getTotalPrice())
+                    .setQuantityUnit(chargeItem.getQuantityUnit()).setQuantityValue(chargeItem.getQuantityValue());
+            }
+            chargeItemDetailList.add(chargeItemDetailVO);
+        }
+        map.put("chargeItem", chargeItemDetailList);// 收费项
+
+        if (chargeItemList.isEmpty()) {
+            throw new ServiceException("未查询到收费项");
+        }
+        Encounter encounter = iEncounterService.getById(paymentReconciliation.getEncounterId());
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+        map.put("classEnum", encounter.getYbClassEnum());// 门诊/住院
+        map.put("regNo", encounter.getBusNo());// 门诊号
+
+        Account account = iAccountService.getOne(new LambdaQueryWrapper<Account>()
+            .eq(Account::getEncounterId, encounter.getId()).eq(Account::getEncounterFlag, Whether.YES.getValue()));
+        if (account == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+
+        InfoPerson perinfo = iPerinfoService.getOne(new LambdaQueryWrapper<InfoPerson>()
+            .eq(InfoPerson::getCertno, patient.getIdCard()).eq(InfoPerson::getTenantId, patient.getTenantId())
+            .orderByDesc(InfoPerson::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (perinfo != null) {
+            map.put("personType", perinfo.getInsutype());// 人员类别：职工医保，居民医保等；如果为空显示自费或其他
+            map.put("insuplcAdmdvs", perinfo.getInsuplcAdmdvs());// 患者参保地区划
+        }
+
+        Contract contract =
+            contractService.getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getBusNo, account.getContractNo()));
+        if (contract == null) {
+            throw new ServiceException("未查询到合同信息");
+        }
+        // 查询主诊断信息
+        EncounterDiagnosis encounterDiagnosis = iEncounterDiagnosisService.getOne(
+            new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getEncounterId, encounter.getId())
+                .eq(EncounterDiagnosis::getMaindiseFlag, Whether.YES.getValue())
+                .eq(EncounterDiagnosis::getDeleteFlag, DelFlag.NO.getCode())
+                .orderByDesc(EncounterDiagnosis::getDiagSrtNo).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (encounterDiagnosis != null) {
+            Condition condition = iConditionService.getById(encounterDiagnosis.getConditionId());
+            if (condition != null) {
+                ConditionDefinition conditionDefinition =
+                    iConditionDefinitionService.getOne(new LambdaQueryWrapper<ConditionDefinition>()
+                        .eq(ConditionDefinition::getId, condition.getDefinitionId()));
+                if (conditionDefinition != null) {
+                    map.put("conditionDefinition", conditionDefinition.getName());// 诊断名
+                }
+            }
+        }
+
+        BigDecimal sum01 = BigDecimal.ZERO;
+        BigDecimal sum02 = BigDecimal.ZERO;
+        BigDecimal sum03 = BigDecimal.ZERO;
+        BigDecimal sum04 = BigDecimal.ZERO;
+        BigDecimal sum05 = BigDecimal.ZERO;
+        BigDecimal sum06 = BigDecimal.ZERO;
+        BigDecimal sum07 = BigDecimal.ZERO;
+        BigDecimal sum08 = BigDecimal.ZERO;
+        BigDecimal sum09 = BigDecimal.ZERO;
+        BigDecimal sum10 = BigDecimal.ZERO;
+        BigDecimal sum11 = BigDecimal.ZERO;
+        BigDecimal sum12 = BigDecimal.ZERO;
+        BigDecimal sum13 = BigDecimal.ZERO;
+        BigDecimal sum14 = BigDecimal.ZERO;
+
+        for (ChargeItem chargeItem : chargeItemList) {
+
+            Long definitionId = chargeItem.getDefinitionId();
+
+            ChargeItemDefinition chargeItemDefinition = iChargeItemDefinitionService.getById(definitionId);
+
+            YbMedChrgItmType medChrgItmType =
+                YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));
+
+            switch (medChrgItmType) {
+                case BED_FEE:
+                    sum01 = sum01.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_FEE:
+                    sum02 = sum02.add(chargeItem.getTotalPrice());
+                    break;
+                case CHECK_FEE:
+                    sum03 = sum03.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_TEST_FEE:
+                    sum04 = sum04.add(chargeItem.getTotalPrice());
+                    break;
+                case MEDICAL_EXPENSE_FEE:
+                    sum05 = sum05.add(chargeItem.getTotalPrice());
+                    break;
+                case OPERATION_FEE:
+                    sum06 = sum06.add(chargeItem.getTotalPrice());
+                    break;
+                case NURSING_FEE:
+                    sum07 = sum07.add(chargeItem.getTotalPrice());
+                    break;
+                case SANITARY_MATERIALS_FEE:
+                    sum08 = sum08.add(chargeItem.getTotalPrice());
+                    break;
+                case WEST_MEDICINE:
+                    sum09 = sum09.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_SLICES_FEE:
+                    sum10 = sum10.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_FEE:
+                    sum11 = sum11.add(chargeItem.getTotalPrice());
+                    break;
+                case GENERAL_CONSULTATION_FEE:
+                    sum12 = sum12.add(chargeItem.getTotalPrice());
+                    break;
+                case REGISTRATION_FEE:
+                    sum13 = sum13.add(chargeItem.getTotalPrice());
+                    break;
+                default:
+                    sum14 = sum14.add(chargeItem.getTotalPrice());
+                    break;
+            }
+        }
+        map.put("BED_FEE", sum01);// 床位费
+        map.put("DIAGNOSTIC_FEE", sum02);// 诊察费
+        map.put("CHECK_FEE", sum03);// 检查费
+        map.put("DIAGNOSTIC_TEST_FEE", sum04);// 化验费
+        map.put("MEDICAL_EXPENSE_FEE", sum05);// 治疗费
+        map.put("OPERATION_FEE", sum06);// 手术费
+        map.put("NURSING_FEE", sum07);// 护理费
+        map.put("SANITARY_MATERIALS_FEE", sum08);// 卫生材料费
+        map.put("WEST_MEDICINE", sum09);// 西药费
+        map.put("CHINESE_MEDICINE_SLICES_FEE", sum10);// 中药饮片费
+        map.put("CHINESE_MEDICINE_FEE", sum11);// 中成药费
+        map.put("GENERAL_CONSULTATION_FEE", sum12);// 一般诊疗费
+        map.put("REGISTRATION_FEE", sum13);// 挂号费
+        map.put("OTHER_FEE", sum14);// 其他费用
+
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
+
+        map.put("fixmedinsName", fixmedinsName);
+        map.put("fixmedinsCode", fixmedinsCode);
+
+        return map;
+    }
+
+    /**
+     * 农大版本
+     * 
+     * @param
+     * @return
+     */
+    @Override
+    public Map getTotal(String startTime, String endTime, Long entererId, String contractNo) {
+        // String contractNo="220100";
+        Map<String, Object> map = new HashMap<>();
+
+        // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+        Date startDate = DateUtils.parseDate(startTime);
+        Date endDate = DateUtils.parseDate(endTime);
+
+        // 查询所有的支付
+        LambdaQueryWrapper<PaymentReconciliation> queryWrapper = new LambdaQueryWrapper<PaymentReconciliation>()
+            .between(PaymentReconciliation::getBillDate, startDate, endDate)
+            .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode())
+            .in(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue(),
+                PaymentStatus.REFUND_ALL.getValue())
+            .eq(PaymentReconciliation::getKindEnum, PaymentKind.OUTPATIENT_CLINIC.getValue());
+        if (entererId != null) {
+            queryWrapper.eq(PaymentReconciliation::getEntererId, entererId);
+        }
+        List<PaymentReconciliation> paymentReconciliationList = paymentReconciliationService.list(queryWrapper);
+        if (paymentReconciliationList.isEmpty()) {
+            return getMap(map);
+        }
+        // 调试使用
+        // for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+        // String[] split = paymentReconciliation.getChargeItemIds().split(",");
+        // List<String> strings = Arrays.asList(split);
+        // for (String string : strings) {
+        // ChargeItem byId = chargeItemService.getById(Long.parseLong(string));
+        // if ("adm_healthcare_service".equals(byId.getServiceTable())) {
+        // System.out.println("//****************************");
+        // System.out.println(JSON.toJSONString(byId));
+        // }
+        // }
+        // }
+
+        // 查询所有的支付详情
+        List<Long> paymentIdList =
+            paymentReconciliationList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+        List<PaymentRecDetail> paymentDetails = paymentRecDetailService
+            .list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getReconciliationId, paymentIdList)
+                .eq(PaymentRecDetail::getDeleteFlag, DelFlag.NO.getCode()));
+        if (paymentDetails.isEmpty()) {
+            return getMap(map);
+        }
+        Map<Long, List<PaymentRecDetail>> paymentDetailsKV =
+            paymentDetails.stream().collect(Collectors.groupingBy(PaymentRecDetail::getReconciliationId));
+        // 声明变量，符合要求的付款记录
+        Collection<PaymentReconciliation> PaymentReconciliationList;
+        List<Account> accountList = new ArrayList<>();
+        if (!StringUtils.isEmpty(contractNo)) {
+            // 查询账户信息用来区分省市医保
+            List<Long> accountIds =
+                paymentDetails.stream().map(PaymentRecDetail::getAccountId).collect(Collectors.toList());
+            if (accountIds.isEmpty()) {
+                throw new ServiceException("查询账户信息为空");
+            }
+            accountList = iAccountService.list(new LambdaQueryWrapper<Account>().in(Account::getId, accountIds));
+
+            // 留下符合条件的付款记录
+            Map<Long, PaymentReconciliation> paymentMap = new HashMap<>();
+            for (PaymentRecDetail paymentDetail : paymentDetails) {
+
+                Optional<Account> first =
+                    accountList.stream().filter(x -> x.getId().equals(paymentDetail.getAccountId())).findFirst();
+                // 账户不符合要求的筛出掉
+                if (first.isEmpty() || !first.get().getContractNo().equals(contractNo)) {
+                    continue;
+                }
+                // 付款记录里匹配不上筛出掉
+                Optional<PaymentReconciliation> first1 = paymentReconciliationList.stream()
+                    .filter(x -> x.getId().equals(paymentDetail.getReconciliationId())).findFirst();
+                if (first1.isEmpty()) {
+                    continue;
+                }
+
+                paymentMap.put(paymentDetail.getReconciliationId(), first1.get());
+            }
+            // 符合省市医保或自费要求的付款实体集合
+            PaymentReconciliationList = paymentMap.values();
+        } else {
+            // 时间段内的全部付款记录
+            PaymentReconciliationList = paymentReconciliationList;
+        }
+        if (PaymentReconciliationList.isEmpty()) {
+            return getMap(map);
+        }
+        // 查询所有的收费项
+        List<String> chargeItemIdStrs = PaymentReconciliationList.stream().map(PaymentReconciliation::getChargeItemIds)
+            .collect(Collectors.toList());
+        List<Long> chargeItemIds = new ArrayList<>();
+        for (String chargeItemIdStr : chargeItemIdStrs) {
+            List<String> strings = Arrays.asList(chargeItemIdStr.split(","));
+            for (String string : strings) {
+                Long id = Long.parseLong(string);
+                chargeItemIds.add(id);
+            }
+        }
+
+        // for (Long chargeItemId : chargeItemIds) {
+        // System.out.println(chargeItemId);
+        // System.out.println(",");
+        // }
+
+        List<ChargeItem> chargeItemList = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+            .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
+        if (paymentDetails.isEmpty()) {
+            throw new ServiceException("数据异常，该时间段内未查询到收费项");
+        }
+
+        // for (ChargeItem chargeItem : chargeItemList) {
+        // if("adm_healthcare_service".equals(chargeItem.getServiceTable())){
+        // System.out.println("//****************************");
+        // System.out.println(JSON.toJSONString(chargeItem));
+        // }
+        // }
+
+        // 查询收费定义列表
+        List<Long> chargeItemDefinitionIdList =
+            chargeItemList.stream().map(ChargeItem::getDefinitionId).collect(Collectors.toList());
+        if (chargeItemDefinitionIdList.isEmpty()) {
+            throw new ServiceException("未查询到收费记录，无收费项信息");
+        }
+        List<ChargeItemDefinition> chargeItemDefinitions =
+            iChargeItemDefinitionService.listByIds(chargeItemDefinitionIdList);
+        if (chargeItemDefinitions.isEmpty()) {
+            throw new ServiceException("未查询到收费记录，无收费项信息");
+        }
+        Map<Long, List<ChargeItemDefinition>> chargeItemDefKV =
+            chargeItemDefinitions.stream().collect(Collectors.groupingBy(ChargeItemDefinition::getId));
+
+        // 查询医保结算id
+        List<String> settleIds = new ArrayList<>();
+        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+            if (!StringUtils.isEmpty(paymentReconciliation.getYbSettleIds())) {
+                List<String> strings = Arrays.asList(paymentReconciliation.getYbSettleIds().split(","));
+                settleIds.addAll(strings);
+            }
+        }
+        List<ClinicSettle> clinicSettle = new ArrayList<>();
+        if (!settleIds.isEmpty()) {
+            clinicSettle = iClinicSettleService.getBySettleIds(settleIds);
+            // List<String> collect = clinicSettle.stream().map(ClinicSettle::getInsutype).collect(Collectors.toList());
+        }
+
+        BigDecimal cashSum = BigDecimal.ZERO;// 现金总数 = rmbCashSum + vxCashSum + aliCashSum + uniCashSum
+        BigDecimal rmbCashSum = BigDecimal.ZERO;// 现金总数
+        BigDecimal vxCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal aliCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal uniCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal vxSum = BigDecimal.ZERO;// 微信总数
+        BigDecimal aliSum = BigDecimal.ZERO;// 支付宝总数
+        BigDecimal uniSum = BigDecimal.ZERO;// 银行卡总数
+        BigDecimal tcSum = BigDecimal.ZERO;// 基本统筹
+        BigDecimal zhSum = BigDecimal.ZERO;// 医保账户
+        BigDecimal fundSum = BigDecimal.ZERO;// 基金支总额
+        // 农大版本只查询收款员，日期，现金多少钱，挂号费多少钱
+        for (PaymentRecDetail paymentDetail : paymentDetails) {
+
+            if (!StringUtils.isEmpty(contractNo)) {
+                Optional<Account> first =
+                    accountList.stream().filter(x -> x.getId().equals(paymentDetail.getAccountId())).findFirst();
+                if (first.isEmpty() || !first.get().getContractNo().equals(contractNo)) {
+                    continue;
+                }
+            }
+
+            if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentDetail.getPayEnum())) {
+                cashSum = cashSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.SELF_CASH_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+                rmbCashSum = rmbCashSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.SELF_CASH_VX_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+                vxCashSum = vxCashSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.SELF_CASH_ALI_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+                aliCashSum = aliCashSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.SELF_CASH_UNION_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+                uniCashSum = uniCashSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.YB_TC_FUND_AMOUNT.getValue().equals(paymentDetail.getPayEnum())) {
+                tcSum = tcSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.YB_FUND_PAY.getValue().equals(paymentDetail.getPayEnum())) {
+                fundSum = fundSum.add(paymentDetail.getAmount());
+            }
+            if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentDetail.getPayEnum())) {
+                zhSum = zhSum.add(paymentDetail.getAmount());
+            }
+            // 其他的大病支付或者慢病特病支付往下接if
+        }
+
+        // 处理退费单
+        List<ReturnBillVO> returnList = new ArrayList<>();
+        List<PaymentReconciliation> returnPaymentList = new ArrayList<>();
+        ReturnBillVO returnBillVO;
+        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+            if (PaymentType.UN_PAY.getValue().equals(paymentReconciliation.getPaymentEnum())) {
+                returnPaymentList.add(paymentReconciliation);
+            }
+        }
+        if (!returnPaymentList.isEmpty()) {
+            List<Long> returnIds =
+                returnPaymentList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+
+            List<Invoice> invoiceList = iInvoiceService.list(new LambdaUpdateWrapper<Invoice>()
+                .in(Invoice::getReconciliationId, returnIds).eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()));
+            if (!invoiceList.isEmpty()) {
+                Map<Long, List<Invoice>> invoiceKV =
+                    invoiceList.stream().collect(Collectors.groupingBy(Invoice::getReconciliationId));
+                for (PaymentReconciliation paymentReconciliation : returnPaymentList) {
+                    returnBillVO = new ReturnBillVO();
+                    returnBillVO.setTotalAmount(paymentReconciliation.getTenderedAmount());
+                    List<PaymentRecDetail> paymentRecDetails = paymentDetailsKV.get(paymentReconciliation.getId());
+                    for (PaymentRecDetail paymentRecDetail : paymentRecDetails) {
+                        if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
+                            returnBillVO.setPaidAmount(paymentRecDetail.getAmount());
+                        }
+                    }
+
+                    if (invoiceKV.get(paymentReconciliation.getId()) == null) {
+                        returnBillVO.setInvoiceNo("");
+                    } else {
+                        Optional<Invoice> max = invoiceKV.get(paymentReconciliation.getId()).stream()
+                            .max(Comparator.comparing(Invoice::getCreateTime));
+                        if (max.isPresent()) {
+                            returnBillVO.setInvoiceNo(max.get().getBillNo());
+                        } else {
+                            returnBillVO.setInvoiceNo("");
+                        }
+                    }
+                    returnBillVO.setPaymentNo(paymentReconciliation.getPaymentNo());
+                    returnList.add(returnBillVO);
+                }
+                map.put("returnList", returnList);// 退费单
+            }
+        }
+
+        map.put("cashSum", cashSum);// 现金支付
+        map.put("rmbCashSum", rmbCashSum);// 现金支付
+        map.put("vxCashSum", vxCashSum);// 现金支付（）
+        map.put("aliCashSum", aliCashSum);// 现金支付（）
+        map.put("uniCashSum", uniCashSum);// 现金支付（）
+        map.put("tcSum", tcSum);// 基本统筹
+        map.put("zhSum", zhSum);// 账户支付
+        map.put("fundSum", fundSum);// 基金支付总额
+
+        BigDecimal sum01 = BigDecimal.ZERO;
+        BigDecimal sum02 = BigDecimal.ZERO;
+        BigDecimal sum03 = BigDecimal.ZERO;
+        BigDecimal sum04 = BigDecimal.ZERO;
+        BigDecimal sum05 = BigDecimal.ZERO;
+        BigDecimal sum06 = BigDecimal.ZERO;
+        BigDecimal sum07 = BigDecimal.ZERO;
+        BigDecimal sum08 = BigDecimal.ZERO;
+        BigDecimal sum09 = BigDecimal.ZERO;
+        BigDecimal sum10 = BigDecimal.ZERO;
+        BigDecimal sum11 = BigDecimal.ZERO;
+        BigDecimal sum12 = BigDecimal.ZERO;
+        BigDecimal sum13 = BigDecimal.ZERO;
+        BigDecimal sum14 = BigDecimal.ZERO;
+        BigDecimal sum15 = BigDecimal.ZERO;
+
+        // 不同医院收费项统计内容不定，下面统计分两个for循环部分统计，一部分按照医保分类统计，一个是按照财务类型的字典去分类
+        for (ChargeItem chargeItem : chargeItemList) {
+
+            if (!chargeItem.getStatusEnum().equals(ChargeItemStatus.BILLED.getValue())
+                && !chargeItem.getStatusEnum().equals(ChargeItemStatus.REFUNDING.getValue())) {
+                continue;
+            }
+
+            Long definitionId = chargeItem.getDefinitionId();
+
+            ChargeItemDefinition chargeItemDefinition = chargeItemDefKV.get(definitionId).get(0);
+
+            YbMedChrgItmType medChrgItmType =
+                YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));
+
+            switch (medChrgItmType) {
+                case BED_FEE:
+                    sum01 = sum01.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_FEE:
+                    sum02 = sum02.add(chargeItem.getTotalPrice());
+                    break;
+                case CHECK_FEE:
+                    sum03 = sum03.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_TEST_FEE:
+                    sum04 = sum04.add(chargeItem.getTotalPrice());
+                    break;
+                case MEDICAL_EXPENSE_FEE:
+                    sum05 = sum05.add(chargeItem.getTotalPrice());
+                    break;
+                case OPERATION_FEE:
+                    sum06 = sum06.add(chargeItem.getTotalPrice());
+                    break;
+                case NURSING_FEE:
+                    sum07 = sum07.add(chargeItem.getTotalPrice());
+                    break;
+                case SANITARY_MATERIALS_FEE:
+                    sum08 = sum08.add(chargeItem.getTotalPrice());
+                    break;
+                case WEST_MEDICINE:
+                    sum09 = sum09.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_SLICES_FEE:
+                    sum10 = sum10.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_FEE:
+                    sum11 = sum11.add(chargeItem.getTotalPrice());
+                    break;
+                case GENERAL_CONSULTATION_FEE:
+                    sum12 = sum12.add(chargeItem.getTotalPrice());
+                    break;
+                case REGISTRATION_FEE:
+                    sum13 = sum13.add(chargeItem.getTotalPrice());
+                    break;
+                default:
+                    sum14 = sum14.add(chargeItem.getTotalPrice());
+                    break;
+            }
+        }
+        map.put("BED_FEE", sum01);// 床位费
+        map.put("DIAGNOSTIC_FEE", sum02);// 诊察费
+        map.put("CHECK_FEE", sum03);// 检查费
+        map.put("DIAGNOSTIC_TEST_FEE", sum04);// 化验费
+        map.put("MEDICAL_EXPENSE_FEE", sum05);// 治疗费
+        map.put("OPERATION_FEE", sum06);// 手术费
+        map.put("NURSING_FEE", sum07);// 护理费
+        map.put("SANITARY_MATERIALS_FEE", sum08);// 卫生材料费
+        map.put("WEST_MEDICINE", sum09);// 西药费
+        map.put("CHINESE_MEDICINE_SLICES_FEE", sum10);// 中药饮片费
+        map.put("CHINESE_MEDICINE_FEE", sum11);// 中成药费
+        map.put("GENERAL_CONSULTATION_FEE", sum12);// 一般诊疗费
+        map.put("REGISTRATION_FEE", sum13);// 挂号费
+        map.put("OTHER_FEE", sum14);// 其他费用
+        sum15 = sum01.add(sum02).add(sum03).add(sum04).add(sum05).add(sum06).add(sum07).add(sum08).add(sum09).add(sum10)
+            .add(sum11).add(sum12).add(sum13).add(sum14);
+        map.put("SUM", sum15);// 合计费用
+
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
+
+        map.put("fixmedinsName", fixmedinsName);
+        map.put("fixmedinsCode", fixmedinsCode);
+
+        // 以chargeItem 的def为循环分类依据
+        for (ChargeItemDefinition chargeItemDefinition : chargeItemDefinitions) {
+            if (chargeItemDefinition.getTypeCode() == null) {
+                throw new ServiceException("收费定义未设置财务分类，提示信息chargeItemDefinitionId：" + chargeItemDefinition.getId());
+            }
+        }
+        Map<String, List<ChargeItemDefinition>> chargeItemDefMapByTypeCode =
+            chargeItemDefinitions.stream().collect(Collectors.groupingBy(ChargeItemDefinition::getTypeCode));
+        Map<Long, List<ChargeItem>> chargeItemMapByDefinitionId =
+            chargeItemList.stream().collect(Collectors.groupingBy(ChargeItem::getDefinitionId));
+
+        for (Map.Entry<String, List<ChargeItemDefinition>> stringListEntry : chargeItemDefMapByTypeCode.entrySet()) {
+            String key = stringListEntry.getKey();
+            BigDecimal bigDecimal = BigDecimal.ZERO;
+            for (ChargeItemDefinition chargeItemDefinition : stringListEntry.getValue()) {
+                List<ChargeItem> chargeItems = chargeItemMapByDefinitionId.get(chargeItemDefinition.getId());
+                for (ChargeItem chargeItem : chargeItems) {
+                    if (chargeItem.getStatusEnum() != ChargeItemStatus.BILLED.getValue()) {
+                        continue;
+                    }
+                    bigDecimal = bigDecimal.add(chargeItem.getTotalPrice());
+                }
+            }
+            map.put(key, bigDecimal);
+        }
+
+        return map;
+    }
+
+    /**
+     * 长大版本(门诊) 2025/08/06版
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public Map getTotalCcu(String startTime, String endTime, Long entererId) {
+        // String contractNo="220100";
+        Map<String, Object> map = new HashMap<>();
+
+        // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+        Date startDate = DateUtils.parseDate(startTime);
+        Date endDate = DateUtils.parseDate(endTime);
+
+        // 查询所有的门诊支付记录（包含4种类型单据：a：该时间内的正向交易记录；b:该时间内的反向交易记录，但关联的正向单在该时间内；c：该时间内的反向交易记录，但是关联正向单在该时间之前；d：该时间内的正向交易记录，但是关联反向单在该时间之后；）
+        LambdaQueryWrapper<PaymentReconciliation> queryWrapper = new LambdaQueryWrapper<PaymentReconciliation>()
+            .between(PaymentReconciliation::getBillDate, startDate, endDate)
+            .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode())
+            .in(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue(),
+                PaymentStatus.REFUND_ALL.getValue())
+            .eq(PaymentReconciliation::getKindEnum, PaymentKind.OUTPATIENT_CLINIC.getValue());
+        if (entererId != null) {
+            queryWrapper.eq(PaymentReconciliation::getEntererId, entererId);
+        }
+        List<PaymentReconciliation> paymentReconciliationList = paymentReconciliationService.list(queryWrapper);
+        if (paymentReconciliationList.isEmpty()) {
+            return getMap(map);
+        }
+
+        // for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+        // String[] split = paymentReconciliation.getChargeItemIds().split(",");
+        // List<String> strings = Arrays.asList(split);
+        // for (String string : strings) {
+        // ChargeItem byId = chargeItemService.getById(Long.parseLong(string));
+        // if ("adm_healthcare_service".equals(byId.getServiceTable())) {
+        // System.out.println("//****************************");
+        // System.out.println(JSON.toJSONString(byId));
+        // }
+        // }
+        // }
+
+        // 查询所有的支付详情
+        List<Long> paymentIdList =
+            paymentReconciliationList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+        // List<PaymentRecDetail> paymentDetails = paymentRecDetailService
+        // .list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getReconciliationId, paymentIdList)
+        // .eq(PaymentRecDetail::getDeleteFlag, DelFlag.NO.getCode()));
+
+        List<PaymentRecDetailAccountResult> PaymentRecDetailAccountResultList =
+            paymentRecDetailService.getListByReconciliationIds(paymentIdList);
+        if (PaymentRecDetailAccountResultList.isEmpty()) {
+            return getMap(map);
+        }
+
+        // 根据主键分组
+        Map<Long, List<PaymentRecDetailAccountResult>> paymentDetailsKV = PaymentRecDetailAccountResultList.stream()
+            .collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getReconciliationId));
+
+        // 调试使用代码
+        // for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+        // List<PaymentRecDetailAccountResult> paymentRecDetailAccountResults =
+        // paymentDetailsKV.get(paymentReconciliation.getId());
+        // BigDecimal bigDecimal = BigDecimal.ZERO;
+        // for (PaymentRecDetailAccountResult paymentRecDetailAccountResult : paymentRecDetailAccountResults) {
+        // if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+        // bigDecimal = bigDecimal.add(paymentRecDetailAccountResult.getAmount());
+        // }
+        // if (YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+        // bigDecimal = bigDecimal.add(paymentRecDetailAccountResult.getAmount());
+        // }
+        // if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+        // bigDecimal = bigDecimal.add(paymentRecDetailAccountResult.getAmount());
+        // }
+        // }
+        // if (bigDecimal.compareTo(paymentReconciliation.getTenderedAmount()) != 0) {
+        // System.out.println("//////**********************///////");
+        // System.out.println("payment:" + paymentReconciliation.getId());
+        // System.out.println("paymentAmount:" + paymentReconciliation.getTenderedAmount());
+        // System.out.println("payment应收:" + paymentReconciliation.getDisplayAmount());
+        // System.out.println("//////**********************///////");
+        // }
+        // if (paymentReconciliation.getStatusEnum() == 3) {
+        // continue;
+        // }
+        // List<Long> collect = Arrays.stream(paymentReconciliation.getChargeItemIds().split(","))
+        // .map(e -> Long.parseLong(e)).collect(Collectors.toList());
+        // List<ChargeItemBaseInfoDto> chargeItemBaseInfoByIds = chargeItemService.getChargeItemBaseInfoByIds(collect);
+        // BigDecimal bigDecimal1 = BigDecimal.ZERO;
+        // for (ChargeItemBaseInfoDto chargeItemBaseInfoById : chargeItemBaseInfoByIds) {
+        // bigDecimal1 = bigDecimal1.add(chargeItemBaseInfoById.getTotalPrice());
+        // System.out.println("收费项：" + chargeItemBaseInfoById.getTotalPrice());
+        // }
+        // System.out.println("付款：" + paymentReconciliation.getTenderedAmount());
+        // if (bigDecimal1.compareTo(paymentReconciliation.getTenderedAmount()) != 0) {
+        // System.out.println("//////**********************///////");
+        // System.out.println("payment:" + paymentReconciliation.getId());
+        // System.out.println("paymentAmount:" + paymentReconciliation.getTenderedAmount());
+        // System.out.println("payment应收:" + paymentReconciliation.getDisplayAmount());
+        // System.out.println("//////**********************///////");
+        // }
+        // }
+        // List<ChargeItem> list1 = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .eq(ChargeItem::getStatusEnum, 5).between(ChargeItem::getCreateTime, startDate, endDate));
+        // for (ChargeItem chargeItem : list1) {
+        // PaymentReconciliation one =
+        // paymentReconciliationService.getOne(new LambdaQueryWrapper<PaymentReconciliation>()
+        // .like(PaymentReconciliation::getChargeItemIds, chargeItem.getId())
+        // .eq(PaymentReconciliation::getStatusEnum, 1));
+        // if (one == null) {
+        // throw new ServiceException("收费项：" + chargeItem.getId());
+        // }
+        // }
+
+        // 根据省市医保分组
+        Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList
+            .stream().collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo));
+
+        // 查询所有的收费项
+        List<String> chargeItemIdStrs = paymentReconciliationList.stream().map(PaymentReconciliation::getChargeItemIds)
+            .collect(Collectors.toList());
+        List<Long> chargeItemIds = new ArrayList<>();
+        for (String chargeItemIdStr : chargeItemIdStrs) {
+            List<String> strings = Arrays.asList(chargeItemIdStr.split(","));
+            for (String string : strings) {
+                Long id = Long.parseLong(string);
+                chargeItemIds.add(id);
+            }
+        }
+
+        List<ChargeItem> chargeItemList = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+            .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
+        if (chargeItemList.isEmpty()) {
+            throw new ServiceException("数据异常，该时间段内未查询到收费项");
+        }
+
+        // for (ChargeItem chargeItem : chargeItemList) {
+        // if("adm_healthcare_service".equals(chargeItem.getServiceTable())){
+        // System.out.println("//****************************");
+        // System.out.println(JSON.toJSONString(chargeItem));
+        // }
+        // }
+
+        // 查询收费定义列表
+        List<Long> chargeItemDefinitionIdList =
+            chargeItemList.stream().map(ChargeItem::getDefinitionId).collect(Collectors.toList());
+        if (chargeItemDefinitionIdList.isEmpty()) {
+            throw new ServiceException("未查询到收费记录，无收费项信息");
+        }
+        List<ChargeItemDefinition> chargeItemDefinitions =
+            iChargeItemDefinitionService.listByIds(chargeItemDefinitionIdList);
+        if (chargeItemDefinitions.isEmpty()) {
+            throw new ServiceException("未查询到收费记录，无收费项信息");
+        }
+        Map<Long, List<ChargeItemDefinition>> chargeItemDefKV =
+            chargeItemDefinitions.stream().collect(Collectors.groupingBy(ChargeItemDefinition::getId));
+
+        // 查询医保结算id
+        List<String> settleIds = new ArrayList<>();
+        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+            if (!StringUtils.isEmpty(paymentReconciliation.getYbSettleIds())) {
+                List<String> strings = Arrays.asList(paymentReconciliation.getYbSettleIds().split(","));
+                settleIds.addAll(strings);
+            }
+        }
+
+        List<ClinicSettle> clinicSettleList = new ArrayList<>();
+        List<ClinicUnSettle> clinicUnSettleList = new ArrayList<>();
+        if (!settleIds.isEmpty()) {
+            clinicSettleList = iClinicSettleService.getBySettleIds(settleIds);
+            clinicUnSettleList = iClinicUnSettleService.getBySettleIds(settleIds);
+            // List<String> collect = clinicSettle.stream().map(ClinicSettle::getInsutype).collect(Collectors.toList());
+        }
+
+        BigDecimal cashSum = BigDecimal.ZERO;// 现金总数 = rmbCashSum + vxCashSum + aliCashSum + uniCashSum
+        BigDecimal rmbCashSum = BigDecimal.ZERO;// 现金总数
+        BigDecimal vxCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal aliCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal uniCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal vxSum = BigDecimal.ZERO;// 微信总数
+        BigDecimal aliSum = BigDecimal.ZERO;// 支付宝总数
+        BigDecimal uniSum = BigDecimal.ZERO;// 银行卡总数
+        // BigDecimal tcSum = BigDecimal.ZERO;// 基本统筹
+        // BigDecimal zhSum = BigDecimal.ZERO;// 医保账户
+        // BigDecimal fundSum = BigDecimal.ZERO;// 基金支总额
+        BigDecimal SelfCashSum = BigDecimal.ZERO;// 自费现金总额
+        BigDecimal YbCashSum = BigDecimal.ZERO;// 医保现金总额
+        // 长大版本要显示出来省市医保的区别
+        List<Contract> redisContractList = iContractService.getRedisContractList();
+        Map<String, List<Contract>> contractMapByBusNo =
+            redisContractList.stream().collect(Collectors.groupingBy(Contract::getBusNo));
+        for (Map.Entry<String, List<PaymentRecDetailAccountResult>> stringListEntry : paymentDetailsMapByContract
+            .entrySet()) {
+            String key = stringListEntry.getKey();
+            List<PaymentRecDetailAccountResult> value = stringListEntry.getValue();
+            BigDecimal tcSum = BigDecimal.ZERO;// 基本统筹
+            BigDecimal cash = BigDecimal.ZERO;// 现金
+            BigDecimal zhSum = BigDecimal.ZERO;// 医保账户
+            BigDecimal fundSum = BigDecimal.ZERO;// 基金支总额
+            for (PaymentRecDetailAccountResult paymentRecDetailAccountResult : value) {
+                if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    cash = cash.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    rmbCashSum = rmbCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_VX_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    vxCashSum = vxCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_ALI_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    aliCashSum = aliCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_UNION_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    uniCashSum = uniCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.YB_TC_FUND_AMOUNT.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    tcSum = tcSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    fundSum = fundSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    zhSum = zhSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                // 其他的大病支付或者慢病特病支付往下接if
+                map.put(
+                    contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "cash",
+                    cash);
+                map.put(
+                    contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "tcSum",
+                    tcSum);
+                map.put(
+                    contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "zhSum",
+                    zhSum);
+                map.put(contractMapByBusNo.get(key) == null ? key
+                    : contractMapByBusNo.get(key).get(0).getBusNo() + "fundSum", fundSum);
+            }
+        }
+        // for (PaymentRecDetail paymentDetail : paymentDetails) {
+        // if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentDetail.getPayEnum())) {
+        // cashSum = cashSum.add(paymentDetail.getAmount());
+        // if (paymentDetail.getPayTransText() != null && paymentDetail.getPayTransText().length() > 10) {
+        // YbCashSum = YbCashSum.add(paymentDetail.getAmount());
+        // } else {
+        // SelfCashSum = SelfCashSum.add(paymentDetail.getAmount());
+        // }
+        // }
+        // if (YbPayment.SELF_CASH_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+        // rmbCashSum = rmbCashSum.add(paymentDetail.getAmount());
+        // }
+        // if (YbPayment.SELF_CASH_VX_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+        // vxCashSum = vxCashSum.add(paymentDetail.getAmount());
+        // }
+        // if (YbPayment.SELF_CASH_ALI_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+        // aliCashSum = aliCashSum.add(paymentDetail.getAmount());
+        // }
+        // if (YbPayment.SELF_CASH_UNION_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
+        // uniCashSum = uniCashSum.add(paymentDetail.getAmount());
+        // }
+        // if (YbPayment.YB_TC_FUND_AMOUNT.getValue().equals(paymentDetail.getPayEnum())) {
+        // tcSum = tcSum.add(paymentDetail.getAmount());
+        // }
+        // if (YbPayment.YB_FUND_PAY.getValue().equals(paymentDetail.getPayEnum())) {
+        // fundSum = fundSum.add(paymentDetail.getAmount());
+        // }
+        // if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentDetail.getPayEnum())) {
+        // zhSum = zhSum.add(paymentDetail.getAmount());
+        // }
+        // // 其他的大病支付或者慢病特病支付往下接if
+        // }
+
+        BigDecimal sum01 = BigDecimal.ZERO;
+        BigDecimal sum02 = BigDecimal.ZERO;
+        BigDecimal sum03 = BigDecimal.ZERO;
+        BigDecimal sum04 = BigDecimal.ZERO;
+        BigDecimal sum05 = BigDecimal.ZERO;
+        BigDecimal sum06 = BigDecimal.ZERO;
+        BigDecimal sum07 = BigDecimal.ZERO;
+        BigDecimal sum08 = BigDecimal.ZERO;
+        BigDecimal sum09 = BigDecimal.ZERO;
+        BigDecimal sum10 = BigDecimal.ZERO;
+        BigDecimal sum11 = BigDecimal.ZERO;
+        BigDecimal sum12 = BigDecimal.ZERO;
+        BigDecimal sum13 = BigDecimal.ZERO;
+        BigDecimal sum14 = BigDecimal.ZERO;
+        BigDecimal sum15 = BigDecimal.ZERO;
+
+        // 处理退费单
+        List<ReturnBillVO> returnList = new ArrayList<>();
+        List<PaymentReconciliation> returnPaymentList = new ArrayList<>();
+        ReturnBillVO returnBillVO;
+        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+            if (PaymentType.UN_PAY.getValue().equals(paymentReconciliation.getPaymentEnum())) {
+                returnPaymentList.add(paymentReconciliation);
+            }
+        }
+        // 按照字典取值时使用的变量
+        List<ChargeItemDefinition> beforeChargeItemDefinitions = new ArrayList<>();
+        List<ChargeItem> beforeChargeItemList = new ArrayList<>();
+        if (!returnPaymentList.isEmpty()) {
+            List<Long> returnIds =
+                returnPaymentList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+            // 查原付款单子
+            List<Long> relationIdList =
+                returnPaymentList.stream().map(PaymentReconciliation::getRelationId).collect(Collectors.toList());
+            if (relationIdList.isEmpty() || returnPaymentList.size() != relationIdList.size()) {
+                throw new ServiceException("数据异常，存在无法关联到原单的退款单，请联系工程师");
+            }
+            // 原单是该时间段前付款的
+            List<PaymentReconciliation> beforeList = new ArrayList<>();
+            List<PaymentReconciliation> paymentReconciliations = paymentReconciliationService
+                .list(new LambdaQueryWrapper<PaymentReconciliation>().in(PaymentReconciliation::getId, relationIdList)
+                    .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode()));
+            for (PaymentReconciliation paymentReconciliation : paymentReconciliations) {
+                if (startDate.compareTo(paymentReconciliation.getBillDate()) > 0) {
+                    beforeList.add(paymentReconciliation);
+                }
+            }
+            if (!beforeList.isEmpty()) {
+                // 拆解所有的chargeItemId，拼装成一个集合
+                List<String> chargeItemIdList =
+                    beforeList.stream().map(PaymentReconciliation::getChargeItemIds).collect(Collectors.toList());
+                List<Long> beforeChargeItemIds = new ArrayList<>();
+                for (String chargeItemId : chargeItemIdList) {
+                    if (StringUtils.isNotEmpty(chargeItemId)) {
+                        beforeChargeItemIds.addAll(Arrays
+                            .stream(chargeItemId.replaceAll("\\[", "").replaceAll("\\]", "")
+                                .split(CommonConstants.Common.COMMA))
+                            .map(Long::parseLong).collect(Collectors.toList()));
+                    }
+                }
+                beforeChargeItemList = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+                    .in(ChargeItem::getId, beforeChargeItemIds).eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
+                if (beforeChargeItemList.isEmpty()) {
+                    throw new ServiceException("数据异常，查找不到退费收费项信息");
+                }
+                List<Long> beforeChargeItemDefinitionIdList =
+                    beforeChargeItemList.stream().map(ChargeItem::getDefinitionId).collect(Collectors.toList());
+                if (beforeChargeItemDefinitionIdList.isEmpty()) {
+                    throw new ServiceException("数据异常，查找不到收费项的定义信息");
+                }
+                beforeChargeItemDefinitions = iChargeItemDefinitionService.listByIds(beforeChargeItemDefinitionIdList);
+                for (ChargeItem chargeItem : beforeChargeItemList) {
+
+                    if (!chargeItem.getStatusEnum().equals(ChargeItemStatus.REFUNDED.getValue())) {
+                        continue;
+                    }
+
+                    chargeItem.setTotalPrice(new BigDecimal("-1").multiply(chargeItem.getTotalPrice()));
+
+                    Long definitionId = chargeItem.getDefinitionId();
+                    // if(chargeItemDefKV.get(definitionId)==null){
+                    // System.out.println(chargeItem.getId());
+                    // System.out.println(JSON.toJSONString(chargeItem));
+                    // }
+
+                    ChargeItemDefinition chargeItemDefinition = chargeItemDefKV.get(definitionId).get(0);
+
+                    YbMedChrgItmType medChrgItmType =
+                        YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));
+
+                    switch (medChrgItmType) {
+                        case BED_FEE:
+                            sum01 = sum01.add(chargeItem.getTotalPrice());
+                            break;
+                        case DIAGNOSTIC_FEE:
+                            sum02 = sum02.add(chargeItem.getTotalPrice());
+                            break;
+                        case CHECK_FEE:
+                            sum03 = sum03.add(chargeItem.getTotalPrice());
+                            break;
+                        case DIAGNOSTIC_TEST_FEE:
+                            sum04 = sum04.add(chargeItem.getTotalPrice());
+                            break;
+                        case MEDICAL_EXPENSE_FEE:
+                            sum05 = sum05.add(chargeItem.getTotalPrice());
+                            break;
+                        case OPERATION_FEE:
+                            sum06 = sum06.add(chargeItem.getTotalPrice());
+                            break;
+                        case NURSING_FEE:
+                            sum07 = sum07.add(chargeItem.getTotalPrice());
+                            break;
+                        case SANITARY_MATERIALS_FEE:
+                            sum08 = sum08.add(chargeItem.getTotalPrice());
+                            break;
+                        case WEST_MEDICINE:
+                            sum09 = sum09.add(chargeItem.getTotalPrice());
+                            break;
+                        case CHINESE_MEDICINE_SLICES_FEE:
+                            sum10 = sum10.add(chargeItem.getTotalPrice());
+                            break;
+                        case CHINESE_MEDICINE_FEE:
+                            sum11 = sum11.add(chargeItem.getTotalPrice());
+                            break;
+                        case GENERAL_CONSULTATION_FEE:
+                            sum12 = sum12.add(chargeItem.getTotalPrice());
+                            break;
+                        case REGISTRATION_FEE:
+                            sum13 = sum13.add(chargeItem.getTotalPrice());
+                            break;
+                        default:
+                            sum14 = sum14.add(chargeItem.getTotalPrice());
+                            break;
+                    }
+                }
+            }
+
+            List<Invoice> invoiceList = iInvoiceService.list(new LambdaUpdateWrapper<Invoice>()
+                .in(Invoice::getReconciliationId, returnIds).eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()));
+            if (!invoiceList.isEmpty()) {
+                Map<Long, List<Invoice>> invoiceKV =
+                    invoiceList.stream().collect(Collectors.groupingBy(Invoice::getReconciliationId));
+                for (PaymentReconciliation paymentReconciliation : returnPaymentList) {
+                    returnBillVO = new ReturnBillVO();
+                    returnBillVO.setTotalAmount(paymentReconciliation.getTenderedAmount());
+                    List<PaymentRecDetailAccountResult> paymentRecDetails =
+                        paymentDetailsKV.get(paymentReconciliation.getId());
+                    for (PaymentRecDetailAccountResult paymentRecDetail : paymentRecDetails) {
+                        if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
+                            returnBillVO.setPaidAmount(paymentRecDetail.getAmount());
+                        }
+                    }
+
+                    if (invoiceKV.get(paymentReconciliation.getId()) == null) {
+                        returnBillVO.setInvoiceNo("");
+                    } else {
+                        Optional<Invoice> max = invoiceKV.get(paymentReconciliation.getId()).stream()
+                            .max(Comparator.comparing(Invoice::getCreateTime));
+                        if (max.isPresent()) {
+                            returnBillVO.setInvoiceNo(max.get().getBillNo());
+                        } else {
+                            returnBillVO.setInvoiceNo("");
+                        }
+                    }
+                    returnBillVO.setPaymentNo(paymentReconciliation.getPaymentNo());
+                    returnList.add(returnBillVO);
+                }
+                map.put("returnList", returnList);// 退费单
+            }
+        }
+
+        // map.put("tcSum", tcSum);// 基本统筹
+        // map.put("zhSum", zhSum);// 账户支付
+        // map.put("fundSum", fundSum);// 基金支付总额
+        map.put("ybCashSum", YbCashSum);// 医保现金
+        map.put("selfCashSum", SelfCashSum);// 自费现金
+
+        // 不同医院收费项统计内容不定，下面统计分两个for循环部分统计，一部分按照医保分类统计，一个是按照财务类型的字典去分类
+        for (ChargeItem chargeItem : chargeItemList) {
+
+            if (!chargeItem.getStatusEnum().equals(ChargeItemStatus.BILLED.getValue())
+                && !chargeItem.getStatusEnum().equals(ChargeItemStatus.REFUNDING.getValue())) {
+                continue;
+            }
+
+            Long definitionId = chargeItem.getDefinitionId();
+            // if(chargeItemDefKV.get(definitionId)==null){
+            // System.out.println(chargeItem.getId());
+            // System.out.println(JSON.toJSONString(chargeItem));
+            // }
+
+            ChargeItemDefinition chargeItemDefinition = chargeItemDefKV.get(definitionId).get(0);
+
+            YbMedChrgItmType medChrgItmType =
+                YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));
+
+            switch (medChrgItmType) {
+                case BED_FEE:
+                    sum01 = sum01.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_FEE:
+                    sum02 = sum02.add(chargeItem.getTotalPrice());
+                    break;
+                case CHECK_FEE:
+                    sum03 = sum03.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_TEST_FEE:
+                    sum04 = sum04.add(chargeItem.getTotalPrice());
+                    break;
+                case MEDICAL_EXPENSE_FEE:
+                    sum05 = sum05.add(chargeItem.getTotalPrice());
+                    break;
+                case OPERATION_FEE:
+                    sum06 = sum06.add(chargeItem.getTotalPrice());
+                    break;
+                case NURSING_FEE:
+                    sum07 = sum07.add(chargeItem.getTotalPrice());
+                    break;
+                case SANITARY_MATERIALS_FEE:
+                    sum08 = sum08.add(chargeItem.getTotalPrice());
+                    break;
+                case WEST_MEDICINE:
+                    sum09 = sum09.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_SLICES_FEE:
+                    sum10 = sum10.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_FEE:
+                    sum11 = sum11.add(chargeItem.getTotalPrice());
+                    break;
+                case GENERAL_CONSULTATION_FEE:
+                    sum12 = sum12.add(chargeItem.getTotalPrice());
+                    break;
+                case REGISTRATION_FEE:
+                    sum13 = sum13.add(chargeItem.getTotalPrice());
+                    break;
+                default:
+                    sum14 = sum14.add(chargeItem.getTotalPrice());
+                    break;
+            }
+        }
+        map.put("BED_FEE", sum01);// 床位费
+        map.put("DIAGNOSTIC_FEE", sum02);// 诊察费
+        map.put("CHECK_FEE", sum03);// 检查费
+        map.put("DIAGNOSTIC_TEST_FEE", sum04);// 化验费
+        map.put("MEDICAL_EXPENSE_FEE", sum05);// 治疗费
+        map.put("OPERATION_FEE", sum06);// 手术费
+        map.put("NURSING_FEE", sum07);// 护理费
+        map.put("SANITARY_MATERIALS_FEE", sum08);// 卫生材料费
+        map.put("WEST_MEDICINE", sum09);// 西药费
+        map.put("CHINESE_MEDICINE_SLICES_FEE", sum10);// 中药饮片费
+        map.put("CHINESE_MEDICINE_FEE", sum11);// 中成药费
+        map.put("GENERAL_CONSULTATION_FEE", sum12);// 一般诊疗费
+        map.put("REGISTRATION_FEE", sum13);// 挂号费
+        map.put("OTHER_FEE", sum14);// 其他费用
+        sum15 = sum01.add(sum02).add(sum03).add(sum04).add(sum05).add(sum06).add(sum07).add(sum08).add(sum09).add(sum10)
+            .add(sum11).add(sum12).add(sum13).add(sum14);
+        map.put("SUM", sum15);// 合计费用
+
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
+
+        map.put("fixmedinsName", fixmedinsName);
+        map.put("fixmedinsCode", fixmedinsCode);
+
+        // 以chargeItem 的def为循环分类依据
+        for (ChargeItemDefinition chargeItemDefinition : chargeItemDefinitions) {
+            if (chargeItemDefinition.getTypeCode() == null) {
+                throw new ServiceException("收费定义未设置财务分类，提示信息chargeItemDefinitionId：" + chargeItemDefinition.getId());
+            }
+        }
+
+        Map<String, List<ChargeItemDefinition>> chargeItemDefMapByTypeCode =
+            chargeItemDefinitions.stream().collect(Collectors.groupingBy(ChargeItemDefinition::getTypeCode));
+        Map<Long, List<ChargeItem>> chargeItemMapByDefinitionId =
+            chargeItemList.stream().collect(Collectors.groupingBy(ChargeItem::getDefinitionId));
+
+        for (Map.Entry<String, List<ChargeItemDefinition>> stringListEntry : chargeItemDefMapByTypeCode.entrySet()) {
+            String key = stringListEntry.getKey();
+            BigDecimal bigDecimal = BigDecimal.ZERO;
+            for (ChargeItemDefinition chargeItemDefinition : stringListEntry.getValue()) {
+                List<ChargeItem> chargeItems = chargeItemMapByDefinitionId.get(chargeItemDefinition.getId());
+                for (ChargeItem chargeItem : chargeItems) {
+                    if (chargeItem.getStatusEnum() != ChargeItemStatus.BILLED.getValue()) {
+                        continue;
+                    }
+                    bigDecimal = bigDecimal.add(chargeItem.getTotalPrice());
+                }
+            }
+            map.put(key, bigDecimal);
+        }
+
+        // 超本时间段的退费单统计
+        if (!beforeChargeItemDefinitions.isEmpty() && !beforeChargeItemList.isEmpty()) {
+            Map<String, List<ChargeItemDefinition>> beforeChargeItemDefMapByTypeCode =
+                beforeChargeItemDefinitions.stream().collect(Collectors.groupingBy(ChargeItemDefinition::getTypeCode));
+            Map<Long, List<ChargeItem>> beforeChargeItemMapByDefinitionId =
+                beforeChargeItemList.stream().collect(Collectors.groupingBy(ChargeItem::getDefinitionId));
+            for (Map.Entry<String, List<ChargeItemDefinition>> longListEntry : beforeChargeItemDefMapByTypeCode
+                .entrySet()) {
+                BigDecimal bigDecimal = map.get(longListEntry.getKey()) == null ? BigDecimal.ZERO
+                    : new BigDecimal(String.valueOf(map.get(longListEntry.getKey())));
+                for (ChargeItemDefinition chargeItemDefinition : longListEntry.getValue()) {
+                    List<ChargeItem> chargeItems = beforeChargeItemMapByDefinitionId.get(chargeItemDefinition.getId());
+                    for (ChargeItem chargeItem : chargeItems) {
+                        if (!chargeItem.getStatusEnum().equals(ChargeItemStatus.REFUNDED.getValue())) {
+                            continue;
+                        }
+                        // chargeItem.setTotalPrice(new BigDecimal("-1").multiply(chargeItem.getTotalPrice()));
+                        bigDecimal = bigDecimal.add(chargeItem.getTotalPrice());
+                    }
+                }
+                map.put(longListEntry.getKey(), bigDecimal);
+            }
+        }
+
+        // 医保人次自费人次计算
+        List<EncounterAccountDto> list = iEncounterService.getEncounterInfoByTime(startDate, endDate);
+        Map<String, List<EncounterAccountDto>> encounterAccountDtoMapByContract =
+            list.stream().collect(Collectors.groupingBy(EncounterAccountDto::getContractNo));
+        for (Map.Entry<String, List<EncounterAccountDto>> stringListEntry : encounterAccountDtoMapByContract
+            .entrySet()) {
+            String key = stringListEntry.getKey();
+            map.put(key + "reg", stringListEntry.getValue().size());
+        }
+
+        return map;
+    }
+
+    /**
+     * 长大门诊日结单(最终版) ps：小范围区间内通用版本，需要时间检验
+     * 
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param entererId 参与人id
+     * @return 参数
+     */
+    public Map getTotalCommen(String startTime, String endTime, Long entererId) {
+
+        // 声明变量 处理时间
+        Map<String, Object> map = new HashMap<>();
+        Date startDate = DateUtils.parseDate(startTime);
+        Date endDate = DateUtils.parseDate(endTime);
+
+        // 查询所有的门诊支付记录 ，大概的情况如下
+        // startDate endDate
+        // | 正 负 | a.该情况下的chargeItem 状态为8 不用统计
+        // | 正 | b.该情况的chargeItem 状态为5 计入统计 做加法
+        // 正 | 负 | c.该情况的chargeItem 状态为8 计入统计 做减法
+        // | 正 | 负 d.该情况的chargeItem 状态为8 计入统计 做加法
+        // | 正 负 | 负 e.该情况的chargeItem 状态8或5 区间内正负的chargeItem差值状态为5 计入统计 做加法
+        // | 正 | 负 负 f.该情况下的chargeItem 状态为8或5 全部计入统计 做加法
+        // 正 负 | 负 | g.该情况的chargeItem 状态8或5 负的chargeItem状态为8 计入统计 做减法
+        LambdaQueryWrapper<PaymentReconciliation> queryWrapper = new LambdaQueryWrapper<PaymentReconciliation>()
+            .between(PaymentReconciliation::getBillDate, startDate, endDate)
+            .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode())
+            .in(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue(),
+                PaymentStatus.REFUND_ALL.getValue())
+            .eq(PaymentReconciliation::getKindEnum, PaymentKind.OUTPATIENT_CLINIC.getValue());
+        if (entererId != null) {
+            queryWrapper.eq(PaymentReconciliation::getEntererId, entererId);
+        }
+        List<PaymentReconciliation> paymentReconciliationList = paymentReconciliationService.list(queryWrapper);
+        if (paymentReconciliationList.isEmpty()) {
+            return getMap(map);
+        }
+
+        // 查询所有的支付详情（业务注释：收集并统计不同支付渠道支付的费用）
+        List<Long> paymentIdList =
+            paymentReconciliationList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+        List<PaymentRecDetailAccountResult> PaymentRecDetailAccountResultList =
+            paymentRecDetailService.getListByReconciliationIds(paymentIdList);
+        if (PaymentRecDetailAccountResultList.isEmpty()) {
+            return getMap(map);
+        }
+
+        // 支付详情根据主键分组
+        Map<Long, List<PaymentRecDetailAccountResult>> paymentDetailsKV = PaymentRecDetailAccountResultList.stream()
+            .collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getReconciliationId));
+
+        // 根据省市医保分组
+        Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList
+            .stream().collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo));
+
+        BigDecimal cashSum = BigDecimal.ZERO;// 现金总数 = rmbCashSum + vxCashSum + aliCashSum + uniCashSum
+        BigDecimal rmbCashSum = BigDecimal.ZERO;// 现金总数
+        BigDecimal vxCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal aliCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal uniCashSum = BigDecimal.ZERO;// 现金总数（）
+        BigDecimal vxSum = BigDecimal.ZERO;// 微信总数
+        BigDecimal aliSum = BigDecimal.ZERO;// 支付宝总数
+        BigDecimal uniSum = BigDecimal.ZERO;// 银行卡总数
+        BigDecimal SelfCashSum = BigDecimal.ZERO;// 自费现金总额
+        BigDecimal YbCashSum = BigDecimal.ZERO;// 医保现金总额
+        // 长大版本要显示出来省市医保的区别
+        List<Contract> redisContractList = iContractService.getRedisContractList();
+        Map<String, List<Contract>> contractMapByBusNo =
+            redisContractList.stream().collect(Collectors.groupingBy(Contract::getBusNo));
+        for (Map.Entry<String, List<PaymentRecDetailAccountResult>> stringListEntry : paymentDetailsMapByContract
+            .entrySet()) {
+
+            String key = stringListEntry.getKey();
+            List<PaymentRecDetailAccountResult> value = stringListEntry.getValue();
+
+            BigDecimal tcSum = BigDecimal.ZERO;// 基本统筹
+            BigDecimal cash = BigDecimal.ZERO;// 现金
+            BigDecimal zhSum = BigDecimal.ZERO;// 医保账户
+            BigDecimal fundSum = BigDecimal.ZERO;// 基金支总额
+
+            for (PaymentRecDetailAccountResult paymentRecDetailAccountResult : value) {
+                if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    cash = cash.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    rmbCashSum = rmbCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_VX_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    vxCashSum = vxCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_ALI_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    aliCashSum = aliCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_CASH_UNION_VALUE.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    uniCashSum = uniCashSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.YB_TC_FUND_AMOUNT.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    tcSum = tcSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    fundSum = fundSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    zhSum = zhSum.add(paymentRecDetailAccountResult.getAmount());
+                }
+                // 其他的大病支付或者慢病特病支付往下接if
+                map.put(
+                    contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "cash",
+                    cash);
+                map.put(
+                    contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "tcSum",
+                    tcSum);
+                map.put(
+                    contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "zhSum",
+                    zhSum);
+                map.put(contractMapByBusNo.get(key) == null ? key
+                    : contractMapByBusNo.get(key).get(0).getBusNo() + "fundSum", fundSum);
+            }
+        }
+        map.put("ybCashSum", YbCashSum);// 医保现金
+//        map.put("selfCashSum", SelfCashSum);// 自费现金
+        map.put("rmbCashSum", rmbCashSum);// 自费现金纯现金
+        map.put("vxCashSum", vxCashSum);// 自费现金vx
+        map.put("uniCashSum", uniCashSum);// 自费现金银联
+        map.put("aliCashSum", aliCashSum);// 自费现金ali
+
+        // 将所有的payment分组进行单独处理（业务注释：处理不同财务分类的金额，如西药费中药费等）
+        List<PaymentReconciliation> paymentList = new ArrayList<>();
+        List<PaymentReconciliation> returnList = new ArrayList<>();
+        // List<PaymentReconciliation> partReturnList = new ArrayList<>();
+
+        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
+            if (PaymentStatus.REFUND_ALL.getValue().equals(paymentReconciliation.getStatusEnum())) {
+                returnList.add(paymentReconciliation);
+            } else if (PaymentStatus.REFUND_PART.getValue().equals(paymentReconciliation.getStatusEnum())) {
+                // partReturnList.add(paymentReconciliation);
+                paymentList.add(paymentReconciliation);
+            } else {
+                paymentList.add(paymentReconciliation);
+            }
+        }
+
+        Map<Long, List<PaymentReconciliation>> returnPaymentMapByRelationId = new HashMap<>();
+        if (!returnList.isEmpty()) {
+            returnPaymentMapByRelationId =
+                returnList.stream().collect(Collectors.groupingBy(PaymentReconciliation::getRelationId));
+        }
+
+        List<String> addChargeItemIds = new ArrayList<>();
+        List<String> subChargeItemIds = new ArrayList<>();
+        for (PaymentReconciliation paymentReconciliation : paymentList) {
+            List<PaymentReconciliation> paymentReconciliations =
+                returnPaymentMapByRelationId.get(paymentReconciliation.getId());
+            if (paymentReconciliations != null && !paymentReconciliations.isEmpty()) {
+                // 情况a
+                if (PaymentStatus.SUCCESS.getValue().equals(paymentReconciliation.getStatusEnum())) {
+                    returnPaymentMapByRelationId.remove(paymentReconciliation.getId());
+                    continue;
+                }
+                // 情况 e
+                List<String> strings = Arrays.asList(paymentReconciliation.getChargeItemIds().split(","));
+                List<String> split = new ArrayList<>();
+                for (PaymentReconciliation reconciliation : paymentReconciliations) {
+                    split.addAll(Arrays.asList(reconciliation.getChargeItemIds().split(",")));
+                }
+                strings.removeAll(split);
+                addChargeItemIds.addAll(strings);
+                returnPaymentMapByRelationId.remove(paymentReconciliation.getId());
+            } else {
+                // 情况 b
+                // 情况 d
+                // 情况 f
+                addChargeItemIds.addAll(Arrays.asList(paymentReconciliation.getChargeItemIds().split(",")));
+            }
+        }
+
+        // 情况 c
+        // 情况 g
+        for (Map.Entry<Long, List<PaymentReconciliation>> longListEntry : returnPaymentMapByRelationId.entrySet()) {
+            for (PaymentReconciliation paymentReconciliation : longListEntry.getValue()) {
+                subChargeItemIds.addAll(Arrays.asList(paymentReconciliation.getChargeItemIds().split(",")));
+            }
+        }
+
+        // 查询所有的收费项
+        List<String> chargeItemIdStrs = new ArrayList<>();
+        chargeItemIdStrs.addAll(addChargeItemIds);
+        chargeItemIdStrs.addAll(subChargeItemIds);
+        List<Long> chargeItemIds = new ArrayList<>();
+        for (String chargeItemIdStr : chargeItemIdStrs) {
+            String[] strings = chargeItemIdStr.split(",");
+            for (String string : strings) {
+                Long id = Long.parseLong(string);
+                chargeItemIds.add(id);
+            }
+        }
+
+        List<ChargeItemDefInfo> chargeItemDefInfoByIds = chargeItemService.getChargeItemDefInfoByIds(chargeItemIds);
+        if (chargeItemDefInfoByIds.isEmpty()) {
+            throw new ServiceException("数据异常，该时间段内未查询到收费项");
+        }
+        Map<Long, List<ChargeItemDefInfo>> chargeItemDefInfoKVById =
+            chargeItemDefInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemDefInfo::getId));
+
+        // 省名变量
+        BigDecimal bedFee = BigDecimal.ZERO;// 床位费
+        BigDecimal diagnosticFee = BigDecimal.ZERO;// 诊察费
+        BigDecimal checkFee = BigDecimal.ZERO;// 检查费
+        BigDecimal diagnosticTestFee = BigDecimal.ZERO;// 化验费
+        BigDecimal medicalExpenseFee = BigDecimal.ZERO;// 治疗费
+        BigDecimal operationFee = BigDecimal.ZERO;// 手术费
+        BigDecimal nursingFee = BigDecimal.ZERO;// 护理费
+        BigDecimal sanitaryMaterialsFee = BigDecimal.ZERO;// 卫生材料费
+        BigDecimal westMedicine = BigDecimal.ZERO;// 西药费
+        BigDecimal chineseMedicineSlicesFee = BigDecimal.ZERO;// 中药饮片费
+        BigDecimal chineseMedicineFee = BigDecimal.ZERO;// 中成药费
+        BigDecimal generalConsultationFee = BigDecimal.ZERO;// 一般诊疗费
+        BigDecimal registrationFee = BigDecimal.ZERO;// 挂号费
+        BigDecimal otherFee = BigDecimal.ZERO;// 其他费用
+        BigDecimal sum = BigDecimal.ZERO;// 合计费用
+
+        ChargeItemDefInfo chargeItem;
+        for (String addChargeItemId : addChargeItemIds) {
+            List<ChargeItemDefInfo> chargeItems = chargeItemDefInfoKVById.get(Long.parseLong(addChargeItemId));
+            if (chargeItems == null || chargeItems.isEmpty()) {
+                continue;
+            }
+            chargeItem = chargeItems.get(0);
+            YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByCode(Integer.parseInt(chargeItem.getYbType()));
+
+            switch (medChrgItmType) {
+                case BED_FEE:
+                    bedFee = bedFee.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_FEE:
+                    diagnosticFee = diagnosticFee.add(chargeItem.getTotalPrice());
+                    break;
+                case CHECK_FEE:
+                    checkFee = checkFee.add(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_TEST_FEE:
+                    diagnosticTestFee = diagnosticTestFee.add(chargeItem.getTotalPrice());
+                    break;
+                case MEDICAL_EXPENSE_FEE:
+                    medicalExpenseFee = medicalExpenseFee.add(chargeItem.getTotalPrice());
+                    break;
+                case OPERATION_FEE:
+                    operationFee = operationFee.add(chargeItem.getTotalPrice());
+                    break;
+                case NURSING_FEE:
+                    nursingFee = nursingFee.add(chargeItem.getTotalPrice());
+                    break;
+                case SANITARY_MATERIALS_FEE:
+                    sanitaryMaterialsFee = sanitaryMaterialsFee.add(chargeItem.getTotalPrice());
+                    break;
+                case WEST_MEDICINE:
+                    westMedicine = westMedicine.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_SLICES_FEE:
+                    chineseMedicineSlicesFee = chineseMedicineSlicesFee.add(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_FEE:
+                    chineseMedicineFee = chineseMedicineFee.add(chargeItem.getTotalPrice());
+                    break;
+                case GENERAL_CONSULTATION_FEE:
+                    generalConsultationFee = generalConsultationFee.add(chargeItem.getTotalPrice());
+                    break;
+                case REGISTRATION_FEE:
+                    registrationFee = registrationFee.add(chargeItem.getTotalPrice());
+                    break;
+                default:
+                    otherFee = otherFee.add(chargeItem.getTotalPrice());
+                    break;
+            }
+        }
+
+        for (String subChargeItemId : subChargeItemIds) {
+            List<ChargeItemDefInfo> chargeItems = chargeItemDefInfoKVById.get(Long.parseLong(subChargeItemId));
+            if (chargeItems == null || chargeItems.isEmpty()) {
+                continue;
+            }
+            chargeItem = chargeItems.get(0);
+
+            YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByCode(Integer.parseInt(chargeItem.getYbType()));
+
+            switch (medChrgItmType) {
+                case BED_FEE:
+                    bedFee = bedFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_FEE:
+                    diagnosticFee = diagnosticFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case CHECK_FEE:
+                    checkFee = checkFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case DIAGNOSTIC_TEST_FEE:
+                    diagnosticTestFee = diagnosticTestFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case MEDICAL_EXPENSE_FEE:
+                    medicalExpenseFee = medicalExpenseFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case OPERATION_FEE:
+                    operationFee = operationFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case NURSING_FEE:
+                    nursingFee = nursingFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case SANITARY_MATERIALS_FEE:
+                    sanitaryMaterialsFee = sanitaryMaterialsFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case WEST_MEDICINE:
+                    westMedicine = westMedicine.subtract(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_SLICES_FEE:
+                    chineseMedicineSlicesFee = chineseMedicineSlicesFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case CHINESE_MEDICINE_FEE:
+                    chineseMedicineFee = chineseMedicineFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case GENERAL_CONSULTATION_FEE:
+                    generalConsultationFee = generalConsultationFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                case REGISTRATION_FEE:
+                    registrationFee = registrationFee.subtract(chargeItem.getTotalPrice());
+                    break;
+                default:
+                    otherFee = otherFee.subtract(chargeItem.getTotalPrice());
+                    break;
+            }
+        }
+
+        map.put("BED_FEE", bedFee);// 床位费
+        map.put("DIAGNOSTIC_FEE", diagnosticFee);// 诊察费
+        map.put("CHECK_FEE", checkFee);// 检查费
+        map.put("DIAGNOSTIC_TEST_FEE", diagnosticTestFee);// 化验费
+        map.put("MEDICAL_EXPENSE_FEE", medicalExpenseFee);// 治疗费
+        map.put("OPERATION_FEE", operationFee);// 手术费
+        map.put("NURSING_FEE", nursingFee);// 护理费
+        map.put("SANITARY_MATERIALS_FEE", sanitaryMaterialsFee);// 卫生材料费
+        map.put("WEST_MEDICINE", westMedicine);// 西药费
+        map.put("CHINESE_MEDICINE_SLICES_FEE", chineseMedicineSlicesFee);// 中药饮片费
+        map.put("CHINESE_MEDICINE_FEE", chineseMedicineFee);// 中成药费
+        map.put("GENERAL_CONSULTATION_FEE", generalConsultationFee);// 一般诊疗费
+        map.put("REGISTRATION_FEE", registrationFee);// 挂号费
+        map.put("OTHER_FEE", otherFee);// 其他费用
+        sum = bedFee.add(diagnosticFee).add(checkFee).add(diagnosticTestFee).add(medicalExpenseFee).add(operationFee)
+            .add(nursingFee).add(sanitaryMaterialsFee).add(westMedicine).add(chineseMedicineFee)
+            .add(chineseMedicineSlicesFee).add(generalConsultationFee).add(registrationFee).add(otherFee);
+        map.put("SUM", sum);// 合计费用
+
+        Map<String, List<ChargeItemDefInfo>> chargeItemDefKVByTypeCode =
+            chargeItemDefInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemDefInfo::getTypeCode));
+        for (Map.Entry<String, List<ChargeItemDefInfo>> longListEntry : chargeItemDefKVByTypeCode.entrySet()) {
+            String key = longListEntry.getKey();
+            BigDecimal bigDecimal = BigDecimal.ZERO;
+            for (ChargeItemDefInfo itemDefinition : longListEntry.getValue()) {
+                if (subChargeItemIds.contains(itemDefinition.getId().toString())) {
+                    bigDecimal = bigDecimal.subtract(itemDefinition.getTotalPrice());
+                } else {
+                    bigDecimal = bigDecimal.add(itemDefinition.getTotalPrice());
+                }
+            }
+            map.put(key, bigDecimal);
+        }
+
+        // 处理退费单
+        List<ReturnBillVO> returnBillVOList = new ArrayList<>();
+        ReturnBillVO returnBillVO;
+
+        if (!returnList.isEmpty()) {
+            List<Long> returnIds = returnList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+            // 查原付款单子
+            List<Long> relationIdList =
+                returnList.stream().map(PaymentReconciliation::getRelationId).collect(Collectors.toList());
+            if (relationIdList.isEmpty() || returnList.size() != relationIdList.size()) {
+                throw new ServiceException("数据异常，存在无法关联到原单的退款单，请联系工程师");
+            }
+
+            List<Invoice> invoiceList = iInvoiceService.list(new LambdaUpdateWrapper<Invoice>()
+                .in(Invoice::getReconciliationId, returnIds).eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()));
+            if (!invoiceList.isEmpty()) {
+                Map<Long, List<Invoice>> invoiceKV =
+                    invoiceList.stream().collect(Collectors.groupingBy(Invoice::getReconciliationId));
+                for (PaymentReconciliation paymentReconciliation : returnList) {
+                    returnBillVO = new ReturnBillVO();
+                    returnBillVO.setTotalAmount(paymentReconciliation.getTenderedAmount());
+                    List<PaymentRecDetailAccountResult> paymentRecDetails =
+                        paymentDetailsKV.get(paymentReconciliation.getId());
+                    for (PaymentRecDetailAccountResult paymentRecDetail : paymentRecDetails) {
+                        if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
+                            returnBillVO.setPaidAmount(paymentRecDetail.getAmount());
+                        }
+                    }
+
+                    if (invoiceKV.get(paymentReconciliation.getId()) == null) {
+                        returnBillVO.setInvoiceNo("");
+                    } else {
+                        Optional<Invoice> max = invoiceKV.get(paymentReconciliation.getId()).stream()
+                            .max(Comparator.comparing(Invoice::getCreateTime));
+                        if (max.isPresent()) {
+                            returnBillVO.setInvoiceNo(max.get().getBillNo());
+                        } else {
+                            returnBillVO.setInvoiceNo("");
+                        }
+                    }
+                    returnBillVO.setPaymentNo(paymentReconciliation.getPaymentNo());
+                    returnBillVOList.add(returnBillVO);
+                }
+                map.put("returnList", returnBillVOList);// 退费单
+            }
+        }
+
+        // map.put("tcSum", tcSum);// 基本统筹
+        // map.put("zhSum", zhSum);// 账户支付
+        // map.put("fundSum", fundSum);// 基金支付总额
+
+        // 医保人次自费人次计算
+        List<EncounterAccountDto> list = iEncounterService.getEncounterInfoByTime(startDate, endDate);
+        Map<String, List<EncounterAccountDto>> encounterAccountDtoMapByContract =
+            list.stream().collect(Collectors.groupingBy(EncounterAccountDto::getContractNo));
+        for (Map.Entry<String, List<EncounterAccountDto>> stringListEntry : encounterAccountDtoMapByContract
+            .entrySet()) {
+            String key = stringListEntry.getKey();
+            map.put(key + "reg", stringListEntry.getValue().size());
+        }
+
+        return map;
+    }
+
+    private Map getMap(Map<String, Object> map) {
+
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
+
+        map.put("fixmedinsName", fixmedinsName);
+        map.put("fixmedinsCode", fixmedinsCode);
+
+        map.put("BED_FEE", BigDecimal.ZERO);// 床位费
+        map.put("DIAGNOSTIC_FEE", BigDecimal.ZERO);// 诊察费
+        map.put("CHECK_FEE", BigDecimal.ZERO);// 检查费
+        map.put("DIAGNOSTIC_TEST_FEE", BigDecimal.ZERO);// 化验费
+        map.put("MEDICAL_EXPENSE_FEE", BigDecimal.ZERO);// 治疗费
+        map.put("OPERATION_FEE", BigDecimal.ZERO);// 手术费
+        map.put("NURSING_FEE", BigDecimal.ZERO);// 护理费
+        map.put("SANITARY_MATERIALS_FEE", BigDecimal.ZERO);// 卫生材料费
+        map.put("WEST_MEDICINE", BigDecimal.ZERO);// 西药费
+        map.put("CHINESE_MEDICINE_SLICES_FEE", BigDecimal.ZERO);// 中药饮片费
+        map.put("CHINESE_MEDICINE_FEE", BigDecimal.ZERO);// 中成药费
+        map.put("GENERAL_CONSULTATION_FEE", BigDecimal.ZERO);// 一般诊疗费
+        map.put("REGISTRATION_FEE", BigDecimal.ZERO);// 挂号费
+        map.put("OTHER_FEE", BigDecimal.ZERO);// 其他费用
+        map.put("SUM", BigDecimal.ZERO);// 合计费用
+        map.put("ybCashSum", BigDecimal.ZERO);// 医保现金
+        map.put("selfCashSum", BigDecimal.ZERO);// 自费现金
+        map.put("selfReg", 0);
+        map.put("ybReg", 0);
+
+        map.put("cashSum", BigDecimal.ZERO);// 现金支付
+        map.put("rmbCashSum", BigDecimal.ZERO);// 现金支付
+        map.put("vxCashSum", BigDecimal.ZERO);// 现金支付（）
+        map.put("aliCashSum", BigDecimal.ZERO);// 现金支付（）
+        map.put("uniCashSum", BigDecimal.ZERO);// 现金支付（）
+        map.put("tcSum", BigDecimal.ZERO);// 基本统筹
+        map.put("zhSum", BigDecimal.ZERO);// 账户支付
+        map.put("fundSum", BigDecimal.ZERO);// 基金支付总额
+
+        return map;
+    }
+
+    /**
+     *
+     * @param paymentId
+     * @return
+     */
+    @Override
+    public Map getMedicalExpenseCoverageSummary(Long paymentId) {
+        return null;
+    }
+
+    @Override
+    public Map getChargeItemByOrg(ChargeSummaryDto chargeSummaryDto) {
+        Map<String, Object> map = new HashMap<>();
+
+        // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+        Date startDate = DateUtils.parseDate(chargeSummaryDto.getStartTime());
+        Date endDate = DateUtils.parseDate(chargeSummaryDto.getEndTime());
+
+        // 查询所有的支付
+        LambdaQueryWrapper<PaymentReconciliation> queryWrapper = new LambdaQueryWrapper<PaymentReconciliation>()
+            .between(PaymentReconciliation::getBillDate, startDate, endDate)
+            .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode())
+            .in(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue(),
+                PaymentStatus.REFUND_ALL.getValue())
+            .eq(PaymentReconciliation::getKindEnum, PaymentKind.OUTPATIENT_CLINIC.getValue());
+
+        List<PaymentReconciliation> paymentReconciliationList = paymentReconciliationService.list(queryWrapper);
+        if (paymentReconciliationList.isEmpty()) {
+            return null;
+        }
+
+        List<Long> chargeItemIds = paymentReconciliationList.stream().map(PaymentReconciliation::getChargeItemIds) // 获取逗号分隔的字符串字段
+            .flatMap(str -> Arrays.stream(str.split(","))) // 拆分字符串并扁平化
+            .map(String::trim) // 去除前后空格
+            .filter(s -> !s.isEmpty()) // 过滤空字符串
+            .map(Long::valueOf) // 转换为Long
+            .collect(Collectors.toList());
+
+        List<ChargeItemExtendInfoDto> ChargeItemExtendInfoDtoList =
+            chargeBillMapper.selectChargeItemExtendInfoList(chargeItemIds, chargeSummaryDto.getOrgIdList());
+
+        Map<Long, List<ChargeItemExtendInfoDto>> chargeItemExtendInfoDtoListGroupByOrgIdMap =
+            ChargeItemExtendInfoDtoList.stream().collect(Collectors.groupingBy(ChargeItemExtendInfoDto::getOrgId));
+        LambdaQueryWrapper<Organization> organizationLambdaQueryWrapper =
+            new LambdaQueryWrapper<Organization>().eq(Organization::getTypeEnum, OrganizationType.DEPARTMENT.getValue())
+                .eq(Organization::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode())
+                .orderByDesc(Organization::getDisplayOrder);
+        if (chargeSummaryDto.getOrgIdList() != null && !chargeSummaryDto.getOrgIdList().isEmpty()) {
+            organizationLambdaQueryWrapper.in(Organization::getId, chargeSummaryDto.getOrgIdList());
+        }
+        List<Organization> organizationList = iOrganizationService.list(organizationLambdaQueryWrapper);
+        if (organizationList.isEmpty()) {
+            throw new ServiceException("未查询到科室信息");
+        }
+        List<OrgIncomeDto> orgIncomeList = new ArrayList();
+        OrgIncomeDto orgIncomeDto;
+        for (Organization organization : organizationList) {
+            orgIncomeDto = new OrgIncomeDto();
+            orgIncomeDto.setOrgName(organization.getName());
+            List<ChargeItemExtendInfoDto> chargeItemExtendInfoDtos =
+                chargeItemExtendInfoDtoListGroupByOrgIdMap.get(organization.getId());
+            if (chargeItemExtendInfoDtos == null) {
+                orgIncomeList.add(orgIncomeDto);
+                continue;
+            }
+            for (ChargeItemExtendInfoDto chargeItemExtendInfoDto : chargeItemExtendInfoDtos) {
+                // 挂号费单独 未计入应收
+                switch (YbMedChrgItmType.getByValue(chargeItemExtendInfoDto.getYbType())) {
+                    case WEST_MEDICINE:
+                    case CHINESE_MEDICINE_SLICES_FEE:
+                    case CHINESE_MEDICINE_FEE:
+                        orgIncomeDto.setAmount(orgIncomeDto.getAmount().add(chargeItemExtendInfoDto.getTotalPrice()));
+                        orgIncomeDto.setMedFee(orgIncomeDto.getMedFee().add(chargeItemExtendInfoDto.getTotalPrice()));
+                        break;
+                    case REGISTRATION_FEE:
+                        orgIncomeDto.setPersonCnt(orgIncomeDto.getPersonCnt() + 1);
+                        orgIncomeDto.setRegistrationFee(
+                            orgIncomeDto.getRegistrationFee().add(chargeItemExtendInfoDto.getTotalPrice()));
+                        break;
+                    default:
+                        orgIncomeDto.setAmount(orgIncomeDto.getAmount().add(chargeItemExtendInfoDto.getTotalPrice()));
+                        orgIncomeDto
+                            .setServiceFee(orgIncomeDto.getServiceFee().add(chargeItemExtendInfoDto.getTotalPrice()));
+                }
+            }
+
+            orgIncomeList.add(orgIncomeDto);
+        }
+        // 住院部分数据tbd
+
+        map.put("clinic", orgIncomeList);
+
+        return map;
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
similarity index 63%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
index c6810476..9945ecba 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
@@ -14,7 +14,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.yb.dto.Clinic2208UnSetlInfoOutput;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
@@ -36,6 +35,7 @@ import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.*;
+import com.openhis.administration.dto.ChargeItemBaseInfoDto;
 import com.openhis.administration.service.*;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
@@ -51,10 +51,7 @@ import com.openhis.financial.model.PaymentRecDetailDto;
 import com.openhis.financial.model.PaymentedItemModel;
 import com.openhis.financial.model.PrePaymentResult;
 import com.openhis.financial.model.PrePaymentResultModel;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentNoticeService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.financial.service.*;
 import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
@@ -66,6 +63,8 @@ import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.AdvicePriceDto;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.*;
+import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
+import com.openhis.web.paymentmanage.dto.Clinic2207OrderResultDto;
 import com.openhis.web.paymentmanage.mapper.PaymentMapper;
 import com.openhis.web.personalization.dto.ActivityDeviceDto;
 import com.openhis.workflow.domain.DeviceRequest;
@@ -75,9 +74,11 @@ import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.IServiceRequestService;
 import com.openhis.yb.domain.ClinicReg;
 import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.dto.Clinic2206OrderOutput;
+import com.openhis.yb.domain.InpatientSettle;
+import com.openhis.yb.dto.*;
 import com.openhis.yb.model.OutpatientRegistrationModel;
 import com.openhis.yb.service.IClinicSettleService;
+import com.openhis.yb.service.IInpatientSettleService;
 import com.openhis.yb.service.IRegService;
 import com.openhis.yb.service.YbManager;
 
@@ -99,6 +100,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     @Resource
     private IAccountService iAccountService;
     @Resource
+    private IContractService iContractService;
+    @Resource
     private IEncounterService iEncounterService;
     @Resource
     private IInvoiceService iInvoiceService;
@@ -107,6 +110,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     @Resource
     private IPaymentRecDetailService paymentRecDetailService;
     @Resource
+    private IPaymentRecStaticService paymentRecStaticService;
+    @Resource
     private IContractService contractService;
     @Resource
     private IChargeItemService chargeItemService;
@@ -127,6 +132,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     @Resource
     private IClinicSettleService clinicSettleService;
     @Resource
+    private IInpatientSettleService iInpatientSettleService;
+    @Resource
     private OutpatientRegistrationAppMapper outpatientRegistrationAppMapper;
     @Resource
     private IRegService iRegService;
@@ -157,6 +164,12 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     @Autowired
     private RedisCache redisCache;
 
+    /**
+     * 【门诊预结算】
+     * 
+     * @param prePaymentDto 预结算入参
+     * @return 结果
+     */
     @Override
     public R<?> prePayment(PrePaymentDto prePaymentDto) {
         logger.info("预结算：参数：" + JSON.toJSONString(prePaymentDto));
@@ -169,12 +182,12 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         // 此次chargeItem的就诊诊断id集合
         List<Long> diagIdList =
             chargeItemList.stream().map(ChargeItem::getEncounterDiagnosisId).collect(Collectors.toList());
-        if(diagIdList.isEmpty()){
+        if (diagIdList.isEmpty()) {
             throw new ServiceException("收费项的就诊诊断查询为空");
         }
         // 此次就诊的医疗类型列表
         List<EncounterDiagnosis> diagList = iEncounterDiagnosisService.getDiagnosisList(diagIdList);
-        if(diagList.isEmpty()){
+        if (diagList.isEmpty()) {
             throw new ServiceException("就诊诊断查询为空，错误信息：EncounterDiagnosis");
         }
         List<String> medTypeList =
@@ -215,7 +228,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     // TODO:后续添加可调价逻辑，当前都用子项目价格进行结算
                     // 处理套餐项目，如果ChargeItem有子项，并且此项目是不可调价项目要被拆出来
                     // 这是不拆的逻辑，如果TODO完成，会多一种情况进入这个逻辑
-                    if (StringUtils.isEmpty(chargeItem.getChildrenJson()) || "0000".equals(account.getContractNo())
+                    if (StringUtils.isEmpty(chargeItem.getChildrenJson())
+                        || CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(account.getContractNo())
                         || "0".equals(
                             SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))) {
                         PaymentedItemModel piModel = ConverterToPaymenItemModel(diagList, chargeItem);
@@ -235,7 +249,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 }
 
                 // 调用核心预结算方法
-                PrePaymentResult prePaymentResult = iPaymentReconciliationService.prePayment(
+                PrePaymentResult prePaymentResult = iPaymentReconciliationService.preSettle(
                     YbMdtrtCertType.getByValue(prePaymentDto.getYbMdtrtCertType()), prePaymentDto.getBusiCardInfo(),
                     settleContract.getBusNo(), prePaymentedItems);
                 // 把多个account的预结算结果加入preSettleResultList
@@ -255,8 +269,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         for (PrePaymentResult prePaymentResult : preSettleResultList) {
             amount = amount.add(prePaymentResult.getMedfeeSumamt());
         }
-        // TODO 通过多次预结算，得到最后的预结算账单：finalPrePaymenResult
-        // PrePaymentResultModel finalResult = calcFinalResult(preSettleResultList);
+
         // 创建草稿状态的付款实体
         // 处理时间
         Date setlTime = new Date();
@@ -293,10 +306,10 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     }
 
     /**
-     * 转换实体给页面显示
+     * 【门诊预结算】-转换实体用于页面显示页面显示
      * 
-     * @param paymentRecDetails
-     * @return
+     * @param paymentRecDetails 收费详情detai集合
+     * @return 操作结果
      */
     private List<PaymentRecDetailDto> getPaymentRecDetailDtoList(List<PaymentRecDetail> paymentRecDetails) {
         List<PaymentRecDetailDto> list = new ArrayList<>();
@@ -314,7 +327,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     }
 
     /**
-     * 付款/结算
+     * 【门诊结算】
      *
      * @param paymentDto 入参
      * @return 结果
@@ -337,26 +350,45 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         List<PaymentRecDetail> paymentRecDetails =
             paymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
                 .eq(PaymentRecDetail::getReconciliationId, paymentReconciliation.getId()));
+        if (paymentRecDetails.isEmpty()) {
+            return R.fail("查询不到收费详情");
+        }
         if (!paymentDto.getChargeItemIds().stream().map(String::valueOf).collect(Collectors.joining(","))
             .equals(paymentReconciliation.getChargeItemIds())) {
             return R.fail("收费项目变动，请重新预结算");
         }
-        // 校验金额
+
+        // 校验金额：前台输入金额与仍需支付的现金部分进行比较
         BigDecimal sum = BigDecimal.ZERO;
+        PaymentRecDetail paymentRecDetailDemo = new PaymentRecDetail();
         for (PaymentRecDetail paymentRecDetail : paymentRecDetails) {
             if (paymentRecDetail.getPayEnum().equals(YbPayment.SELF_CASH_PAY.getValue())) {
                 sum = sum.add(paymentRecDetail.getAmount());
+                paymentRecDetailDemo = paymentRecDetail;
             }
+            paymentRecDetailDemo = paymentRecDetail;
         }
         BigDecimal chargeAmount = BigDecimal.ZERO;
+        PaymentRecDetail newPaymentRecDetail;
+        // 声明变量，该部分的收费详情为前台传递的微信支付支付宝支付等
+        List<PaymentRecDetail> list = new ArrayList<>();
         for (PaymentDetailDto paymentDetail : paymentDto.getPaymentDetails()) {
             chargeAmount = chargeAmount.add(paymentDetail.getAmount());
+            newPaymentRecDetail = new PaymentRecDetail();
+            BeanUtils.copyProperties(paymentRecDetailDemo, newPaymentRecDetail);
+            newPaymentRecDetail.setPayEnum(paymentDetail.getPayEnum()).setId(null)
+                .setPayLevelEnum(YbPayment.getByValue(paymentDetail.getPayEnum()) == null ? null
+                    : YbPayment.getByValue(paymentDetail.getPayEnum()).getLevel())
+                .setAmount(paymentDetail.getAmount());
+            list.add(newPaymentRecDetail);
         }
-        if (sum.compareTo(chargeAmount) != 0) {
+        // 前台传入数据可能会精度丢失，后天临时处理使用近似
+        if (sum.setScale(2, BigDecimal.ROUND_HALF_UP)
+            .compareTo(chargeAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) != 0) {
             throw new ServiceException("交款金额与预结算金额不相等");
         }
 
-        // 前端传过来的收费项
+        // 前端传过来的收费项：更改ChargeItem的状态等操作
         List<ChargeItem> chargeItemList = getChargeItems(paymentDto.getChargeItemIds());
         if (chargeItemList.isEmpty()) {
             return R.fail("未选择收费项");
@@ -377,8 +409,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             }
         });
         if (!medReqIdList.isEmpty()) {
-            List<MedicationRequest> medicationRequestList = medicationRequestService.list(
-                new LambdaQueryWrapper<MedicationRequest>().in(MedicationRequest::getId, medReqIdList));
+            List<MedicationRequest> medicationRequestList = medicationRequestService
+                .list(new LambdaQueryWrapper<MedicationRequest>().in(MedicationRequest::getId, medReqIdList));
             if (!medicationRequestList.isEmpty()) {
                 minpacuntDrugTracCnt = medicationRequestList.stream().mapToInt(MedicationRequest::getQuantity).sum();
             }
@@ -391,36 +423,49 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             }
         }
 
+        // 收费详情按照收费批次进行分组
         Map<String, List<PaymentRecDetail>> payTransNoMap =
             paymentRecDetails.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransNo));
 
         com.openhis.financial.model.PaymentResult paymentResult;
         List<com.openhis.financial.model.PaymentResult> paymentResultList = new ArrayList<>();
+
         for (Map.Entry<String, List<PaymentRecDetail>> stringListEntry : payTransNoMap.entrySet()) {
             // paymentResult = new PaymentResult();
-            paymentResult = iPaymentReconciliationService.settle(stringListEntry.getKey(),
-                YbMdtrtCertType.getByValue(paymentDto.getYbMdtrtCertType()), paymentDto.getBusiCardInfo(),
-                minpacuntDrugTracCnt, mcsTracCnt);
-            paymentResult.setAccountId(stringListEntry.getValue().get(0).getAccountId());
+            Account account = iAccountService.getById(stringListEntry.getValue().get(0).getAccountId());
+            if (account == null) {
+                throw new ServiceException("未查询到账户信息");
+            }
+            // 结算方法
+            paymentResult = iPaymentReconciliationService.settle(contractService.getContract(account.getContractNo()),
+                stringListEntry.getKey(), YbMdtrtCertType.getByValue(paymentDto.getYbMdtrtCertType()),
+                paymentDto.getBusiCardInfo(), minpacuntDrugTracCnt, mcsTracCnt);
+            paymentResult.setAccountId(stringListEntry.getValue().get(0).getAccountId());// 记录账户余额的时候要使用这个AccountId
             for (PaymentRecDetail paymentRecDetail : stringListEntry.getValue()) {
-                paymentRecDetail.setPayTransText(paymentResult.getSetlId());//医保结算赋值结算id；用于医保对账清算时使用
+                paymentRecDetail.setPayTransText(paymentResult.getSetlId())
+                    .setResultEnum(PaymentResult.PAID.getValue());// 医保结算赋值结算id；用于医保对账清算时使用
             }
-            if (paymentResult != null) {
-                paymentResultList.add(paymentResult);
+            for (PaymentRecDetail paymentRecDetail : list) {
+                paymentRecDetail.setPayTransText(paymentResult.getSetlId())
+                    .setResultEnum(PaymentResult.PAID.getValue());// 整合数据
             }
+            paymentResultList.add(paymentResult);
         }
 
-        List<String> collect = paymentResultList.stream().map(com.openhis.financial.model.PaymentResult::getSetlId)
+        List<String> ybSettleIds = paymentResultList.stream().map(com.openhis.financial.model.PaymentResult::getSetlId)
             .collect(Collectors.toList());
 
         // 更改付款状态
         logger.info("更新付款状态：payment：" + JSON.toJSONString(paymentReconciliation));
         iPaymentReconciliationService.updatePaymentStatusAndSettleIdsById(paymentReconciliation.getId(),
-            PaymentStatus.SUCCESS, collect);
-        iPaymentRecDetailService.updateResultByPaymentId(paymentReconciliation.getId(), PaymentResult.PAID);
-
-        //更改付款详情的信息
+            PaymentStatus.SUCCESS, ybSettleIds);
+        // iPaymentRecDetailService.updateResultByPaymentId(paymentReconciliation.getId(), PaymentResult.PAID);
+        // 更改付款详情的信息
         iPaymentRecDetailService.updateBatchById(paymentRecDetails);
+        // 新增详情信息
+        if (!list.isEmpty()) {
+            iPaymentRecDetailService.saveBatch(list);
+        }
 
         // 记录卡余额等信息
         com.openhis.financial.model.PaymentResult minAmountResult = null;
@@ -432,20 +477,14 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 minAmountResult = result;
             }
         }
-
         if (minAmountResult != null) {
-            // 賬戶餘額
+            // 账户余额
             BigDecimal balc = minAmountResult.getBalc();
             if (balc != null) {
                 PaymentRecDetail paymentRecDetail = new PaymentRecDetail();
-                // paymentRecDetail.setReconciliationId(paymentReconciliation.getId())
-                // .setPayEnum(YbPayment.YB_JZ_FUND_AMOUNT.getValue())
-                // .setPayLevelEnum(YbPayment.YB_JZ_FUND_AMOUNT.getLevel()).setAmount(balc)
-                // .setPayTransNo(minAmountResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
-                // .setAccountId(minAmountResult.getAccountId());
                 paymentRecDetail.setReconciliationId(paymentReconciliation.getId())
                     .setPayEnum(YbPayment.BALC.getValue()).setPayLevelEnum(YbPayment.BALC.getLevel()).setAmount(balc)
-                    .setPayTransNo(minAmountResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
+                    .setPayTransNo(minAmountResult.getChrgBchno()).setResultEnum(PaymentResult.PAID.getValue())
                     .setAccountId(minAmountResult.getAccountId()).setPayTransText(minAmountResult.getSetlId());
                 iPaymentRecDetailService.save(paymentRecDetail);
             }
@@ -454,6 +493,11 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         // 更改chargeItem的状态
         List<Long> chargeItemIdList = chargeItemList.stream().map(ChargeItem::getId).collect(Collectors.toList());
         chargeItemService.updatePaymentStatus(chargeItemIdList, ChargeItemStatus.BILLED.getValue());
+
+        // 保存付款快照信息 2025/08/08
+        // paymentRecStaticService.savePaymentRecStatics(paymentReconciliation.getId(), PaymentType.PAY, null,
+        // chargeItemService.getChargeItemDefInfoByIds(chargeItemIdList));
+
         // 生成发票信息
         Invoice invoice = new Invoice();
         invoice.setPatientId(paymentReconciliation.getPatientId()).setStatusEnum(InvoiceStatus.DRAFT)
@@ -468,24 +512,28 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
         chargeItemList.forEach(item -> {
             switch (item.getServiceTable()) {
-                case CommonConstants.TableName.MED_MEDICATION_REQUEST -> medicationRequestIdList
-                    .add(item.getServiceId());
+                case CommonConstants.TableName.MED_MEDICATION_REQUEST ->
+                    medicationRequestIdList.add(item.getServiceId());
                 case CommonConstants.TableName.WOR_DEVICE_REQUEST -> deviceRequestIdList.add(item.getServiceId());
                 case CommonConstants.TableName.WOR_SERVICE_REQUEST -> serviceRequestIdList.add(item.getServiceId());
             }
         });
 
         if (!medicationRequestIdList.isEmpty()) {
+            // 更新请求状态为已完成
+            medicationRequestService.updateCompletedStatusBatch(medicationRequestIdList, null, null);
             // 更新药品发放状态为待配药
             medicationDispenseService.updatePreparationDispenseStatus(medicationRequestIdList);
         }
         if (!deviceRequestIdList.isEmpty()) {
+            // 更新耗材请求状态为已完成
+            deviceRequestService.updateCompletedStatusBatch(deviceRequestIdList);
             // 更新耗材发放状态为待配药
             deviceDispenseService.updatePreparationDispenseStatus(deviceRequestIdList);
         }
         if (!serviceRequestIdList.isEmpty()) {
-            // 更新服务请求状态为待执行
-            serviceRequestService.updatePreparationStatus(serviceRequestIdList);
+            // 更新服务请求状态为已完成
+            serviceRequestService.updateCompleteRequestStatus(serviceRequestIdList, null, null);
         }
         logger.info("收费成功：payment：" + JSON.toJSONString(paymentReconciliation));
         // throw new ServiceException("");
@@ -508,6 +556,9 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         if (paymentReconciliation == null) {
             throw new ServiceException("未查询到结算信息");
         }
+        if (!Objects.equals(paymentReconciliation.getKindEnum(), PaymentKind.OUTPATIENT_CLINIC.getValue())) {
+            throw new ServiceException("请选择正确退费渠道，该付款不是门诊收费");
+        }
         // 原结算的ChargeItemIdList
         List<Long> chargeItemIdList = Arrays.asList(paymentReconciliation.getChargeItemIds().split(",")).stream()
             .filter(Objects::nonNull).map(Long::parseLong).collect(Collectors.toList());
@@ -544,7 +595,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
         // 全退
         String ybSettleIds = paymentReconciliation.getYbSettleIds();
-        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, PaymentRecDetails,null);
+        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, PaymentRecDetails, null);
         if (!StringUtils.isEmpty(ybSettleIds)) {
             // 医保结算信息
             List<String> ybSettleIdList = Arrays.asList(ybSettleIds.split(","));
@@ -556,14 +607,17 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 for (ClinicSettle clinicSettle : clinicSettleList) {
                     R<?> r = ybManager.unSettle(clinicSettle.getSetlId());
                     if (r.getCode() == 200) {
-                        //获取医保反结算后的2208输出参数
+                        // 获取医保反结算后的2208输出参数
                         Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoOutput = null;
                         if (Clinic2208UnSetlInfoOutput.class.isAssignableFrom(r.getData().getClass())) {
                             clinic2208UnSetlInfoOutput = (Clinic2208UnSetlInfoOutput)r.getData();
                             stringBuilder.append(clinic2208UnSetlInfoOutput.getSetlId()).append(",");
-                            //对payment详情的结算id进行处理
-                            List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().eq(PaymentRecDetail::getReconciliationId, unPaymentReconciliation).eq(PaymentRecDetail::getPayTransText, clinicSettle.getSetlId()));
-                            if(!paymentRecDetailList.isEmpty()){
+                            // 对payment详情的结算id进行处理
+                            List<PaymentRecDetail> paymentRecDetailList =
+                                iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
+                                    .eq(PaymentRecDetail::getReconciliationId, unPaymentReconciliation.getId())
+                                    .eq(PaymentRecDetail::getPayTransText, clinicSettle.getSetlId()));
+                            if (!paymentRecDetailList.isEmpty()) {
                                 for (PaymentRecDetail paymentRecDetail : paymentRecDetailList) {
                                     paymentRecDetail.setPayTransText(clinic2208UnSetlInfoOutput.getSetlId());
                                 }
@@ -576,7 +630,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 if (stringBuilder.length() > 0 && stringBuilder.charAt(stringBuilder.length() - 1) == ',') {
                     stringBuilder.deleteCharAt(stringBuilder.length() - 1);
                 }
-                //回填payment的settleId字段
+                // 回填payment的settleId字段
                 unPaymentReconciliation.setYbSettleIds(stringBuilder.toString());
                 iPaymentReconciliationService.updateById(unPaymentReconciliation);
             }
@@ -677,7 +731,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             throw new ServiceException("查询不到付款记录");
         }
 
-        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, paymentRecDetails,cancelPaymentDto.getSetlId());
+        PaymentReconciliation unPaymentReconciliation =
+            normalUnCharge(paymentReconciliation, paymentRecDetails, cancelPaymentDto.getSetlId());
 
         return R.ok(unPaymentReconciliation);
     }
@@ -692,17 +747,21 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
      * @return 结果
      */
     @Override
-    public IPage<PaymentVO> getPage(String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+    public IPage<PaymentVO> getPage(String searchKey, Integer kingEnum, Integer pageNo, Integer pageSize,
+        HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<PaymentVO> queryWrapper = HisQueryUtils.buildQueryWrapper(new PaymentVO(), searchKey,
-            new HashSet<>(Arrays.asList(CommonConstants.FieldName.encounterId, CommonConstants.FieldName.contractNo,
-                CommonConstants.FieldName.paymentNo)), request);
-
-        IPage<PaymentVO> paymentDtoIPage = paymentMapper.getPage(new Page<>(pageNo, pageSize), queryWrapper);
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.EncounterId, CommonConstants.FieldName.ContractNo,
+                CommonConstants.FieldName.paymentNo)),
+            request);
+        // queryWrapper.eq(PaymentVO::getStatusEnum,PaymentStatus.SUCCESS.getValue()).or().eq(PaymentVO::getStatusEnum,PaymentStatus.REFUND_ALL.getValue());
+        queryWrapper.in("status_enum", PaymentStatus.SUCCESS.getValue(), PaymentStatus.REFUND_ALL.getValue());
+        IPage<PaymentVO> paymentDtoIPage = paymentMapper.getPage(new Page<>(pageNo, pageSize), kingEnum, queryWrapper);
 
         for (PaymentVO record : paymentDtoIPage.getRecords()) {
             record.setPaymentId(record.getId().toString());
             record.setEncounterIdStr(record.getEncounterId().toString());
+            record.setRelationIdStr(String.valueOf(record.getRelationId()));
         }
 
         // todo：sjq 1.是否联表查询患者名字，收款员姓名等信息 2.赋值
@@ -746,7 +805,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             .setTenderedAmount(paymentReconciliation.getTenderedAmount().negate())
             .setReturnedAmount(paymentReconciliation.getReturnedAmount().negate())
             .setDisplayAmount(paymentReconciliation.getDisplayAmount().negate());
-        if(setlIds!=null){
+        if (setlIds != null) {
             paymentReconciliation.setYbSettleIds(setlIds);
         }
         paymentReconciliationService.save(paymentReconciliation);
@@ -762,7 +821,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             newPaymentRecDetail.setResultEnum(PaymentResult.PAID.getValue());
             newPaymentRecDetail.setAmount(paymentRecDetail.getAmount().multiply(new BigDecimal("-1")));
             newPaymentRecDetail.setDeleteFlag(DelFlag.NO.getCode());
-            if(setlIds!=null){
+            if (setlIds != null) {
                 newPaymentRecDetail.setPayTransText(setlIds);
             }
             addDetailList.add(newPaymentRecDetail);
@@ -778,26 +837,19 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
         paymentRecDetailService.updateBatchById(list);
         logger.info("退款payment：" + JSON.toJSONString(paymentReconciliation));
-        return paymentReconciliation;
-    }
 
-    /**
-     * 初始化一个收费参数
-     *
-     * @return 预结算的参数
-     */
-    public Clinic2206OrderOutput initClinic2206OrderOutput() {
-        Clinic2206OrderOutput clinic2206OrderResult = new Clinic2206OrderOutput();
-        return clinic2206OrderResult.setMedfeeSumamt(new BigDecimal("0.0")).setFulamtOwnpayAmt(new BigDecimal("0.0"))
-            .setOverlmtSelfpay(new BigDecimal("0.0")).setPreselfpayAmt(new BigDecimal("0.0"))
-            .setInscpScpAmt(new BigDecimal("0.0")).setActPayDedc(new BigDecimal("0.0"))
-            .setHifpPay(new BigDecimal("0.0")).setPoolPropSelfpay(new BigDecimal("0.0"))
-            .setCvlservPay(new BigDecimal("0.0")).setHifesPay(new BigDecimal("0.0")).setHifmiPay(new BigDecimal("0.0"))
-            .setHifobPay(new BigDecimal("0.00")).setMafPay(new BigDecimal("0.0")).setOthPay(new BigDecimal("0.0"))
-            .setFundPaySumamt(new BigDecimal("0.0")).setPsnPartAmt(new BigDecimal("0.0"))
-            .setAcctPay(new BigDecimal("0.0")).setPsnCashPay(new BigDecimal("0.0"))
-            .setHospPartAmt(new BigDecimal("0.0")).setBalc(new BigDecimal("0.0"))
-            .setAcctMulaidPay(new BigDecimal("0.0")).setHifdmPay(new BigDecimal("0.0"));
+        // 保存付款快照信息 2025/08/08
+        // List<Long> chargeItemIds = new ArrayList<>();
+        // for (String s : paymentReconciliation.getChargeItemIds().split(",")) {
+        // chargeItemIds.add(Long.parseLong(s));
+        // }
+        // if (chargeItemIds.isEmpty()) {
+        // throw new ServiceException("payment数据未关联收费项信息，异常数据payment" + id);
+        // }
+        // paymentRecStaticService.savePaymentRecStatics(paymentReconciliation.getId(), PaymentType.PAY, null,
+        // chargeItemService.getChargeItemDefInfoByIds(chargeItemIds));
+
+        return paymentReconciliation;
     }
 
     /**
@@ -1004,6 +1056,22 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail19);
             }
+            if (prePaymentResult.getSetldetail() != null && !prePaymentResult.getSetldetail().isEmpty()) {
+                PaymentRecDetail paymentRecDetail20;
+                for (Clinic2206FundPaymentResult clinic2206FundPaymentResult : prePaymentResult.getSetldetail()) {
+                    YbPayment ybPayment =
+                        YbPayment.getByValue(Integer.parseInt(clinic2206FundPaymentResult.getFundPayType()));
+                    if (ybPayment == null) {
+                        continue;
+                    }
+                    paymentRecDetail20 = new PaymentRecDetail();
+                    paymentRecDetail20.setReconciliationId(payment.getId()).setPayEnum(ybPayment.getValue())
+                        .setPayLevelEnum(ybPayment.getLevel()).setAmount(clinic2206FundPaymentResult.getFundPayamt())
+                        .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
+                        .setAccountId(prePaymentResult.getAccountId());
+                    paymentRecDetails.add(paymentRecDetail20);
+                }
+            }
         }
         paymentRecDetailService.saveBatch(paymentRecDetails);
         return paymentRecDetails;
@@ -1032,7 +1100,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 paymentRecDetail.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.SELF_CASH_VX_VALUE.getValue()).setAccountId(accountId)
                     .setPayLevelEnum(YbPayment.SELF_CASH_VX_VALUE.getLevel()).setAmount(paymentDetail.getAmount())
-                    .setResultEnum(PaymentResult.PAID.getValue());
+                    .setResultEnum(PaymentResult.PAID.getValue()).setPayTransNo(paymentResult.getChrgBchno());
                 paymentRecDetails.add(paymentRecDetail);
             }
             if (YbPayment.SELF_CASH_ALI_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
@@ -1040,7 +1108,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 paymentRecDetail.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.SELF_CASH_ALI_VALUE.getValue()).setAccountId(accountId)
                     .setPayLevelEnum(YbPayment.SELF_CASH_ALI_VALUE.getLevel()).setAmount(paymentDetail.getAmount())
-                    .setResultEnum(PaymentResult.PAID.getValue());
+                    .setResultEnum(PaymentResult.PAID.getValue()).setPayTransNo(paymentResult.getChrgBchno());
                 paymentRecDetails.add(paymentRecDetail);
             }
             if (YbPayment.SELF_CASH_UNION_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
@@ -1048,14 +1116,15 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 paymentRecDetail.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.SELF_CASH_UNION_VALUE.getValue()).setAccountId(accountId)
                     .setPayLevelEnum(YbPayment.SELF_CASH_UNION_VALUE.getLevel()).setAmount(paymentDetail.getAmount())
-                    .setResultEnum(PaymentResult.PAID.getValue());
+                    .setResultEnum(PaymentResult.PAID.getValue()).setPayTransNo(paymentResult.getChrgBchno());
                 paymentRecDetails.add(paymentRecDetail);
             }
             if (YbPayment.SELF_CASH_VALUE.getValue().equals(paymentDetail.getPayEnum())) {
                 paymentRecDetail = new PaymentRecDetail();
                 paymentRecDetail.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_CASH_VALUE.getValue())
                     .setPayLevelEnum(YbPayment.SELF_CASH_VALUE.getLevel()).setAmount(paymentDetail.getAmount())
-                    .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+                    .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId)
+                    .setPayTransNo(paymentResult.getChrgBchno());
                 paymentRecDetails.add(paymentRecDetail);
             }
 
@@ -1069,131 +1138,166 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         // 现金支付
         PaymentRecDetail paymentRecDetail10 = new PaymentRecDetail();
         paymentRecDetail10.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_CASH_PAY.getValue())
-            .setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()).setAmount(psnCashPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()).setAmount(psnCashPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail10);
         // 个人负担总金额
         BigDecimal psnPartAmt = paymentResult.getPsnPartAmt();
         PaymentRecDetail paymentRecDetail1 = new PaymentRecDetail();
         paymentRecDetail1.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_PAY.getValue())
-            .setPayLevelEnum(YbPayment.SELF_PAY.getLevel()).setAmount(psnPartAmt).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.SELF_PAY.getLevel()).setAmount(psnPartAmt)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail1);
         // 基本医疗保险统筹基金支出
         BigDecimal hifpPay = paymentResult.getHifpPay();
         PaymentRecDetail paymentRecDetail2 = new PaymentRecDetail();
         paymentRecDetail2.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_TC_FUND_AMOUNT.getValue())
-            .setPayLevelEnum(YbPayment.YB_TC_FUND_AMOUNT.getLevel()).setAmount(hifpPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_TC_FUND_AMOUNT.getLevel()).setAmount(hifpPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail2);
         // 公务员医疗补助资金支出
         BigDecimal cvlservPay = paymentResult.getCvlservPay();
         PaymentRecDetail paymentRecDetail3 = new PaymentRecDetail();
         paymentRecDetail3.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_BC_GWY_BZ_VALUE.getValue())
-            .setPayLevelEnum(YbPayment.YB_BC_GWY_BZ_VALUE.getLevel()).setAmount(cvlservPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_BC_GWY_BZ_VALUE.getLevel()).setAmount(cvlservPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail3);
         // 企业补充医疗保险基金支出
         BigDecimal hifesPay = paymentResult.getHifesPay();
         PaymentRecDetail paymentRecDetail4 = new PaymentRecDetail();
         paymentRecDetail4.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_BC_FUND_AMOUNT.getValue())
-            .setPayLevelEnum(YbPayment.YB_BC_FUND_AMOUNT.getLevel()).setAmount(hifesPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_BC_FUND_AMOUNT.getLevel()).setAmount(hifesPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail4);
         // 居民大病保险资金支出
         BigDecimal hifmiPay = paymentResult.getHifmiPay();
         PaymentRecDetail paymentRecDetail5 = new PaymentRecDetail();
         paymentRecDetail5.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_BC_JM_DB_VALUE.getValue())
-            .setPayLevelEnum(YbPayment.YB_BC_JM_DB_VALUE.getLevel()).setAmount(hifmiPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_BC_JM_DB_VALUE.getLevel()).setAmount(hifmiPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail5);
         // 职工大额医疗费用补助基金支出
         BigDecimal hifobPay = paymentResult.getHifobPay();
         PaymentRecDetail paymentRecDetail6 = new PaymentRecDetail();
         paymentRecDetail6.setReconciliationId(payment.getId())
-            .setPayLevelEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getLevel()).setAmount(hifobPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getLevel()).setAmount(hifobPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail6);
         // 医疗救助基金支出
         BigDecimal mafPay = paymentResult.getMafPay();
         PaymentRecDetail paymentRecDetail7 = new PaymentRecDetail();
         paymentRecDetail7.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_JZ_FUND_AMOUNT.getValue())
-            .setPayLevelEnum(YbPayment.YB_JZ_FUND_AMOUNT.getLevel()).setAmount(mafPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_JZ_FUND_AMOUNT.getLevel()).setAmount(mafPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail7);
         // 其他支出
         BigDecimal othPay = paymentResult.getOthPay();
         PaymentRecDetail paymentRecDetail8 = new PaymentRecDetail();
         paymentRecDetail8.setReconciliationId(payment.getId()).setPayEnum(YbPayment.OTHER_PAY.getValue())
-            .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(othPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(othPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail8);
         // 基金支付总额
         BigDecimal fundPaySumamt = paymentResult.getFundPaySumamt();
         PaymentRecDetail paymentRecDetail9 = new PaymentRecDetail();
         paymentRecDetail9.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_FUND_PAY.getValue())
-            .setPayLevelEnum(YbPayment.YB_FUND_PAY.getLevel()).setAmount(fundPaySumamt).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.YB_FUND_PAY.getLevel()).setAmount(fundPaySumamt)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail9);
         // 个人账户支出
         BigDecimal acctPay = paymentResult.getAcctPay();
         PaymentRecDetail paymentRecDetail11 = new PaymentRecDetail();
         paymentRecDetail11.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_YB_ZH_PAY.getValue())
-            .setPayLevelEnum(YbPayment.SELF_YB_ZH_PAY.getLevel()).setAmount(acctPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.SELF_YB_ZH_PAY.getLevel()).setAmount(acctPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail11);
         // 医院负担金额
         BigDecimal hospPartAmt = paymentResult.getHospPartAmt();
         PaymentRecDetail paymentRecDetail12 = new PaymentRecDetail();
         paymentRecDetail12.setReconciliationId(payment.getId()).setPayEnum(YbPayment.OTHER_PAY.getValue())
-            .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(hospPartAmt).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(hospPartAmt)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail12);
         // 个人账户共济支付金额
         BigDecimal acctMulaidPay = paymentResult.getAcctMulaidPay();
         PaymentRecDetail paymentRecDetail13 = new PaymentRecDetail();
         paymentRecDetail13.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_YB_ZH_GJ_VALUE.getValue())
-            .setPayLevelEnum(YbPayment.SELF_YB_ZH_GJ_VALUE.getLevel()).setAmount(acctMulaidPay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.SELF_YB_ZH_GJ_VALUE.getLevel()).setAmount(acctMulaidPay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail13);
         // 全自费金额
         BigDecimal fulamtOwnpayAmt = paymentResult.getFulamtOwnpayAmt();
         PaymentRecDetail paymentRecDetail14 = new PaymentRecDetail();
         paymentRecDetail14.setReconciliationId(payment.getId()).setPayEnum(YbPayment.FULAMT_OWNPAY_AMT.getValue())
-            .setPayLevelEnum(YbPayment.FULAMT_OWNPAY_AMT.getLevel()).setAmount(fulamtOwnpayAmt).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.FULAMT_OWNPAY_AMT.getLevel()).setAmount(fulamtOwnpayAmt)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail14);
         // 超限价自费费用
         BigDecimal overlmtSelfpay = paymentResult.getOverlmtSelfpay();
         PaymentRecDetail paymentRecDetail15 = new PaymentRecDetail();
         paymentRecDetail15.setReconciliationId(payment.getId()).setPayEnum(YbPayment.OVERLMT_SELFPAY.getValue())
-            .setPayLevelEnum(YbPayment.OVERLMT_SELFPAY.getLevel()).setAmount(overlmtSelfpay).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(accountId);
+            .setPayLevelEnum(YbPayment.OVERLMT_SELFPAY.getLevel()).setAmount(overlmtSelfpay)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setAccountId(accountId).setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail15);
         BigDecimal balc = paymentResult.getBalc();
         PaymentRecDetail paymentRecDetail16 = new PaymentRecDetail();
         paymentRecDetail16.setReconciliationId(payment.getId()).setPayEnum(YbPayment.BALC.getValue())
-            .setAccountId(accountId).setPayLevelEnum(YbPayment.BALC.getLevel()).setAmount(balc).setPayTransText(paymentResult.getSetlId())
+            .setAccountId(accountId).setPayLevelEnum(YbPayment.BALC.getLevel()).setAmount(balc)
+            .setPayTransNo(paymentResult.getChrgBchno()).setPayTransText(paymentResult.getSetlId())
             .setResultEnum(PaymentResult.PAID.getValue());
         paymentRecDetails.add(paymentRecDetail16);
         BigDecimal preselfpayAmt = paymentResult.getPreselfpayAmt();
         PaymentRecDetail paymentRecDetail17 = new PaymentRecDetail();
         paymentRecDetail17.setReconciliationId(payment.getId()).setPayEnum(YbPayment.PRESELFPAY_AMT.getValue())
-            .setPayLevelEnum(YbPayment.PRESELFPAY_AMT.getLevel()).setAmount(preselfpayAmt).setAccountId(accountId).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue());
+            .setPayLevelEnum(YbPayment.PRESELFPAY_AMT.getLevel()).setAmount(preselfpayAmt).setAccountId(accountId)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail17);
         BigDecimal inscpScpAmt = paymentResult.getInscpScpAmt();
         PaymentRecDetail paymentRecDetail18 = new PaymentRecDetail();
         paymentRecDetail18.setReconciliationId(payment.getId()).setPayEnum(YbPayment.INSCP_SCP_AMT.getValue())
-            .setPayLevelEnum(YbPayment.INSCP_SCP_AMT.getLevel()).setAmount(inscpScpAmt).setAccountId(accountId).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue());
+            .setPayLevelEnum(YbPayment.INSCP_SCP_AMT.getLevel()).setAmount(inscpScpAmt).setAccountId(accountId)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail18);
         BigDecimal actPayDedc = paymentResult.getActPayDedc();
         PaymentRecDetail paymentRecDetail19 = new PaymentRecDetail();
         paymentRecDetail19.setReconciliationId(payment.getId()).setPayEnum(YbPayment.ACT_PAY_DEDC.getValue())
-            .setPayLevelEnum(YbPayment.ACT_PAY_DEDC.getLevel()).setAmount(actPayDedc).setAccountId(accountId).setPayTransText(paymentResult.getSetlId())
-            .setResultEnum(PaymentResult.PAID.getValue());
+            .setPayLevelEnum(YbPayment.ACT_PAY_DEDC.getLevel()).setAmount(actPayDedc).setAccountId(accountId)
+            .setPayTransText(paymentResult.getSetlId()).setResultEnum(PaymentResult.PAID.getValue())
+            .setPayTransNo(paymentResult.getChrgBchno());
         paymentRecDetails.add(paymentRecDetail19);
+        if (paymentResult.getSetldetail() != null && !paymentResult.getSetldetail().isEmpty()) {
+            PaymentRecDetail paymentRecDetail20;
+            for (Clinic2206FundPaymentResult clinic2206FundPaymentResult : paymentResult.getSetldetail()) {
+                YbPayment ybPayment =
+                    YbPayment.getByValue(Integer.parseInt(clinic2206FundPaymentResult.getFundPayType()));
+                if (ybPayment == null) {
+                    continue;
+                }
+                paymentRecDetail20 = new PaymentRecDetail();
+                paymentRecDetail20.setReconciliationId(payment.getId()).setPayEnum(ybPayment.getValue())
+                    .setPayLevelEnum(ybPayment.getLevel()).setAmount(clinic2206FundPaymentResult.getFundPayamt())
+                    .setPayTransNo(paymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
+                    .setAccountId(paymentResult.getAccountId()).setPayTransText(paymentResult.getSetlId());
+                paymentRecDetails.add(paymentRecDetail20);
+            }
+        }
 
         paymentRecDetailService.saveBatch(paymentRecDetails);
     }
@@ -1451,7 +1555,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
 
         if (doctor == null) {
-            throw new ServiceException("医保挂号未选择医生，并且没配置默认挂号医生");
+            throw new ServiceException("挂号时未选择医生，科室未配置默认挂号医生");
         }
 
         // 校验当天是否已经医保挂号，若有则冲销
@@ -1461,18 +1565,21 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         for (ClinicReg clinicReg : list) {
             if (organization.getYbNo().equals(clinicReg.getDeptCode())
                 && doctor.getYbNo().equals(clinicReg.getDeptCode())) {
-                ybManager.cancelRegById(clinicReg.getId());
+                //
+                ybManager.cancelRegById(clinicReg);
             }
         }
 
         Clinic2206OrderOutput clinic2206OrderResult;
         if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
-            && !"0000".equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
+            && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
+                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
             OutpatientRegistrationModel model = new OutpatientRegistrationModel();
             model.setMdtrtCertType(outpatientRegistrationAddParam.getYbMdtrtCertType());
             model.setBusiCardInfo(outpatientRegistrationAddParam.getBusiCardInfo());
             model.setPsnSetlWay(outpatientRegistrationAddParam.getYbPsnSetlWay());
             model.setTotalPrice(outpatientRegistrationAddParam.getChargeItemFormData().getTotalPrice());
+            model.setContractNo(outpatientRegistrationAddParam.getAccountFormData().getContractNo());
             // 进入医保挂号及预结算流程
             clinic2206OrderResult = ybManager.getPreSettleInfo(model, patient, organization, doctor);
         } else {
@@ -1488,12 +1595,12 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         BeanUtils.copyProperties(outpatientRegistrationAddParam.getChargeItemFormData(), chargeItem);
         chargeItem.setContextEnum(ChargeItemContext.REGISTER.getValue());// 挂号
 
-        Clinic2206OrderOutput clinic2206OrderResult = this.initClinic2206OrderOutput();
+        Clinic2206OrderOutput clinic2206OrderResult = new Clinic2206OrderOutput();
         return clinic2206OrderResult
             .setChrgBchno(assignSeqUtil.getSeqByDay(AssignSeqEnum.SF_CLINIC_ORDER.getPrefix(), 12))
             .setMedfeeSumamt(chargeItem.getTotalPrice()).setFulamtOwnpayAmt(chargeItem.getTotalPrice())
             .setPsnPartAmt(chargeItem.getTotalPrice()).setPsnCashPay(chargeItem.getTotalPrice())
-            .setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 8));
+            .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 4));
     }
 
     @Override
@@ -1537,15 +1644,18 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
         com.openhis.financial.model.PaymentResult paymentResult;
         if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
-            && !"0000".equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
+            && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
+                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
             // 医保结算
-            paymentResult = ybManager.settle(chrgBchno);
+            paymentResult = ybManager.settle(
+                contractService.getContract(outpatientRegistrationAddParam.getAccountFormData().getContractNo()),
+                chrgBchno);
         } else {
             // 自费结算
             paymentResult = new com.openhis.financial.model.PaymentResult();
             paymentResult.setChrgBchno(chrgBchno).setMedfeeSumamt(chargeItem.getTotalPrice())
                 .setFulamtOwnpayAmt(chargeItem.getTotalPrice()).setPsnPartAmt(chargeItem.getTotalPrice())
-                .setPsnCashPay(chargeItem.getTotalPrice()).setSetlId("0000");
+                .setPsnCashPay(chargeItem.getTotalPrice()).setSetlId(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
         }
 
         // 生成payment
@@ -1576,7 +1686,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             EncounterParticipant encounterParticipant = new EncounterParticipant();
             BeanUtils.copyProperties(encounterParticipantFormData, encounterParticipant);
             encounterParticipant.setTypeCode(ParticipantType.REGISTRATION_DOCTOR.getCode()); // 挂号医生
-            iEncounterParticipantService.saveEncounterParticipantByRegister(encounterParticipant);
+            iEncounterParticipantService.saveEncounterParticipant(encounterParticipant);
         }
         // 保存就诊账户信息
         accountFormData.setEncounterId(encounterId);
@@ -1587,10 +1697,11 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         // 账户ID
         Long accountId = iAccountService.saveAccountByRegister(account);
         // 2025/05/23 如果是医保挂号，创建两个ACCOUNT
-        if (!"0000".equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
+        if (!CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
+            .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
             Account accountZf = new Account();
             BeanUtils.copyProperties(accountFormData, accountZf);
-            accountZf.setContractNo("0000").setEncounterFlag(0)
+            accountZf.setContractNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO).setEncounterFlag(0)
                 .setTypeCode(outpatientRegistrationAddParam.getYbMdtrtCertType() == null
                     ? YbMdtrtCertType.MDTRT_CERT_TYPE02.getValue()
                     : outpatientRegistrationAddParam.getYbMdtrtCertType());
@@ -1607,9 +1718,9 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         chargeItemIdList.add(chargeItem.getId().toString());
 
         String paymentNo;
-        if(StringUtils.isEmpty(paymentResult.getPaymentNo())){
+        if (!StringUtils.isEmpty(paymentResult.getPaymentNo())) {
             paymentNo = paymentResult.getPaymentNo();
-        }else{
+        } else {
             // 统一生成业务流水
             paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20);
         }
@@ -1634,6 +1745,11 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         List<Long> chargeItemIds =
             Arrays.stream(payment.getChargeItemIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
         chargeItemService.updatePaymentStatus(chargeItemIds, ChargeItemStatus.BILLED.getValue());
+
+        // 保存付款快照信息 2025/08/08
+        // paymentRecStaticService.savePaymentRecStatics(payment.getId(), PaymentType.PAY, null,
+        // chargeItemService.getChargeItemDefInfoByIds(chargeItemIds));
+
         // 生成发票信息
         Invoice invoice = new Invoice();
         invoice.setPatientId(encounter.getPatientId()).setStatusEnum(InvoiceStatus.DRAFT)
@@ -1668,9 +1784,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             Integer quantity = activityDeviceDto.getQuantity(); // 请求数量
             adviceBaseDto.setAdviceDefinitionId(activityDeviceDto.getDevActId());
             // 对应的诊疗医嘱信息
-            AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService
-                .getAdviceBaseInfo(adviceBaseDto, null, null, null, organizationId, 1, 1, Whether.NO.getValue())
-                .getRecords().get(0);
+            AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null,
+                null, null, organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
             // 价格信息
             if (activityAdviceBaseDto != null) {
                 // 费用定价
@@ -1679,7 +1794,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     // 生成诊疗请求
                     serviceRequest = new ServiceRequest();
                     serviceRequest.setStatusEnum(RequestStatus.COMPLETED.getValue());// 请求状态,默认已完成
-                    serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
+                    serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
                     serviceRequest.setQuantity(quantity); // 请求数量
                     serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
                     serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
@@ -1724,10 +1839,23 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         return chargeItemIdList;
     }
 
+    /**
+     * 获取收费项集合
+     * 
+     * @param chargeItemIds 收费项id集合
+     * @return 收费项集合
+     */
     private List<ChargeItem> getChargeItems(List<Long> chargeItemIds) {
         return chargeItemService.list(new LambdaQueryWrapper<ChargeItem>().in(ChargeItem::getId, chargeItemIds));
     }
 
+    /**
+     * 类型转换：收费项chargeItem转成PaymentedItemModel
+     *
+     * @param diagList 诊断集合
+     * @param chargeItem 收费项
+     * @return 结果
+     */
     private PaymentedItemModel ConverterToPaymenItemModel(List<EncounterDiagnosis> diagList, ChargeItem chargeItem) {
         PaymentedItemModel piModel = new PaymentedItemModel();
         piModel.setBusNo(chargeItem.getBusNo());
@@ -1749,6 +1877,12 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         return piModel;
     }
 
+    /**
+     * 【取消预结算】
+     * 
+     * @param paymentId 结算id
+     * @return 结果
+     */
     @Override
     public R<?> unPrePayment(Long paymentId) {
 
@@ -1762,9 +1896,694 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         List<String> payTransNoList =
             paymentRecDetails.stream().map(PaymentRecDetail::getPayTransNo).distinct().collect(Collectors.toList());
 
+        List<Long> accountIdList =
+            paymentRecDetails.stream().map(PaymentRecDetail::getAccountId).distinct().collect(Collectors.toList());
+        if (accountIdList.isEmpty()) {
+            throw new ServiceException("未查到账户信息");
+        }
+
+        List<Account> accountList =
+            iAccountService.list(new LambdaQueryWrapper<Account>().in(Account::getId, accountIdList));
+        if (accountList.isEmpty()) {
+            throw new ServiceException("未查到账户信息");
+        }
+
         for (String s : payTransNoList) {
             ybManager.unPreSettle(byId.getEncounterId(), s);
         }
         return R.ok("取消预结算");
     }
+
+    /**
+     * 医保住院预结算
+     * 
+     * @param prePaymentDto 预结算参数
+     * @return 预结算集合
+     */
+    public InpatientPreSettleResultDto inpatientPreSettle(PrePaymentDto prePaymentDto) {
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoByIds =
+            iChargeItemService.getChargeItemBaseInfoByIds(prePaymentDto.getChargeItemIds());
+        Map<String, List<ChargeItemBaseInfoDto>> chargeItemKVByContractNo =
+            chargeItemBaseInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemBaseInfoDto::getContractNo));
+        List<InpatientPreSettleDto> yb2303OutputSetInfos = new ArrayList<>();
+        Yb2303OutputSetInfo yb2303OutputSetInfo;
+        InpatientPreSettleDto inpatientPreSettleDto;
+        for (Map.Entry<String, List<ChargeItemBaseInfoDto>> stringListEntry : chargeItemKVByContractNo.entrySet()) {
+            if (!CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(stringListEntry.getKey())) {
+                inpatientPreSettleDto = new InpatientPreSettleDto();
+                yb2303OutputSetInfo = ybManager.preSettleInpatient(prePaymentDto);
+                BeanUtils.copyProperties(yb2303OutputSetInfo, inpatientPreSettleDto);
+                inpatientPreSettleDto.setAccountId(stringListEntry.getValue().get(0).getAccountId());
+                yb2303OutputSetInfos.add(inpatientPreSettleDto);
+
+            } else {
+                inpatientPreSettleDto =
+                    preSettleInpatientBySelf(prePaymentDto.getEncounterId(), stringListEntry.getValue());
+                yb2303OutputSetInfos.add(inpatientPreSettleDto);
+            }
+        }
+
+        // 生成业务参数 paymentDetail
+        // PS:2025/08/12同李电话沟通确认，住院患者结算常规情况是会生成三个个payment，特殊情况两条payment，所以结算的时候的支付详情一定是和最初预交金的那条payment绑定，且若开始中途结算功能的话必须要按照payment成对出现的规则执行即正
+        // 生成业务参数payment
+        PaymentReconciliation paymentReconciliation = getPaymentReconciliation(chargeItemBaseInfoByIds);
+        iPaymentReconciliationService.save(paymentReconciliation);
+
+        List<PaymentRecDetail> paymentDetailList =
+            getPaymentRecDetailList(paymentReconciliation.getId(), yb2303OutputSetInfos);
+        iPaymentRecDetailService.saveBatch(paymentDetailList);
+
+        // 查询原预交金 payment
+        PaymentReconciliation oldPayment = iPaymentReconciliationService
+            .getByEncounterId(prePaymentDto.getEncounterId(), PaymentKind.HOSPITAL_DEPOSIT);
+        if (oldPayment == null) {
+            throw new ServiceException("未查询到原预交金记录");
+        }
+
+        // 校验是否生成多退少补 payment
+        PaymentReconciliation newPayment = getPaymentReconciliation(oldPayment, paymentDetailList);
+        if (newPayment != null) {
+            iPaymentReconciliationService.save(newPayment);
+        }
+
+        // 页面回显
+        List<PaymentRecDetailDto> paymentRecDetailDtoList = getPaymentRecDetailDtoList(paymentDetailList);
+
+        // 组装参数
+        InpatientPreSettleResultDto inpatientPreSettleResultDto = new InpatientPreSettleResultDto();
+        inpatientPreSettleResultDto.setPaymentRecDetailDtoList(paymentRecDetailDtoList);
+        inpatientPreSettleResultDto.setPaymentReconciliation(paymentReconciliation);
+        inpatientPreSettleResultDto.setOldPayment(oldPayment);
+        inpatientPreSettleResultDto.setNewPayment(newPayment);// 可能为null
+        // 2025/08/14 上述三个实体的id到前台会有精度丢失的问题
+        inpatientPreSettleResultDto.setOldId(oldPayment.getId().toString());
+        inpatientPreSettleResultDto.setId(paymentReconciliation.getId().toString());
+        if (newPayment != null) {
+            inpatientPreSettleResultDto.setNewId(newPayment.getId().toString());// 可能为null
+        }
+        return inpatientPreSettleResultDto;
+    }
+
+    /**
+     * 【住院结算】
+     * 
+     * @param paymentDto 住院结算参数
+     * @return 操作结果
+     */
+    public R<?> inpatientSettle(PaymentInpatientDto paymentDto) {
+
+        // <1> 校验及获取相关参数
+        if (paymentDto.getChargeItemIds().isEmpty()) {
+            return R.fail("未选择收费项");
+        }
+        // 查找付款实例(预交金原单)
+        PaymentReconciliation oldPayment = paymentReconciliationService.getById(paymentDto.getOldId());
+
+        // 业务付款单
+        PaymentReconciliation paymentReconciliation = paymentReconciliationService.getById(paymentDto.getId());
+
+        // 查找付款实例(多退少补单)
+        PaymentReconciliation newPayment = paymentReconciliationService.getById(paymentDto.getNewId());
+
+        if (paymentReconciliation == null) {
+            return R.fail("未查询到业务付款草稿");
+        }
+        if (oldPayment == null) {
+            return R.fail("未查询到预交金付款记录");
+        }
+        if (!PaymentStatus.DRAFT.getValue().equals(paymentReconciliation.getStatusEnum())) {
+            return R.fail("该账单不是待支付账单");
+        }
+        if (!paymentDto.getChargeItemIds().stream().map(String::valueOf).collect(Collectors.joining(","))
+            .equals(paymentReconciliation.getChargeItemIds())) {
+            return R.fail("收费项目变动，请重新预结算");
+        }
+
+        // 查找对应的收费详情,根据批次号查询
+        List<PaymentRecDetail> paymentRecDetails =
+            paymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
+                .eq(PaymentRecDetail::getReconciliationId, paymentReconciliation.getId()));
+
+        if (paymentRecDetails.isEmpty()) {
+            return R.fail("未查询到业务付款草稿的收费详情");
+        }
+
+        // 校验金额：前台输入金额与仍需支付的现金部分进行比较
+        if (newPayment != null) {
+            BigDecimal sum = newPayment.getTenderedAmount();
+            BigDecimal chargeAmount = BigDecimal.ZERO;
+            for (PaymentDetailDto paymentDetail : paymentDto.getPaymentDetails()) {
+                chargeAmount = chargeAmount.add(paymentDetail.getAmount());
+            }
+            // 前台传入数据可能会精度丢失，后台临时处理使用近似
+            if (sum.setScale(2, BigDecimal.ROUND_HALF_UP)
+                .compareTo(chargeAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) != 0) {
+                throw new ServiceException("交款金额与预结算金额不相等");
+            }
+        }
+
+        // <2> 查询基础数据
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoByIds =
+            iChargeItemService.getChargeItemBaseInfoByIds(paymentDto.getChargeItemIds());
+        Map<String, List<ChargeItemBaseInfoDto>> chargeItemKVByContractNo =
+            chargeItemBaseInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemBaseInfoDto::getContractNo));
+
+        List<Account> accountList = iAccountService.getAccountListByEncounter(paymentDto.getEncounterId());
+        if (accountList.isEmpty()) {
+            throw new ServiceException("未查询到账户信息");
+        }
+        Map<Long, List<Account>> accountKVById = accountList.stream().collect(Collectors.groupingBy(Account::getId));
+
+        com.openhis.financial.model.PaymentResult paymentResult;
+        List<com.openhis.financial.model.PaymentResult> paymentResultList = new ArrayList<>();
+
+        Integer minpacuntDrugTracCnt = 0;
+        Integer mcsTracCnt = 0;
+
+        // <3>收费详情按照收费批次进行分组后结算
+        Map<Long, List<PaymentRecDetail>> payTransNoMap =
+            paymentRecDetails.stream().collect(Collectors.groupingBy(PaymentRecDetail::getAccountId));
+
+        for (Map.Entry<Long, List<PaymentRecDetail>> stringListEntry : payTransNoMap.entrySet()) {
+            // paymentResult = new PaymentResult();
+            List<Account> accounts = accountKVById.get(stringListEntry.getKey());
+            if (accounts == null) {
+                throw new ServiceException("未查询到账户信息");
+            }
+            // 结算方法
+            paymentResult = iPaymentReconciliationService
+                .inpatientSettle(contractService.getContract(accounts.get(0).getContractNo()), paymentDto);
+            paymentResult.setAccountId(accounts.get(0).getId());// 记录账户余额的时候要使用这个AccountId
+            // 现有的paymentDetail处理，计划update
+            for (PaymentRecDetail paymentRecDetail : stringListEntry.getValue()) {
+                paymentRecDetail.setPayTransText(paymentResult.getSetlId())
+                    .setResultEnum(PaymentResult.PAID.getValue());// 医保结算赋值结算id；用于医保对账清算时使用
+            }
+            // 前台传入的微信支付等集合处理，计划insert
+            // for (PaymentRecDetail paymentRecDetail : list) {
+            // paymentRecDetail.setPayTransText(paymentResult.getSetlId()).setAccountId(paymentResult.getAccountId())
+            // .setResultEnum(PaymentResult.PAID.getValue());// 整合数据
+            // }
+            paymentResultList.add(paymentResult);
+        }
+
+        List<String> ybSettleIds = paymentResultList.stream().map(com.openhis.financial.model.PaymentResult::getSetlId)
+            .collect(Collectors.toList());
+
+        // <4>更改付款状态
+        logger.info("更新付款状态：payment：" + JSON.toJSONString(paymentReconciliation));
+        iPaymentReconciliationService.updatePaymentStatusAndSettleIdsById(paymentReconciliation.getId(),
+            PaymentStatus.SUCCESS, ybSettleIds);
+
+        // 更改付款详情的信息
+        iPaymentRecDetailService.updateBatchById(paymentRecDetails);
+
+        // 此部分是前台传入的微信支付阿里支付等信息，作为多退少补预交金的处理（暂定此部分集合不与业务payment关联）
+        if (!paymentDto.getPaymentDetails().isEmpty() && newPayment != null) {
+            // 更改新预交金payment状态
+            iPaymentReconciliationService.updatePaymentStatusAndSettleIdsById(newPayment.getId(), PaymentStatus.SUCCESS,
+                new ArrayList<>());
+            // 新增详情信息
+            Optional<Account> accountSelfOptional = accountList.stream()
+                .filter(e -> e.getTypeCode().equals(AccountType.PERSONAL_CASH_ACCOUNT.getCode())).findAny();
+            Account selfAccount;// 预交金账户
+            if (accountSelfOptional.isEmpty()) {
+                throw new ServiceException("未查询到预交金账户");
+            }
+            selfAccount = accountSelfOptional.get();
+            PaymentRecDetail paymentDetail;
+            List<PaymentRecDetail> list = new ArrayList<>();
+            for (PaymentDetailDto paymentRecDetail : paymentDto.getPaymentDetails()) {
+                // 支付管理子表
+                paymentDetail = new PaymentRecDetail();
+                paymentDetail.setAccountId(selfAccount.getId()); // 账户
+                paymentDetail.setPayEnum(paymentRecDetail.getPayEnum()); // 支付类型
+                paymentDetail.setPayLevelEnum(YbPayment.getByValue(paymentRecDetail.getPayEnum()).getLevel()); // 支付类型等级
+                paymentDetail.setAmount(paymentRecDetail.getAmount()); // 金额
+                paymentDetail.setPayTransNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+                paymentDetail.setPayTransText(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+                paymentDetail.setResultEnum(PaymentResult.PAID.getValue());
+                paymentDetail.setReconciliationId(newPayment.getId()); // 付款id
+                list.add(paymentDetail);
+            }
+            iPaymentRecDetailService.saveBatch(list);
+        }
+
+        // 记录卡余额等信息
+        com.openhis.financial.model.PaymentResult minAmountResult = null;
+        for (com.openhis.financial.model.PaymentResult result : paymentResultList) {
+            if (result.getBalc() == null) {
+                continue;
+            }
+            if (minAmountResult == null || result.getBalc().compareTo(minAmountResult.getBalc()) < 0) {
+                minAmountResult = result;
+            }
+        }
+        if (minAmountResult != null) {
+            // 账户余额
+            BigDecimal balc = minAmountResult.getBalc();
+            if (balc != null) {
+                PaymentRecDetail paymentRecDetail = new PaymentRecDetail();
+                paymentRecDetail.setReconciliationId(paymentReconciliation.getId())
+                    .setPayEnum(YbPayment.BALC.getValue()).setPayLevelEnum(YbPayment.BALC.getLevel()).setAmount(balc)
+                    .setPayTransNo(minAmountResult.getChrgBchno()).setResultEnum(PaymentResult.PAID.getValue())
+                    .setAccountId(minAmountResult.getAccountId()).setPayTransText(minAmountResult.getSetlId());
+                iPaymentRecDetailService.save(paymentRecDetail);
+            }
+        }
+
+        // 更改chargeItem的状态
+        chargeItemService.updatePaymentStatus(paymentDto.getChargeItemIds(), ChargeItemStatus.BILLED.getValue());
+
+        // 保存付款快照信息 2025/08/08
+        paymentRecStaticService.savePaymentRecStatics(paymentReconciliation.getId(), PaymentType.PAY, null,
+            chargeItemService.getChargeItemDefInfoByIds(paymentDto.getChargeItemIds()));
+
+        // 生成发票信息
+        Invoice invoice = new Invoice();
+        invoice.setPatientId(paymentReconciliation.getPatientId()).setStatusEnum(InvoiceStatus.DRAFT)
+            .setReconciliationId(paymentReconciliation.getId()).setTypeCode(InvoiceType.ISSUING_INVOICES.getValue())
+            .setChargeItemIds(paymentReconciliation.getChargeItemIds());
+        iInvoiceService.save(invoice);
+
+        // 获取收费项对应的项目请求id
+        List<Long> medicationRequestIdList = new ArrayList<>();
+        List<Long> deviceRequestIdList = new ArrayList<>();
+        List<Long> serviceRequestIdList = new ArrayList<>();
+
+        chargeItemBaseInfoByIds.forEach(item -> {
+            switch (item.getServiceTable()) {
+                case CommonConstants.TableName.MED_MEDICATION_REQUEST ->
+                    medicationRequestIdList.add(item.getServiceId());
+                case CommonConstants.TableName.WOR_DEVICE_REQUEST -> deviceRequestIdList.add(item.getServiceId());
+                case CommonConstants.TableName.WOR_SERVICE_REQUEST -> serviceRequestIdList.add(item.getServiceId());
+            }
+        });
+
+        if (!medicationRequestIdList.isEmpty()) {
+            // 更新药品发放状态为待配药
+            medicationDispenseService.updatePreparationDispenseStatus(medicationRequestIdList);
+        }
+        if (!deviceRequestIdList.isEmpty()) {
+            // 更新耗材发放状态为待配药
+            deviceDispenseService.updatePreparationDispenseStatus(deviceRequestIdList);
+        }
+        if (!serviceRequestIdList.isEmpty()) {
+            // 更新服务请求状态为待执行
+            serviceRequestService.updateCompleteRequestStatus(serviceRequestIdList, null, null);
+        }
+        logger.info("收费成功：payment：" + JSON.toJSONString(paymentReconciliation));
+        // throw new ServiceException("");
+        return R.ok(paymentReconciliation,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"收费"}));
+    }
+
+    /**
+     * 【取消住院结算】
+     * 
+     * @param paymentId 付款id
+     * @return 操作结果
+     */
+    public R<?> inpatientUnPay(Long paymentId) {
+
+        PaymentReconciliation paymentReconciliation = iPaymentReconciliationService.getById(paymentId);
+        if (paymentReconciliation == null) {
+            return R.fail("未查询到业务付款记录");
+        }
+        if (!Objects.equals(paymentReconciliation.getKindEnum(), PaymentKind.INPATIENT_CLINIC.getValue())) {
+            throw new ServiceException("请选择正确退费渠道，该付款不是住院收费");
+        }
+        // 查找对应的收费详情,根据批次号查询
+        List<PaymentRecDetail> paymentRecDetails =
+            paymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
+                .eq(PaymentRecDetail::getReconciliationId, paymentReconciliation.getId()));
+        if (paymentRecDetails.isEmpty()) {
+            return R.fail("未查询到业务付款记录收费详情");
+        }
+
+        // 全退
+        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, paymentRecDetails, null);
+
+        // 取医保结算数据
+        String ybSettleIds = paymentReconciliation.getYbSettleIds();
+        if (!StringUtils.isEmpty(ybSettleIds)) {
+            // 医保结算信息
+            List<String> ybSettleIdList = Arrays.asList(ybSettleIds.split(","));
+            if (!ybSettleIdList.isEmpty()) {
+                // 医保反结
+                List<InpatientSettle> InpatientSettleList = iInpatientSettleService
+                    .list(new LambdaQueryWrapper<InpatientSettle>().in(InpatientSettle::getSetlId, ybSettleIdList));
+                Account ybAccount = iAccountService.getYbAccount(paymentReconciliation.getEncounterId());
+                if (ybAccount == null) {
+                    throw new ServiceException("未查询到医保账户信息");
+                }
+                Contract contract = iContractService.getContract(ybAccount.getContractNo());
+                if (contract == null) {
+                    throw new ServiceException("未查询到合同信息");
+                }
+                StringBuilder stringBuilder = new StringBuilder();
+                for (InpatientSettle inpatientSettle : InpatientSettleList) {
+                    Yb2305OutputSetlInfo yb2305OutputSetlInfo = ybManager.inpatientUnSettle(contract, inpatientSettle);
+                    if (yb2305OutputSetlInfo != null) {
+                        // 获取医保反结算后的2305输出参数
+                        stringBuilder.append(yb2305OutputSetlInfo.getSetlId()).append(",");
+                        // 对payment详情的结算id进行处理
+                        List<PaymentRecDetail> paymentRecDetailList =
+                            iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
+                                .eq(PaymentRecDetail::getReconciliationId, unPaymentReconciliation.getId())
+                                .eq(PaymentRecDetail::getPayTransText, inpatientSettle.getSetlId()));
+                        if (!paymentRecDetailList.isEmpty()) {
+                            for (PaymentRecDetail paymentRecDetail : paymentRecDetailList) {
+                                paymentRecDetail.setPayTransText(yb2305OutputSetlInfo.getSetlId());
+                            }
+                            iPaymentRecDetailService.updateBatchById(paymentRecDetailList);
+                        }
+                    }
+                }
+                // 删除最后一个逗号
+                if (stringBuilder.length() > 0 && stringBuilder.charAt(stringBuilder.length() - 1) == ',') {
+                    stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+                }
+                // 回填payment的settleId字段
+                unPaymentReconciliation.setYbSettleIds(stringBuilder.toString());
+                iPaymentReconciliationService.updateById(unPaymentReconciliation);
+            }
+        }
+        return R.ok(unPaymentReconciliation, "退款成功");
+    }
+
+    /**
+     * 【住院预结算】-生成detail的方法
+     * 
+     * @param paymentId paymentId
+     * @param yb2303OutputSetInfos 住院预结算结果
+     * @return detail详情
+     */
+    private List<PaymentRecDetail> getPaymentRecDetailList(Long paymentId,
+        List<InpatientPreSettleDto> yb2303OutputSetInfos) {
+
+        List<PaymentRecDetail> paymentRecDetails = new ArrayList<>();
+
+        for (InpatientPreSettleDto inpatientPreSettleDto : yb2303OutputSetInfos) {
+            // 个人现金支出
+            BigDecimal psnCashPay = inpatientPreSettleDto.getPsnCashPay();
+            // 现金支付
+            if (psnCashPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail10 = new PaymentRecDetail();
+                paymentRecDetail10.setReconciliationId(paymentId).setPayEnum(YbPayment.SELF_CASH_PAY.getValue())
+                    .setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()).setAmount(psnCashPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail10);
+            }
+            // 个人负担总金额
+            BigDecimal psnPartAmt = inpatientPreSettleDto.getPsnPartAmt();
+            if (psnPartAmt.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail1 = new PaymentRecDetail();
+                paymentRecDetail1.setReconciliationId(paymentId).setPayEnum(YbPayment.SELF_PAY.getValue())
+                    .setPayLevelEnum(YbPayment.SELF_PAY.getLevel()).setAmount(psnPartAmt)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail1);
+            }
+            // 基本医疗保险统筹基金支出
+            BigDecimal hifpPay = inpatientPreSettleDto.getHifpPay();
+            if (hifpPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail2 = new PaymentRecDetail();
+                paymentRecDetail2.setReconciliationId(paymentId).setPayEnum(YbPayment.YB_TC_FUND_AMOUNT.getValue())
+                    .setPayLevelEnum(YbPayment.YB_TC_FUND_AMOUNT.getLevel()).setAmount(hifpPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail2);
+            }
+            // 公务员医疗补助资金支出
+            BigDecimal cvlservPay = inpatientPreSettleDto.getCvlservPay();
+            if (cvlservPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail3 = new PaymentRecDetail();
+                paymentRecDetail3.setReconciliationId(paymentId).setPayEnum(YbPayment.YB_BC_GWY_BZ_VALUE.getValue())
+                    .setPayLevelEnum(YbPayment.YB_BC_GWY_BZ_VALUE.getLevel()).setAmount(cvlservPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail3);
+            }
+            // 企业补充医疗保险基金支出
+            BigDecimal hifesPay = inpatientPreSettleDto.getHifesPay();
+            if (hifesPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail4 = new PaymentRecDetail();
+                paymentRecDetail4.setReconciliationId(paymentId).setPayEnum(YbPayment.YB_BC_FUND_AMOUNT.getValue())
+                    .setPayLevelEnum(YbPayment.YB_BC_FUND_AMOUNT.getLevel()).setAmount(hifesPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail4);
+            }
+            // 居民大病保险资金支出
+            BigDecimal hifmiPay = inpatientPreSettleDto.getHifmiPay();
+            if (hifmiPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail5 = new PaymentRecDetail();
+                paymentRecDetail5.setReconciliationId(paymentId).setPayEnum(YbPayment.YB_BC_JM_DB_VALUE.getValue())
+                    .setPayLevelEnum(YbPayment.YB_BC_JM_DB_VALUE.getLevel()).setAmount(hifmiPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail5);
+            }
+            // 职工大额医疗费用补助基金支出
+            BigDecimal hifobPay = inpatientPreSettleDto.getHifobPay();
+            if (hifobPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail6 = new PaymentRecDetail();
+                paymentRecDetail6.setReconciliationId(paymentId)
+                    .setPayLevelEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getLevel()).setAmount(hifobPay)
+                    .setPayEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getValue())
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail6);
+            }
+            // 医疗救助基金支出
+            BigDecimal mafPay = inpatientPreSettleDto.getMafPay();
+            if (mafPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail7 = new PaymentRecDetail();
+                paymentRecDetail7.setReconciliationId(paymentId).setPayEnum(YbPayment.YB_JZ_FUND_AMOUNT.getValue())
+                    .setPayLevelEnum(YbPayment.YB_JZ_FUND_AMOUNT.getLevel()).setAmount(mafPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail7);
+            }
+            // 其他支出
+            BigDecimal othPay = inpatientPreSettleDto.getOthPay();
+            if (othPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail8 = new PaymentRecDetail();
+                paymentRecDetail8.setReconciliationId(paymentId).setPayEnum(YbPayment.OTHER_PAY.getValue())
+                    .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(othPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail8);
+            }
+            // 基金支付总额
+            BigDecimal fundPaySumamt = inpatientPreSettleDto.getFundPaySumamt();
+            if (fundPaySumamt.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail9 = new PaymentRecDetail();
+                paymentRecDetail9.setReconciliationId(paymentId).setPayEnum(YbPayment.YB_FUND_PAY.getValue())
+                    .setPayLevelEnum(YbPayment.YB_FUND_PAY.getLevel()).setAmount(fundPaySumamt)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail9);
+            }
+            // 个人账户支出
+            BigDecimal acctPay = inpatientPreSettleDto.getAcctPay();
+            if (acctPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail11 = new PaymentRecDetail();
+                paymentRecDetail11.setReconciliationId(paymentId).setPayEnum(YbPayment.SELF_YB_ZH_PAY.getValue())
+                    .setPayLevelEnum(YbPayment.SELF_YB_ZH_PAY.getLevel()).setAmount(acctPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail11);
+            }
+            // 医院负担金额
+            BigDecimal hospPartAmt = inpatientPreSettleDto.getHospPartAmt();
+            if (hospPartAmt.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail12 = new PaymentRecDetail();
+                paymentRecDetail12.setReconciliationId(paymentId).setPayEnum(YbPayment.HOSP_PART_AMT.getValue())
+                    .setPayLevelEnum(YbPayment.HOSP_PART_AMT.getLevel()).setAmount(hospPartAmt)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail12);
+            }
+            // 个人账户共济支付金额
+            BigDecimal acctMulaidPay = inpatientPreSettleDto.getAcctMulaidPay();
+            if (acctMulaidPay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail13 = new PaymentRecDetail();
+                paymentRecDetail13.setReconciliationId(paymentId).setPayEnum(YbPayment.SELF_YB_ZH_GJ_VALUE.getValue())
+                    .setPayLevelEnum(YbPayment.SELF_YB_ZH_GJ_VALUE.getLevel()).setAmount(acctMulaidPay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail13);
+            }
+            // 全自费金额
+            BigDecimal fulamtOwnpayAmt = inpatientPreSettleDto.getFulamtOwnpayAmt();
+            if (fulamtOwnpayAmt.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail14 = new PaymentRecDetail();
+                paymentRecDetail14.setReconciliationId(paymentId).setPayEnum(YbPayment.FULAMT_OWNPAY_AMT.getValue())
+                    .setPayLevelEnum(YbPayment.FULAMT_OWNPAY_AMT.getLevel()).setAmount(fulamtOwnpayAmt)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail14);
+            }
+            // 超限价自费费用
+            BigDecimal overlmtSelfpay = inpatientPreSettleDto.getOverlmtSelfpay();
+            if (overlmtSelfpay.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail15 = new PaymentRecDetail();
+                paymentRecDetail15.setReconciliationId(paymentId).setPayEnum(YbPayment.OVERLMT_SELFPAY.getValue())
+                    .setPayLevelEnum(YbPayment.OVERLMT_SELFPAY.getLevel()).setAmount(overlmtSelfpay)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail15);
+            }
+            BigDecimal balc = inpatientPreSettleDto.getBalc();
+            if (balc.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail16 = new PaymentRecDetail();
+                paymentRecDetail16.setReconciliationId(paymentId).setPayEnum(YbPayment.BALC.getValue())
+                    .setPayLevelEnum(YbPayment.BALC.getLevel()).setAmount(balc)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail16);
+            }
+            BigDecimal preselfpayAmt = inpatientPreSettleDto.getPreselfpayAmt();
+            if (preselfpayAmt.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail17 = new PaymentRecDetail();
+                paymentRecDetail17.setReconciliationId(paymentId).setPayEnum(YbPayment.PRESELFPAY_AMT.getValue())
+                    .setPayLevelEnum(YbPayment.PRESELFPAY_AMT.getLevel()).setAmount(preselfpayAmt)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail17);
+            }
+            BigDecimal inscpScpAmt = inpatientPreSettleDto.getInscpScpAmt();
+            if (inscpScpAmt.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail18 = new PaymentRecDetail();
+                paymentRecDetail18.setReconciliationId(paymentId).setPayEnum(YbPayment.INSCP_SCP_AMT.getValue())
+                    .setPayLevelEnum(YbPayment.INSCP_SCP_AMT.getLevel()).setAmount(inscpScpAmt)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail18);
+            }
+            BigDecimal actPayDedc = inpatientPreSettleDto.getActPayDedc();
+            if (actPayDedc.compareTo(BigDecimal.ZERO) != 0) {
+                PaymentRecDetail paymentRecDetail19 = new PaymentRecDetail();
+                paymentRecDetail19.setReconciliationId(paymentId).setPayEnum(YbPayment.ACT_PAY_DEDC.getValue())
+                    .setPayLevelEnum(YbPayment.ACT_PAY_DEDC.getLevel()).setAmount(actPayDedc)
+                    .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(inpatientPreSettleDto.getAccountId());
+                paymentRecDetails.add(paymentRecDetail19);
+            }
+            if (inpatientPreSettleDto.getSetldetail() != null && !inpatientPreSettleDto.getSetldetail().isEmpty()) {
+                PaymentRecDetail paymentRecDetail20;
+                for (Clinic2206FundPaymentResult clinic2206FundPaymentResult : inpatientPreSettleDto.getSetldetail()) {
+                    YbPayment ybPayment =
+                        YbPayment.getByValue(Integer.parseInt(clinic2206FundPaymentResult.getFundPayType()));
+                    if (ybPayment == null) {
+                        continue;
+                    }
+                    paymentRecDetail20 = new PaymentRecDetail();
+                    paymentRecDetail20.setReconciliationId(paymentId).setPayEnum(ybPayment.getValue())
+                        .setPayLevelEnum(ybPayment.getLevel()).setAmount(clinic2206FundPaymentResult.getFundPayamt())
+                        // .setPayTransNo(inpatientPreSettleDto.getChrgBchno())住院结算没有这个批次的字段就不用了
+                        .setResultEnum(PaymentResult.UNPAID.getValue())
+                        .setAccountId(inpatientPreSettleDto.getAccountId());
+                    paymentRecDetails.add(paymentRecDetail20);
+                }
+            }
+        }
+        return paymentRecDetails;
+    }
+
+    /**
+     * 【住院预结算】-生成payment的方法
+     *
+     * @param chargeItemList 收费项基础信息集合
+     * @return payment实体
+     */
+    private PaymentReconciliation getPaymentReconciliation(List<ChargeItemBaseInfoDto> chargeItemList) {
+
+        PaymentReconciliation payment = new PaymentReconciliation();
+        BigDecimal bigDecimal = BigDecimal.ZERO;
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemList) {
+            bigDecimal = bigDecimal.add(chargeItemBaseInfoDto.getTotalPrice());
+        }
+
+        Date setlTime = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(setlTime);
+        calendar.add(Calendar.HOUR_OF_DAY, 24);
+        Date futureTime = calendar.getTime();
+
+        // 生成流水号
+        String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20);
+
+        payment.setStatusEnum(PaymentStatus.DRAFT.getValue()).setPaymentNo(paymentNo).setYbSettleIds("")
+            .setPaymentEnum(PaymentType.PAY.getValue()).setEntererId(SecurityUtils.getLoginUser().getPractitionerId())
+            .setPaymentReconciliationId(chargeItemList.get(0).getPatientId())
+            .setPatientId(chargeItemList.get(0).getPatientId()).setKindEnum(PaymentKind.INPATIENT_CLINIC.getValue())
+            .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId())
+            .setOutcomeEnum(PaymentOutcome.COMPLETED.getCode()).setLocationId(-99l).setExpirationDate(futureTime)
+            .setBillDate(setlTime).setPrintCount(0)
+            .setChargeItemIds(chargeItemList.stream().map(ChargeItemBaseInfoDto::getId).map(String::valueOf)
+                .collect(Collectors.joining(",")))
+            .setTenderedAmount(bigDecimal).setDisplayAmount(bigDecimal).setReturnedAmount(new BigDecimal("0.0"))
+            .setEncounterId(chargeItemList.get(0).getEncounterId());
+        return payment;
+    }
+
+    /**
+     * 【住院预结算】-生成payment的方法
+     * 
+     * @param paymentDetailList 收费项基础信息集合
+     * @return payment实体
+     */
+    private PaymentReconciliation getPaymentReconciliation(PaymentReconciliation oldPayment,
+        List<PaymentRecDetail> paymentDetailList) {
+
+        PaymentReconciliation payment = new PaymentReconciliation();
+
+        BigDecimal bigDecimal = BigDecimal.ZERO;
+        for (PaymentRecDetail paymentRecDetail : paymentDetailList) {
+            if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
+                bigDecimal = bigDecimal.add(paymentRecDetail.getAmount());
+            }
+        }
+        // 校验
+        BigDecimal tenderedAmount = oldPayment.getTenderedAmount();
+        BigDecimal mul = BigDecimal.ONE;
+        PaymentType paymentType = PaymentType.PAY;
+        // 正补负退，默认患者补钱
+        BigDecimal subtract = bigDecimal.subtract(oldPayment.getTenderedAmount());
+        if (tenderedAmount.compareTo(bigDecimal) == 0) {
+            return null;
+        } else if (tenderedAmount.compareTo(bigDecimal) > 0) {
+            // 退钱
+            mul = mul.multiply(new BigDecimal("-1"));
+            paymentType = PaymentType.UN_PAY;
+        }
+
+        Date setlTime = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(setlTime);
+        calendar.add(Calendar.HOUR_OF_DAY, 24);
+        Date futureTime = calendar.getTime();
+
+        // 生成流水号
+        String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20);
+
+        payment.setStatusEnum(PaymentStatus.DRAFT.getValue()).setPaymentNo(paymentNo).setYbSettleIds("")
+            .setPaymentEnum(paymentType.getValue()).setEntererId(SecurityUtils.getLoginUser().getPractitionerId())
+            .setPaymentReconciliationId(oldPayment.getPatientId()).setPatientId(oldPayment.getPatientId())
+            .setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()).setRelationId(oldPayment.getId())
+            .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId())
+            .setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()).setLocationId(-99l).setExpirationDate(futureTime)
+            .setBillDate(setlTime).setPrintCount(0).setChargeItemIds(oldPayment.getChargeItemIds())
+            .setTenderedAmount(subtract.multiply(mul)).setDisplayAmount(subtract.multiply(mul))
+            .setReturnedAmount(new BigDecimal("0.0")).setEncounterId(oldPayment.getEncounterId());
+        return payment;
+    }
+
+    /**
+     * 【住院预结算】-生成自费参数的方法
+     *
+     * @param encounterId 结算id
+     * @param chargeItems 收费项
+     * @return 预结算参数
+     */
+    private InpatientPreSettleDto preSettleInpatientBySelf(Long encounterId, List<ChargeItemBaseInfoDto> chargeItems) {
+
+        BigDecimal bigDecimal = BigDecimal.ZERO;
+
+        for (ChargeItemBaseInfoDto chargeItem : chargeItems) {
+            bigDecimal = bigDecimal.add(chargeItem.getTotalPrice());
+        }
+        InpatientPreSettleDto inpatientPreSettleDto = new InpatientPreSettleDto();
+        inpatientPreSettleDto.setMedinsSetlId(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+        inpatientPreSettleDto.setMedfeeSumamt(bigDecimal).setFulamtOwnpayAmt(bigDecimal).setPsnPartAmt(bigDecimal)
+            .setPsnCashPay(bigDecimal).setAccountId(chargeItems.get(0).getAccountId());
+
+        return inpatientPreSettleDto;
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
similarity index 41%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
index 7b643322..73c15fc5 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
@@ -1,15 +1,14 @@
 package com.openhis.web.paymentmanage.controller;
 
-import com.core.common.core.domain.R;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.dto.PaymentSettleDto;
-import com.openhis.web.paymentmanage.dto.ReportVo;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
+import com.core.common.annotation.Anonymous;
+import com.core.common.core.domain.R;
+import com.openhis.web.paymentmanage.appservice.IChargeBillService;
+import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 报表
@@ -35,7 +34,6 @@ public class ChargeBillController {
         return R.ok(iChargeBillService.getDetail(paymentId));
     }
 
-
     /**
      * 日结算账单
      *
@@ -44,7 +42,41 @@ public class ChargeBillController {
      * @param entererId 结算参数
      */
     @GetMapping("/getTotal")
-    public R<?> getTotal(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestParam("entererId")Long entererId) {
-        return R.ok(iChargeBillService.getTotal(startTime,endTime,entererId));
+    public R<?> getTotal(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime,
+        @RequestParam("entererId") Long entererId,
+        @RequestParam(value = "contractNo", required = false) String contractNo) {
+        return R.ok(iChargeBillService.getTotal(startTime, endTime, entererId, contractNo));
     }
+
+    /**
+     * 日结算账单(长大版本)
+     *
+     * @param startTime 结算参数
+     * @param endTime 结算参数
+     * @param entererId 结算参数
+     */
+    @GetMapping("/getTotalCcu")
+    @Anonymous
+    public R<?> getTotalCcu(@RequestParam(value = "startTime") String startTime,
+        @RequestParam("endTime") String endTime, @RequestParam(value = "entererId", required = false) Long entererId) {
+        return R.ok(iChargeBillService.getTotalCommen(startTime, endTime, entererId));
+    }
+
+    /**
+     * 获取医疗保障金清单（门诊慢病用）
+     */
+    @PostMapping("/get-med-exp-cov-sum")
+    public R<?> getMedicalExpenseCoverageSummary(Long paymentId) {
+        return R.ok(iChargeBillService.getMedicalExpenseCoverageSummary(paymentId));
+    }
+
+    /**
+     * 获取各科室营收信息
+     */
+    @PostMapping("/charge-summary")
+    public R<?> getChargeSummary(@RequestBody ChargeSummaryDto chargeSummaryDto) {
+        return R.ok(iChargeBillService.getChargeItemByOrg(chargeSummaryDto));
+        // return null;
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
similarity index 89%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
index 8d9b67fb..30c98547 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
@@ -7,6 +7,7 @@ import com.openhis.common.enums.ybenums.YbEncounterClass;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.paymentmanage.appservice.IChargeBillService;
 import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
+import com.openhis.web.paymentmanage.dto.InvoiceWriteOffDto;
 import com.openhis.web.paymentmanage.dto.MakeInvoiceDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,18 +72,17 @@ public class EleInvoiceController {
     /**
      * 医疗电子票据红冲接口
      *
-     * @param paymentId 原付款id
-     * @param reason 取消理由
+     * @param invoiceWriteOffDto 原付款id
      * @return
      */
     @PostMapping("/invoiceWriteoff")
-    public R<?> invoiceWriteoff(Long paymentId, String reason) {
+    public R<?> invoiceWriteoff(@RequestBody InvoiceWriteOffDto invoiceWriteOffDto) {
         // 退款成功后，开具发票
-        R<?> eleResult = eleInvoiceService.invoiceWriteoff(paymentId, reason);
+        R<?> eleResult = eleInvoiceService.invoiceWriteoff(Long.parseLong(invoiceWriteOffDto.getPaymentId()), invoiceWriteOffDto.getReason());
         if (eleResult.getCode() != 200) {
             return R.ok(" 电子票据红冲失败 :" + eleResult.getMsg());
         }
-        Map detail = iChargeBillService.getDetail(paymentId);
+        Map detail = iChargeBillService.getDetail(Long.parseLong(invoiceWriteOffDto.getPaymentId()));
         return R.ok(detail);
     }
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
new file mode 100644
index 00000000..fbac2303
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.paymentmanage.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.service.IContractService;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 付款合同管理
+ *
+ * @author SunJQ
+ * @date 2025-06-23
+ */
+@RestController
+@RequestMapping("/payment/contract")
+@Slf4j
+@AllArgsConstructor
+public class PaymentContractController {
+
+    @Autowired
+    private IContractService contractService;
+
+    /**
+     * 查询租户合同信息分页
+     *
+     * @param tenantId 租户ID
+     * @param pageNum 当前页
+     * @param pageSize 每页条数
+     * @return 租户合同信息分页
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @GetMapping("/page")
+    public R<IPage<Contract>> getTenantContractPage(@RequestParam Integer tenantId,
+        @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
+        return R.ok(contractService.getTenantContractPage(tenantId, pageNum, pageSize));
+    }
+
+    /**
+     * 查询租户合同信息详情
+     *
+     * @param id 合同ID
+     * @return 租户合同信息详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @GetMapping("/{id}")
+    public R<Contract> getTenantContractDetail(@PathVariable Long id) {
+        return R.ok(contractService.getTenantContractDetail(id));
+    }
+
+    /**
+     * 新增租户合同信息
+     *
+     * @param contract 合同管理实体
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PostMapping
+    public R<?> addTenantContract(@RequestBody Contract contract) {
+        contractService.addTenantContract(contract);
+        return R.ok();
+    }
+
+    /**
+     * 编辑租户合同信息
+     *
+     * @param contract 合同管理实体
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PutMapping
+    public R<?> editTenantContract(@RequestBody Contract contract) {
+        contractService.editTenantContract(contract);
+        return R.ok();
+    }
+
+    /**
+     * 删除租户合同信息
+     *
+     * @param id ID
+     * @return 结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @DeleteMapping("/{id}")
+    public R<?> delTenantContract(@PathVariable Long id) {
+        contractService.delTenantContract(id);
+        return R.ok();
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
similarity index 61%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
index f2da5c65..856bf949 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
@@ -3,15 +3,13 @@
  */
 package com.openhis.web.paymentmanage.controller;
 
-import java.util.Date;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import com.openhis.web.paymentmanage.dto.PaymentVO;
+import com.openhis.web.paymentmanage.dto.CancelPaymentInpatientDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,8 +21,9 @@ import com.openhis.web.paymentmanage.appservice.IChargeBillService;
 import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
-import com.openhis.web.paymentmanage.dto.PaymentDto;
-import com.openhis.web.paymentmanage.dto.PrePaymentDto;
+import com.openhis.yb.dto.PaymentDto;
+import com.openhis.yb.dto.PaymentInpatientDto;
+import com.openhis.yb.dto.PrePaymentDto;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -60,6 +59,12 @@ public class PaymentReconciliationController {
         return paymentReconciliationService.prePayment(prePaymentDto);
     }
 
+    /**
+     * 取消预付款（该接口未被调用）
+     * 
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
     @PostMapping("/unprecharge")
     public R<?> unPrePayment(Long encounterId) {
         return paymentReconciliationService.unPrePayment(encounterId);
@@ -80,11 +85,12 @@ public class PaymentReconciliationController {
                 paymentRecon = (PaymentReconciliation)result.getData();
             }
             R<?> eleResult = eleInvoiceService.invoiceMZMake(paymentRecon.getId(), paymentDto.getEncounterId());
+            Map detail = iChargeBillService.getDetail(paymentRecon.getId());
             if (eleResult.getCode() != 200) {
                 // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
-                return R.ok(null, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
+                return R.ok(detail, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
             }
-            Map detail = iChargeBillService.getDetail(paymentRecon.getId());
+            // Map detail = iChargeBillService.getDetail(paymentRecon.getId());
             return R.ok(detail);
         }
         return result;
@@ -104,7 +110,8 @@ public class PaymentReconciliationController {
             if (PaymentReconciliation.class.isAssignableFrom(result.getData().getClass())) {
                 paymentRecon = (PaymentReconciliation)result.getData();
             }
-            R<?> eleResult = eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentDto.getReason());
+            R<?> eleResult =
+                eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentDto.getReason());
             if (eleResult.getCode() != 200) {
                 // 因取消付款成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                 return R.ok(null, " 取消付款成功，电子发票开具失败 :" + eleResult.getMsg());
@@ -116,24 +123,25 @@ public class PaymentReconciliationController {
     /**
      * 支付列表
      *
-     * @param searchKey
-     * @param pageNo
-     * @param pageSize
-     * @param request
-     * @return
+     * @param searchKey 模糊查寻
+     * @param pageNo 页号
+     * @param pageSize 页容量
+     * @param request 请求体
+     * @return 查询结果
      */
     @GetMapping("/page")
     public R<?> paymentPage(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "kinsEnum", defaultValue = "") Integer kinsEnum,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return R.ok(paymentReconciliationService.getPage(searchKey, pageNo, pageSize, request));
+        return R.ok(paymentReconciliationService.getPage(searchKey, kinsEnum, pageNo, pageSize, request));
     }
 
     /**
      * 支付详情
      *
-     * @param paymentDto
-     * @return
+     * @param paymentDto 付款信息
+     * @return 查询结果
      */
     @PostMapping("/detail")
     public R<?> paymentDetail(@RequestBody PaymentDto paymentDto) {
@@ -143,8 +151,8 @@ public class PaymentReconciliationController {
     /**
      * 挂号收费（挂号收费先医保挂号，收费成功后再本系统挂号）
      *
-     * @param outpatientRegistrationAddParam
-     * @return
+     * @param outpatientRegistrationAddParam 挂号信息
+     * @return 操做结果
      */
     @PostMapping("/reg-pre-pay")
     public R<?> regPrePay(@Valid @RequestBody OutpatientRegistrationAddParam outpatientRegistrationAddParam) {
@@ -154,8 +162,8 @@ public class PaymentReconciliationController {
     /**
      * 挂号收费（挂号收费先医保挂号，收费成功后再本系统挂号）
      *
-     * @param outpatientRegistrationAddParam
-     * @return
+     * @param outpatientRegistrationAddParam 挂号信息
+     * @return 操做结果
      */
     @PostMapping("/reg-pay")
     public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationAddParam) {
@@ -169,13 +177,77 @@ public class PaymentReconciliationController {
             }
             Long encounterId = paymentRecon.getEncounterId();
             R<?> eleResult = eleInvoiceService.invoiceRegMake(paymentRecon.getId(), encounterId);
+            Map detail = iChargeBillService.getDetail(paymentRecon.getId());
             if (eleResult.getCode() != 200) {
                 // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
-                return R.ok(null, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
+                return R.ok(detail, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
             }
-            Map detail = iChargeBillService.getDetail(paymentRecon.getId());
             return R.ok(detail);
         }
         return result;
     }
+
+    /**
+     * 【住院预结算】
+     *
+     * @param prePaymentDto 预结算参数
+     * @return 操作结果
+     */
+    @PostMapping("/inpa-pre-pay")
+
+    public R<?> inpatientPrePay(@RequestBody PrePaymentDto prePaymentDto) {
+        return R.ok(paymentReconciliationService.inpatientPreSettle(prePaymentDto));
+    }
+
+    /**
+     * 【住院结算】
+     *
+     * @param paymentDto 预结算参数
+     * @return 操作结果
+     */
+    @PostMapping("/inpa-pay")
+    public R<?> inpatientPay(@RequestBody PaymentInpatientDto paymentDto) {
+        R<?> r = paymentReconciliationService.inpatientSettle(paymentDto);
+        // 付款成功后，开具发票
+        if (r.getCode() == 200) {
+            PaymentReconciliation paymentRecon = null;
+            if (PaymentReconciliation.class.isAssignableFrom(r.getData().getClass())) {
+                paymentRecon = (PaymentReconciliation)r.getData();
+            }
+            Long encounterId = paymentRecon.getEncounterId();
+            R<?> eleResult = eleInvoiceService.invoiceZYMake(paymentRecon.getId(), encounterId);
+            Map detail = iChargeBillService.getDetail(paymentRecon.getId());
+            if (eleResult.getCode() != 200) {
+                // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
+                return R.ok(detail, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
+            }
+            return R.ok(detail);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 【取消住院结算】
+     *
+     * @param cancelPaymentInpatientDto 退款参数
+     * @return 操作结果
+     */
+    @PostMapping("/inpa-un-pay")
+    public R<?> inpatientUnPay(@RequestBody CancelPaymentInpatientDto cancelPaymentInpatientDto) {
+        R<?> r = paymentReconciliationService.inpatientUnPay(cancelPaymentInpatientDto.getId());
+        // 付款成功后，开具发票
+        if (r.getCode() == 200) {
+            PaymentReconciliation paymentRecon = null;
+            if (PaymentReconciliation.class.isAssignableFrom(r.getData().getClass())) {
+                paymentRecon = (PaymentReconciliation)r.getData();
+            }
+            R<?> eleResult = eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentInpatientDto.getReason());
+            if (eleResult.getCode() != 200) {
+                // 因取消付款成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
+                return R.ok(null, " 取消付款成功，电子发票开具失败 :" + eleResult.getMsg());
+            }
+        }
+        return R.ok();
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
similarity index 41%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
index 0e34849f..e96463a3 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
@@ -3,16 +3,14 @@
  */
 package com.openhis.web.paymentmanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.List;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
+
+import com.openhis.yb.dto.PaymentDetailDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
  * 退费入参
@@ -29,20 +27,20 @@ public class CancelPaymentDto {
     private Long id;
 
     /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
+    private List<Long> chargeItemIds;// 收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
 
     /** 支付详细 */
     @NotEmpty
     private List<PaymentDetailDto> paymentDetails;
 
     /** 支付批次号 */
-    private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算（弃用）
+    private String chrgBchno;// 医保预结算时返回，医保结算时必传，否则结算时一直预结算（弃用）
 
-    private String ybMdtrtCertType;//社保卡/身份证/电子医保码
+    private String ybMdtrtCertType;// 社保卡/身份证/电子医保码
 
-    private String busiCardInfo;//社保卡号/身份证号/ecToken
+    private String busiCardInfo;// 社保卡号/身份证号/ecToken
 
-    private String reason;//退款理由
+    private String reason;// 退款理由
 
-    private String setlId;//结算id
+    private String setlId;// 结算id
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
new file mode 100644
index 00000000..8494b05f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+
+/**
+ * 住院取消结算
+ *
+ * @author SunJQ
+ * @date 2025-08-15
+ */
+@Data
+public class CancelPaymentInpatientDto {
+    /**
+     * paymentId
+     */
+    private Long id;
+    /**
+     * 退费原因
+     */
+    private String reason;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
similarity index 67%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
index e949b735..fdc5060c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
@@ -1,16 +1,18 @@
 package com.openhis.web.paymentmanage.dto;
 
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.yb.dto.PaymentDetailDto;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
 @Data
 @Accessors(chain = true)
 public class CancelRegPaymentDto {
@@ -40,14 +42,14 @@ public class CancelRegPaymentDto {
     private Long encounterId;
 
     /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
+    private List<Long> chargeItemIds;// 收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
 
     /** 支付详细 */
     @NotEmpty
-    private List<com.openhis.web.paymentmanage.dto.PaymentDetailDto> paymentDetails;
+    private List<PaymentDetailDto> paymentDetails;
 
     /** 支付批次号 */
-    private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算
+    private String chrgBchno;// 医保预结算时返回，医保结算时必传，否则结算时一直预结算
 
-    private String reason;//退号理由
+    private String reason;// 退号理由
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
new file mode 100644
index 00000000..74a6b4d3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
@@ -0,0 +1,13 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ChargeItemExtendInfoDto {
+    private Long orgId;
+    private String orgName;
+    private BigDecimal totalPrice;
+    private String ybType;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
new file mode 100644
index 00000000..cec1231c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
@@ -0,0 +1,14 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Data
+public class ChargeSummaryDto {
+
+    private String startTime;
+    private String endTime;
+    private List<Long> orgIdList;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
new file mode 100644
index 00000000..3eefdb52
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
@@ -0,0 +1,18 @@
+package com.openhis.web.paymentmanage.dto;
+
+import com.alibaba.fastjson2.JSONObject;
+import lombok.Data;
+
+@Data
+public class EleInvioceBillDto {
+
+    JSONObject jsonObject;
+
+    String endpoint;
+
+    String baseUrl;
+
+    String appID;
+
+    String appKey;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
new file mode 100644
index 00000000..ec6c7130
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.paymentmanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-08-11
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientPreSettleDto {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 伤残人员医疗保障基金支出 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    @JSONField(name = "setldetail")
+    private List<Clinic2206FundPaymentResult> setldetail;
+
+    /**
+     * 账户id
+     */
+    private Long accountId;
+
+    public InpatientPreSettleDto() {
+        this.medfeeSumamt = BigDecimal.ZERO;
+        this.fulamtOwnpayAmt = BigDecimal.ZERO;
+        this.overlmtSelfpay = BigDecimal.ZERO;
+        this.preselfpayAmt = BigDecimal.ZERO;
+        this.inscpScpAmt = BigDecimal.ZERO;
+        this.actPayDedc = BigDecimal.ZERO;
+        this.hifpPay = BigDecimal.ZERO;
+        this.poolPropSelfpay = BigDecimal.ZERO;
+        this.cvlservPay = BigDecimal.ZERO;
+        this.hifesPay = BigDecimal.ZERO;
+        this.hifmiPay = BigDecimal.ZERO;
+        this.hifobPay = BigDecimal.ZERO;
+        this.mafPay = BigDecimal.ZERO;
+        this.othPay = BigDecimal.ZERO;
+        this.fundPaySumamt = BigDecimal.ZERO;
+        this.psnPartAmt = BigDecimal.ZERO;
+        this.acctPay = BigDecimal.ZERO;
+        this.psnCashPay = BigDecimal.ZERO;
+        this.hospPartAmt = BigDecimal.ZERO;
+        this.balc = BigDecimal.ZERO;
+        this.acctMulaidPay = BigDecimal.ZERO;
+        this.hifdmPay = BigDecimal.ZERO;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
new file mode 100644
index 00000000..fbc3adc4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.paymentmanage.dto;
+
+import java.util.List;
+
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.model.PaymentRecDetailDto;
+
+import lombok.Data;
+
+/**
+ * 住院预结算回显数据
+ *
+ * @author SunJQ
+ * @date 2025-08-11
+ */
+@Data
+public class InpatientPreSettleResultDto {
+    /**
+     * 收费详情
+     */
+    List<PaymentRecDetailDto> paymentRecDetailDtoList;
+    /**
+     * 付款实体（业务payment）
+     */
+    PaymentReconciliation paymentReconciliation;
+    /**
+     * 付款实体(多退少补)
+     */
+    PaymentReconciliation newPayment;
+    /**
+     * 付款实体(预交金)
+     */
+    PaymentReconciliation oldPayment;
+    /**
+     * 付款id（业务单）
+     */
+    private String id;// paymentId
+    /**
+     * 付款id(预交金原单)
+     */
+    private String oldId;
+    /**
+     * 付款id(多退少补单)
+     */
+    private String newId;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
new file mode 100644
index 00000000..a8768089
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
@@ -0,0 +1,9 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+
+@Data
+public class InvoiceWriteOffDto {
+    private String paymentId;
+    private String reason;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
new file mode 100644
index 00000000..9c716a01
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
@@ -0,0 +1,51 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+public class OrgIncomeDto {
+    /**
+     * 人次
+     */
+    private Integer personCnt;
+    /**
+     * 应收
+     */
+    private BigDecimal amount;
+    /**
+     * 实收
+     */
+    private BigDecimal receivedAmount;
+    /**
+     * 药品金额
+     */
+    private BigDecimal medFee;
+    /**
+     * 处置费
+     */
+    private BigDecimal serviceFee;
+    //private BigDecimal receivedAmount;
+    /**
+     * 挂号费
+     */
+    private BigDecimal registrationFee;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+
+    public OrgIncomeDto() {
+        this.personCnt = 0;
+        this.amount = BigDecimal.ZERO;
+        this.receivedAmount = BigDecimal.ZERO;
+        this.medFee = BigDecimal.ZERO;
+        this.serviceFee = BigDecimal.ZERO;
+        this.registrationFee = BigDecimal.ZERO;
+        //this.orgName = orgName;
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
index 539ce3dc..70c9a1cc 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
@@ -39,6 +39,10 @@ public class PaymentVO {
     private String paymentEnum;//付费/退款
     private String paymentEnum_dictText;
 
+    /** 关联ID */
+    private Long relationId;
+    private String relationIdStr;
+
     /** 收款员 */
     private Long entererId;//收款员
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
similarity index 37%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
index 6724ed40..b76f367c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
@@ -1,10 +1,18 @@
 package com.openhis.web.paymentmanage.mapper;
 
 import com.openhis.web.paymentmanage.dto.ChargeItemDetailVO;
+import com.openhis.web.paymentmanage.dto.ChargeItemExtendInfoDto;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 @Component
 public interface ChargeBillMapper {
+    /**
+     * 获取收费项的统计信息
+     * @param chargeItemIds 收费项的ID
+     * @return 查询信息
+     */
+    List<ChargeItemExtendInfoDto> selectChargeItemExtendInfoList(@Param("list") List<Long> chargeItemIds, @Param("orgIdList")List<Long> orgIdList);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
similarity index 84%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
index 460f8e38..3c7dfd3f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
@@ -5,7 +5,7 @@ package com.openhis.web.paymentmanage.mapper;
 
 import java.util.List;
 
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,8 +14,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.paymentmanage.dto.ChargeItemDto;
 import com.openhis.web.paymentmanage.dto.DispenseQuantityDto;
-import com.openhis.web.paymentmanage.dto.PaymentDetailDto;
 import com.openhis.web.paymentmanage.dto.PaymentVO;
+import com.openhis.yb.dto.PaymentDetailDto;
 
 /**
  * 付款Dao
@@ -32,8 +32,8 @@ public interface PaymentMapper {
      * @param queryWrapper
      * @return
      */
-    IPage<PaymentVO> getPage(@org.apache.ibatis.annotations.Param("page") Page<Object> page,
-        @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper<PaymentVO> queryWrapper);
+    IPage<PaymentVO> getPage(@Param("page") Page<Object> page, @Param("kindEnum") Integer kindEnum,
+        @Param(Constants.WRAPPER) QueryWrapper<PaymentVO> queryWrapper);
 
     /**
      * 付款详情
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
new file mode 100644
index 00000000..0c37377e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
@@ -0,0 +1,79 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+/**
+ * 药房共通方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryCommonService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    PharmacyDispensaryInitDto init();
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    R<?> getPage(PharmacyDispensarySearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request,String locationFlg,Integer supplyType);
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> deleteOrder(String busNo);
+
+//    /**
+//     * 提交审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> submitApproval(String busNo);
+
+//    /**
+//     * 同意审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> agreeApproval(String busNo);
+
+//    /**
+//     * 撤回审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> withdrawApproval(String busNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
new file mode 100644
index 00000000..8b5477bd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
@@ -0,0 +1,40 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房发药单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryDispensingOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 发药单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 发药单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 添加/编辑发药单
+     *
+     * @param dispenseIdList 药品发放id
+     * @return 操作结果
+     */
+    boolean addOrEditDispensingOrder(List<Long> dispenseIdList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
new file mode 100644
index 00000000..a2fb777b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryProfitLossOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    R<?> addOrEditProfitLossOrder(List<PharmacyDispensaryDetailDto> profitLossOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
new file mode 100644
index 00000000..bdb26392
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
@@ -0,0 +1,90 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+
+/**
+ * 药房审批方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryReceiptApprovalService {
+
+    /**
+     * 请领单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> requisitionOrderAgreeApproval(String busNo);
+
+    /**
+     * 药房入库单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> stockInOrderAgreeApproved(String busNo);
+
+    /**
+     * 药库退库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> returnToWarehouseAgreeApproved(String busNo);
+
+
+//     /**
+//     * 药房发药审批通过
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//     R<?> dispensingAgreeApproved(String busNo);
+
+    /**
+     * 药房损益单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> profitLossAgreeApproved(String busNo);
+
+    /**
+     * 药房盘点单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> stocktakingAgreepproved(String busNo);
+     /**
+     * 药房调入单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> transferInAgreeApproved(String busNo);
+
+    /**
+     * 药房调出单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> transferOutAgreeApproved(String busNo);
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    List<SupplyItemDetailDto> getSupplyItemDetail(String busNo);
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
new file mode 100644
index 00000000..e36c9590
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房请领单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryRequisitionOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 请领单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 请领单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param requisitionOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    R<?> addOrEditRequisitionOrder(List<PharmacyDispensaryDetailDto> requisitionOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
new file mode 100644
index 00000000..0b70e967
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryReturnToWarehouseOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToDispensaryOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditReturnToWarehouseOrder(List<PharmacyDispensaryDetailDto> returnToDispensaryOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
new file mode 100644
index 00000000..d9ae6f87
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房入库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryStockInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 入库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 入库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑入库单
+     *
+     * @param stockInOrderDtoList 入库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStockInOrder(List<PharmacyDispensaryDetailDto> stockInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
new file mode 100644
index 00000000..1fd7fbcb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryStocktakingOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStocktakingOrder(List<PharmacyDispensaryDetailDto> stocktakingOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
new file mode 100644
index 00000000..5bbc44dc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房调入单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryTransferInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferInOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    R<?> addOrEditTransferInOrder(List<PharmacyDispensaryDetailDto> transferInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
new file mode 100644
index 00000000..e6eb5188
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+
+/**
+ * 药房调出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyDispensaryTransferOutOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferOutOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    R<?> addOrEditTransferOutOrder(List<PharmacyDispensaryDetailDto> transferOutOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
new file mode 100644
index 00000000..6c882806
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
@@ -0,0 +1,228 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.workflow.domain.SupplyRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AcceptanceResult;
+import com.openhis.common.enums.PackagingCondition;
+import com.openhis.common.enums.SupplyStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.common.appservice.ICommonService;
+import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryRequisitionOrderMapper;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房共通
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryCommonServiceImpl implements IPharmacyDispensaryCommonService {
+
+    @Resource
+    private ISupplierService supplierService;
+
+    @Resource
+    private IPractitionerService practitionerService;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+    @Resource
+    private ICommonService commonServiceImpl;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public PharmacyDispensaryInitDto init() {
+        PharmacyDispensaryInitDto orderInitDto = new PharmacyDispensaryInitDto();
+
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 查询经手人列表
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 经手人信息
+        List<PharmacyDispensaryInitDto.LongOption> practitionerListOption = practitionerList.stream()
+            .map(practitioner -> new PharmacyDispensaryInitDto.LongOption(practitioner.getId(), practitioner.getName()))
+            .collect(Collectors.toList());
+        // 供应商信息
+        List<PharmacyDispensaryInitDto.SupplierOption> supplierListOption = supplierList.stream()
+            .map(supplier -> new PharmacyDispensaryInitDto.SupplierOption(supplier.getId(), supplier.getName() ,supplier.getPhone()))
+            .collect(Collectors.toList());
+        // 审批状态
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyStatusOption = Stream.of(SupplyStatus.values()).map(
+            supplyStatus -> new PharmacyDispensaryInitDto.IntegerOption(supplyStatus.getValue(), supplyStatus.getInfo()))
+            .collect(Collectors.toList());
+
+        // 包装情况
+        List<PharmacyDispensaryInitDto.IntegerOption> packagingConditionOption = Stream.of(PackagingCondition.values())
+            .map(packagingCondition -> new PharmacyDispensaryInitDto.IntegerOption(packagingCondition.getValue(),
+                packagingCondition.getInfo()))
+            .collect(Collectors.toList());
+
+        // 验收结果
+        List<PharmacyDispensaryInitDto.IntegerOption> acceptanceResultOption = Stream.of(AcceptanceResult.values())
+            .map(acceptanceResult -> new PharmacyDispensaryInitDto.IntegerOption(acceptanceResult.getValue(),
+                acceptanceResult.getInfo()))
+            .collect(Collectors.toList());
+
+        // 仓库列表
+        List<LocationDto> cabinetList = commonServiceImpl.getCabinetList();
+
+        // 药房列表
+        List<LocationDto> pharmacyList = commonServiceImpl.getPharmacyList();
+
+        orderInitDto.setCabinetListOptions(cabinetList).setPharmacyListOptions(pharmacyList).setSupplierOption(supplierListOption)
+            .setPractitionerOption(practitionerListOption).setSupplyStatusOptions(supplyStatusOption)
+            .setPackagingConditionOptions(packagingConditionOption)
+            .setAcceptanceResultoryOptions(acceptanceResultOption);
+
+        return orderInitDto;
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @Override
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+
+        Long locationId = purchaseOrderSearchParam.getLocationId();
+        purchaseOrderSearchParam.setLocationId(null);
+        Long supplierId = purchaseOrderSearchParam.getSupplierId();
+        purchaseOrderSearchParam.setSupplierId(null);
+        // 构建查询条件
+        QueryWrapper<PharmacyDispensarySearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name, CommonConstants.FieldName.PyStr)), request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.Name);
+
+        Page<PharmacyDispensaryMedicationInfoDto> medicationInfoDto = pharmacyDispensaryCommonMapper
+            .getMedicationInfo(new Page<>(pageNo, pageSize), queryWrapper, locationId, supplierId);
+
+        for (PharmacyDispensaryMedicationInfoDto item : medicationInfoDto.getRecords()) {
+            List<PharmacyDispensaryMedicationInfoDto.Option> unitList = new ArrayList<>();
+            unitList
+                .add(new PharmacyDispensaryMedicationInfoDto.Option(item.getUnitCode(), item.getUnitCode_dictText()));
+            unitList.add(
+                new PharmacyDispensaryMedicationInfoDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(medicationInfoDto);
+    }
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    @Override
+    public R<?> getPage(PharmacyDispensarySearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request,  String locationFlg,Integer supplyType) {
+        //判断哪个画面使用
+        if (supplyType != null) {
+            purchaseOrderSearchParam.setTypeEnum(supplyType);
+        }
+//        if (locationForm != null) {
+//            purchaseOrderSearchParam.setLocationTypeEnum(locationForm);
+//        }
+        String originalBusNoFlg = purchaseOrderSearchParam.getOriginalBusNoFlg();
+        purchaseOrderSearchParam.setOriginalBusNoFlg(null);
+        // 构建查询条件
+        QueryWrapper<PharmacyDispensarySearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(
+                    Arrays.asList(CommonConstants.FieldName.SupplyBusNo, CommonConstants.FieldName.ApplicantName)),
+                request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.SupplyBusNo);
+        // 查询订货单分页列表
+        Page<PharmacyDispensaryDto> purchaseOrderDtoPage =
+            pharmacyDispensaryCommonMapper.getPage(new Page<>(pageNo, pageSize), queryWrapper,originalBusNoFlg, locationFlg);
+
+        purchaseOrderDtoPage.getRecords().forEach(e -> {
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        return R.ok(purchaseOrderDtoPage);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deleteOrder(String busNo) {
+        // 根据原始单据号查询信息
+        List<SupplyRequest> supplyRequest = supplyRequestService.getSupplyByOriginalBusNo(busNo);
+        if (!supplyRequest.isEmpty()) {
+            // 将原始单据号信息的原始单据号删除
+            boolean flg = supplyRequestService.updateByBusNo(supplyRequest.get(0).getBusNo());
+            if (!flg) {
+                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        // 删除单据
+        boolean result = supplyRequestService.removeByBusNo(busNo);
+        return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
new file mode 100644
index 00000000..caab158f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
@@ -0,0 +1,185 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房发药单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryDispensingOrderServiceImpl implements IPharmacyDispensaryDispensingOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Resource
+    private ISupplyDeliveryService supplyDeliveryService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+    @Autowired
+    private PharmacyDispensaryDispensingOrderMapper pharmacyDispensaryDispensingOrderMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption
+            .add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.OUTPATIENT_PATIENT_DISPENSING.getValue(),
+                SupplyCategory.OUTPATIENT_PATIENT_DISPENSING.getInfo()));
+        supplyCategoryOption
+            .add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.INPATIENT_PATIENT_DISPENSING.getValue(),
+                SupplyCategory.INPATIENT_PATIENT_DISPENSING.getInfo()));
+        supplyCategoryOption.add(
+            new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.INPATIENT_PATIENT_SUMMARY_DISPENSING.getValue(),
+                SupplyCategory.INPATIENT_PATIENT_SUMMARY_DISPENSING.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 发药单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 发药单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> dispensingOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        dispensingOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+
+        });
+
+        return R.ok(dispensingOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 单据号
+     */
+    public String getBusNo() {
+        return assignSeqUtil.getSeqByDay(AssignSeqEnum.DISPENSING_ORDER.getPrefix(), 4);
+    }
+
+    /**
+     * 添加/编辑发药单
+     *
+     * @param dispenseIdList 药品发放id
+     * @return 操作结果
+     */
+
+    @Override
+    public boolean addOrEditDispensingOrder(List<Long> dispenseIdList) {
+
+        // 获取单据号
+        String busNo = this.getBusNo();
+        // 获取更表所需信息
+        List<PharmacyDispensaryDetailDto> detailDto =
+            pharmacyDispensaryDispensingOrderMapper.getInfo(dispenseIdList, DispenseStatus.COMPLETED.getValue());
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        SupplyRequest supplyRequest;
+        List<SupplyDelivery> supplyDeliveryList = new ArrayList<>();
+        SupplyDelivery supplyDelivery;
+        for (PharmacyDispensaryDetailDto item : detailDto) {
+            // 供应申请
+            supplyRequest = new SupplyRequest().setBusNo(busNo).setTypeEnum(SupplyType.DISPENSING_ORDER.getValue())
+                .setStatusEnum(SupplyStatus.AGREE.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setLotNumber(item.getLotNumber())
+                .setSourceTypeEnum(LocationForm.PHARMACY.getValue()).setSourceLocationId(item.getSourceLocationId())
+                .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(item.getApplyTime()).setApproverId(item.getApproverId())
+                .setApprovalTime(item.getApprovalTime());
+            supplyRequestList.add(supplyRequest);
+            // 供应发放
+            supplyDelivery = new SupplyDelivery().setRequestId(supplyRequest.getId())
+                .setStatusEnum(DispenseStatus.COMPLETED.getValue()).setTypeEnum(supplyRequest.getTypeEnum())
+                .setItemTable(supplyRequest.getItemTable()).setItemId(supplyRequest.getItemId())
+                .setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_DISPENSE).setBasedOnIds(item.getDispenseIds())
+                .setUnitCode(supplyRequest.getUnitCode()).setQuantity(supplyRequest.getItemQuantity())
+                .setLotNumber(supplyRequest.getLotNumber())
+                .setPractitionerId(supplyRequest.getApplicantId()).setOccurrenceTime(supplyRequest.getApprovalTime())
+                .setReceiverId(supplyRequest.getPurposeLocationId()).setReceiveTime(supplyRequest.getApprovalTime());
+
+            supplyDeliveryList.add(supplyDelivery);
+        }
+
+        // 更新供应请求表
+        boolean requestFlg = supplyRequestService.saveBatch(supplyRequestList);
+        if (!requestFlg) {
+            return false;
+        }
+        // 更新供应发放表
+        boolean deliveryFlg = supplyDeliveryService.saveBatch(supplyDeliveryList);
+        if (!deliveryFlg) {
+            return false;
+        }
+
+        return true;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
new file mode 100644
index 00000000..296d6020
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
@@ -0,0 +1,174 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryProfitLossOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryProfitLossOrderServiceImpl implements IPharmacyDispensaryProfitLossOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.STANDBY_RESCUE_MEDICINES.getValue(),
+            SupplyCategory.STANDBY_RESCUE_MEDICINES.getInfo()));
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.DAMAGED_EXPIRED_MEDICINES.getValue(),
+            SupplyCategory.DAMAGED_EXPIRED_MEDICINES.getInfo()));
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.DONATED_MEDICINES.getValue(),
+            SupplyCategory.DONATED_MEDICINES.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> profitLossOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        profitLossOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : profitLossOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(profitLossOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_PRPFITLOSS.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditProfitLossOrder(List<PharmacyDispensaryDetailDto> profitLossOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyDispensaryDetailDto item : profitLossOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.PURCHASE_PRPFITLOSS.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                    .setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                    .setTraceNoUnitCode(item.getTraceNoUnitCode()).setReason(item.getReason())
+                    .setPurposeTypeEnum(LocationForm.PHARMACY.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                    .setApplicantId(item.getApplicantId())
+                    .setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
new file mode 100644
index 00000000..40cca160
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
@@ -0,0 +1,933 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.common.enums.TraceNoStatus;
+import com.openhis.common.enums.Whether;
+import com.openhis.common.enums.ybenums.YbInvChgType;
+import com.openhis.common.enums.ybenums.YbRxFlag;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+import com.openhis.yb.dto.Medical3503Param;
+import com.openhis.yb.dto.MedicalInventory3501Param;
+import com.openhis.yb.dto.MedicalInventory3502Param;
+import com.openhis.yb.dto.MedicalPurchase3504Param;
+import com.openhis.yb.service.YbManager;
+
+/**
+ * 药房审批
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryReceiptApprovalServiceImpl implements IPharmacyDispensaryReceiptApprovalService {
+    @Autowired
+    private ITraceNoAppService traceNoAppService;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private ISupplyDeliveryService supplyDeliveryService;
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+    @Autowired
+    private ReceiptApprovalMapper receiptApprovalMapper;
+    @Autowired
+    private YbManager ybService;
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+    @Autowired
+    private IReceiptApprovalAppService receiptApprovalAppService;
+
+    /**
+     * 请领单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> requisitionOrderAgreeApproval(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // // 获取审批通过后的供应请求id列表
+        // List<Long> supplyReqIdList = agreedList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+        //
+        // // 校验(已经审批通过的单号(发放状态是已完成),不能再重复审批通过)
+        // boolean validation = supplyDeliveryService.supplyDeliveryValidation(supplyReqIdList);
+        // if (validation) {
+        // throw new ServiceException("请勿重复审批");
+        // }
+        // // 根据单据，生成供应发放单
+        // List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        // if (deliveredList.isEmpty()) {
+        // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        // }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药房入库单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> stockInOrderAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            InventoryItem inventoryItemPurpose = null;
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplyList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplyList.add(supplyItemDetailDto);
+                } else {
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(调拨数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+调拨数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新源仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            if (!supplyList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplyList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.PURCHASE_STOCKIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保商品采购接口 todo 药房相关医保接口未对应
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3503商品采购上传错误，错误项目编码" + uploadFailedNoList;
+                } else {
+                    returnMsg = "3503商品采购上传成功";
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药库退库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> returnToWarehouseAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource;
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemSource = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算退货后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 仓库库存-(退货数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 仓库库存-退货数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.PURCHASE_RETURN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 调用医保采购退货接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3504采购退货上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+    //
+    // /**
+    // * 药房发药审批通过 todo 发药只查询，没有审批
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // @Override
+    // public R<?> dispensingAgreeApproved(String busNo) {
+    // // 获取当前时间
+    // Date now = DateUtils.getNowDate();
+    // // 审批单据并返回单据详情
+    // List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+    // if (agreedList.isEmpty()) {
+    // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+    // // 根据单据，发放物品
+    // List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+    // if (deliveredList.isEmpty()) {
+    // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+    //
+    // // 查询供应项目的详细信息
+    // List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+    //
+    // if (!supplyItemDetailList.isEmpty()) {
+    //
+    // for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+    // // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
+    // List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+    // supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+    // supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+    // InventoryItem inventoryItemSource = new InventoryItem();
+    // if (!inventoryItemSourceList.isEmpty()) {
+    // inventoryItemSource = inventoryItemSourceList.get(0);
+    //
+    // // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+    // BigDecimal baseQuantitySource = inventoryItemSource.getQuantity();
+    // // 最小数量（最小单位库存数量）
+    // BigDecimal minQuantitySource = inventoryItemSource.getQuantity();
+    //
+    // // 供应申请的物品计量单位与包装单位相同
+    // if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+    // if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+    // // 库存数量不足
+    // return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+    // } else {
+    // // 源仓库库存-(领用数量*拆零比)
+    // minQuantitySource = minQuantitySource.subtract(
+    // supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+    // }
+    // } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+    // if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+    // // 库存数量不足
+    // return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+    // } else {
+    // // 供应申请的物品计量单位与最小单位相同
+    // // 源仓库库存-领用数量
+    // minQuantitySource = minQuantitySource.subtract(supplyItemDetailDto.getItemQuantity());
+    // }
+    // }
+    // // 更新源仓库库存数量
+    // Boolean aBooleanSource = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
+    // baseQuantitySource, minQuantitySource, now, supplyItemDetailDto.getTraceNo());
+    //
+    // if (!aBooleanSource) {
+    // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+    // }
+    // }
+    //
+    // }
+    // return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    // }
+
+    /**
+     * 药房损益单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> profitLossAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 返回信息
+        String returnMsg = null;
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItem = new InventoryItem();
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItem = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算报损后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 数量*拆零比
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity());
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 数量
+                        minQuantity = supplyItemDetailDto.getItemQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.PURCHASE_PRPFITLOSS.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保库存变更接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
+                    YbInvChgType.DESTRUCTION, false, false, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药房盘点单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> stocktakingAgreepproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 首次盘存列表
+        List<SupplyItemDetailDto> firstSupplyItemDetailList = new ArrayList<>();
+        // 药品/耗材发放列表
+        List<MedicationDispense> medicationDispenses = null;
+        List<DeviceDispense> deviceDispenses = null;
+        // 返回信息
+        String stocktakingReturnMsg = null;
+        String changeReturnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            // 获取盘盈列表（itemQuantity > 0）
+            List<SupplyItemDetailDto> positiveList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .collect(Collectors.toList());
+            // 获取盘亏列表（itemQuantity < 0）
+            List<SupplyItemDetailDto> negativeList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) < 0)
+                .collect(Collectors.toList());
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                // 查看该批号的药品/耗材是否发放过(用于证明是否首次盘存)
+                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    medicationDispenses = medicationDispenseService.list(new LambdaQueryWrapper<MedicationDispense>()
+                        .eq(MedicationDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (medicationDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    deviceDispenses = deviceDispenseService.list(new LambdaQueryWrapper<DeviceDispense>()
+                        .in(DeviceDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (deviceDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                }
+                if (!inventoryItemList.isEmpty()) {
+                    InventoryItem inventoryItem = inventoryItemList.get(0);
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItem.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getTotalQuantity());
+                        // 供应申请的物品计量单位与最小单位相同
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        minQuantity = supplyItemDetailDto.getTotalQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+
+                String ybSwitch =
+                    SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+                if (Whether.YES.getCode().equals(ybSwitch)) {
+                    // 如果首次盘点信息不为空
+                    if (!firstSupplyItemDetailList.isEmpty()) {
+                        // 调用医保盘存接口，盘盈
+                        List<String> uploadFailedNoList = this.ybInventoryIntegrated(firstSupplyItemDetailList,
+                            YbInvChgType.INVENTORY_GAIN, true, false, false, now);
+                        if (!uploadFailedNoList.isEmpty()) {
+                            stocktakingReturnMsg = "3501盘存上传错误，错误项目编码" + uploadFailedNoList;
+                        }
+                    }
+                    List<String> uploadFailedGainList = null;
+                    List<String> uploadFailedLossList = null;
+                    if (!positiveList.isEmpty()) {
+                        // 调用医保库存变更接口，盘盈
+                        uploadFailedGainList = this.ybInventoryIntegrated(positiveList, YbInvChgType.INVENTORY_GAIN,
+                            false, false, false, now);
+                    }
+                    if (!negativeList.isEmpty()) {
+                        // 调用医保库存变更接口，盘亏
+                        uploadFailedLossList = this.ybInventoryIntegrated(negativeList, YbInvChgType.INVENTORY_LOSS,
+                            false, false, false, now);
+                    }
+                    if (uploadFailedGainList != null || uploadFailedLossList != null) {
+                        changeReturnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedGainList + uploadFailedLossList;
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.PURCHASE_STOCKTAKING.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(stocktakingReturnMsg + changeReturnMsg,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药房调入单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> transferInAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+
+        if (!supplyItemDetailList.isEmpty()) {
+
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplylList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemPurpose = null;
+                if (!inventoryItemPurposeList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemPurposeList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplylList.add(supplyItemDetailDto);
+                } else {
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItemPurpose.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(退库数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+退库数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanPurpose =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+                    if (!bBooleanPurpose) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            if (!supplylList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplylList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.PURCHASE_TRANSFERIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 药房调出单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> transferOutAgreeApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource = null;
+                if (!inventoryItemSourceList.isEmpty()) {
+                    inventoryItemSource = inventoryItemSourceList.get(0);
+
+                    // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
+                    BigDecimal baseQuantity = inventoryItemSource.getQuantity();
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 源仓库库存-(退库数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 源仓库库存-退库数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanSource =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+                    if (!bBooleanSource) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.PURCHASE_TRANSFEROUT.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    @Override
+    public List<SupplyItemDetailDto> getSupplyItemDetail(String busNo) {
+        return receiptApprovalMapper.selectSupplyDetail(busNo, DispenseStatus.COMPLETED.getValue());
+    }
+
+    /**
+     * 医保库存相关进销存接口
+     *
+     * @param supplyItemDetailList 供应申请项目详细信息
+     * @param ybInvChgType 库存变更类型
+     * @param firstFlag 首次盘存标识
+     * @param now 库存变更时间
+     * @return 上传失败的id集合
+     */
+    private List<String> ybInventoryIntegrated(List<SupplyItemDetailDto> supplyItemDetailList,
+        YbInvChgType ybInvChgType, Boolean firstFlag, Boolean purchaseFlag, Boolean returnFlag, Date now) {
+        List<String> uploadFailedNoList = new ArrayList<>();
+        R<?> result;
+        R<?> firstResult = R.ok();
+        R<?> returnResult = R.ok();
+        R<?> purchaseResult = R.ok();
+        for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            if (supplyItemDetailDto.getYbNo() == null) {
+                continue;
+            }
+            switch (ybInvChgType) {
+                case ALLOCATION_IN:
+                case ALLOCATION_OUT:
+                case INVENTORY_GAIN:
+                case INVENTORY_LOSS:
+                case DESTRUCTION:
+                case OTHER_IN:
+                case OTHER_OUT:
+                case DONATION_IN:
+                case DONATION_RETURN_OUT:
+                case PURCHASE_IN:
+                case RETURN_OUT:
+                    if (firstFlag) {
+                        firstResult =
+                            ybService.uploadInventoryCount(getMedicalInventory3501Param(supplyItemDetailDto, now), now);
+                        if (firstResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (returnFlag) {
+                        returnResult =
+                            ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
+                        if (returnResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (purchaseFlag) {
+                        purchaseResult = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
+                        if (purchaseResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    result = ybService.updateInventoryCount(
+                        getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
+                    if (result.getCode() != 200) {
+                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                    }
+                    break;
+                default:
+                    throw new IllegalArgumentException("未知的库存变更类型: " + ybInvChgType);
+            }
+        }
+        return uploadFailedNoList;
+    }
+
+    private MedicalPurchase3504Param getMedicalPurchase3504Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        MedicalPurchase3504Param medicalPurchase3504Param = new MedicalPurchase3504Param();
+        medicalPurchase3504Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setPurcInvoNo(supplyItemDetailDto.getInvoiceNo())
+            .setManuDate(supplyItemDetailDto.getStartTime()).setExpyEnd(supplyItemDetailDto.getEndTime())
+            .setPurcRetnCnt(supplyItemDetailDto.getItemQuantity()).setPurcRetnStoinTime(now)
+            .setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+        return medicalPurchase3504Param;
+    }
+
+    private Medical3503Param getMedical3503Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        Medical3503Param medical3503Param = new Medical3503Param();
+        medical3503Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setManuLotnum(supplyItemDetailDto.getLotNumber())
+            .setProdentpName(supplyItemDetailDto.getManufacturerText())
+            .setAprvno(supplyItemDetailDto.getApprovalNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+            .setExpyEnd(supplyItemDetailDto.getEndTime()).setPurcRetnCnt(supplyItemDetailDto.getItemQuantity())
+            .setPurcRetnStoinTime(now).setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+
+        return medical3503Param;
+    }
+
+    private MedicalInventory3502Param getMedicalInventory3502Param(SupplyItemDetailDto supplyItemDetailDto, Date now,
+        String ybInvChgType) {
+        MedicalInventory3502Param medicalInventory3502Param = new MedicalInventory3502Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        // 查询商品价格信息
+        List<ItemChargeDetailDto> itemChargeDetailList =
+            receiptApprovalAppService.getItemChargeDetail(List.of(supplyItemDetailDto.getItemId()));
+        if (!inventoryItemList.isEmpty() && !itemChargeDetailList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            // 最小单位售卖价格
+            BigDecimal minPrice = BigDecimal.ZERO;
+            Optional<BigDecimal> price = itemChargeDetailList.stream()
+                .filter(x -> x.getConditionValue().equals(supplyItemDetailDto.getLotNumber()))
+                .map(ItemChargeDetailDto::getSellPrice).findFirst();
+            if (price.isPresent()) {
+                if (supplyItemDetailDto.getPartPercent().compareTo(BigDecimal.ZERO) > 0) {
+                    minPrice = price.get().divide(supplyItemDetailDto.getPartPercent(), RoundingMode.HALF_UP);
+                }
+            }
+            // 转换为JSON
+            JSONArray medicalTraceNo = new JSONArray();
+            // 获取追溯码信息
+            if (supplyItemDetailDto.getTraceNo() != null) {
+                List<String> traceNoList =
+                    Arrays.stream(supplyItemDetailDto.getTraceNo().split(CommonConstants.Common.COMMA))
+                        .map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
+                for (String traceNo : traceNoList) {
+                    Map<String, String> traceNoMap = new HashMap<>();
+                    traceNoMap.put("drug_trac_codg", traceNo);
+                    medicalTraceNo.add(traceNoMap);
+                }
+            }
+            medicalInventory3502Param.setMedListCodg(supplyItemDetailDto.getYbNo()).setInvChgType(ybInvChgType)
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setPric(minPrice).setCnt(totalQuantity)
+                .setInvChgTime(now).setDrugtracinfo(medicalTraceNo);
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3502Param;
+    }
+
+    private MedicalInventory3501Param getMedicalInventory3501Param(SupplyItemDetailDto supplyItemDetailDto, Date date) {
+        MedicalInventory3501Param medicalInventory3501Param = new MedicalInventory3501Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        if (!inventoryItemList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            medicalInventory3501Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable()).setInvdate(date).setInvCnt(totalQuantity)
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+                .setExpyEnd(supplyItemDetailDto.getEndTime());
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3501Param;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
new file mode 100644
index 00000000..f93c1fbc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
@@ -0,0 +1,164 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryRequisitionOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房请领单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryRequisitionOrderServiceImpl implements IPharmacyDispensaryRequisitionOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto requisitionOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.PURCHASE_APPLICATION.getValue(),
+            SupplyCategory.PURCHASE_APPLICATION.getInfo()));
+
+        requisitionOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(requisitionOrderInitDto);
+    }
+
+    /**
+     * 请领单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 请领单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> requisitionOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        requisitionOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : requisitionOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(requisitionOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_REQUISITION.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑请领单
+     *
+     * @param requisitionOrderDtoList 请领信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditRequisitionOrder(List<PharmacyDispensaryDetailDto> requisitionOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(requisitionOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        for (PharmacyDispensaryDetailDto item : requisitionOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.PURCHASE_REQUISITION.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                    .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setSupplierId(item.getSupplierId())
+                    .setReason(item.getReason()).setSourceTypeEnum(LocationForm.CABINET.getValue())
+                    .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.PHARMACY.getValue())
+                    .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                    .setApplyTime(item.getApplyTime()).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
new file mode 100644
index 00000000..05594601
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
@@ -0,0 +1,169 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryReturnToWarehouseOrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryReturnToWarehouseOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl implements
+    IPharmacyDispensaryReturnToWarehouseOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> returnToDispensaryOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        returnToDispensaryOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : returnToDispensaryOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(returnToDispensaryOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_RETURN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToDispensaryOrderDtoList 退库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditReturnToWarehouseOrder(List<PharmacyDispensaryDetailDto> returnToDispensaryOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToDispensaryOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyDispensaryDetailDto item : returnToDispensaryOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.PURCHASE_RETURN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setStartTime(item.getStartTime()).setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setSupplierId(item.getSupplierId()).setReason(item.getReason())
+                .setSourceTypeEnum(LocationForm.PHARMACY.getValue()).setSourceLocationId(item.getSourceLocationId())
+                .setPurposeTypeEnum(LocationForm.CABINET.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
new file mode 100644
index 00000000..f75939d4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
@@ -0,0 +1,173 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStockInOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房入库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryStockInOrderServiceImpl implements IPharmacyDispensaryStockInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 入库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 入库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> stockInOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stockInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : stockInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stockInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_STOCKIN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑入库单
+     *
+     * @param stockInOrderDtoList 入库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStockInOrder(List<PharmacyDispensaryDetailDto> stockInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(stockInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(stockInOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockInOrderDtoList.get(0).getOriginalBusNo(), stockInOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyDispensaryDetailDto item : stockInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.PURCHASE_STOCKIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setStartTime(item.getStartTime()).setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setSupplierId(item.getSupplierId()).setReason(item.getReason())
+                .setSourceTypeEnum(LocationForm.CABINET.getValue()).setSourceLocationId(item.getSourceLocationId())
+                .setPurposeTypeEnum(LocationForm.PHARMACY.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
new file mode 100644
index 00000000..5dc21506
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
@@ -0,0 +1,168 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStocktakingOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryStocktakingOrderServiceImpl implements IPharmacyDispensaryStocktakingOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(
+            SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(
+            SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> stocktakingOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stocktakingOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : stocktakingOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stocktakingOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_STOCKTAKING.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStocktakingOrder(List<PharmacyDispensaryDetailDto> stocktakingOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(stocktakingOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyDispensaryDetailDto item : stocktakingOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.PURCHASE_STOCKTAKING.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setTotalQuantity(item.getTotalQuantity()).setPrice(item.getPrice()).setTotalPrice(item.getTotalPrice())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setBatchInventory(item.getBatchInventory()).setLotNumber(item.getLotNumber())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setReasonCode(item.getReasonCode()).setReason(item.getReason())
+                .setPurposeTypeEnum(LocationForm.PHARMACY.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
new file mode 100644
index 00000000..68907a3a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
@@ -0,0 +1,166 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferInOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房调入单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryTransferInOrderServiceImpl implements IPharmacyDispensaryTransferInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> transferInOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        transferInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : transferInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(transferInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_TRANSFERIN.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferInOrderDtoList 采购信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditTransferInOrder(List<PharmacyDispensaryDetailDto> transferInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyDispensaryDetailDto item : transferInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.PURCHASE_TRANSFERIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setRetailPrice(item.getPrice())
+                .setTotalRetailPrice(item.getTotalPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setEndTime(item.getEndTime())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.PHARMACY.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.PHARMACY.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
new file mode 100644
index 00000000..7a3a3b7c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
@@ -0,0 +1,165 @@
+package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferOutOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药房调出单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyDispensaryTransferOutOrderServiceImpl implements IPharmacyDispensaryTransferOutOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyDispensaryInitDto purchaseOrderInitDto = pharmacyDispensaryCommonService.init();
+
+        // 单据分类
+        List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyDispensaryDetailDto> transferOutOrderDtoDetailPage =
+            pharmacyDispensaryCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        transferOutOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyDispensaryDetailDto.Option> unitList;
+        for (PharmacyDispensaryDetailDto item : transferOutOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(transferOutOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_TRANSFEROUT.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferOutOrderDtoList 采购信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditTransferOutOrder(List<PharmacyDispensaryDetailDto> transferOutOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferOutOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyDispensaryDetailDto item : transferOutOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.PURCHASE_TRANSFEROUT.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setRetailPrice(item.getPrice())
+                .setTotalRetailPrice(item.getTotalPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setEndTime(item.getEndTime())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.PHARMACY.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.PHARMACY.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
new file mode 100644
index 00000000..91a0cddf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
@@ -0,0 +1,82 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房发药单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/dispensing-order")
+@Slf4j
+public class PharmacyDispensaryDispensingOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryDispensingOrderService pharmacyDispensaryDispensingOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+    /**
+     * 发药单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryDispensingOrderService.init();
+    }
+
+    /**
+     * 发药单单据列表
+     *
+     * @param dispensingOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 发药单据分页列表
+     */
+    @GetMapping(value = "/dispensing-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam dispensingOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(dispensingOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.DISPENSING_ORDER.getValue());
+    }
+    /**
+     * 发药单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 发药单单据详情
+     */
+    @GetMapping(value = "/dispensing-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryDispensingOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
new file mode 100644
index 00000000..2e348038
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房损益单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/profitLoss-order")
+@Slf4j
+public class PharmacyDispensaryProfitLossOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryProfitLossOrderService pharmacyDispensaryProfitLossOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+    /**
+     * 损益单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryProfitLossOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 损益单单据列表
+     *
+     * @param profitLossOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 损益单据分页列表
+     */
+    @GetMapping(value = "/profitLoss-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam profitLossOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(profitLossOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.PURCHASE_PRPFITLOSS.getValue());
+    }
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @GetMapping(value = "/profitLoss-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryProfitLossOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryProfitLossOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-profitLossOrder")
+    public R<?> addOrEditProfitLossOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> profitLossOrderDtoList) {
+        return pharmacyDispensaryProfitLossOrderService.addOrEditProfitLossOrder(profitLossOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-profitLossOrder")
+    public R<?> deleteProfitLossOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.profitLossAgreeApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
new file mode 100644
index 00000000..9f7d8413
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房请领单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/requisition-order")
+@Slf4j
+public class PharmacyDispensaryRequisitionOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryRequisitionOrderService pharmacyDispensaryRequisitionOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+    /**
+     * 请领单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryRequisitionOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param requisitionOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam requisitionOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(requisitionOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 请领单单据列表
+     *
+     * @param requisitionOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 请领单据分页列表
+     */
+    @GetMapping(value = "/requisition-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam requisitionOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(requisitionOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.PURCHASE_REQUISITION.getValue());
+    }
+    /**
+     * 请领单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 请领单单据详情
+     */
+    @GetMapping(value = "/requisition-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryRequisitionOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryRequisitionOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param requisitionOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-requisitionOrder")
+    public R<?> addOrEditRequisitionOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> requisitionOrderDtoList) {
+        return pharmacyDispensaryRequisitionOrderService.addOrEditRequisitionOrder(requisitionOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-requisitionOrder")
+    public R<?> deleteRequisitionOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.requisitionOrderAgreeApproval(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
new file mode 100644
index 00000000..84778117
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
@@ -0,0 +1,139 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房退库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/returnToWarehouse-order")
+@Slf4j
+public class PharmacyDispensaryReturnToWarehouseOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryReturnToWarehouseOrderService pharmacyDispensaryReturnToWarehouseOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+    /**
+     * 退库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryReturnToWarehouseOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 退库单单据列表
+     *
+     * @param returnToDispensaryOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 退库单据分页列表
+     */
+    @GetMapping(value = "/returnToDispensary-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam returnToDispensaryOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(returnToDispensaryOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.PURCHASE_RETURN.getValue());
+    }
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @GetMapping(value = "/returnToDispensary-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryReturnToWarehouseOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryReturnToWarehouseOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToDispensaryOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-returnToDispensaryOrder")
+    public R<?> addOrEditReturnToDispensaryOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> returnToDispensaryOrderDtoList) {
+        return pharmacyDispensaryReturnToWarehouseOrderService.addOrEditReturnToWarehouseOrder(returnToDispensaryOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-returnToDispensaryOrder")
+    public R<?> deleteReturnToDispensaryOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.returnToWarehouseAgreeApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
new file mode 100644
index 00000000..a794bd42
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房入库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/stockIn-order")
+@Slf4j
+public class PharmacyDispensaryStockInOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryStockInOrderService pharmacyDispensaryStockInOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+    /**
+     * 入库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryStockInOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 入库单单据列表
+     *
+     * @param stockInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 入库单据分页列表
+     */
+    @GetMapping(value = "/stockIn-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam stockInOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(stockInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.PURCHASE_STOCKIN.getValue());
+    }
+    /**
+     * 入库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 入库单单据详情
+     */
+    @GetMapping(value = "/stockIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryStockInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryStockInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑入库单
+     *
+     * @param stockInOrderDtoList 入库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stockInOrder")
+    public R<?> addOrEditStockInOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> stockInOrderDtoList) {
+        return pharmacyDispensaryStockInOrderService.addOrEditStockInOrder(stockInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stockInOrder")
+    public R<?> deleteStockInOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.stockInOrderAgreeApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
new file mode 100644
index 00000000..f1a9b9c7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房盘点单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/stocktaking-order")
+@Slf4j
+public class PharmacyDispensaryStocktakingOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryStocktakingOrderService pharmacyDispensaryStocktakingOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+    /**
+     * 盘点单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryStocktakingOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 盘点单单据列表
+     *
+     * @param stocktakingOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 盘点单据分页列表
+     */
+    @GetMapping(value = "/stocktaking-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam stocktakingOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(stocktakingOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.PURCHASE_STOCKTAKING.getValue());
+    }
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @GetMapping(value = "/stocktaking-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryStocktakingOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryStocktakingOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stocktakingOrder")
+    public R<?> addOrEditStocktakingOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> stocktakingOrderDtoList) {
+        return pharmacyDispensaryStocktakingOrderService.addOrEditStocktakingOrder(stocktakingOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stocktakingOrder")
+    public R<?> deleteStocktakingOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.stocktakingAgreepproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
new file mode 100644
index 00000000..0a212765
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房调入单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/transferIn-order")
+@Slf4j
+public class PharmacyDispensaryTransferInOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryTransferInOrderService pharmacyDispensaryTransferInOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+
+    /**
+     * 调入单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryTransferInOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 调入单单据列表
+     *
+     * @param transferInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 调入单据分页列表
+     */
+    @GetMapping(value = "/transferIn-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam transferInOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(transferInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.PURCHASE_TRANSFERIN.getValue());
+    }
+
+    /**
+     * 调入单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调入单单据详情
+     */
+    @GetMapping(value = "/transferIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryTransferInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryTransferInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferInOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-transferInOrder")
+    public R<?> addOrEditTransferInOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> transferInOrderDtoList) {
+        return pharmacyDispensaryTransferInOrderService.addOrEditTransferInOrder(transferInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-transferInOrder")
+    public R<?> deleteTransferInOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.transferInAgreeApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
new file mode 100644
index 00000000..adb2ecba
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.pharmacyDispensarymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药房调出单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-dispensary/transferOut-order")
+@Slf4j
+public class PharmacyDispensaryTransferOutOrderController {
+
+    @Autowired
+    private IPharmacyDispensaryTransferOutOrderService pharmacyDispensaryTransferOutOrderService;
+
+    @Autowired
+    private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
+
+    @Autowired
+    private IPharmacyDispensaryReceiptApprovalService pharmacyDispensaryReceiptApprovalService;
+
+    /**
+     * 调出单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyDispensaryTransferOutOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyDispensarySearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 调出单单据列表
+     *
+     * @param transferOutOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 调出单据分页列表
+     */
+    @GetMapping(value = "/transferOut-order-page")
+    public R<?> getPage(PharmacyDispensarySearchParam transferOutOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyDispensaryCommonService.getPage(transferOutOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.PURCHASE_TRANSFEROUT.getValue());
+    }
+
+    /**
+     * 调出单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 调出单单据详情
+     */
+    @GetMapping(value = "/transferOut-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyDispensaryTransferOutOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyDispensaryTransferOutOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param transferOutOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-transferOutOrder")
+    public R<?> addOrEditTransferOutOrder(@Validated @RequestBody List<PharmacyDispensaryDetailDto> transferOutOrderDtoList) {
+        return pharmacyDispensaryTransferOutOrderService.addOrEditTransferOutOrder(transferOutOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-transferOutOrder")
+    public R<?> deleteTransferOutOrder(@RequestParam String busNo) {
+        return pharmacyDispensaryCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyDispensaryReceiptApprovalService.transferOutAgreeApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
new file mode 100644
index 00000000..1f9926ac
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyDispensarymanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import liquibase.pro.packaged.S;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 订购单信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyDispensaryDetailDto implements Serializable {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 单据号 */
+    private String busNo;
+    /** 再生成单据号 */
+    private String originalBusNo;
+
+    /** 药品编码 */
+    private String itemBusNo;
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 物品名称 */
+    private String itemName;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 选择单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 常规单位 */
+    @Dict(dictCode = "unit_code")
+    private String maxUnitCode;
+    private String maxUnitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private String partPercent;
+
+    /** 数量 */
+    private BigDecimal itemQuantity;
+
+    /** 合计数量 */
+    private BigDecimal totalQuantity;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 零价金额 */
+    private BigDecimal totalRetailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 备注 */
+    private String remake;
+
+    /** 理由类型 */
+    private String  reasonCode;
+
+    /** 摘要（理由） */
+    private String  reason;
+
+    /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 源仓库类型 */
+    private Integer sourceTypeEnum;
+    /** 源仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+
+    /** 目的仓库类型 */
+    private Integer purposeTypeEnum;
+    /** 目的仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long purposeLocationId;
+
+    /** 采购员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+
+    /** 审批人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 单据分类 */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+
+    /** 供应商联系人 */
+    private String phone;
+
+    /** 仓库员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long  practitionerId;
+
+    /** 发票号 */
+    private String invoiceNo;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 生产日期 */
+    private Date startTime;
+
+    /** 失效日期 */
+    private Date endTime;
+
+    /** 追溯码*/
+    private String traceNo;
+
+    /** 追溯码单位 */
+    @Dict(dictCode = "unit_code")
+    private String traceNoUnitCode;
+    private String traceNoUnitCode_dictText;
+
+    /** 包装情况 */
+    private Integer packagingConditionEnum;
+    private String packagingConditionEnum_enumText;
+
+    /** 验收结果 */
+    private Integer acceptanceResultEnum;
+    private String acceptanceResultEnum_enumText;
+
+    /** 禁用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date occurrenceTime;
+
+    /** 药品发放id */
+    private String dispenseIds;
+
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+        public Option() {
+        }
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
new file mode 100644
index 00000000..100e9b3b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyDispensarymanage.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 订购单信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyDispensaryDto implements Serializable {
+    /** 单据号 */
+    private String supplyBusNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    private String locationTypeEnum_enumText;
+
+    /** 仓库 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_location")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 采购员 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+    private String applicantId_dictText;
+
+    /** 审批人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
new file mode 100644
index 00000000..77a21c2b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyDispensarymanage.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.web.common.dto.LocationDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 订购单信息
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyDispensaryInitDto implements Serializable {
+
+    /**
+     * 单据号
+     */
+    private String busNo;
+
+    /**
+     * 库房类型列表
+     */
+    private List<DispensaryOption> warehouseTypeOption;
+
+    /**
+     * 库房列表
+     */
+    private List<LongOption> warehouseOption;
+
+    /**
+     * 供应商列表
+     */
+     private List<SupplierOption> supplierOption;
+
+    /**
+     * 人员列表
+     */
+    private List<LongOption> practitionerOption;
+    /**
+     * 审批状态
+     */
+    private List<IntegerOption> supplyStatusOptions;
+
+    /**
+     * 单据类型
+     */
+    private List<IntegerOption> supplyTypeOptions;
+
+    /**
+     * 单据分类
+     */
+    private List<IntegerOption> supplyCategoryOptions;
+    /**
+     * 包装情况
+     */
+    private List<IntegerOption> packagingConditionOptions;
+    /**
+     * 包装情况
+     */
+    private List<IntegerOption> acceptanceResultoryOptions;
+
+    /**
+     * 仓库
+     */
+    private List<LocationDto> cabinetListOptions;
+    /**
+     * 药房
+     */
+    private List<LocationDto> pharmacyListOptions;
+
+    @Data
+    public static class LongOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public LongOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class SupplierOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+        private String phone;
+
+        public SupplierOption(Long value, String label, String phone) {
+            this.value = value;
+            this.label = label;
+            this.phone = phone;
+        }
+    }
+
+    @Data
+    public static class IntegerOption {
+        private Integer value;
+        private String label;
+
+        public IntegerOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class DispensaryOption {
+        private Integer value;
+        private String label;
+        private List<LocationDto> locationOption;
+        private List<DispensaryItemOption> orderOption;
+
+        public DispensaryOption(Integer value, String label,List<LocationDto> locationOption,List<DispensaryItemOption> orderOption) {
+            this.value = value;
+            this.label = label;
+            this.locationOption = locationOption;
+            this.orderOption = orderOption;
+        }
+    }
+
+    @Data
+    public static class DispensaryItemOption {
+        private Integer value;
+        private String label;
+
+        public DispensaryItemOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
new file mode 100644
index 00000000..3529eec6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyDispensarymanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyDispensaryMedicationInfoDto implements Serializable {
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 物品编号 */
+    private String busNo;
+
+    /** 物品名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 包装单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+
+//    /** 价格单位 */
+//    @Dict(dictCode = "unit_code")
+//    private String conditionUnitCode;
+//    private String conditionUnitCode_dictText;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 库存最小警戒线 */
+    private BigDecimal itemMinQuantity;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 生产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date productionDate;
+
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date expirationDate;
+
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
new file mode 100644
index 00000000..2263b3d5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyDispensarymanage.dto;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 订购单查询条件
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyDispensarySearchParam implements Serializable {
+    /** id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /** 单据号 */
+    private String busNo;
+
+    /** 采购员 */
+    private String applicantName;
+
+    /** 项目名 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 供应商id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+    /** 单据状态 */
+    private Integer statusEnum;
+
+    /** 再生成单据号flg */
+    private String originalBusNoFlg;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
new file mode 100644
index 00000000..08d0ce8c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
@@ -0,0 +1,58 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+
+/**
+ * 药库共通 mapper
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryCommonMapper {
+    /**
+     * 根据供应商获取药品
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param locationId 仓库id
+     * @return 药品信息
+     */
+
+    Page<PharmacyDispensaryMedicationInfoDto> getMedicationInfo(
+        @Param("page") Page<PharmacyDispensaryMedicationInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PharmacyDispensarySearchParam> queryWrapper,
+        @Param("locationId") Long locationId, @Param("supplierId") Long supplierId);
+
+    /**
+     * 查询订货单分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param originalBusNoFlg 再生成单据号flg
+     * @param locationFlg 仓库flg
+     * @return 订货单分页列表
+     */
+    Page<PharmacyDispensaryDto> getPage(@Param("page") Page<PharmacyDispensaryDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PharmacyDispensarySearchParam> queryWrapper,
+        @Param("originalBusNoFlg") String originalBusNoFlg, @Param("locationFlg") String locationFlg);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    Page<PharmacyDispensaryDetailDto> getDetailPage(@Param("page") Page<PharmacyDispensaryDetailDto> page,
+        @Param("busNo") String busNo);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
new file mode 100644
index 00000000..9ded9aa6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
@@ -0,0 +1,29 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 药房发药单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryDispensingOrderMapper {
+
+
+    /**
+     * 获取更表所需信息
+     *
+     * @param dispenseIdList 药品发放id
+     * @param dispenseStatus 发放状态
+     * @return 单据详情
+     */
+    List<PharmacyDispensaryDetailDto> getInfo(@Param("dispenseIdList") List<Long> dispenseIdList,@Param("dispenseStatus") Integer dispenseStatus);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
new file mode 100644
index 00000000..90eaa129
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房损益单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryProfitLossOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
new file mode 100644
index 00000000..9e7ff8d9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房请领单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryRequisitionOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
new file mode 100644
index 00000000..f7bd14ac
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房退库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryReturnToWarehouseOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
new file mode 100644
index 00000000..9fd74c06
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房入库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryStockInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
new file mode 100644
index 00000000..2073cb3e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房盘点单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryStocktakingOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
new file mode 100644
index 00000000..2eebf106
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房调入单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryTransferInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
new file mode 100644
index 00000000..768d4a3b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyDispensarymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药房调出单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyDispensaryTransferOutOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
new file mode 100644
index 00000000..ff73d700
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
@@ -0,0 +1,83 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 药库共通方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseCommonService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    PharmacyWarehouseInitDto init();
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    R<?> getPage(PharmacyWarehouseSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request,String locationFlg,Integer supplyType);
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> deleteOrder(String busNo);
+
+//    /**
+//     * 提交审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> submitApproval(String busNo);
+
+//    /**
+//     * 同意审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> agreeApproval(String busNo);
+
+//    /**
+//     * 撤回审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    R<?> withdrawApproval(String busNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
new file mode 100644
index 00000000..fefd008c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
@@ -0,0 +1,22 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+
+/**
+ * 药库单据
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseDocumentManagementService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
new file mode 100644
index 00000000..e572cc84
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+
+/**
+ * 药库损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseProfitLossOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    R<?> addOrEditProfitLossOrder(List<PharmacyWarehouseDetailDto> profitLossOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
new file mode 100644
index 00000000..3b1c1b8d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
@@ -0,0 +1,49 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 药库订货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehousePurchaseOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 订货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 订货单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param purchaseOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    R<?> addOrEditPurchaseOrder(List<PharmacyWarehouseDetailDto> purchaseOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
new file mode 100644
index 00000000..1becbcc5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
@@ -0,0 +1,114 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import java.util.List;
+
+/**
+ * 药库审批方法
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseReceiptApprovalService {
+
+    /**
+     * 采购单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> purchaseOrderAgreeApproval(String busNo);
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    List<SupplyItemDetailDto> getSupplyItemDetail(String busNo);
+
+    /**
+     * 获取物品的价格信息
+     *
+     * @param itemIdList 物品id
+     * @return 价格信息
+     */
+    List<ItemChargeDetailDto> getItemChargeDetail(List<Long> itemIdList);
+
+    /**
+     * 入库单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> purchaseInventoryApproved(String busNo);
+
+    /**
+     * 采购退货审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    R<?> purchaseReturnApproved(String busNo);
+
+
+     /**
+     * 领用出库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> requisitionIssueApproved(String busNo);
+
+     /**
+     * 领用退库审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> returnIssueApproved(String busNo);
+
+
+     /**
+     * 报损单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> lossReportApproved(String busNo);
+
+     /**
+     * 商品盘点审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+     R<?> productStocktakingApproved(String busNo);
+    //
+    // /**
+    // * 商品调拨审批通过
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // R<?> productTransferApproved(String busNo);
+
+
+    //
+    // /**
+    // * 审批驳回
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // R<?> reject(String busNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
new file mode 100644
index 00000000..7f37b51e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
@@ -0,0 +1,50 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 药库退货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseReturnOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 退货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退货单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param returnOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    R<?> addOrEditReturnOrder(List<PharmacyWarehouseDetailDto> returnOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
new file mode 100644
index 00000000..f5760e84
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+
+/**
+ * 药库退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseReturnToWarehouseOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToWarehouseOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditReturnToWarehouseOrder(List<PharmacyWarehouseDetailDto> returnToWarehouseOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
new file mode 100644
index 00000000..87c3734b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
@@ -0,0 +1,50 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 药库进货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseStockInOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 进货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 进货单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑进货单
+     *
+     * @param stockInOrderDtoList 进货信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStockInOrder(List<PharmacyWarehouseDetailDto> stockInOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
new file mode 100644
index 00000000..a3e47d82
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+
+/**
+ * 药库出库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseStockOutOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 出库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 出库单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑出库单
+     *
+     * @param stockOutOrderDtoList 出库信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStockOutOrder(List<PharmacyWarehouseDetailDto> stockOutOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
new file mode 100644
index 00000000..55779f63
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
@@ -0,0 +1,47 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+
+/**
+ * 药库盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+public interface IPharmacyWarehouseStocktakingOrderService {
+    /**
+     * 单据初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    R<?> getBusNo();
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    R<?> addOrEditStocktakingOrder(List<PharmacyWarehouseDetailDto> stocktakingOrderDtoList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
new file mode 100644
index 00000000..6eb2bf9d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
@@ -0,0 +1,273 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.common.appservice.ICommonService;
+import com.openhis.web.common.dto.InventoryItemDto;
+import com.openhis.web.common.dto.UnitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehousePurchaseOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 药库共通
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseCommonServiceImpl implements IPharmacyWarehouseCommonService {
+
+    @Resource
+    private ISupplierService supplierService;
+
+    @Resource
+    private IPractitionerService practitionerService;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+    @Resource
+    private ICommonService commonServiceImpl;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public PharmacyWarehouseInitDto init() {
+        PharmacyWarehouseInitDto orderInitDto = new PharmacyWarehouseInitDto();
+
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 查询经手人列表
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 经手人信息
+        List<PharmacyWarehouseInitDto.LongOption> practitionerListOption = practitionerList.stream()
+            .map(practitioner -> new PharmacyWarehouseInitDto.LongOption(practitioner.getId(), practitioner.getName()))
+            .collect(Collectors.toList());
+        // 供应商信息
+        List<PharmacyWarehouseInitDto.SupplierOption> supplierListOption =
+            supplierList.stream().map(supplier -> new PharmacyWarehouseInitDto.SupplierOption(supplier.getId(),
+                supplier.getName(), supplier.getPhone())).collect(Collectors.toList());
+        // 审批状态
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyStatusOption = Stream.of(SupplyStatus.values()).map(
+            supplyStatus -> new PharmacyWarehouseInitDto.IntegerOption(supplyStatus.getValue(), supplyStatus.getInfo()))
+            .collect(Collectors.toList());
+
+        // 包装情况
+        List<PharmacyWarehouseInitDto.IntegerOption> packagingConditionOption = Stream.of(PackagingCondition.values())
+            .map(packagingCondition -> new PharmacyWarehouseInitDto.IntegerOption(packagingCondition.getValue(),
+                packagingCondition.getInfo()))
+            .collect(Collectors.toList());
+
+        // 验收结果
+        List<PharmacyWarehouseInitDto.IntegerOption> acceptanceResultOption = Stream.of(AcceptanceResult.values())
+            .map(acceptanceResult -> new PharmacyWarehouseInitDto.IntegerOption(acceptanceResult.getValue(),
+                acceptanceResult.getInfo()))
+            .collect(Collectors.toList());
+
+        // 仓库列表
+        List<LocationDto> cabinetList = commonServiceImpl.getCabinetList();
+        // 药房列表
+        List<LocationDto> pharmacyList = commonServiceImpl.getPharmacyList();
+
+        orderInitDto.setCabinetListOptions(cabinetList).setPharmacyListOptions(pharmacyList)
+            .setSupplierOption(supplierListOption).setPractitionerOption(practitionerListOption)
+            .setSupplyStatusOptions(supplyStatusOption).setPackagingConditionOptions(packagingConditionOption)
+            .setAcceptanceResultoryOptions(acceptanceResultOption);
+
+        return orderInitDto;
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @Override
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+
+        Long locationId = purchaseOrderSearchParam.getLocationId();
+        purchaseOrderSearchParam.setLocationId(null);
+        Long supplierId = null;
+        // 为药库订货时，需要传参数supplierId
+        if (purchaseOrderSearchParam.getTypeEnum() != null
+            && purchaseOrderSearchParam.getTypeEnum().equals(SupplyType.CABINET_PURCHASE.getValue())) {
+            supplierId = purchaseOrderSearchParam.getSupplierId();
+            purchaseOrderSearchParam.setSupplierId(null);
+            purchaseOrderSearchParam.setTypeEnum(null);
+        }
+        // 构建查询条件
+        QueryWrapper<PharmacyWarehouseSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name, CommonConstants.FieldName.PyStr)), request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.Name);
+
+        Page<PharmacyWarehouseMedicationInfoDto> medicationInfoDto = pharmacyWarehouseCommonMapper
+            .getMedicationInfo(new Page<>(pageNo, pageSize), queryWrapper, locationId, supplierId);
+
+        for (PharmacyWarehouseMedicationInfoDto item : medicationInfoDto.getRecords()) {
+            List<PharmacyWarehouseMedicationInfoDto.Option> unitList = new ArrayList<>();
+            unitList
+                .add(new PharmacyWarehouseMedicationInfoDto.Option(item.getUnitCode(), item.getUnitCode_dictText()));
+            unitList.add(
+                new PharmacyWarehouseMedicationInfoDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(medicationInfoDto);
+    }
+
+    /**
+     * 单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param locationFlg 仓库flg
+     * @param supplyType 单据类型
+     * @return 订货单据分页列表
+     */
+    @Override
+    public R<?> getPage(PharmacyWarehouseSearchParam purchaseOrderSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request, String locationFlg, Integer supplyType) {
+        // 判断哪个画面使用
+        if (supplyType != null) {
+            purchaseOrderSearchParam.setTypeEnum(supplyType);
+        }
+        // if (locationForm != null) {
+        // purchaseOrderSearchParam.setLocationTypeEnum(locationForm);
+        // }
+        String originalBusNoFlg = purchaseOrderSearchParam.getOriginalBusNoFlg();
+        purchaseOrderSearchParam.setOriginalBusNoFlg(null);
+        // 构建查询条件
+        QueryWrapper<PharmacyWarehouseSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseOrderSearchParam, searchKey,
+                new HashSet<>(
+                    Arrays.asList(CommonConstants.FieldName.SupplyBusNo, CommonConstants.FieldName.ApplicantName)),
+                request);
+        // 设置排序
+        queryWrapper.orderByDesc(CommonConstants.FieldName.SupplyBusNo);
+        // 查询订货单分页列表
+        Page<PharmacyWarehouseDto> purchaseOrderDtoPage = pharmacyWarehouseCommonMapper
+            .getPage(new Page<>(pageNo, pageSize), queryWrapper, originalBusNoFlg, locationFlg);
+
+        purchaseOrderDtoPage.getRecords().forEach(e -> {
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        return R.ok(purchaseOrderDtoPage);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> deleteOrder(String busNo) {
+        // 根据原始单据号查询信息
+        List<SupplyRequest> supplyRequest = supplyRequestService.getSupplyByOriginalBusNo(busNo);
+        if (!supplyRequest.isEmpty()) {
+            // 将原始单据号信息的原始单据号删除
+            boolean flg = supplyRequestService.updateByBusNo(supplyRequest.get(0).getBusNo());
+            if (!flg) {
+                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        // 删除单据
+        boolean result = supplyRequestService.removeByBusNo(busNo);
+        return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    // /**
+    // * 提交审批
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // @Override
+    // public R<?> submitApproval(String busNo) {
+    // // 单据提交审核
+    // boolean result = supplyRequestService.submitApproval(busNo);
+    // return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+    // : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+
+    // /**
+    // * 同意审批
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // @Override
+    // public R<?> agreeApproval(String busNo) {
+    // // 单据同意审核
+    // List<SupplyRequest> result = supplyRequestService.agreeRequest(busNo, DateUtils.getNowDate());
+    // return result == null ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+    // : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+
+    // /**
+    // * 撤回审批
+    // *
+    // * @param busNo 单据号
+    // * @return 操作结果
+    // */
+    // @Override
+    // public R<?> withdrawApproval(String busNo) {
+    // // 撤回审核
+    // boolean result = supplyRequestService.withdrawApproval(busNo);
+    // return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+    // : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    // }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
new file mode 100644
index 00000000..47dd6f77
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
@@ -0,0 +1,184 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.domain.Organization;
+import com.openhis.common.enums.*;
+import com.openhis.web.common.appservice.ICommonService;
+import com.openhis.web.common.dto.LocationDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseDocumentManagementMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库单据
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseDocumentManagementServiceImpl implements IPharmacyWarehouseDocumentManagementService {
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Resource
+    private ICommonService commonServiceImpl;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据类型
+        List<PharmacyWarehouseInitDto.IntegerOption> cabinetTypeOption = new ArrayList<>();
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_PURCHASE.getValue(),
+            SupplyType.CABINET_PURCHASE.getInfo()));
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_STOCKIN.getValue(),
+            SupplyType.CABINET_STOCKIN.getInfo()));
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_RETURN.getValue(),
+            SupplyType.CABINET_RETURN.getInfo()));
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_STOCKOUT.getValue(),
+            SupplyType.CABINET_STOCKOUT.getInfo()));
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_PRODUCT_RETURN.getValue(),
+            SupplyType.CABINET_PRODUCT_RETURN.getInfo()));
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_PRPFITLOSS.getValue(),
+            SupplyType.CABINET_PRPFITLOSS.getInfo()));
+        cabinetTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.CABINET_STOCKTAKING.getValue(),
+            SupplyType.CABINET_STOCKTAKING.getInfo()));
+        // 单据类型
+        List<PharmacyWarehouseInitDto.IntegerOption> pharmacyTypeOption = new ArrayList<>();
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_REQUISITION.getValue(),
+            SupplyType.PURCHASE_REQUISITION.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_STOCKIN.getValue(),
+            SupplyType.PURCHASE_STOCKIN.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_RETURN.getValue(),
+            SupplyType.PURCHASE_RETURN.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_PRPFITLOSS.getValue(),
+            SupplyType.PURCHASE_PRPFITLOSS.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_STOCKTAKING.getValue(),
+            SupplyType.PURCHASE_STOCKTAKING.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_TRANSFERIN.getValue(),
+            SupplyType.PURCHASE_TRANSFERIN.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.PURCHASE_TRANSFEROUT.getValue(),
+            SupplyType.PURCHASE_TRANSFEROUT.getInfo()));
+        pharmacyTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DISPENSING_ORDER.getValue(),
+            SupplyType.DISPENSING_ORDER.getInfo()));
+        // 单据类型
+        List<PharmacyWarehouseInitDto.IntegerOption> warehouseTypeOption = new ArrayList<>();
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_PURCHASE.getValue(),
+            SupplyType.MATERIAL_PURCHASE.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_STOCKIN.getValue(),
+            SupplyType.MATERIAL_STOCKIN.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_RETURN.getValue(),
+            SupplyType.MATERIAL_RETURN.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_STOCKOUT.getValue(),
+            SupplyType.MATERIAL_STOCKOUT.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_PRODUCT_RETURN.getValue(),
+            SupplyType.MATERIAL_PRODUCT_RETURN.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_PRPFITLOSS.getValue(),
+            SupplyType.MATERIAL_PRPFITLOSS.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_STOCKTAKING.getValue(),
+            SupplyType.MATERIAL_STOCKTAKING.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_TRANSFERIN.getValue(),
+            SupplyType.MATERIAL_TRANSFERIN.getInfo()));
+        warehouseTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.MATERIAL_TRANSFEROUT.getValue(),
+            SupplyType.MATERIAL_TRANSFEROUT.getInfo()));
+        // 单据类型
+        List<PharmacyWarehouseInitDto.IntegerOption> departmentTypeOption = new ArrayList<>();
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_REQUISITION.getValue(),
+            SupplyType.DEPARTMENT_REQUISITION.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_STOCKIN.getValue(),
+            SupplyType.DEPARTMENT_STOCKIN.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_RETURN.getValue(),
+            SupplyType.DEPARTMENT_RETURN.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_PRPFITLOSS.getValue(),
+            SupplyType.DEPARTMENT_PRPFITLOSS.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_STOCKTAKING.getValue(),
+            SupplyType.DEPARTMENT_STOCKTAKING.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_TRANSFERIN.getValue(),
+            SupplyType.DEPARTMENT_TRANSFERIN.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DEPARTMENT_TRANSFEROUT.getValue(),
+            SupplyType.DEPARTMENT_TRANSFEROUT.getInfo()));
+        departmentTypeOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyType.DISPENSING_ORDER.getValue(),
+            SupplyType.DISPENSING_ORDER.getInfo()));
+
+        // 药库列表
+        List<PharmacyWarehouseInitDto.item> cabinetList = new ArrayList<>();
+        PharmacyWarehouseInitDto.item cabinetListItem;
+        for (LocationDto item : commonServiceImpl.getCabinetList()) {
+            cabinetListItem = new PharmacyWarehouseInitDto.item();
+            BeanUtils.copyProperties(item, cabinetListItem);
+            cabinetList.add(cabinetListItem);
+        }
+
+        // 药房列表
+        List<PharmacyWarehouseInitDto.item> pharmacyList = new ArrayList<>();
+        PharmacyWarehouseInitDto.item pharmacyListItem;
+        for (LocationDto item : commonServiceImpl.getPharmacyList()) {
+            pharmacyListItem = new PharmacyWarehouseInitDto.item();
+            BeanUtils.copyProperties(item, pharmacyListItem);
+            pharmacyList.add(pharmacyListItem);
+        }
+
+        // 仓库列表
+        List<PharmacyWarehouseInitDto.item> warehouseList = new ArrayList<>();
+        PharmacyWarehouseInitDto.item warehouseListItem;
+        for (LocationDto item : commonServiceImpl.getWarehouseList()) {
+            warehouseListItem = new PharmacyWarehouseInitDto.item();
+            BeanUtils.copyProperties(item, warehouseListItem);
+            warehouseList.add(warehouseListItem);
+        }
+
+        // 仓库列表
+        List<PharmacyWarehouseInitDto.item> departmentList = new ArrayList<>();
+        PharmacyWarehouseInitDto.item departmentListItem;
+        for (Organization item : commonServiceImpl.departmentList()) {
+            departmentListItem = new PharmacyWarehouseInitDto.item();
+            BeanUtils.copyProperties(item, departmentListItem);
+            departmentList.add(departmentListItem);
+        }
+
+        // 库房类型
+        List<PharmacyWarehouseInitDto.WarehouseOption> typeOption = new ArrayList<>();
+        typeOption.add(new PharmacyWarehouseInitDto.WarehouseOption(LocationForm.CABINET.getValue(),
+            LocationForm.CABINET.getInfo(), cabinetList, cabinetTypeOption));
+        typeOption.add(new PharmacyWarehouseInitDto.WarehouseOption(LocationForm.PHARMACY.getValue(),
+            LocationForm.PHARMACY.getInfo(), pharmacyList, pharmacyTypeOption));
+        typeOption.add(new PharmacyWarehouseInitDto.WarehouseOption(LocationForm.WAREHOUSE.getValue(),
+            LocationForm.WAREHOUSE.getInfo(), warehouseList, warehouseTypeOption));
+        typeOption.add(new PharmacyWarehouseInitDto.WarehouseOption(LocationForm.DEPARTMENT.getValue(),
+            LocationForm.DEPARTMENT.getInfo(), departmentList, departmentTypeOption));
+
+        purchaseOrderInitDto.setWarehouseTypeOption(typeOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
new file mode 100644
index 00000000..a2d19aaa
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
@@ -0,0 +1,170 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.common.enums.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseProfitLossOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库损益单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWarehouseProfitLossOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
+            SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PREPARATION_CONSUMPTION.getValue(),
+            SupplyCategory.PREPARATION_CONSUMPTION.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> profitLossOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        profitLossOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : profitLossOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(profitLossOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.LOSS_BUS_NO.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditProfitLossOrder(List<PharmacyWarehouseDetailDto> profitLossOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyWarehouseDetailDto item : profitLossOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.CABINET_PRPFITLOSS.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                    .setEndTime(item.getEndTime()).setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                    .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                    .setReason(item.getReason()).setPurposeTypeEnum(LocationForm.CABINET.getValue())
+                    .setPurposeLocationId(item.getPurposeLocationId())
+                    .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
new file mode 100644
index 00000000..b19fbeb3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
@@ -0,0 +1,170 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.common.dto.LocationDto;
+import com.openhis.web.common.dto.UnitDto;
+import com.openhis.web.inventorymanage.dto.*;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.*;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehousePurchaseOrderMapper;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 药库订货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehousePurchaseOrderServiceImpl implements IPharmacyWarehousePurchaseOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+
+    @Autowired
+    private   PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASE_PLAN_GENERATION.getValue(),
+            SupplyCategory.PURCHASE_PLAN_GENERATION.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 订货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 订货单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> purchaseOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        purchaseOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : purchaseOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(purchaseOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PHARMACY_WAREHOUSE_PURCHASE.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param purchaseOrderDtoList 采购信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditPurchaseOrder(List<PharmacyWarehouseDetailDto> purchaseOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(purchaseOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        for (PharmacyWarehouseDetailDto item : purchaseOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.CABINET_PURCHASE.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                    .setSpecificationInventory(item.getSpecificationInventory()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setPurposeTypeEnum(LocationForm.CABINET.getValue())
+                    .setPurposeLocationId(item.getPurposeLocationId()).setSupplierId(item.getSupplierId())
+                    .setApplicantId(item.getApplicantId()).setApplyTime(item.getApplyTime()).setReason(item.getReason())
+                    .setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
new file mode 100644
index 00000000..9432b59f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
@@ -0,0 +1,984 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbInvChgType;
+import com.openhis.common.enums.ybenums.YbRxFlag;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+import com.openhis.yb.dto.Medical3503Param;
+import com.openhis.yb.dto.MedicalInventory3501Param;
+import com.openhis.yb.dto.MedicalInventory3502Param;
+import com.openhis.yb.dto.MedicalPurchase3504Param;
+import com.openhis.yb.service.YbManager;
+
+/**
+ * 药库审批
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseReceiptApprovalServiceImpl implements IPharmacyWarehouseReceiptApprovalService {
+    @Autowired
+    private ITraceNoAppService traceNoAppService;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private ISupplyDeliveryService supplyDeliveryService;
+
+    @Autowired
+    private IChargeItemDefDetailService chargeItemDefAppService;
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+    @Autowired
+    private ReceiptApprovalMapper receiptApprovalMapper;
+    @Autowired
+    private YbManager ybService;
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+    @Autowired
+    private IReceiptApprovalAppService receiptApprovalAppService;
+
+    /**
+     * 采购单同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> purchaseOrderAgreeApproval(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // // 获取审批通过后的供应请求id列表
+        // List<Long> supplyReqIdList = agreedList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+        //
+        // // 校验(已经审批通过的单号(发放状态是已完成),不能再重复审批通过)
+        // boolean validation = supplyDeliveryService.supplyDeliveryValidation(supplyReqIdList);
+        // if (validation) {
+        // throw new ServiceException("请勿重复审批");
+        // }
+        // // 根据单据，生成供应发放单
+        // List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        // if (deliveredList.isEmpty()) {
+        // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        // }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药库进货单据审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> purchaseInventoryApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 获取审批通过后的供应请求id列表
+        List<Long> supplyReqIdList = agreedList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+
+        // 校验(已经审批通过的单号(发放状态是已完成),不能再重复审批通过)
+        boolean validation = supplyDeliveryService.supplyDeliveryValidation(supplyReqIdList);
+        if (validation) {
+            throw new ServiceException("请勿重复审批");
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 获取供应的物品
+        List<Long> itemIdList = supplyRequestService.getItem(agreedList);
+        // 获取项目价格相关信息
+        List<ItemChargeDetailDto> chargeDetailList = this.getItemChargeDetail(itemIdList);
+        List<ChargeItemDefDetail> chargeItemDefDetailList;
+        if (!chargeDetailList.isEmpty()) {
+            // 生成与之前定价不同的定价子表数据
+            chargeItemDefDetailList = this.creatChargeItemDetail(agreedList, chargeDetailList);
+            if (!chargeItemDefDetailList.isEmpty()) {
+                for (ChargeItemDefDetail chargeItemDefDetail : chargeItemDefDetailList) {
+                    // 增加项目定价子表数据
+                    chargeItemDefAppService.addChargeItemDefApp(chargeItemDefDetail);
+                }
+            }
+        }
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            InventoryItem inventoryItemPurpose = null;
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplyList = new ArrayList<>();
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplyList.add(supplyItemDetailDto);
+                } else {
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(调拨数量*拆零比)
+                        minQuantity = minQuantity
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+调拨数量
+                        minQuantity = minQuantity.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新源仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            if (!supplyList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplyList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.CABINET_STOCKIN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保商品采购接口 todo 药库相关医保接口未对应
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3503商品采购上传错误，错误项目编码" + uploadFailedNoList;
+                } else {
+                    returnMsg = "3503商品采购上传成功";
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药库退货单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> purchaseReturnApproved(String busNo) {
+        // // 根据原始单据号查询信息
+        // List<SupplyRequest> supplyRequest = supplyRequestService.getSupplyByOriginalBusNo(busNo);
+        // if (!supplyRequest.isEmpty()) {
+        // // 将原始单据号信息的状态改为已失效
+        // boolean flg = supplyRequestService.updateStatusEnumByBusNo(supplyRequest.get(0).getBusNo());
+        // if (!flg) {
+        // R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        // }
+        // }
+
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 返回信息
+        String returnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询仓库库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource;
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItemSource = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // 计算退货后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 仓库库存-(退货数量*拆零比)
+                            minQuantity = minQuantity.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 仓库库存-退货数量
+                            minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+                    // 更新仓库库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+
+                    // 退货数量等于库存数量时，删除库存数据
+                    if (minQuantity.compareTo(BigDecimal.ZERO) == 0) {
+                        inventoryItemService.removeById(inventoryItemSource.getId());
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.CABINET_RETURN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保采购退货接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList =
+                    this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3504采购退货上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 药库出库单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> requisitionIssueApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
+                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemSource = new InventoryItem();
+                if (!inventoryItemSourceList.isEmpty()) {
+                    inventoryItemSource = inventoryItemSourceList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantitySource = inventoryItemSource.getQuantity();
+
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 源仓库库存-(领用数量*拆零比)
+                            minQuantitySource = minQuantitySource.subtract(
+                                supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                        }
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        if (minQuantitySource.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                            // 库存数量不足
+                            return R.fail(MessageUtils.createMessage("操作失败,库存数量不足", null));
+                        } else {
+                            // 供应申请的物品计量单位与最小单位相同
+                            // 源仓库库存-领用数量
+                            minQuantitySource = minQuantitySource.subtract(supplyItemDetailDto.getItemQuantity());
+                        }
+                    }
+
+                    // 更新源仓库库存数量
+                    Boolean aBooleanSource = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(),
+                        minQuantitySource, now);
+
+                    if (!aBooleanSource) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
+                SupplyType.CABINET_STOCKOUT.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 药库退库单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> returnIssueApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，发放物品
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+            // 新增库存信息
+            List<SupplyItemDetailDto> supplylList = new ArrayList<>();
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
+                List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItemPurpose = null;
+                if (!inventoryItemPurposeList.isEmpty()) {
+                    inventoryItemPurpose = inventoryItemPurposeList.get(0);
+                }
+
+                if (inventoryItemPurpose == null) {
+                    // 新增库存信息
+                    supplylList.add(supplyItemDetailDto);
+                } else {
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantityPurpose = inventoryItemPurpose.getQuantity();
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 源仓库库存+(退库数量*拆零比)
+                        minQuantityPurpose = minQuantityPurpose
+                            .add(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存+退库数量
+                        minQuantityPurpose = minQuantityPurpose.add(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // 更新目的仓库库存数量
+                    Boolean bBooleanPurpose = inventoryItemService.updateInventoryQuantity(inventoryItemPurpose.getId(),
+                        minQuantityPurpose, now);
+                    if (!bBooleanPurpose) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            if (!supplylList.isEmpty()) {
+                // 将供应项目的详细信息装配为库存项目
+                List<InventoryItem> inventoryItemList = InventoryManageAssembler.assembleInventoryItem(supplylList);
+                // 入库
+                inventoryItemService.stockIn(inventoryItemList);
+            }
+            // 追加追溯码信息
+            boolean flg = traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.IN.getValue(),
+                SupplyType.CABINET_PRODUCT_RETURN.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
+    /**
+     * 损益单审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> lossReportApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 返回信息
+        String returnMsg = null;
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        if (!supplyItemDetailList.isEmpty()) {
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                InventoryItem inventoryItem = new InventoryItem();
+                if (!inventoryItemList.isEmpty()) {
+                    inventoryItem = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算报损后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        // 数量*拆零比
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity());
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        // 数量
+                        minQuantity = supplyItemDetailDto.getItemQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+            }
+
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.CABINET_PRPFITLOSS.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+
+            // 调用医保库存变更接口
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+            if (Whether.YES.getCode().equals(ybSwitch)) {
+                List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
+                    YbInvChgType.DESTRUCTION, false, false, false, now);
+                if (!uploadFailedNoList.isEmpty()) {
+                    returnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedNoList;
+                }
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 商品盘点审批通过
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public R<?> productStocktakingApproved(String busNo) {
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 审批单据并返回单据详情
+        List<SupplyRequest> agreedList = supplyRequestService.agreeRequest(busNo, now);
+        if (agreedList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 根据单据，生成供应发放单
+        List<SupplyDelivery> deliveredList = supplyDeliveryService.createCompletedSupplyDelivery(agreedList, now);
+        if (deliveredList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 查询供应项目的详细信息
+        List<SupplyItemDetailDto> supplyItemDetailList = this.getSupplyItemDetail(busNo);
+        // 首次盘存列表
+        List<SupplyItemDetailDto> firstSupplyItemDetailList = new ArrayList<>();
+        // 药品/耗材发放列表
+        List<MedicationDispense> medicationDispenses = null;
+        List<DeviceDispense> deviceDispenses = null;
+        // 返回信息
+        String stocktakingReturnMsg = null;
+        String changeReturnMsg = null;
+        if (!supplyItemDetailList.isEmpty()) {
+            // 获取盘盈列表（itemQuantity > 0）
+            List<SupplyItemDetailDto> positiveList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .collect(Collectors.toList());
+            // 获取盘亏列表（itemQuantity < 0）
+            List<SupplyItemDetailDto> negativeList = supplyItemDetailList.stream()
+                .filter(item -> item.getItemQuantity() != null && item.getItemQuantity().compareTo(BigDecimal.ZERO) < 0)
+                .collect(Collectors.toList());
+
+            for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+                // 根据id，产品批号，仓库 查询库存表信息
+                List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                    supplyItemDetailDto.getPurposeLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                // 查看该批号的药品/耗材是否发放过(用于证明是否首次盘存)
+                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    medicationDispenses = medicationDispenseService.list(new LambdaQueryWrapper<MedicationDispense>()
+                        .eq(MedicationDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (medicationDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyItemDetailDto.getItemTable())) {
+                    deviceDispenses = deviceDispenseService.list(new LambdaQueryWrapper<DeviceDispense>()
+                        .in(DeviceDispense::getLotNumber, supplyItemDetailDto.getLotNumber()));
+                    if (deviceDispenses.isEmpty()) {
+                        firstSupplyItemDetailList.add(supplyItemDetailDto);
+                    }
+                }
+                if (!inventoryItemList.isEmpty()) {
+                    InventoryItem inventoryItem = inventoryItemList.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = null;
+
+                    // 计算盘点后库存数量，结果取小单位
+                    // 供应申请的物品计量单位与包装单位相同
+                    if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                        minQuantity =
+                            supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getTotalQuantity());
+                        // 供应申请的物品计量单位与最小单位相同
+                    } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                        minQuantity = supplyItemDetailDto.getTotalQuantity();
+                    }
+                    // 更新库存数量
+                    Boolean aBoolean =
+                        inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                    }
+                }
+
+                String ybSwitch =
+                    SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+                if (Whether.YES.getCode().equals(ybSwitch)) {
+                    // 如果首次盘点信息不为空
+                    if (!firstSupplyItemDetailList.isEmpty()) {
+                        // 调用医保盘存接口，盘盈
+                        List<String> uploadFailedNoList = this.ybInventoryIntegrated(firstSupplyItemDetailList,
+                            YbInvChgType.INVENTORY_GAIN, true, false, false, now);
+                        if (!uploadFailedNoList.isEmpty()) {
+                            stocktakingReturnMsg = "3501盘存上传错误，错误项目编码" + uploadFailedNoList;
+                        }
+                    }
+                    List<String> uploadFailedGainList = null;
+                    List<String> uploadFailedLossList = null;
+                    if (!positiveList.isEmpty()) {
+                        // 调用医保库存变更接口，盘盈
+                        uploadFailedGainList = this.ybInventoryIntegrated(positiveList, YbInvChgType.INVENTORY_GAIN,
+                            false, false, false, now);
+                    }
+                    if (!negativeList.isEmpty()) {
+                        // 调用医保库存变更接口，盘亏
+                        uploadFailedLossList = this.ybInventoryIntegrated(negativeList, YbInvChgType.INVENTORY_LOSS,
+                            false, false, false, now);
+                    }
+                    if (uploadFailedGainList != null || uploadFailedLossList != null) {
+                        changeReturnMsg = "3502库存变更上传错误，错误项目编码" + uploadFailedGainList + uploadFailedLossList;
+                    }
+                }
+            }
+            // 追加追溯码信息
+            boolean flg =
+                traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.CABINET_STOCKTAKING.getValue());
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+        return R.ok(stocktakingReturnMsg + changeReturnMsg,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 根据单据号获取供应单据及供应项相关详细信息
+     *
+     * @param busNo 单据号
+     * @return 供应单据及供应项相关详细信息
+     */
+    @Override
+    public List<SupplyItemDetailDto> getSupplyItemDetail(String busNo) {
+        return receiptApprovalMapper.selectSupplyDetail(busNo, DispenseStatus.COMPLETED.getValue());
+    }
+
+    /**
+     * 获取物品的价格信息
+     *
+     * @param itemIdList 物品id
+     * @return 价格信息
+     */
+    @Override
+    public List<ItemChargeDetailDto> getItemChargeDetail(List<Long> itemIdList) {
+        // todo：未来会移到charge相关的service中
+        if (!itemIdList.isEmpty()) {
+            return receiptApprovalMapper.selectChargeDetail(itemIdList);
+        }
+        return null;
+    }
+
+    /**
+     * 入库项价格验证
+     *
+     * @param agreedList 供应单据
+     * @param chargeDetailList 项目价格
+     * @return 价格定义子表数据
+     */
+    private List<ChargeItemDefDetail> creatChargeItemDetail(List<SupplyRequest> agreedList,
+        List<ItemChargeDetailDto> chargeDetailList) {
+        List<ChargeItemDefDetail> resultList = new ArrayList<>();
+
+        // 将各个项目的定价信息按项目id分组
+        Map<Long, List<ItemChargeDetailDto>> chargeDetailGroup =
+            chargeDetailList.stream().collect(Collectors.groupingBy(ItemChargeDetailDto::getInstanceId));
+
+        for (SupplyRequest supplyRequest : agreedList) {
+            Long itemId = supplyRequest.getItemId();
+            // 通过供应项目id匹配项目定价
+            List<ItemChargeDetailDto> details = chargeDetailGroup.get(itemId);
+            if (details == null)
+                continue;
+
+            boolean shouldSkip = false;
+            for (ItemChargeDetailDto detail : details) {
+                // 如果入库项的批次与定价中的批次相同
+                if (detail.getConditionValue().equals(supplyRequest.getLotNumber())) {
+                    // 无论价格是否相同都跳过这条记录
+                    shouldSkip = true;
+                    break;
+                }
+            }
+            if (!shouldSkip) {
+                // 新增对应项目的价格定义子表
+                resultList.addAll(this.addChargeItemDefApp(supplyRequest.getLotNumber(), supplyRequest.getPrice(),
+                    supplyRequest.getRetailPrice(), details.get(0).getDefinitionId()));
+            }
+        }
+        return resultList;
+    }
+
+    /**
+     * 添加项目定价子表信息
+     *
+     * @param conditionValue 命中值
+     * @param price 进价
+     * @param retailPrice 售价
+     * @param definitionId 主表id
+     * @return 子表信息
+     */
+    private List<ChargeItemDefDetail> addChargeItemDefApp(String conditionValue, BigDecimal price,
+        BigDecimal retailPrice, Long definitionId) {
+        List<ChargeItemDefDetail> chargeItemDefDetailList = new ArrayList<>();
+        ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
+        chargeItemDefDetail
+            // 命中条件：批号
+            .setConditionCode(ConditionCode.LOT_NUMBER_COST.getCode())
+            // 命中值
+            .setConditionValue(conditionValue)
+            // 主表id
+            .setDefinitionId(definitionId)
+            // 进价
+            .setAmount(price);
+        chargeItemDefDetailList.add(chargeItemDefDetail);
+        chargeItemDefDetail = new ChargeItemDefDetail();
+        chargeItemDefDetail
+            // 命中条件：批号
+            .setConditionCode(ConditionCode.LOT_NUMBER_PRICE.getCode())
+            // 命中值
+            .setConditionValue(conditionValue)
+            // 主表id
+            .setDefinitionId(definitionId)
+            // 售价
+            .setAmount(retailPrice);
+        chargeItemDefDetailList.add(chargeItemDefDetail);
+
+        return chargeItemDefDetailList;
+    }
+
+    /**
+     * 医保库存相关进销存接口
+     *
+     * @param supplyItemDetailList 供应申请项目详细信息
+     * @param ybInvChgType 库存变更类型
+     * @param firstFlag 首次盘存标识
+     * @param now 库存变更时间
+     * @return 上传失败的id集合
+     */
+    private List<String> ybInventoryIntegrated(List<SupplyItemDetailDto> supplyItemDetailList,
+        YbInvChgType ybInvChgType, Boolean firstFlag, Boolean purchaseFlag, Boolean returnFlag, Date now) {
+        List<String> uploadFailedNoList = new ArrayList<>();
+        R<?> result;
+        R<?> firstResult = R.ok();
+        R<?> returnResult = R.ok();
+        R<?> purchaseResult = R.ok();
+        for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
+            if (supplyItemDetailDto.getYbNo() == null) {
+                continue;
+            }
+            switch (ybInvChgType) {
+                case ALLOCATION_IN:
+                case ALLOCATION_OUT:
+                case INVENTORY_GAIN:
+                case INVENTORY_LOSS:
+                case DESTRUCTION:
+                case OTHER_IN:
+                case OTHER_OUT:
+                case DONATION_IN:
+                case DONATION_RETURN_OUT:
+                case PURCHASE_IN:
+                case RETURN_OUT:
+                    if (firstFlag) {
+                        firstResult =
+                            ybService.uploadInventoryCount(getMedicalInventory3501Param(supplyItemDetailDto, now), now);
+                        if (firstResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (returnFlag) {
+                        returnResult =
+                            ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
+                        if (returnResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    if (purchaseFlag) {
+                        purchaseResult = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
+                        if (purchaseResult.getCode() != 200) {
+                            uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                        }
+                    }
+                    result = ybService.updateInventoryCount(
+                        getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
+                    if (result.getCode() != 200) {
+                        uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
+                    }
+                    break;
+                default:
+                    throw new IllegalArgumentException("未知的库存变更类型: " + ybInvChgType);
+            }
+        }
+        return uploadFailedNoList;
+    }
+
+    private MedicalPurchase3504Param getMedicalPurchase3504Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        MedicalPurchase3504Param medicalPurchase3504Param = new MedicalPurchase3504Param();
+        medicalPurchase3504Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setPurcInvoNo(supplyItemDetailDto.getInvoiceNo())
+            .setManuDate(supplyItemDetailDto.getStartTime()).setExpyEnd(supplyItemDetailDto.getEndTime())
+            .setPurcRetnCnt(supplyItemDetailDto.getItemQuantity()).setPurcRetnStoinTime(now)
+            .setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medicalPurchase3504Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+        return medicalPurchase3504Param;
+    }
+
+    private Medical3503Param getMedical3503Param(SupplyItemDetailDto supplyItemDetailDto, Date now) {
+        Medical3503Param medical3503Param = new Medical3503Param();
+        medical3503Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+            .setFixmedinsBchno(supplyItemDetailDto.getLotNumber())
+            .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+            .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+            .setSplerName(supplyItemDetailDto.getSupplierName()).setManuLotnum(supplyItemDetailDto.getLotNumber())
+            .setProdentpName(supplyItemDetailDto.getManufacturerText())
+            .setAprvno(supplyItemDetailDto.getApprovalNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+            .setExpyEnd(supplyItemDetailDto.getEndTime()).setPurcRetnCnt(supplyItemDetailDto.getItemQuantity())
+            .setPurcRetnStoinTime(now).setPurcRetnOpterName(supplyItemDetailDto.getPractitionerName());
+        if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+        } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+            medical3503Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+        }
+
+        return medical3503Param;
+    }
+
+    private MedicalInventory3502Param getMedicalInventory3502Param(SupplyItemDetailDto supplyItemDetailDto, Date now,
+        String ybInvChgType) {
+        MedicalInventory3502Param medicalInventory3502Param = new MedicalInventory3502Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        // 查询商品价格信息
+        List<ItemChargeDetailDto> itemChargeDetailList =
+            receiptApprovalAppService.getItemChargeDetail(List.of(supplyItemDetailDto.getItemId()));
+        if (!inventoryItemList.isEmpty() && !itemChargeDetailList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            // 最小单位售卖价格
+            BigDecimal minPrice = BigDecimal.ZERO;
+            Optional<BigDecimal> price = itemChargeDetailList.stream()
+                .filter(x -> x.getConditionValue().equals(supplyItemDetailDto.getLotNumber()))
+                .map(ItemChargeDetailDto::getSellPrice).findFirst();
+            if (price.isPresent()) {
+                if (supplyItemDetailDto.getPartPercent().compareTo(BigDecimal.ZERO) > 0) {
+                    minPrice = price.get().divide(supplyItemDetailDto.getPartPercent(), RoundingMode.HALF_UP);
+                }
+            }
+            // 转换为JSON
+            JSONArray medicalTraceNo = new JSONArray();
+            // 获取追溯码信息
+            if (supplyItemDetailDto.getTraceNo() != null) {
+                List<String> traceNoList =
+                    Arrays.stream(supplyItemDetailDto.getTraceNo().split(CommonConstants.Common.COMMA))
+                        .map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
+                for (String traceNo : traceNoList) {
+                    Map<String, String> traceNoMap = new HashMap<>();
+                    traceNoMap.put("drug_trac_codg", traceNo);
+                    medicalTraceNo.add(traceNoMap);
+                }
+            }
+            medicalInventory3502Param.setMedListCodg(supplyItemDetailDto.getYbNo()).setInvChgType(ybInvChgType)
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable())
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setPric(minPrice).setCnt(totalQuantity)
+                .setInvChgTime(now).setDrugtracinfo(medicalTraceNo);
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3502Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3502Param;
+    }
+
+    private MedicalInventory3501Param getMedicalInventory3501Param(SupplyItemDetailDto supplyItemDetailDto, Date date) {
+        MedicalInventory3501Param medicalInventory3501Param = new MedicalInventory3501Param();
+        // 查库存信息
+        List<InventoryItem> inventoryItemList =
+            inventoryItemService.selectInventoryByItemId(supplyItemDetailDto.getItemId(),
+                supplyItemDetailDto.getLotNumber(), null, SecurityUtils.getLoginUser().getTenantId());
+        if (!inventoryItemList.isEmpty()) {
+            // 获取该项目所有的数量（最小单位）
+            BigDecimal totalQuantity = inventoryItemList.stream()
+                .map(item -> item.getQuantity() != null ? item.getQuantity() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+            medicalInventory3501Param.setMedListCodg(supplyItemDetailDto.getYbNo())
+                .setFixmedinsHilistId(supplyItemDetailDto.getItemBusNo())
+                .setFixmedinsHilistName(supplyItemDetailDto.getItemTable()).setInvdate(date).setInvCnt(totalQuantity)
+                .setFixmedinsBchno(supplyItemDetailDto.getLotNumber()).setManuDate(supplyItemDetailDto.getStartTime())
+                .setExpyEnd(supplyItemDetailDto.getEndTime());
+            if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
+            } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == supplyItemDetailDto.getRxFlag()) {
+                medicalInventory3501Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
+            }
+        }
+        return medicalInventory3501Param;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
new file mode 100644
index 00000000..8a1fd8c6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
@@ -0,0 +1,173 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.*;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.dto.*;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库退货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseReturnOrderServiceImpl implements IPharmacyWarehouseReturnOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 退货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退货单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> returnOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        returnOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : returnOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(returnOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.RETURN_BUS_NO.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑退货单
+     *
+     * @param returnOrderDtoList 采购信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditReturnOrder(List<PharmacyWarehouseDetailDto> returnOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(returnOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnOrderDtoList.get(0).getOriginalBusNo(), returnOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyWarehouseDetailDto item : returnOrderDtoList) {
+            SupplyRequest supplyRequest =
+                new SupplyRequest().setBusNo(item.getBusNo()).setTypeEnum(SupplyType.CABINET_RETURN.getValue())
+                    .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                    .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                    .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                    .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                    .setOccurrenceTime(item.getOccurrenceTime()).setEndTime(item.getEndTime())
+                    .setLotNumber(item.getLotNumber()).setInvoiceNo(item.getInvoiceNo()).setTraceNo(item.getTraceNo())
+                    .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                    .setReason(item.getReason()).setSourceTypeEnum(LocationForm.CABINET.getValue())
+                    .setSourceLocationId(item.getSourceLocationId()).setApplicantId(item.getApplicantId())
+                    .setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
new file mode 100644
index 00000000..f2e19a70
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
@@ -0,0 +1,176 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.common.enums.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnToWarehouseOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库退库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseReturnToWarehouseOrderServiceImpl implements IPharmacyWarehouseReturnToWarehouseOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> returnToWarehouseOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        returnToWarehouseOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : returnToWarehouseOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(returnToWarehouseOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.RETURN_ISSUE_NUM.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToWarehouseOrderDtoList 退库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditReturnToWarehouseOrder(List<PharmacyWarehouseDetailDto> returnToWarehouseOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToWarehouseOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(returnToWarehouseOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnToWarehouseOrderDtoList.get(0).getOriginalBusNo(), returnToWarehouseOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyWarehouseDetailDto item : returnToWarehouseOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.CABINET_PRODUCT_RETURN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                .setEndTime(item.getEndTime()).setPractitionerId(item.getPractitionerId())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.PHARMACY.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.CABINET.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
new file mode 100644
index 00000000..786d2804
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
@@ -0,0 +1,202 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbInvChgType;
+import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.dto.*;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockInOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库进货单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseStockInOrderServiceImpl implements IPharmacyWarehouseStockInOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption
+            .add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getValue(),
+                SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+            SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getValue(), SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption
+            .add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getValue(),
+                SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+            SupplyCategory.OTHER_DRUGS_WAREHOUSING.getValue(), SupplyCategory.OTHER_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+            SupplyCategory.DONATED_DRUGS_WAREHOUSING.getValue(), SupplyCategory.DONATED_DRUGS_WAREHOUSING.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 进货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 进货单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> stockInOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stockInOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+            // 包装情况
+            e.setPackagingConditionEnum_enumText(
+                EnumUtils.getInfoByValue(PackagingCondition.class, e.getPackagingConditionEnum()));
+            // 验收结果
+            e.setAcceptanceResultEnum_enumText(
+                EnumUtils.getInfoByValue(AcceptanceResult.class, e.getAcceptanceResultEnum()));
+        });
+
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : stockInOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stockInOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.PURCHASE_NUM.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑进货单
+     *
+     * @param stockInOrderDtoList 进货信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStockInOrder(List<PharmacyWarehouseDetailDto> stockInOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(stockInOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(stockInOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockInOrderDtoList.get(0).getOriginalBusNo(), stockInOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyWarehouseDetailDto item : stockInOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.CABINET_STOCKIN.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setBatchInventory(item.getBatchInventory()).setSpecificationInventory(item.getSpecificationInventory())
+                .setPrice(item.getPrice()).setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                .setTotalRetailPrice(item.getTotalRetailPrice()).setStartTime(item.getStartTime())
+                .setEndTime(item.getEndTime()).setPractitionerId(item.getPractitionerId())
+                .setLotNumber(item.getLotNumber()).setInvoiceNo(item.getInvoiceNo()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setPurposeTypeEnum(LocationForm.CABINET.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId()).setPackagingConditionEnum(item.getPackagingConditionEnum())
+                .setAcceptanceResultEnum(item.getAcceptanceResultEnum()).setSupplierId(item.getSupplierId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setReason(item.getReason())
+                .setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
new file mode 100644
index 00000000..493da6ae
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
@@ -0,0 +1,181 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockOutOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库出库单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseStockOutOrderServiceImpl implements IPharmacyWarehouseStockOutOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(),
+            SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(),
+            SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(),
+            SupplyCategory.OTHER_OUTBOUND.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 出库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 出库单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> stockOutOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stockOutOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+
+        });
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : stockOutOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(),item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(),item.getMinUnitCode_dictText()
+            ));
+
+            item.setUnitList(unitList);
+        }
+
+        return R.ok(stockOutOrderDtoDetailPage);
+    }
+
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.REQUISITION_NUM.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑出库单
+     *
+     * @param stockOutOrderDtoList 出库信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStockOutOrder(List<PharmacyWarehouseDetailDto> stockOutOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(stockOutOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+        //添加原始单据号
+        if(stockOutOrderDtoList.get(0).getOriginalBusNo()!=null){
+            // 审批单据并返回单据详情
+            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockOutOrderDtoList.get(0).getOriginalBusNo(), stockOutOrderDtoList.get(0).getBusNo());
+            if (agreedList.isEmpty()) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyWarehouseDetailDto item : stockOutOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.CABINET_STOCKOUT.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity()).setPrice(item.getPrice())
+                .setTotalPrice(item.getTotalPrice()).setRetailPrice(item.getRetailPrice())
+                .setTotalRetailPrice(item.getTotalRetailPrice()).setBatchInventory(item.getBatchInventory())
+                .setSpecificationInventory(item.getSpecificationInventory()).setStartTime(item.getStartTime())
+                .setEndTime(item.getEndTime()).setPractitionerId(item.getPractitionerId())
+                .setLotNumber(item.getLotNumber()).setTraceNo(item.getTraceNo())
+                .setTraceNoUnitCode(item.getTraceNoUnitCode()).setSupplierId(item.getSupplierId())
+                .setReason(item.getReason()).setSourceTypeEnum(LocationForm.CABINET.getValue())
+                .setSourceLocationId(item.getSourceLocationId()).setPurposeTypeEnum(LocationForm.PHARMACY.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
new file mode 100644
index 00000000..5833ef50
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
@@ -0,0 +1,167 @@
+package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.openhis.common.enums.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStocktakingOrderMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+/**
+ * 药库盘点单
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Service
+public class PharmacyWarehouseStocktakingOrderServiceImpl implements IPharmacyWarehouseStocktakingOrderService {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+
+    /**
+     * 初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PharmacyWarehouseInitDto purchaseOrderInitDto = pharmacyWarehouseCommonService.init();
+
+        // 单据分类
+        List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+            SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+            SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
+
+        purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
+
+        return R.ok(purchaseOrderInitDto);
+    }
+
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @Override
+    public R<?> getDetailPage(String busNo, Integer pageNo, Integer pageSize) {
+
+        Page<PharmacyWarehouseDetailDto> stocktakingOrderDtoDetailPage =
+            pharmacyWarehouseCommonMapper.getDetailPage(new Page<>(pageNo, pageSize), busNo);
+
+        stocktakingOrderDtoDetailPage.getRecords().forEach(e -> {
+            // 单据分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyCategory.class, e.getCategoryEnum()));
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 单据类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getTypeEnum()));
+        });
+
+        List<PharmacyWarehouseDetailDto.Option> unitList;
+        for (PharmacyWarehouseDetailDto item : stocktakingOrderDtoDetailPage.getRecords()) {
+            unitList = new ArrayList<>();
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
+
+            item.setUnitList(unitList);
+        }
+        return R.ok(stocktakingOrderDtoDetailPage);
+    }
+
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> getBusNo() {
+
+        ProductStocktakingInitDto initDto = new ProductStocktakingInitDto();
+        // 单据号
+        initDto.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.STOCKTAKING_NUM.getPrefix(), 4));
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+
+    @Override
+    public R<?> addOrEditStocktakingOrder(List<PharmacyWarehouseDetailDto> stocktakingOrderDtoList) {
+        // 请求数据取得
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(stocktakingOrderDtoList.get(0).getBusNo());
+        if (!requestList.isEmpty()) {
+            // 请求id取得
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
+            // 单据信息删除
+            supplyRequestService.removeByIds(requestIdList);
+        }
+
+        List<SupplyRequest> supplyRequestList = new ArrayList<>();
+        Date applyTime = DateUtils.getNowDate();
+        for (PharmacyWarehouseDetailDto item : stocktakingOrderDtoList) {
+            SupplyRequest supplyRequest = new SupplyRequest().setBusNo(item.getBusNo())
+                .setTypeEnum(SupplyType.CABINET_STOCKTAKING.getValue())
+                .setStatusEnum(SupplyStatus.PENDING_REVIEW.getValue()).setCategoryEnum(item.getCategoryEnum())
+                .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setItemId(item.getItemId())
+                .setUnitCode(item.getUnitCode()).setItemQuantity(item.getItemQuantity())
+                .setTotalQuantity(item.getTotalQuantity()).setPrice(item.getPrice()).setTotalPrice(item.getTotalPrice())
+                .setRetailPrice(item.getRetailPrice()).setTotalRetailPrice(item.getTotalRetailPrice())
+                .setBatchInventory(item.getBatchInventory()).setLotNumber(item.getLotNumber()).setSupplierId(item.getSupplierId())
+                .setTraceNo(item.getTraceNo()).setTraceNoUnitCode(item.getTraceNoUnitCode())
+                .setReasonCode(item.getReasonCode()).setReason(item.getReason())
+                .setPurposeTypeEnum(LocationForm.CABINET.getValue()).setPurposeLocationId(item.getPurposeLocationId())
+                .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setRemake(item.getRemake());
+            supplyRequestList.add(supplyRequest);
+        }
+        // 更新请求表
+        boolean flg = supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+        if (!flg) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
new file mode 100644
index 00000000..fab3502c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
@@ -0,0 +1,68 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库单据管理
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/documentManagement")
+@Slf4j
+public class PharmacyWarehouseDocumentManagementController {
+
+    @Autowired
+    private IPharmacyWarehouseDocumentManagementService pharmacyWarehouseDocumentManagementService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+
+    /**
+     * 单据管理初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseDocumentManagementService.init();
+    }
+
+    /**
+     * 单据管理单据列表
+     *
+     * @param documentManagementSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据管理据分页列表
+     */
+    @GetMapping(value = "/documentManagement-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam documentManagementSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(documentManagementSearchParam, pageNo, pageSize, searchKey, request,
+           null, null);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
new file mode 100644
index 00000000..9bbe7205
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库损益单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/profitLoss-order")
+@Slf4j
+public class PharmacyWarehouseProfitLossOrderController {
+
+    @Autowired
+    private IPharmacyWarehouseProfitLossOrderService pharmacyWarehouseProfitLossOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+    /**
+     * 损益单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseProfitLossOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 损益单单据列表
+     *
+     * @param profitLossOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 损益单据分页列表
+     */
+    @GetMapping(value = "/profitLoss-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam profitLossOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(profitLossOrderSearchParam, pageNo, pageSize, searchKey, request,
+           null, SupplyType.CABINET_PRPFITLOSS.getValue());
+    }
+    /**
+     * 损益单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 损益单单据详情
+     */
+    @GetMapping(value = "/profitLoss-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehouseProfitLossOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehouseProfitLossOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑损益单
+     *
+     * @param profitLossOrderDtoList 损益信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-profitLossOrder")
+    public R<?> addOrEditProfitLossOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> profitLossOrderDtoList) {
+        return pharmacyWarehouseProfitLossOrderService.addOrEditProfitLossOrder(profitLossOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-profitLossOrder")
+    public R<?> deleteProfitLossOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.lossReportApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
new file mode 100644
index 00000000..80a5f8a1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
@@ -0,0 +1,159 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 药库订货单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/purchase-order")
+@Slf4j
+public class PharmacyWarehousePurchaseOrderController {
+
+    @Autowired
+    private IPharmacyWarehousePurchaseOrderService pharmacyWarehousePurchaseOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+    /**
+     * 订货单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehousePurchaseOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 订货单单据列表
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 订货单据分页列表
+     */
+    @GetMapping(value = "/purchase-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.CABINET_PURCHASE.getValue());
+    }
+    /**
+     * 订货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 订货单单据详情
+     */
+    @GetMapping(value = "/purchase-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehousePurchaseOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehousePurchaseOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param purchaseOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-purchaseOrder")
+    public R<?> addOrEditPurchaseOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> purchaseOrderDtoList) {
+        return pharmacyWarehousePurchaseOrderService.addOrEditPurchaseOrder(purchaseOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-purchaseOrder")
+    public R<?> deletePurchaseOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.purchaseOrderAgreeApproval(busNo);
+    }
+
+//    /**
+//     * 提交审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    @PutMapping("/submit-approval")
+//    public R<?> submitApproval(@RequestParam String busNo) {
+//        return pharmacyWarehouseCommonService.submitApproval(busNo);
+//    }
+//
+//    /**
+//     * 撤回审批
+//     *
+//     * @param busNo 单据号
+//     * @return 操作结果
+//     */
+//    @PutMapping("/withdraw-approval")
+//    public R<?> withdrawApproval(@RequestParam String busNo) {
+//        return pharmacyWarehouseCommonService.withdrawApproval(busNo);
+//    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
new file mode 100644
index 00000000..48486ca0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
@@ -0,0 +1,140 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库退货单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/return-order")
+@Slf4j
+public class PharmacyWarehouseReturnOrderController {
+
+    @Autowired
+    private IPharmacyWarehouseReturnOrderService pharmacyWarehouseReturnOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+
+    /**
+     * 退货单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseReturnOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+    /**
+     * 退货单单据列表
+     *
+     * @param returnOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 退货单据分页列表
+     */
+    @GetMapping(value = "/return-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam returnOrderSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(returnOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.CABINET_RETURN.getValue());
+    }
+
+    /**
+     * 退货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退货单单据详情
+     */
+    @GetMapping(value = "/return-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehouseReturnOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehouseReturnOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑采购单
+     *
+     * @param returnOrderDtoList 采购信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-returnOrder")
+    public R<?> addOrEditReturnOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> returnOrderDtoList) {
+        return pharmacyWarehouseReturnOrderService.addOrEditReturnOrder(returnOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-returnOrder")
+    public R<?> deleteReturnOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.purchaseReturnApproved(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
new file mode 100644
index 00000000..c16ba7f3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库退库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/returnToWarehouse-order")
+@Slf4j
+public class PharmacyWarehouseReturnToWarehouseOrderController {
+
+    @Autowired
+    private IPharmacyWarehouseReturnToWarehouseOrderService pharmacyWarehouseReturnToWarehouseOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+    /**
+     * 退库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseReturnToWarehouseOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 退库单单据列表
+     *
+     * @param returnToWarehouseOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 退库单据分页列表
+     */
+    @GetMapping(value = "/returnToWarehouse-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam returnToWarehouseOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(returnToWarehouseOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.CABINET_PRODUCT_RETURN.getValue());
+    }
+    /**
+     * 退库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 退库单单据详情
+     */
+    @GetMapping(value = "/returnToWarehouse-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehouseReturnToWarehouseOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehouseReturnToWarehouseOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑退库单
+     *
+     * @param returnToWarehouseOrderDtoList 退库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-returnToWarehouseOrder")
+    public R<?> addOrEditReturnToWarehouseOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> returnToWarehouseOrderDtoList) {
+        return pharmacyWarehouseReturnToWarehouseOrderService.addOrEditReturnToWarehouseOrder(returnToWarehouseOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-returnToWarehouseOrder")
+    public R<?> deleteReturnToWarehouseOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.returnIssueApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
new file mode 100644
index 00000000..372dfb5b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
@@ -0,0 +1,139 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import liquibase.pro.packaged.S;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库进货单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/stockIn-order")
+@Slf4j
+public class PharmacyWarehouseStockInOrderController {
+
+    @Autowired
+    private IPharmacyWarehouseStockInOrderService pharmacyWarehouseStockInOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+    /**
+     * 进货单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseStockInOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 进货单单据列表
+     *
+     * @param stockInOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 进货单据分页列表
+     */
+    @GetMapping(value = "/stockIn-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam stockInOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(stockInOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.CABINET_STOCKIN.getValue());
+    }
+    /**
+     * 进货单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 进货单单据详情
+     */
+    @GetMapping(value = "/stockIn-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehouseStockInOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehouseStockInOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑进货单
+     *
+     * @param stockInOrderDtoList 进货信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stockInOrder")
+    public R<?> addOrEditStockInOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> stockInOrderDtoList) {
+        return pharmacyWarehouseStockInOrderService.addOrEditStockInOrder(stockInOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stockInOrder")
+    public R<?> deleteStockInOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.purchaseInventoryApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
new file mode 100644
index 00000000..30249c52
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库出库单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/stockOut-order")
+@Slf4j
+public class PharmacyWarehouseStockOutOrderController {
+
+    @Autowired
+    private IPharmacyWarehouseStockOutOrderService pharmacyWarehouseStockOutOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+    /**
+     * 出库单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseStockOutOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 出库单单据列表
+     *
+     * @param stockOutOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 出库单据分页列表
+     */
+    @GetMapping(value = "/stockOut-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam stockOutOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(stockOutOrderSearchParam, pageNo, pageSize, searchKey, request,
+            "1", SupplyType.CABINET_STOCKOUT.getValue());
+    }
+    /**
+     * 出库单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 出库单单据详情
+     */
+    @GetMapping(value = "/stockOut-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehouseStockOutOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehouseStockOutOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑出库单
+     *
+     * @param stockOutOrderDtoList 出库信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stockOutOrder")
+    public R<?> addOrEditStockOutOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> stockOutOrderDtoList) {
+        return pharmacyWarehouseStockOutOrderService.addOrEditStockOutOrder(stockOutOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stockOutOrder")
+    public R<?> deleteStockOutOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.requisitionIssueApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
new file mode 100644
index 00000000..a40b917c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
@@ -0,0 +1,138 @@
+package com.openhis.web.pharmacyWarehousemanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.common.enums.LocationForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药库盘点单
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/pharmacy-warehouse/stocktaking-order")
+@Slf4j
+public class PharmacyWarehouseStocktakingOrderController {
+
+    @Autowired
+    private IPharmacyWarehouseStocktakingOrderService pharmacyWarehouseStocktakingOrderService;
+
+    @Autowired
+    private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
+    @Autowired
+    private IPharmacyWarehouseReceiptApprovalService pharmacyWarehouseReceiptApprovalService;
+    /**
+     * 盘点单初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return pharmacyWarehouseStocktakingOrderService.init();
+    }
+
+    /**
+     * 获取药品
+     *
+     * @param purchaseOrderSearchParam 查询条件
+     * @return 药品信息
+     */
+    @GetMapping(value = "/medication-info")
+    public R<?> getMedicationInfo(PharmacyWarehouseSearchParam purchaseOrderSearchParam,
+                                  @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getMedicationInfo(purchaseOrderSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
+    /**
+     * 盘点单单据列表
+     *
+     * @param stocktakingOrderSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 盘点单据分页列表
+     */
+    @GetMapping(value = "/stocktaking-order-page")
+    public R<?> getPage(PharmacyWarehouseSearchParam stocktakingOrderSearchParam,
+                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return pharmacyWarehouseCommonService.getPage(stocktakingOrderSearchParam, pageNo, pageSize, searchKey, request,
+            null, SupplyType.CABINET_STOCKTAKING.getValue());
+    }
+    /**
+     * 盘点单单据详情
+     *
+     * @param busNo 单据号
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 盘点单单据详情
+     */
+    @GetMapping(value = "/stocktaking-order-detail-page")
+    public R<?> getDetail(@RequestParam String busNo,
+                          @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return pharmacyWarehouseStocktakingOrderService.getDetailPage(busNo, pageNo, pageSize);
+    }
+    /**
+     * 获取单据号
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/busNo-init")
+    public R<?> getBusNo() {
+        return pharmacyWarehouseStocktakingOrderService.getBusNo();
+    }
+
+    /**
+     * 添加/编辑盘点单
+     *
+     * @param stocktakingOrderDtoList 盘点信息
+     * @return 操作结果
+     */
+    @PutMapping("/addOrEdit-stocktakingOrder")
+    public R<?> addOrEditStocktakingOrder(@Validated @RequestBody List<PharmacyWarehouseDetailDto> stocktakingOrderDtoList) {
+        return pharmacyWarehouseStocktakingOrderService.addOrEditStocktakingOrder(stocktakingOrderDtoList);
+    }
+
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @DeleteMapping("/delete-stocktakingOrder")
+    public R<?> deleteStocktakingOrder(@RequestParam String busNo) {
+        return pharmacyWarehouseCommonService.deleteOrder(busNo);
+    }
+    /**
+     * 同意审批
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @PutMapping("/agree-approval")
+    public R<?> agreeApproval(@RequestParam String busNo) {
+        return pharmacyWarehouseReceiptApprovalService.productStocktakingApproved(busNo);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
new file mode 100644
index 00000000..b31ecf35
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyWarehousemanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据详细信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyWarehouseDetailDto implements Serializable {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 再生成单据号 */
+    private String originalBusNo;
+
+    /** 药品编码 */
+    private String itemBusNo;
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 物品名称 */
+    private String itemName;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 选择单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 常规单位 */
+    @Dict(dictCode = "unit_code")
+    private String maxUnitCode;
+    private String maxUnitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private String partPercent;
+
+    /** 数量 */
+    private BigDecimal itemQuantity;
+
+    /** 合计数量 */
+    private BigDecimal totalQuantity;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 零价金额 */
+    private BigDecimal totalRetailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 备注 */
+    private String remake;
+
+    /** 理由类型 */
+    private String  reasonCode;
+
+    /** 摘要（理由） */
+    private String  reason;
+
+    /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 源仓库类型 */
+    private Integer sourceTypeEnum;
+    /** 源仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+
+    /** 目的仓库类型 */
+    private Integer purposeTypeEnum;
+    /** 目的仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long purposeLocationId;
+
+    /** 采购员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+
+    /** 审批人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 单据分类 */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+
+    /** 供应商联系人 */
+    private String phone;
+
+    /** 仓库员 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long  practitionerId;
+
+    /** 发票号 */
+    private String invoiceNo;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 生产日期 */
+    private Date startTime;
+
+    /** 失效日期 */
+    private Date endTime;
+
+    /** 追溯码*/
+    private String traceNo;
+
+    /** 追溯码单位 */
+    @Dict(dictCode = "unit_code")
+    private String traceNoUnitCode;
+    private String traceNoUnitCode_dictText;
+
+    /** 包装情况 */
+    private Integer packagingConditionEnum;
+    private String packagingConditionEnum_enumText;
+
+    /** 验收结果 */
+    private Integer acceptanceResultEnum;
+    private String acceptanceResultEnum_enumText;
+
+    /** 禁用日期 */
+    private Date occurrenceTime;
+
+    /**
+     * 单位列表
+     */
+    private List<PharmacyWarehouseDetailDto.Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+        public Option() {
+        }
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
new file mode 100644
index 00000000..b30d88c7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyWarehousemanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyWarehouseDto implements Serializable {
+    /** 单据号 */
+    private String supplyBusNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 类型 */
+    private Integer typeEnum;
+    private String typeEnum_enumText;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    private String locationTypeEnum_enumText;
+
+    /** 仓库 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_location")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 采购员 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+    private String applicantId_dictText;
+
+    /** 审批人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approvalTime;
+
+    /** 制单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date applyTime;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
new file mode 100644
index 00000000..b46fd85c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyWarehousemanage.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.web.common.dto.LocationDto;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据初期信息
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyWarehouseInitDto implements Serializable {
+
+    /**
+     * 单据号
+     */
+    private String busNo;
+
+    /**
+     * 库房类型列表
+     */
+    private List<PharmacyWarehouseInitDto.WarehouseOption> warehouseTypeOption;
+
+    /**
+     * 库房列表
+     */
+    private List<PharmacyWarehouseInitDto.LongOption> warehouseOption;
+
+    /**
+     * 供应商列表
+     */
+     private List<PharmacyWarehouseInitDto.SupplierOption> supplierOption;
+
+    /**
+     * 人员列表
+     */
+    private List<PharmacyWarehouseInitDto.LongOption> practitionerOption;
+    /**
+     * 审批状态
+     */
+    private List<PharmacyWarehouseInitDto.IntegerOption> supplyStatusOptions;
+
+    /**
+     * 单据类型
+     */
+    private List<PharmacyWarehouseInitDto.IntegerOption> supplyTypeOptions;
+
+    /**
+     * 单据分类
+     */
+    private List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOptions;
+    /**
+     * 包装情况
+     */
+    private List<PharmacyWarehouseInitDto.IntegerOption> packagingConditionOptions;
+    /**
+     * 包装情况
+     */
+    private List<PharmacyWarehouseInitDto.IntegerOption> acceptanceResultoryOptions;
+
+    /**
+     * 仓库
+     */
+    private List<LocationDto> cabinetListOptions;
+    /**
+     * 药房
+     */
+    private List<LocationDto> pharmacyListOptions;
+
+    @Data
+    public static class LongOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public LongOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class SupplierOption {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+        private String phone;
+
+        public SupplierOption(Long value, String label, String phone) {
+            this.value = value;
+            this.label = label;
+            this.phone = phone;
+        }
+    }
+
+    @Data
+    public static class IntegerOption {
+        private Integer value;
+        private String label;
+
+        public IntegerOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class WarehouseOption {
+        private Integer value;
+        private String label;
+        private List<item> locationOption;
+        private List<IntegerOption> orderOption;
+
+        public WarehouseOption(Integer value, String label,List<item> locationOption,List<IntegerOption> orderOption) {
+            this.value = value;
+            this.label = label;
+            this.locationOption = locationOption;
+            this.orderOption = orderOption;
+        }
+    }
+
+    @Data
+    public static class item {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long id;
+        private String name;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
new file mode 100644
index 00000000..927650a0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyWarehousemanage.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import com.openhis.web.common.dto.UnitDto;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品信息
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyWarehouseMedicationInfoDto implements Serializable {
+
+    /** 物品id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 物品编号 */
+    private String busNo;
+
+    /** 物品名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 包装单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+
+//    /** 价格单位 */
+//    @Dict(dictCode = "unit_code")
+//    private String conditionUnitCode;
+//    private String conditionUnitCode_dictText;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 厂家/产地 */
+    private String manufacturerText;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 库存最小警戒线 */
+    private BigDecimal itemMinQuantity;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+
+    /** 供应商 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+    private String supplierId_dictText;
+
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 生产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date productionDate;
+
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date expirationDate;
+
+    /**
+     * 单位列表
+     */
+    private List<Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
new file mode 100644
index 00000000..7152ef95
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacyWarehousemanage.dto;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 单据查询条件
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+public class PharmacyWarehouseSearchParam implements Serializable {
+
+    /** id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /** 单据号 */
+    private String busNo;
+
+    /** 采购员 */
+    private String applicantName;
+
+    /** 项目名 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 供应商id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+    
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+    /** 单据状态 */
+    private Integer statusEnum;
+
+
+    /** 再生成单据号flg */
+    private String originalBusNoFlg;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
new file mode 100644
index 00000000..076444d7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
@@ -0,0 +1,58 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 药库共通 mapper
+ *
+ * @author yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseCommonMapper {
+    /**
+     * 根据供应商获取药品
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param locationId 仓库id
+     * @return 药品信息
+     */
+
+    Page<PharmacyWarehouseMedicationInfoDto> getMedicationInfo(
+        @Param("page") Page<PharmacyWarehouseMedicationInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PharmacyWarehouseSearchParam> queryWrapper,
+        @Param("locationId") Long locationId, @Param("supplierId") Long supplierId);
+
+    /**
+     * 查询订货单分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param originalBusNoFlg 再生成单据号flg
+     * @param locationFlg 仓库flg
+     * @return 订货单分页列表
+     */
+    Page<PharmacyWarehouseDto> getPage(@Param("page") Page<PharmacyWarehouseDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PharmacyWarehouseSearchParam> queryWrapper,
+        @Param("originalBusNoFlg") String originalBusNoFlg, @Param("locationFlg") String locationFlg);
+
+    /**
+     * 查询单据详情
+     *
+     * @param page 分页
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    Page<PharmacyWarehouseDetailDto> getDetailPage(@Param("page") Page<PharmacyWarehouseDetailDto> page,
+        @Param("busNo") String busNo);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
new file mode 100644
index 00000000..90c6d9ab
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药库单据 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseDocumentManagementMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
new file mode 100644
index 00000000..58f2175b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药库损益单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseProfitLossOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
new file mode 100644
index 00000000..7bc85a39
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
@@ -0,0 +1,22 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药库订货单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehousePurchaseOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
new file mode 100644
index 00000000..73227626
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
@@ -0,0 +1,23 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 药库进货单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseReturnOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
new file mode 100644
index 00000000..f226fbd4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药库退库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseReturnToWarehouseOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
new file mode 100644
index 00000000..63084103
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
@@ -0,0 +1,23 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+
+/**
+ * 药库进货单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseStockInOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
new file mode 100644
index 00000000..1c74db9c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药库出库单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseStockOutOrderMapper {
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
new file mode 100644
index 00000000..1915de49
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
@@ -0,0 +1,14 @@
+package com.openhis.web.pharmacyWarehousemanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 药库盘点单 mapper
+ *
+ * @author  yuxj
+ * @date 2025-07-22
+ */
+@Repository
+public interface PharmacyWarehouseStocktakingOrderMapper {
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IChineseMedicineDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IChineseMedicineDispenseAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IChineseMedicineDispenseAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IChineseMedicineDispenseAppService.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IDeviceDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IDeviceDispenseAppService.java
new file mode 100644
index 00000000..dd0f1542
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IDeviceDispenseAppService.java
@@ -0,0 +1,65 @@
+package com.openhis.web.pharmacymanage.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.dto.DispenseDeviceDto;
+import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
+import com.openhis.web.pharmacymanage.dto.PrescriptionDeviceInfoDto;
+
+/**
+ * 材料发送 应用实现接口
+ *
+ * @author yuxj
+ * @date 2025/8/21
+ */
+public interface IDeviceDispenseAppService {
+
+    /**
+     * 页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 分页查询发药病人列表
+     *
+     * @param encounterInfoPageDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    R<?> getEncounterInfoListPage(EncounterInfoPageDto encounterInfoPageDto, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 处方单查询
+     *
+     * @param prescriptionDeviceInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
+     */
+    R<?> getPrescriptionInfo(PrescriptionDeviceInfoDto prescriptionDeviceInfoDto, Integer pageNo, Integer pageSize);
+
+    /**
+     * 处方单核对发药
+     *
+     * @param dispenseDeviceList 发药信息
+     * @return 处理结果
+     */
+    R<?> deviceDispense(List<DispenseDeviceDto> dispenseDeviceList);
+
+    /**
+     * 作废
+     *
+     * @param dispenseDeviceList 作废信息
+     * @return 处理结果
+     */
+    R<?> deviceCancel(List<DispenseDeviceDto> dispenseDeviceList);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineDispenseAppService.java
new file mode 100644
index 00000000..3c15899e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineDispenseAppService.java
@@ -0,0 +1,31 @@
+package com.openhis.web.pharmacymanage.appservice;//package com.openhis.web.pharmacymanage.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.dto.DispenseMedicineDto;
+import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 住院发药 应用实现接口
+ *
+ * @author yuxj
+ * @date 2025/6/3
+ */
+public interface IInpatientMedicineDispenseAppService {
+
+    /**
+     * 分页查询发药病人列表
+     *
+     * @param encounterInfoPageDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    R<?> getEncounterInfoListPage(EncounterInfoPageDto encounterInfoPageDto, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineSummaryDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineSummaryDispenseAppService.java
new file mode 100644
index 00000000..fc0d9c51
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInpatientMedicineSummaryDispenseAppService.java
@@ -0,0 +1,54 @@
+package com.openhis.web.pharmacymanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.dto.DispenseMedicineDto;
+import com.openhis.web.pharmacymanage.dto.InpatientMedicineSearchParam;
+
+import java.util.List;
+
+/**
+ * 住院汇总发药 应用实现接口
+ *
+ * @author yuxj
+ * @date 2025/6/3
+ */
+public interface IInpatientMedicineSummaryDispenseAppService {
+
+    /**
+     * 页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 医嘱查询
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     */
+    R<?> getMedicationSummaryInfo(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 处方单核对发药
+     *
+     * @param searchParam 条件
+     * @return 处理结果
+     */
+    R<?> medicineDispense(List<InpatientMedicineSearchParam> searchParam);
+
+    /**
+     * 作废
+     *
+     * @param deliveryIdList 供应发放id
+     * @param notPerformedReasonEnum 未发原因
+     * @return 处理结果
+     */
+    R<?> medicineCancel(List<Long> deliveryIdList, Integer notPerformedReasonEnum);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalConsumablesDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalConsumablesDispenseAppService.java
new file mode 100644
index 00000000..315548c6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalConsumablesDispenseAppService.java
@@ -0,0 +1,22 @@
+package com.openhis.web.pharmacymanage.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+
+/**
+ * 处方管理 应用实现接口
+ *
+ * @author zwh
+ * @date 2025/6/20
+ */
+public interface IMedicalConsumablesDispenseAppService {
+
+    /**
+     * 发放耗材
+     *
+     * @param chargeItemIds 耗材收费单ids
+     * @return 处理结果
+     */
+    R<?> dispenseMedicalConsumables(List<Long> chargeItemIds);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ReturnMedicineAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ReturnMedicineAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
index cb0e6a46..8cee8334 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ReturnMedicineAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
@@ -14,7 +14,7 @@ import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto;
  * @author yangmo
  * @date 2025/4/4
  */
-public interface ReturnMedicineAppService {
+public interface IReturnMedicineAppService {
 
     /**
      * 页面初始化
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
similarity index 68%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
index 2aacc32a..279f4104 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
@@ -1,12 +1,13 @@
 package com.openhis.web.pharmacymanage.appservice;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.pharmacymanage.dto.DispenseMedicineDto;
 import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
-
-import java.util.List;
+import com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto;
 
 /**
  * 处方管理 应用实现接口
@@ -37,13 +38,14 @@ public interface IWesternMedicineDispenseAppService {
         Integer pageSize, HttpServletRequest request);
 
     /**
-     * 查询处方单列表
+     * 处方单查询
      *
-     * @param encounterId 就诊号
-     * @param dispenseStatus 发药状态
-     * @return 处方单列表
+     * @param prescriptionMedicineInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
      */
-    R<?> getPrescriptionInfo(Long encounterId,Integer dispenseStatus);
+    R<?> getPrescriptionInfo(PrescriptionMedicineInfoDto prescriptionMedicineInfoDto, Integer pageNo, Integer pageSize);
 
     /**
      * 配药
@@ -68,4 +70,17 @@ public interface IWesternMedicineDispenseAppService {
      * @return 处理结果
      */
     R<?> medicineCancel(List<DispenseMedicineDto> dispenseMedicineList);
+
+    /**
+     * 处方详情
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 单据详情
+     */
+    R<?> getMonthlySettlementPatientInfoList(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/DeviceDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/DeviceDispenseAppServiceImpl.java
new file mode 100644
index 00000000..c6972c9d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/DeviceDispenseAppServiceImpl.java
@@ -0,0 +1,443 @@
+package com.openhis.web.pharmacymanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.pharmacymanage.appservice.IDeviceDispenseAppService;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.*;
+import com.core.system.mapper.SysDictDataMapper;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.service.*;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+;
+import com.openhis.web.pharmacymanage.dto.*;
+import com.openhis.web.pharmacymanage.mapper.IDeviceDispenseMapper;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IInventoryItemService;
+
+/**
+ * 材料发送 应用实现类
+ *
+ * @author yuxj
+ * @date 2025/8/21
+ */
+@Service
+public class DeviceDispenseAppServiceImpl implements IDeviceDispenseAppService {
+
+    @Autowired
+    private IOrganizationService organizationService;
+
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+
+    @Autowired
+    private IInventoryItemService iInventoryItemService;
+
+    @Autowired
+    private IDeviceDispenseMapper deviceDispenseMapper;
+
+    @Autowired
+    private ReturnMedicineMapper returnMedicineMapper;
+
+    @Resource
+    private SysDictDataMapper sysDictDataMapper;
+
+    @Autowired
+    private ITraceNoManageService traceNoManageService;
+    @Resource
+    private IWesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppService;
+
+    /**
+     * 获取页面初始化信息
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        DispenseInitDto initDto = new DispenseInitDto();
+
+        // 获取科室下拉选列表
+        List<Organization> organizationList =
+            organizationService.getList(OrganizationType.DEPARTMENT.getValue(), OrganizationClass.CLINIC.getValue());
+        List<DispenseInitDto.DepartmentOption> organizationOptions = organizationList.stream()
+            .map(organization -> new DispenseInitDto.DepartmentOption(organization.getId(), organization.getName()))
+            .collect(Collectors.toList());
+
+        // 获取配药人下拉选列表
+        List<Practitioner> preparerDoctorList =
+            deviceDispenseMapper.getPreparerDoctorList(PractitionerRoles.PHARMACIST.getCode());
+        List<DispenseInitDto.PreparerDoctorOption> preparerDoctorOptions = preparerDoctorList.stream()
+            .map(practitioner -> new DispenseInitDto.PreparerDoctorOption(practitioner.getId(), practitioner.getName()))
+            .collect(Collectors.toList());
+
+        // 未发药原因下拉选列表
+        List<DispenseInitDto.NotPerformedReasonOption> notPerformedReasonOptions =
+            Stream.of(NotPerformedReasonEnum.values())
+                .map(notPerformedReason -> new DispenseInitDto.NotPerformedReasonOption(notPerformedReason.getValue(),
+                    notPerformedReason.getInfo()))
+                .collect(Collectors.toList());
+
+        // 发药状态
+        List<DispenseInitDto.DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
+        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
+            DispenseStatus.IN_PROGRESS.getInfo()));
+        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
+            DispenseStatus.COMPLETED.getInfo()));
+
+        initDto.setDepartmentOptions(organizationOptions).setNotPerformedReasonOptions(notPerformedReasonOptions)
+            .setDispenseStatusOptions(dispenseStatusOptions).setPreparerDoctorOptions(preparerDoctorOptions);
+        return R.ok(initDto);
+    }
+
+    /**
+     * 分页查询发药病人列表
+     *
+     * @param encounterInfoPageDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    @Override
+    public R<?> getEncounterInfoListPage(EncounterInfoPageDto encounterInfoPageDto, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+        // 发药状态初始化
+        Integer statusEnum = encounterInfoPageDto.getStatusEnum();
+        encounterInfoPageDto.setStatusEnum(null);
+        // 构建查询条件
+        QueryWrapper<EncounterInfoPageDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(encounterInfoPageDto, searchKey,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.idCard,
+                    CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
+                request);
+        // 查询就诊病人列表
+        Page<EncounterInfoPageDto> encounterInfoPage = deviceDispenseMapper.selectEncounterInfoListPage(
+            new Page<>(pageNo, pageSize), queryWrapper, statusEnum, DispenseStatus.IN_PROGRESS.getValue(),
+            DispenseStatus.COMPLETED.getValue(), DispenseStatus.PREPARATION.getValue(),
+            DispenseStatus.PREPARED.getValue(), EncounterClass.AMB.getValue());
+        encounterInfoPage.getRecords().forEach(encounterInfo -> {
+            // 性别
+            encounterInfo.setGenderEnum_enumText(
+                EnumUtils.getInfoByValue(AdministrativeGender.class, encounterInfo.getGenderEnum()));
+            // 发药状态
+            encounterInfo
+                .setStatusEnum_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, encounterInfo.getStatusEnum()));
+        });
+        return R.ok(encounterInfoPage);
+    }
+
+    /**
+     * 处方单查询
+     *
+     * @param prescriptionDeviceInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
+     */
+    @Override
+    public R<?> getPrescriptionInfo(PrescriptionDeviceInfoDto prescriptionDeviceInfoDto, Integer pageNo,
+        Integer pageSize) {
+        // 发药状态初始化
+        Integer dispenseStatus = prescriptionDeviceInfoDto.getStatusEnum();
+        prescriptionDeviceInfoDto.setStatusEnum(null);
+
+        // 构建查询条件
+        QueryWrapper<PrescriptionDeviceInfoDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(prescriptionDeviceInfoDto, null, null, null);
+
+        // 获取所属医院id
+        Long hospitalId = SecurityUtils.getLoginUser().getHospitalId();
+        // 患者基本信息查询
+        PrescriptionPatientInfoDto prescriptionPatientInfoDto = deviceDispenseMapper
+            .selectPrescriptionPatientInfo(prescriptionDeviceInfoDto.getEncounterId(), hospitalId);
+
+        // 年龄
+        prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirthDate()));
+        // 性别
+        prescriptionPatientInfoDto.setGenderEnum_enumText(
+            EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.getGenderEnum()));
+        // 合同类型
+        if (StringUtils.isNotNull(prescriptionPatientInfoDto.getCategoryEnum())) {
+            prescriptionPatientInfoDto.setCategoryEnum_enumText(
+                EnumUtils.getInfoByValue(FinCategory.class, prescriptionPatientInfoDto.getCategoryEnum()));
+        }
+
+        // 处方单信息查询
+
+        Page<PrescriptionDeviceInfoDto> prescriptionDeviceInfoPage =
+            deviceDispenseMapper.selectPrescriptionDeviceInfoList(new Page<>(pageNo, pageSize), queryWrapper,
+                DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
+                DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus);
+
+        // 查询字典值
+        List<SysDictData> unitCodeList = sysDictDataMapper.selectDictDataByType("unit_code");
+        Map<String, String> unitCodeLabel = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+            ));
+        List<SysDictData> methodCodeList = sysDictDataMapper.selectDictDataByType("method_code");
+        Map<String, String> methodCodeLabel = methodCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+            ));
+
+        List<PrescriptionDeviceInfoDto> prescriptionDeviceInfoList = prescriptionDeviceInfoPage.getRecords();
+        Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+        );
+        prescriptionDeviceInfoList.forEach(prescriptionDeviceInfo -> {
+            // 发药状态
+            prescriptionDeviceInfo.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(DispenseStatus.class, prescriptionDeviceInfo.getStatusEnum()));
+//            // 匹配剂量单位字典文本
+//            String doseUnitCode = prescriptionDeviceInfo.getDoseUnitCode();
+//            String doseUnitLabel = unitCodeLabel.getOrDefault(doseUnitCode, "");
+//            prescriptionDeviceInfo.setDoseUnitCode_dictText(doseUnitLabel);
+            // 匹配单位字典文本
+            String unitCode = prescriptionDeviceInfo.getUnitCode();
+            String unitLabel = unitCodeLabel.getOrDefault(unitCode, "");
+            prescriptionDeviceInfo.setUnitCode_dictText(unitLabel);
+//            // 匹配用法字典文本
+//            String methodCode = prescriptionDeviceInfo.getMethodCode();
+//            String methodLabel = methodCodeLabel.getOrDefault(methodCode, "");
+//            prescriptionDeviceInfo.setMethodCode_dictText(methodLabel);
+
+//            switch (prescriptionDeviceInfo.getPharmacologyCategoryCode()) {
+//                case "2": // 麻醉药品
+//                    prescriptionDeviceInfo.setPharmacologyCategoryCode_Text("麻醉");
+//                case "3": // 毒性药品
+//                    prescriptionDeviceInfo.setPharmacologyCategoryCode_Text("毒性");
+//                case "4": // 一类精神药
+//                    prescriptionDeviceInfo.setPharmacologyCategoryCode_Text("精一");
+//                case "5": // 二类精神药
+//                    prescriptionDeviceInfo.setPharmacologyCategoryCode_Text("精二");
+//                default: // 普通药品
+//                    prescriptionDeviceInfo.setPharmacologyCategoryCode_Text("普通");
+//            }
+
+            // 判断是否为慢病
+            if (EncounterYbClass.CHRONIC_DISEASE_OUTPATIENT.getCode()
+                .equals(prescriptionDeviceInfo.getMedTypeCode())) {
+                prescriptionDeviceInfo.setChronicDisease(Whether.YES.getInfo());
+            } else {
+                prescriptionDeviceInfo.setChronicDisease(Whether.NO.getInfo());
+            }
+//            // 皮试flag为是时
+//            if (Whether.YES.getValue().equals(prescriptionDeviceInfo.getSkinTestFlag())) {
+//                // 获取皮试结果
+//                ServiceRequest serReqObj =
+//                    serviceRequestService.selectByMedRequestId(prescriptionDeviceInfo.getRequestId());
+//                if (serReqObj != null) {
+//                    Integer clinicalStatus = allergyIntoleranceService.getPsResultByRequestId(serReqObj.getId());
+//                    prescriptionDeviceInfo.setPsResult(ClinicalStatus.getByValue(clinicalStatus).getInfo());
+//                }
+//            } else {
+//                prescriptionDeviceInfo.setPsResult("无");
+//            }
+
+        });
+
+        // 计算合计金额
+        if (!prescriptionDeviceInfoList.isEmpty()) {
+            double totalPrice = 0d;
+            for (PrescriptionDeviceInfoDto item : prescriptionDeviceInfoList) {
+                totalPrice += item.getTotalPrice().doubleValue();
+            }
+            prescriptionPatientInfoDto.setTotalPrice(totalPrice);
+        }
+        PrescriptionInfoDto prescriptionInfoDto = new PrescriptionInfoDto();
+        prescriptionInfoDto.setPrescriptionPatientInfoDto(prescriptionPatientInfoDto);
+        prescriptionInfoDto.setPrescriptionDeviceInfoDtoList(prescriptionDeviceInfoList);
+        return R.ok(prescriptionInfoDto);
+    }
+
+    /**
+     * 处方单核对发药
+     *
+     * @param dispenseDeviceList 发药信息
+     * @return 处理结果
+     */
+    @Override
+    public R<?> deviceDispense(List<DispenseDeviceDto> dispenseDeviceList) {
+        List<InventoryItem> inventoryItemList = new ArrayList<>();
+        // 获取发药单id列表
+        List<Long> devDispenseIdList =
+            dispenseDeviceList.stream().map(DispenseDeviceDto::getDispenseId).collect(Collectors.toList());
+        // 获取药品申请id列表
+        List<Long> devRequestIdList =
+            dispenseDeviceList.stream().map(DispenseDeviceDto::getRequestId).collect(Collectors.toList());
+        // 获取库存信息
+        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        // 按每个药品分组
+        Map<Long, List<InventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        // 遍历每个分组校验库存状态
+        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<InventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+                .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
+                // 库存停供校验
+                return R.fail(groupItems.get(0).getItemName() + "库存已停供");
+            }
+        }
+        if (!inventoryList.isEmpty()) {
+            for (InventoryDto inventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(inventoryDto.getInventoryStatusEnum())) {
+                    InventoryItem inventoryItem = new InventoryItem();
+                    // 库存数量判定
+                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    } else {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
+                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    }
+                    inventoryItemList.add(inventoryItem);
+                }
+            }
+        }
+        // 材料发放信息查询
+        List<DeviceDispense> dispenseList = deviceDispenseService
+            .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+        // 追溯码列表
+        List<TraceNoManage> tracesNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
+        if (dispenseList != null) {
+            if (dispenseList.stream().map(DeviceDispense::getStatusEnum)
+                .anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()))) {
+                throw new ServiceException("材料已发放，请勿重复发放");
+            } else {
+                for (DeviceDispense deviceDispense : dispenseList) {
+                    // 材料发放状态
+                    deviceDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                    // 发药数量
+                    deviceDispense.setDispenseQuantity(deviceDispense.getQuantity());
+                    // 发药时间
+                    deviceDispense.setDispenseTime(DateUtils.getNowDate());
+                    // 发药人
+                    deviceDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId());
+                    // 根据数量设置追溯码
+                    deviceDispense.setTraceNo(String.join(CommonConstants.Common.COMMA,
+                        Collections.nCopies(deviceDispense.getQuantity(), CommonConstants.Common.DEV_TRACE_NO)));
+                    // 使用逗号分割追溯码并转换为List
+                    String[] traceNoList = deviceDispense.getTraceNo().split(CommonConstants.Common.COMMA);
+                    for (String item : traceNoList) {
+                        traceNoManage = new TraceNoManage();
+                        // 追溯码处理
+                        traceNoManage.setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+                            // 项目id
+                            .setItemId(deviceDispense.getDeviceDefId())
+                            // 仓库类型
+                            .setLocationTypeEnum(LocationForm.WAREHOUSE.getValue())
+                            // 仓库
+                            .setLocationId(deviceDispense.getLocationId())
+                            // 产品批号
+                            .setLotNumber(deviceDispense.getLotNumber())
+                            // 追溯码
+                            .setTraceNo(item)
+                            // 追溯码状态
+                            .setStatusEnum(TraceNoStatus.OUT.getValue())
+                            // 追溯码单位
+                            .setUnitCode(deviceDispense.getUnitCode())
+                            // 操作类型
+                            .setOperationType(SupplyType.DISPENSE_MEDICATION.getValue());
+                        tracesNoManageList.add(traceNoManage);
+                    }
+                }
+                // 药品发放更新
+                deviceDispenseService.updateBatchById(dispenseList);
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 库存更新
+        iInventoryItemService.updateBatchById(inventoryItemList);
+        // 追溯码管理表数据追加
+        boolean result = traceNoManageService.saveBatch(tracesNoManageList);
+        if (!result) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 返回信息
+        String returnMsg = null;
+        // 调用医保商品销售接口
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+        // 医保开关
+        if (Whether.YES.getCode().equals(ybSwitch)) {
+            List<String> uploadFailedNoList =
+                westernMedicineDispenseAppService.ybMedicineIntegrated(null, devDispenseIdList);
+            if (uploadFailedNoList != null) {
+                returnMsg = "3505商品销售上传错误，错误项目编码" + uploadFailedNoList;
+            } else {
+                returnMsg = "3505商品销售上传成功";
+            }
+        }
+
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 作废
+     *
+     * @param dispenseDeviceList 作废信息
+     * @return 处理结果
+     */
+    @Override
+    public R<?> deviceCancel(List<DispenseDeviceDto> dispenseDeviceList) {
+        // 获取发材料单id列表
+        List<Long> devDispenseIdList =
+            dispenseDeviceList.stream().map(DispenseDeviceDto::getDispenseId).collect(Collectors.toList());
+        // 材料发放信息查询
+        List<DeviceDispense> dispenseList = deviceDispenseService
+            .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+        if (dispenseList != null) {
+            for (DeviceDispense medicationDispense : dispenseList) {
+                // 材料发放状态
+                medicationDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
+                // 未发药原因
+                medicationDispense.setNotPerformedReasonEnum(dispenseDeviceList.get(0).getNotPerformedReasonEnum());
+            }
+            // 药品发放更新
+            deviceDispenseService.updateBatchById(dispenseList);
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IChineseMedicineDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IChineseMedicineDispenseAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IChineseMedicineDispenseAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IChineseMedicineDispenseAppServiceImpl.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicalConsumablesDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicalConsumablesDispenseAppServiceImpl.java
new file mode 100644
index 00000000..06a67a1e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicalConsumablesDispenseAppServiceImpl.java
@@ -0,0 +1,226 @@
+package com.openhis.web.pharmacymanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.HospitalCodeEnum;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.Whether;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
+import com.openhis.web.pharmacymanage.appservice.IMedicalConsumablesDispenseAppService;
+import com.openhis.web.pharmacymanage.dto.InventoryDto;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IDeviceRequestService;
+import com.openhis.workflow.service.IInventoryItemService;
+/*
+ *
+ * 
+ * 耗材发放 应用实现类
+ *
+ * @author wangyang
+ * 
+ * @date 2025/3/14
+ * 
+ */
+
+@Service
+public class IMedicalConsumablesDispenseAppServiceImpl implements IMedicalConsumablesDispenseAppService {
+
+    @Resource
+    private ITraceNoAppService traceNoAppService;
+
+    @Resource
+    private IDeviceDispenseService deviceDispenseService;
+
+    @Resource
+    private IDeviceRequestService deviceRequestService;
+
+    @Resource
+    private ReturnMedicineMapper returnMedicineMapper;
+
+    @Resource
+    private IInventoryItemService iInventoryItemService;
+
+    @Resource
+    private IWesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppService;
+
+    @Resource
+    private IChargeItemService chargeItemService;
+
+    /**
+     * 发放耗材
+     *
+     * @param chargeItemIds 耗材收费单ids
+     * @return 处理结果
+     */
+    @Override
+    public R<?> dispenseMedicalConsumables(List<Long> chargeItemIds) {
+        // 查看所属医院
+        String fixmedinsCode =
+            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
+        if (!HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
+            return R.ok();
+        }
+        List<ChargeItem> chargeItemList = chargeItemService.listByIds(chargeItemIds);
+        if (chargeItemList == null || chargeItemList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        List<InventoryItem> inventoryItemList = new ArrayList<>();
+        // 获取发申请id列表
+        List<Long> devRequestIdList =
+            chargeItemList.stream().map(ChargeItem::getServiceId).collect(Collectors.toList());
+        // 获取耗材发放id列表
+        List<Long> devDispenseIdList = deviceDispenseService
+            .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getDeviceReqId, devRequestIdList))
+            .stream().map(DeviceDispense::getId).collect(Collectors.toList());
+        // 获取库存信息
+        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
+            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        // 按每个耗材分组
+        Map<Long, List<InventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        // 遍历每个分组校验库存状态
+        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<InventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+                .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
+                // 库存停供校验
+                return R.fail(groupItems.get(0).getItemName() + "库存已停供");
+            }
+        }
+        if (!inventoryList.isEmpty()) {
+            for (InventoryDto inventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(inventoryDto.getInventoryStatusEnum())) {
+                    InventoryItem inventoryItem = new InventoryItem();
+                    // 库存数量判定
+                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    } else {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
+                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    }
+                    inventoryItemList.add(inventoryItem);
+                }
+            }
+        }
+        // 发耗材信息查询
+        List<DeviceDispense> dispenseList = deviceDispenseService
+            .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+        // todo 耗材追溯码待定
+        // // 追溯码列表
+        // List<TraceNoInfoParam> traceNoInfoList = new ArrayList<>();
+        // TraceNoInfoParam traceNoInfo;
+        if (dispenseList != null) {
+            if (dispenseList.stream().map(DeviceDispense::getStatusEnum)
+                .anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()))) {
+                throw new ServiceException("耗材已发放，请勿重复操作");
+            } else {
+                for (DeviceDispense deviceDispense : dispenseList) {
+                    // 耗材发放状态
+                    deviceDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                    // 发药数量
+                    deviceDispense.setDispenseQuantity(deviceDispense.getQuantity());
+                    // 发药时间
+                    deviceDispense.setDispenseTime(DateUtils.getNowDate());
+                    // 发药人（长大写死发耗材人）
+                    deviceDispense.setPerformerId(CommonConstants.CCU.DisDeviceDoctor);
+                    // 根据数量设置追溯码
+                    deviceDispense.setTraceNo(String.join(CommonConstants.Common.COMMA,
+                        Collections.nCopies(deviceDispense.getQuantity(), CommonConstants.Common.DEV_TRACE_NO)));
+                    // // 使用逗号分割追溯码并转换为List
+                    // String[] traceNoList = deviceDispense.getTraceNo().split(",");
+                    // for (String item : traceNoList) {
+                    // traceNoInfo = new TraceNoInfoParam();
+                    // // 追溯码处理
+                    // // 项目所属表
+                    // traceNoInfo.setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+                    // // 项目id
+                    // .setItemId(deviceDispense.getDeviceDefId())
+                    // // 仓库类型
+                    // .setLocationTypeEnum(null)
+                    // // 仓库
+                    // .setLocationId(deviceDispense.getLocationId())
+                    // // 仓位
+                    // .setLocationStoreId(null)
+                    // // 产品批号
+                    // .setLotNumber(deviceDispense.getLotNumber())
+                    // // 追溯码
+                    // .setTraceNo(item)
+                    // // 追溯码状态
+                    // .setStatusEnum(TraceNoStatus.OUT.getValue())
+                    // // 追溯码单位
+                    // .setUnitCode(deviceDispense.getUnitCode())
+                    // // 操作类型
+                    // .setOperationType(SupplyType.DISPENSE_MEDICATION.getValue());
+                    // traceNoInfoList.add(traceNoInfo);
+                    // }
+                }
+                // 药品发放更新
+                deviceDispenseService.updateBatchById(dispenseList);
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+        // 库存更新
+        iInventoryItemService.updateBatchById(inventoryItemList);
+        // // 追溯码管理表数据追加
+        // R<?> request = traceNoAppService.addTraceNoInfo(traceNoInfoList);
+        // if (request.getCode() != 200) {
+        // return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        // }
+        // 返回信息
+        String returnMsg = null;
+        // 调用医保商品销售接口
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
+        // 医保开关
+        if (Whether.YES.getCode().equals(ybSwitch)) {
+            List<String> uploadFailedNoList =
+                westernMedicineDispenseAppService.ybMedicineIntegrated(null, devDispenseIdList);
+            if (uploadFailedNoList != null) {
+                returnMsg = "3505商品销售上传错误，错误项目编码" + uploadFailedNoList;
+            } else {
+                returnMsg = "3505商品销售上传成功";
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IReturnMedicineAppServiceImpl.java
similarity index 67%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IReturnMedicineAppServiceImpl.java
index 507d2f87..7378db66 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IReturnMedicineAppServiceImpl.java
@@ -15,19 +15,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
-import com.core.common.utils.AgeCalculatorUtil;
-import com.core.common.utils.AssignSeqUtil;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.SecurityUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.EncounterDiagnosis;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterDiagnosisService;
-import com.openhis.administration.service.IOrganizationService;
+import com.core.common.utils.*;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.service.*;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
@@ -42,7 +32,7 @@ import com.openhis.financial.service.IPaymentReconciliationService;
 import com.openhis.medication.domain.MedicationDispense;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.pharmacymanage.appservice.ReturnMedicineAppService;
+import com.openhis.web.pharmacymanage.appservice.IReturnMedicineAppService;
 import com.openhis.web.pharmacymanage.dto.*;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
 import com.openhis.workflow.domain.DeviceDispense;
@@ -63,7 +53,10 @@ import com.openhis.yb.service.YbManager;
  * @date 2025/4/4
  */
 @Service
-public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
+public class IReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
+
+    @Autowired
+    private ITraceNoManageService traceNoManageService;
 
     @Autowired
     private IOrganizationService iOrganizationService;
@@ -132,8 +125,8 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
 
         // 发药状态
         List<ReturnMedicineInitDto.RefundStatusOption> refundStatusOptions = new ArrayList<>();
-        refundStatusOptions.add(new ReturnMedicineInitDto.RefundStatusOption(RequestStatus.IN_REFUND.getValue(),
-            RequestStatus.IN_REFUND.getInfo()));
+        refundStatusOptions.add(new ReturnMedicineInitDto.RefundStatusOption(RequestStatus.CANCELLED.getValue(),
+            RequestStatus.CANCELLED.getInfo()));
         refundStatusOptions.add(new ReturnMedicineInitDto.RefundStatusOption(RequestStatus.COMPLETED.getValue(),
             RequestStatus.COMPLETED.getInfo()));
         initDto.setDepartmentOptions(organizationOptions).setRefundStatusOptions(refundStatusOptions);
@@ -160,8 +153,8 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
                     CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
                 request);
         // 查询退药患者分页列表
-        Page<EncounterInfoPageDto> encounterInfoPage =
-            returnMedicineMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper);
+        Page<EncounterInfoPageDto> encounterInfoPage = returnMedicineMapper
+            .selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.AMB.getValue());
         encounterInfoPage.getRecords().forEach(encounterInfo -> {
             // 性别
             encounterInfo.setGenderEnum_enumText(
@@ -202,7 +195,7 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         // 获取退药信息
         List<ReturnMedicineInfoDto> returnMedicineInfoList = returnMedicineMapper.selectReturnMedicineInfo(encounterId,
             CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.TableName.MED_MEDICATION_REQUEST,
-            ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(), refundStatus, RequestStatus.IN_REFUND.getValue(),
+            ItemType.MEDICINE.getValue(), ItemType.DEVICE.getValue(), refundStatus, RequestStatus.CANCELLED.getValue(),
             RequestStatus.COMPLETED.getValue());
         returnMedicineInfoList.forEach(returnMedicineInfoDto -> {
             // 退药状态
@@ -224,9 +217,16 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
      */
     @Override
     public R<?> medicineReturn(List<ReturnMedicineDto> medicineReturnList) {
+        if (medicineReturnList == null || medicineReturnList.isEmpty()) {
+            return R.ok();
+        }
         // 分别处理退药与退耗材的请求
         List<ReturnMedicineDto> returnMedicineList = new ArrayList<>();
         List<ReturnMedicineDto> returnDeviceList = new ArrayList<>();
+        // 追溯码列表
+        List<TraceNoManage> traceNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
+
         medicineReturnList.forEach(item -> {
             switch (item.getTableName()) {
                 case CommonConstants.TableName.MED_MEDICATION_REQUEST -> returnMedicineList
@@ -242,13 +242,15 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         List<Long> medRequestIdList =
             returnMedicineList.stream().map(ReturnMedicineDto::getRequestId).collect(Collectors.toList());
 
-        // 药品已退药信息查询
-        List<MedicationDispense> refundList = medicationDispenseService
-            .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getMedReqId, medRequestIdList));
-        if (refundList != null) {
-            if (refundList.stream().map(MedicationDispense::getStatusEnum)
-                .anyMatch(x -> x.equals(DispenseStatus.REFUNDED.getValue()))) {
-                throw new ServiceException("药品已退药，请勿重复退药");
+        if (!medRequestIdList.isEmpty()) {
+            // 药品已退药信息查询
+            List<MedicationDispense> refundList = medicationDispenseService.list(
+                new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getMedReqId, medRequestIdList));
+            if (refundList != null) {
+                if (refundList.stream().map(MedicationDispense::getStatusEnum)
+                    .anyMatch(x -> x.equals(DispenseStatus.REFUNDED.getValue()))) {
+                    throw new ServiceException("药品已退药，请勿重复退药");
+                }
             }
         }
         // 退药单列表
@@ -262,20 +264,51 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
                 // 退药的药品请求id
                 for (ReturnMedicineDto returnMedicineDto : returnMedicineList) {
                     if (returnMedicineDto.getDispenseId().equals(medicationDispense.getId())) {
-                        medicationDispense.setMedReqId(returnMedicineDto.getRequestId())
-                            .setTraceNo(returnMedicineDto.getTraceNo());
+                        medicationDispense.setMedReqId(returnMedicineDto.getRequestId());
                     }
                 }
                 // 药品发放编码
-                medicationDispense.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 10));
+                medicationDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
                 // 退药状态
                 medicationDispense.setStatusEnum(DispenseStatus.REFUNDED.getValue());
+                // 状态变更时间
+                medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
+                // 退药时间
+                medicationDispense.setDispenseTime(DateUtils.getNowDate());
+                // 退药人
+                medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
                 medicationDispense.setId(null);
                 medicationRefundList.add(medicationDispense);
+                // 使用逗号分割追溯码并转换为List
+                String[] traceNoList = medicationDispense.getTraceNo().split(CommonConstants.Common.COMMA);
+                for (String item : traceNoList) {
+                    traceNoManage = new TraceNoManage();
+                    // 追溯码处理
+                    traceNoManage.setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+                        // 项目id
+                        .setItemId(medicationDispense.getMedicationId())
+                        // 仓库类型
+                        .setLocationTypeEnum(null)
+                        // 仓库
+                        .setLocationId(medicationDispense.getLocationId())
+                        // 仓位
+                        .setLocationStoreId(null)
+                        // 产品批号
+                        .setLotNumber(medicationDispense.getLotNumber())
+                        // 追溯码
+                        .setTraceNo(item)
+                        // 追溯码状态
+                        .setStatusEnum(TraceNoStatus.IN.getValue())
+                        // 追溯码单位
+                        .setUnitCode(medicationDispense.getUnitCode())
+                        // 操作类型
+                        .setOperationType(SupplyType.RETURN_MEDICATION.getValue());
+                    traceNoManageList.add(traceNoManage);
+                }
             }
             medicationDispenseService.saveBatch(medicationRefundList);
             // 药品退药请求状态变更(待退药→已完成)
-            medicationRequestService.updateCompletedStatusBatch(medRequestIdList);
+            medicationRequestService.updateCompletedStatusBatch(medRequestIdList, null, null);
         }
         // 获取耗材发放id列表
         List<Long> devDispenseIdList =
@@ -283,6 +316,17 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         // 获取退耗材请求id列表
         List<Long> devRequestIdList =
             returnDeviceList.stream().map(ReturnMedicineDto::getRequestId).collect(Collectors.toList());
+        if (!devRequestIdList.isEmpty()) {
+            // 药品已退药信息查询
+            List<DeviceDispense> refundList = deviceDispenseService
+                .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getDeviceReqId, devRequestIdList));
+            if (refundList != null) {
+                if (refundList.stream().map(DeviceDispense::getStatusEnum)
+                    .anyMatch(x -> x.equals(DispenseStatus.REFUNDED.getValue()))) {
+                    throw new ServiceException("耗材已退，请勿重复操作");
+                }
+            }
+        }
         // 退耗材单列表
         List<DeviceDispense> devRefundList = new ArrayList<>();
         if (!devDispenseIdList.isEmpty()) {
@@ -291,22 +335,47 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
                 .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
             // 根据发药单对应生成退药单
             for (DeviceDispense deviceDispense : deviceDispenseList) {
-                if (DispenseStatus.REFUNDED.getValue().equals(deviceDispense.getStatusEnum())) {
-                    throw new ServiceException("耗材已退药，请勿重复退药");
-                }
-                deviceDispense.setId(null);
                 // 耗材发放编码
-                deviceDispense.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 10));
-                // 退药的药品请求id
+                deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
+                // 退耗材的耗材请求id
                 for (ReturnMedicineDto returnDeviceDto : returnDeviceList) {
                     if (returnDeviceDto.getDispenseId().equals(deviceDispense.getId())) {
-                        deviceDispense.setDeviceReqId(returnDeviceDto.getRequestId())
-                            .setTraceNo(returnDeviceDto.getTraceNo());
+                        deviceDispense.setDeviceReqId(returnDeviceDto.getRequestId());
+                        // 根据数量设置追溯码
+                        deviceDispense.setTraceNo(String.join(CommonConstants.Common.COMMA,
+                            Collections.nCopies(deviceDispense.getQuantity(), CommonConstants.Common.DEV_TRACE_NO)));
                     }
                 }
+                // 退药时间
+                deviceDispense.setDispenseTime(DateUtils.getNowDate());
                 // 退药状态
                 deviceDispense.setStatusEnum(DispenseStatus.REFUNDED.getValue());
+                deviceDispense.setId(null);
                 devRefundList.add(deviceDispense);
+                // // 使用逗号分割追溯码并转换为List
+                // String[] traceNoList = deviceDispense.getTraceNo().split(CommonConstants.Common.COMMA);
+                // for (String item : traceNoList) {
+                // traceNoManage = new TraceNoManage();
+                // // 追溯码处理
+                // traceNoManage.setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+                // // 项目id
+                // .setItemId(deviceDispense.getDeviceDefId())
+                // // 仓库类型
+                // .setLocationTypeEnum(LocationForm.PHARMACY.getValue())
+                // // 仓库
+                // .setLocationId(deviceDispense.getLocationId())
+                // // 产品批号
+                // .setLotNumber(deviceDispense.getLotNumber())
+                // // 追溯码
+                // .setTraceNo(item)
+                // // 追溯码状态
+                // .setStatusEnum(TraceNoStatus.IN.getValue())
+                // // 追溯码单位
+                // .setUnitCode(deviceDispense.getUnitCode())
+                // // 操作类型
+                // .setOperationType(SupplyType.RETURN_MEDICATION.getValue());
+                // traceNoManageList.add(traceNoManage);
+                // }
             }
             deviceDispenseService.saveBatch(devRefundList);
             // 药品退药请求状态变更(待退药→已完成)
@@ -318,26 +387,32 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         List<InventoryDto> inventoryList =
             returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, medDispenseIdList,
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-
-        // 设置库存数量
-        for (InventoryDto inventory : inventoryList) {
-            // 库存表项目设定
-            InventoryItem inventoryItem = new InventoryItem();
-            // id
-            inventoryItem.setId(inventory.getInventoryId());
-            // 库存数量
-            if (inventory.getDispenseUnit().equals(inventory.getInventoryUnitCode())) {
-                // 当前库存数量(拆零单位)=当前库存数量(拆零单位)+待退数量
-                inventoryItem.setQuantity(inventory.getInventoryQuantity().add(inventory.getDispenseQuantity()));
-            } else {
-                // 当前库存数量(拆零单位)=当前库存数量(拆零单位)+退药数量（拆零比×待退数量）
-                inventoryItem.setQuantity(inventory.getInventoryQuantity()
-                    .add(inventory.getPartPercent().multiply(inventory.getDispenseQuantity())));
+        if (inventoryList != null && !inventoryList.isEmpty()) {
+            // 设置库存数量
+            for (InventoryDto inventory : inventoryList) {
+                // 库存表项目设定
+                InventoryItem inventoryItem = new InventoryItem();
+                // id
+                inventoryItem.setId(inventory.getInventoryId());
+                // 库存数量
+                if (inventory.getDispenseUnit().equals(inventory.getInventoryUnitCode())) {
+                    // 当前库存数量(拆零单位)=当前库存数量(拆零单位)+待退数量
+                    inventoryItem.setQuantity(inventory.getInventoryQuantity().add(inventory.getDispenseQuantity()));
+                } else {
+                    // 当前库存数量(拆零单位)=当前库存数量(拆零单位)+退药数量（拆零比×待退数量）
+                    inventoryItem.setQuantity(inventory.getInventoryQuantity()
+                        .add(inventory.getPartPercent().multiply(inventory.getDispenseQuantity())));
+                }
+                inventoryItemList.add(inventoryItem);
+            }
+            // 库存更新
+            iInventoryItemService.updateBatchById(inventoryItemList);
+            // 追溯码管理表数据追加
+            boolean result = traceNoManageService.saveBatch(traceNoManageList);
+            if (!result) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
             }
-            inventoryItemList.add(inventoryItem);
         }
-        // 库存更新
-        iInventoryItemService.updateBatchById(inventoryItemList);
         // 返回信息
         String returnMsg = null;
         // 调用医保商品销售退货接口
@@ -368,7 +443,6 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         R<?> result;
         if (!dispenseMedIdList.isEmpty() || !dispenseDevIdList.isEmpty()) {
             // 查询退药项目相关信息
-            // 因暂时无发药材的需求，不查询退耗材的信息
             List<DispenseInventoryDto> dispenseInventoryList = returnMedicineMapper.selectReturnItemDetail(
                 dispenseDevIdList, dispenseMedIdList, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
                 CommonConstants.TableName.ADM_DEVICE_DEFINITION);
@@ -387,12 +461,19 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
 
     private Medical3506Param getMedical3505Result(DispenseInventoryDto dispenseInventoryDto) {
         Medical3506Param medical3506Param = new Medical3506Param();
-        ObjectMapper mapper = new ObjectMapper();
-        // 查询费用结算信息
-        ChargeItem chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
-            .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
-            .eq(ChargeItem::getServiceId, dispenseInventoryDto.getMedReqId())
-            .eq(ChargeItem::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        ChargeItem chargeItem = null;
+        if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            // 查询费用结算信息
+            chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
+                .eq(ChargeItem::getServiceId, dispenseInventoryDto.getReqId())
+                .eq(ChargeItem::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_DEVICE_REQUEST)
+                .eq(ChargeItem::getServiceId, dispenseInventoryDto.getReqId())
+                .eq(ChargeItem::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        }
         if (chargeItem == null) {
             throw new ServiceException("未查询到收费项");
         }
@@ -445,6 +526,8 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
                 .eq(ClinicSettle::getMedType, encounterDiagnosis.getMedTypeCode()).last(" LIMIT 1"));
             if (clinicSettle != null) {
                 medical3506Param.setMdtrtSn(clinicSettle.getMdtrtId());
+            } else {
+                medical3506Param.setMdtrtSn(dispenseInventoryDto.getEncounterNo());
             }
         }
         // // 查询发票信息
@@ -458,7 +541,7 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         if (dispenseInventoryDto.getTraceNo() != null) {
             List<String> traceNoList =
                 Arrays.stream(dispenseInventoryDto.getTraceNo().split(CommonConstants.Common.COMMA)).map(String::trim)
-                    .filter(s -> !s.isEmpty()).collect(Collectors.toList());
+                    .filter(s -> !s.isEmpty()).toList();
             for (String traceNo : traceNoList) {
                 Map<String, String> traceNoMap = new HashMap<>();
                 traceNoMap.put("drug_trac_codg", traceNo);
@@ -467,15 +550,22 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         }
         medical3506Param.setMedListCodg(dispenseInventoryDto.getYbNo())
             .setFixmedinsBchno(dispenseInventoryDto.getLotNumber())
-            .setFixmedinsHilistId(dispenseInventoryDto.getMedicationNo())
+            .setFixmedinsHilistId(dispenseInventoryDto.getItemNo())
             .setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
             .setPsnCertType(mdtrtCertType.getValue()).setManuLotnum(dispenseInventoryDto.getLotNumber())
             .setManuDate(dispenseInventoryDto.getProductionDate())
             .setSelRetnCnt(new BigDecimal(dispenseInventoryDto.getDispenseQuantity().toString()))
-            .setSelRetnTime(dispenseInventoryDto.getDispenseTime())
-            .setSelRetnOpterName(dispenseInventoryDto.getPreparerName())
-            .setExpyEnd(dispenseInventoryDto.getExpirationDate())
-            .setMedinsProdSelNo(dispenseInventoryDto.getDispenseNo()).setDrugtracinfo(medicalTraceNo);
+            .setSelRetnTime(dispenseInventoryDto.getDispenseTime()).setExpyEnd(dispenseInventoryDto.getExpirationDate())
+            .setMedinsProdSelNo(dispenseInventoryDto.getDispenseNo()).setDrugtracinfo(medicalTraceNo)
+            .setCertno(dispenseInventoryDto.getIdCard());
+        // 查看所属医院
+        String fixmedinsCode =
+            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
+        if (dispenseInventoryDto.getPreparerName() == null && HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
+            medical3506Param.setSelRetnOpterName(CommonConstants.CCU.DisDeviceDoctorName);
+        } else {
+            medical3506Param.setSelRetnOpterName(dispenseInventoryDto.getPreparerName());
+        }
         if (dispenseInventoryDto.getInventoryUnitCode().equals(dispenseInventoryDto.getDispenseUnitCode())) {
             medical3506Param.setTrdnFlag(Whether.YES.getCode());
         } else {
@@ -488,6 +578,11 @@ public class ReturnMedicineAppServiceImpl implements ReturnMedicineAppService {
         } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == dispenseInventoryDto.getRxFlag()) {
             medical3506Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
         }
+        if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            medical3506Param.setFixmedinsHilistName(CommonConstants.TableName.MED_MEDICATION_DEFINITION);
+        } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            medical3506Param.setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        }
         return medical3506Param;
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
similarity index 63%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
index 08e70fd9..b932f236 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
@@ -21,10 +21,8 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.system.mapper.SysDictDataMapper;
 import com.openhis.administration.domain.*;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterDiagnosisService;
-import com.openhis.administration.service.IOrganizationService;
+import com.openhis.administration.service.*;
+import com.openhis.clinical.service.IAllergyIntoleranceService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
@@ -39,17 +37,22 @@ import com.openhis.financial.service.IPaymentReconciliationService;
 import com.openhis.medication.domain.MedicationDispense;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
 import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
 import com.openhis.web.pharmacymanage.dto.*;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
 import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
 import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.IServiceRequestService;
 import com.openhis.yb.domain.ClinicSettle;
 import com.openhis.yb.dto.Medical3505Param;
 import com.openhis.yb.service.IClinicSettleService;
 import com.openhis.yb.service.YbManager;
 
+import reactor.util.annotation.Nullable;
+
 /**
  * 西药发放 应用实现类
  *
@@ -59,6 +62,9 @@ import com.openhis.yb.service.YbManager;
 @Service
 public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineDispenseAppService {
 
+    @Autowired
+    private ITraceNoAppService traceNoAppService;
+
     @Autowired
     private IOrganizationService organizationService;
 
@@ -98,9 +104,18 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
     @Autowired
     private IEncounterDiagnosisService encounterDiagnosisService;
 
+    @Autowired
+    private IServiceRequestService serviceRequestService;
+
+    @Autowired
+    private IAllergyIntoleranceService allergyIntoleranceService;
+
     @Resource
     private SysDictDataMapper sysDictDataMapper;
 
+    @Autowired
+    private ITraceNoManageService traceNoManageService;
+
     /**
      * 获取页面初始化信息
      *
@@ -167,10 +182,10 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
                     CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
                 request);
         // 查询就诊病人列表
-        Page<EncounterInfoPageDto> encounterInfoPage =
-            westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper,
-                statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
-                DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue());
+        Page<EncounterInfoPageDto> encounterInfoPage = westernMedicineDispenseMapper.selectEncounterInfoListPage(
+            new Page<>(pageNo, pageSize), queryWrapper, statusEnum, DispenseStatus.IN_PROGRESS.getValue(),
+            DispenseStatus.COMPLETED.getValue(), DispenseStatus.PREPARATION.getValue(),
+            DispenseStatus.PREPARED.getValue(), EncounterClass.AMB.getValue());
         encounterInfoPage.getRecords().forEach(encounterInfo -> {
             // 性别
             encounterInfo.setGenderEnum_enumText(
@@ -183,34 +198,43 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
     }
 
     /**
-     * 查询处方单列表
+     * 处方单查询
      *
-     * @param encounterId 就诊号
-     * @param dispenseStatus 发药状态
-     * @return 处方单列表
+     * @param prescriptionMedicineInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
      */
     @Override
-    public R<?> getPrescriptionInfo(Long encounterId, Integer dispenseStatus) {
+    public R<?> getPrescriptionInfo(PrescriptionMedicineInfoDto prescriptionMedicineInfoDto, Integer pageNo,
+        Integer pageSize) {
+        // 发药状态初始化
+        Integer dispenseStatus = prescriptionMedicineInfoDto.getStatusEnum();
+        prescriptionMedicineInfoDto.setStatusEnum(null);
+
+        // 构建查询条件
+        QueryWrapper<PrescriptionMedicineInfoDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(prescriptionMedicineInfoDto, null, null, null);
 
+        // 获取所属医院id
+        Long hospitalId = SecurityUtils.getLoginUser().getHospitalId();
         // 患者基本信息查询
-        PrescriptionPatientInfoDto prescriptionPatientInfoDto =
-            westernMedicineDispenseMapper.selectPrescriptionPatientInfo(encounterId);
+        PrescriptionPatientInfoDto prescriptionPatientInfoDto = westernMedicineDispenseMapper
+            .selectPrescriptionPatientInfo(prescriptionMedicineInfoDto.getEncounterId(), hospitalId);
+
         // 年龄
         prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirthDate()));
         // 性别
         prescriptionPatientInfoDto.setGenderEnum_enumText(
             EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.getGenderEnum()));
-        // 合同类型
-        if (StringUtils.isNotNull(prescriptionPatientInfoDto.getCategoryEnum())) {
-            prescriptionPatientInfoDto.setCategoryEnum_enumText(
-                EnumUtils.getInfoByValue(FinCategory.class, prescriptionPatientInfoDto.getCategoryEnum()));
-        }
 
         // 处方单信息查询
-        List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoList =
-            westernMedicineDispenseMapper.selectPrescriptionMedicineInfoList(encounterId,
+
+        Page<PrescriptionMedicineInfoDto> prescriptionMedicineInfoPage =
+            westernMedicineDispenseMapper.selectPrescriptionMedicineInfoList(new Page<>(pageNo, pageSize), queryWrapper,
                 DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
                 DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus);
+
         // 查询字典值
         List<SysDictData> unitCodeList = sysDictDataMapper.selectDictDataByType("unit_code");
         Map<String, String> unitCodeLabel = unitCodeList.stream().collect(
@@ -220,6 +244,10 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         Map<String, String> methodCodeLabel = methodCodeList.stream().collect(
             Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
             ));
+
+        List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoList = prescriptionMedicineInfoPage.getRecords();
+        Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+        );
         prescriptionMedicineInfoList.forEach(prescriptionMedicineInfo -> {
             // 发药状态
             prescriptionMedicineInfo.setStatusEnum_enumText(
@@ -236,6 +264,40 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
             String methodCode = prescriptionMedicineInfo.getMethodCode();
             String methodLabel = methodCodeLabel.getOrDefault(methodCode, "");
             prescriptionMedicineInfo.setMethodCode_dictText(methodLabel);
+
+            switch (prescriptionMedicineInfo.getPharmacologyCategoryCode()) {
+                case "2": // 麻醉药品
+                    prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("麻醉");
+                case "3": // 毒性药品
+                    prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("毒性");
+                case "4": // 一类精神药
+                    prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("精一");
+                case "5": // 二类精神药
+                    prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("精二");
+                default: // 普通药品
+                    prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("普通");
+            }
+
+            // 判断是否为慢病
+            if (EncounterYbClass.CHRONIC_DISEASE_OUTPATIENT.getCode()
+                .equals(prescriptionMedicineInfo.getMedTypeCode())) {
+                prescriptionMedicineInfo.setChronicDisease(Whether.YES.getInfo());
+            } else {
+                prescriptionMedicineInfo.setChronicDisease(Whether.NO.getInfo());
+            }
+            // 皮试flag为是时
+            if (Whether.YES.getValue().equals(prescriptionMedicineInfo.getSkinTestFlag())) {
+                // 获取皮试结果
+                ServiceRequest serReqObj =
+                    serviceRequestService.selectByMedRequestId(prescriptionMedicineInfo.getRequestId());
+                if (serReqObj != null) {
+                    Integer clinicalStatus = allergyIntoleranceService.getPsResultByRequestId(serReqObj.getId());
+                    prescriptionMedicineInfo.setPsResult(ClinicalStatus.getByValue(clinicalStatus).getInfo());
+                }
+            } else {
+                prescriptionMedicineInfo.setPsResult("无");
+            }
+
         });
 
         // 计算合计金额
@@ -271,12 +333,19 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         // 获取库存信息
         List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
             CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-        if (!inventoryList.isEmpty()) {
-            if (inventoryList.stream().map(InventoryDto::getInventoryStatusEnum)
+        // 按每个药品分组
+        Map<Long, List<InventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        // 遍历每个分组校验库存状态
+        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<InventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
                 .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
-                // 库存停供
-                return R.fail("当前处方中的药品库存已停供");
+                // 库存停供校验
+                return R.fail(groupItems.get(0).getItemName() + "库存已停供");
             }
+        }
+        if (!inventoryList.isEmpty()) {
             for (InventoryDto inventoryDto : inventoryList) {
                 if (PublicationStatus.ACTIVE.getValue().equals(inventoryDto.getInventoryStatusEnum())) {
                     // 库存数量判定
@@ -351,12 +420,19 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         // 获取库存信息
         List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
             CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-        if (!inventoryList.isEmpty()) {
-            if (inventoryList.stream().map(InventoryDto::getInventoryStatusEnum)
+        // 按每个药品分组
+        Map<Long, List<InventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        // 遍历每个分组校验库存状态
+        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<InventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
                 .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
-                // 库存停供
-                return R.fail("当前处方中的药品库存已停供");
+                // 库存停供校验
+                return R.fail(groupItems.get(0).getItemName() + "库存已停供");
             }
+        }
+        if (!inventoryList.isEmpty()) {
             for (InventoryDto inventoryDto : inventoryList) {
                 if (PublicationStatus.ACTIVE.getValue().equals(inventoryDto.getInventoryStatusEnum())) {
                     InventoryItem inventoryItem = new InventoryItem();
@@ -390,6 +466,9 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         // 药品发药信息查询
         List<MedicationDispense> dispenseList = medicationDispenseService
             .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, medDispenseIdList));
+        // 追溯码列表
+        List<TraceNoManage> tracesNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
         if (dispenseList != null) {
             if (dispenseList.stream().map(MedicationDispense::getStatusEnum)
                 .anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()))) {
@@ -406,6 +485,30 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
                     medicationDispense.setDispenseTime(DateUtils.getNowDate());
                     // 发药人
                     medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                    // 使用逗号分割追溯码并转换为List
+                    String[] traceNoList = medicationDispense.getTraceNo().split(CommonConstants.Common.COMMA);
+                    for (String item : traceNoList) {
+                        traceNoManage = new TraceNoManage();
+                        // 追溯码处理
+                        traceNoManage.setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+                            // 项目id
+                            .setItemId(medicationDispense.getMedicationId())
+                            // 仓库类型
+                            .setLocationTypeEnum(LocationForm.PHARMACY.getValue())
+                            // 仓库
+                            .setLocationId(medicationDispense.getLocationId())
+                            // 产品批号
+                            .setLotNumber(medicationDispense.getLotNumber())
+                            // 追溯码
+                            .setTraceNo(item)
+                            // 追溯码状态
+                            .setStatusEnum(TraceNoStatus.OUT.getValue())
+                            // 追溯码单位
+                            .setUnitCode(medicationDispense.getUnitCode())
+                            // 操作类型
+                            .setOperationType(SupplyType.DISPENSE_MEDICATION.getValue());
+                        tracesNoManageList.add(traceNoManage);
+                    }
                 }
                 // 药品发放更新
                 medicationDispenseService.updateBatchById(dispenseList);
@@ -415,14 +518,17 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         }
         // 库存更新
         iInventoryItemService.updateBatchById(inventoryItemList);
-        // 更新请求状态为已完成
-        medicationRequestService.updateCompletedStatusBatch(medRequestIdList);
+        // 追溯码管理表数据追加
+        boolean result = traceNoManageService.saveBatch(tracesNoManageList);
+        if (!result) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
         // 返回信息
         String returnMsg = null;
         // 调用医保商品销售接口
         String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
-            List<String> uploadFailedNoList = this.ybMedicineIntegrated(medDispenseIdList);
+            List<String> uploadFailedNoList = this.ybMedicineIntegrated(medDispenseIdList, null);
             if (uploadFailedNoList != null) {
                 returnMsg = "3505商品销售上传错误，错误项目编码" + uploadFailedNoList;
             } else {
@@ -467,15 +573,18 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
      * 医保发药相关进销存接口
      *
      * @param medDispenseIdList 发药id列表
+     * @param devDispenseIdList 发耗材id列表
      * @return 上传失败的编号集合
      */
-    public List<String> ybMedicineIntegrated(List<Long> medDispenseIdList) {
+    public List<String> ybMedicineIntegrated(@Nullable List<Long> medDispenseIdList,
+        @Nullable List<Long> devDispenseIdList) {
         List<String> uploadFailedNoList = new ArrayList<>();
         R<?> result;
-        if (!medDispenseIdList.isEmpty()) {
+        if ((medDispenseIdList != null && !medDispenseIdList.isEmpty())
+            || (devDispenseIdList != null && !devDispenseIdList.isEmpty())) {
             // 查询发药项目相关信息
-            List<DispenseInventoryDto> dispenseInventoryList = returnMedicineMapper.selectReturnItemDetail(null,
-                medDispenseIdList, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            List<DispenseInventoryDto> dispenseInventoryList = returnMedicineMapper.selectReturnItemDetail(
+                devDispenseIdList, medDispenseIdList, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
                 CommonConstants.TableName.ADM_DEVICE_DEFINITION);
             for (DispenseInventoryDto dispenseInventoryDto : dispenseInventoryList) {
                 if (dispenseInventoryDto.getYbNo() == null) {
@@ -492,11 +601,20 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
 
     private Medical3505Param getMedical3505Param(DispenseInventoryDto dispenseInventoryDto) {
         Medical3505Param medical3505Param = new Medical3505Param();
-        // 查询费用结算信息
-        ChargeItem chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
-            .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
-            .eq(ChargeItem::getServiceId, dispenseInventoryDto.getMedReqId())
-            .eq(ChargeItem::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        ChargeItem chargeItem = null;
+        if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            // 查询费用结算信息
+            chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
+                .eq(ChargeItem::getServiceId, dispenseInventoryDto.getReqId())
+                .eq(ChargeItem::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_DEVICE_REQUEST)
+                .eq(ChargeItem::getServiceId, dispenseInventoryDto.getReqId())
+                .eq(ChargeItem::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        }
+
         if (chargeItem == null) {
             throw new ServiceException("未查找到收费项");
         }
@@ -506,17 +624,19 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
             throw new ServiceException("未查找到就诊诊断信息");
         }
         // 查询付款信息
-        PaymentReconciliation paymentReconciliation =
-            iPaymentReconciliationService.getOne(new LambdaQueryWrapper<PaymentReconciliation>()
+        List<PaymentReconciliation> paymentReconciliationList =
+            iPaymentReconciliationService.list(new LambdaQueryWrapper<PaymentReconciliation>()
                 .eq(PaymentReconciliation::getEncounterId, dispenseInventoryDto.getEncounterId())
                 .eq(PaymentReconciliation::getTenantId, SecurityUtils.getLoginUser().getTenantId())
                 .like(PaymentReconciliation::getChargeItemIds, chargeItem.getId())
                 .eq(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue())
                 .eq(PaymentReconciliation::getPatientId, dispenseInventoryDto.getPatientId())
-                .eq(PaymentReconciliation::getPaymentEnum, PaymentType.PAY.getValue()));
-        if (paymentReconciliation == null) {
+                .eq(PaymentReconciliation::getPaymentEnum, PaymentType.PAY.getValue())
+                .orderByDesc(PaymentReconciliation::getBillDate));
+        if (paymentReconciliationList == null || paymentReconciliationList.isEmpty()) {
             throw new ServiceException("未查找到收费信息");
         }
+        PaymentReconciliation paymentReconciliation = paymentReconciliationList.get(0);
         // 查询账户信息
         Account account = accountService
             .getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, dispenseInventoryDto.getEncounterId())
@@ -550,6 +670,8 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
                 .eq(ClinicSettle::getMedType, encounterDiagnosis.getMedTypeCode()).last(" LIMIT 1"));
             if (clinicSettle != null) {
                 medical3505Param.setMdtrtSn(clinicSettle.getMdtrtId()).setMdtrtSetlType("1");
+            } else {
+                medical3505Param.setMdtrtSn(dispenseInventoryDto.getEncounterNo()).setMdtrtSetlType("2");
             }
         }
         // // 查询发票信息
@@ -563,7 +685,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         if (dispenseInventoryDto.getTraceNo() != null) {
             List<String> traceNoList =
                 Arrays.stream(dispenseInventoryDto.getTraceNo().split(CommonConstants.Common.COMMA)).map(String::trim)
-                    .filter(s -> !s.isEmpty()).collect(Collectors.toList());
+                    .filter(s -> !s.isEmpty()).toList();
             for (String traceNo : traceNoList) {
                 Map<String, String> traceNoMap = new HashMap<>();
                 traceNoMap.put("drug_trac_codg", traceNo);
@@ -572,23 +694,29 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         }
         medical3505Param.setMedListCodg(dispenseInventoryDto.getYbNo())
             .setFixmedinsBchno(dispenseInventoryDto.getLotNumber())
-            .setFixmedinsHilistId(dispenseInventoryDto.getMedicationNo())
-            .setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+            .setFixmedinsHilistId(dispenseInventoryDto.getItemNo())
             .setPrscDrName(dispenseInventoryDto.getPractitionerName())
             .setPharName(dispenseInventoryDto.getDispenseName())
             .setPharPracCertNo(dispenseInventoryDto.getPharPracCertNo()).setPsnCertType(mdtrtCertType.getValue())
             .setManuLotnum(dispenseInventoryDto.getLotNumber()).setManuDate(dispenseInventoryDto.getProductionDate())
             .setRtalDocno(dispenseInventoryDto.getDispenseNo())
             .setSelRetnCnt(new BigDecimal(dispenseInventoryDto.getDispenseQuantity().toString()))
-            .setSelRetnTime(dispenseInventoryDto.getDispenseTime())
-            .setSelRetnOpterName(dispenseInventoryDto.getPreparerName())
-            .setExpyEnd(dispenseInventoryDto.getExpirationDate()).setStooutNo(dispenseInventoryDto.getDispenseNo())
-            .setDrugtracinfo(medicalTraceNo);
+            .setSelRetnTime(dispenseInventoryDto.getDispenseTime()).setExpyEnd(dispenseInventoryDto.getExpirationDate())
+            .setStooutNo(dispenseInventoryDto.getDispenseNo()).setDrugtracinfo(medicalTraceNo)
+            .setCertno(dispenseInventoryDto.getIdCard()).setPsnName(dispenseInventoryDto.getPatientName());
         if (dispenseInventoryDto.getInventoryUnitCode().equals(dispenseInventoryDto.getDispenseUnitCode())) {
             medical3505Param.setTrdnFlag(Whether.YES.getCode());
         } else {
             medical3505Param.setTrdnFlag(Whether.NO.getCode());
         }
+        // 查看所属医院
+        String fixmedinsCode =
+            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
+        if (dispenseInventoryDto.getPreparerName() == null && HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
+            medical3505Param.setSelRetnOpterName(CommonConstants.CCU.DisDeviceDoctorName);
+        } else {
+            medical3505Param.setSelRetnOpterName(dispenseInventoryDto.getPreparerName());
+        }
         if (YbRxFlag.IMPORTANT_HERBAL_SLICES.getCode() == dispenseInventoryDto.getRxFlag()) {
             medical3505Param.setRxFlag(YbRxFlag.IMPORTANT_HERBAL_SLICES.getName());
         } else if (YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getCode() == dispenseInventoryDto.getRxFlag()) {
@@ -596,7 +724,115 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
         } else if (YbRxFlag.SELF_PREPARED_MEDICATION.getCode() == dispenseInventoryDto.getRxFlag()) {
             medical3505Param.setRxFlag(YbRxFlag.WESTERN_AND_CHINESE_PATENT_MEDICINE.getName());
         }
+        if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            medical3505Param.setFixmedinsHilistName(CommonConstants.TableName.MED_MEDICATION_DEFINITION);
+        } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
+            medical3505Param.setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        }
         return medical3505Param;
 
     }
+
+
+    /**
+     * 处方单查询
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
+     */
+    @Override
+    public R<?> getMonthlySettlementPatientInfoList(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize) {
+
+        // 患者基本信息查询
+        PrescriptionPatientInfoDto prescriptionPatientInfoDto =new PrescriptionPatientInfoDto();
+
+        // 处方单信息查询
+        Page<PrescriptionMedicineInfoDto> prescriptionMedicineInfoPage =
+            westernMedicineDispenseMapper.selectMonthlySettlementPatientInfoList(new Page<>(pageNo, pageSize),
+                locationId,startTime, endTime, DispenseStatus.COMPLETED.getValue(),ItemType.MEDICINE.getValue(),
+                ItemType.DEVICE.getValue());
+
+        // 查询字典值
+        List<SysDictData> unitCodeList = sysDictDataMapper.selectDictDataByType("unit_code");
+        Map<String, String> unitCodeLabel = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+            ));
+        List<SysDictData> methodCodeList = sysDictDataMapper.selectDictDataByType("method_code");
+        Map<String, String> methodCodeLabel = methodCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+            ));
+
+        List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoList = prescriptionMedicineInfoPage.getRecords();
+        Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 如果有重复键，保留旧值
+        );
+        prescriptionMedicineInfoList.forEach(prescriptionMedicineInfo -> {
+            if(prescriptionMedicineInfo.getType().equals(ItemType.MEDICINE.getValue())){
+                // 发药状态
+                prescriptionMedicineInfo.setStatusEnum_enumText(
+                    EnumUtils.getInfoByValue(DispenseStatus.class, prescriptionMedicineInfo.getStatusEnum()));
+                // 匹配剂量单位字典文本
+                String doseUnitCode = prescriptionMedicineInfo.getDoseUnitCode();
+                String doseUnitLabel = unitCodeLabel.getOrDefault(doseUnitCode, "");
+                prescriptionMedicineInfo.setDoseUnitCode_dictText(doseUnitLabel);
+                // 匹配单位字典文本
+                String unitCode = prescriptionMedicineInfo.getUnitCode();
+                String unitLabel = unitCodeLabel.getOrDefault(unitCode, "");
+                prescriptionMedicineInfo.setUnitCode_dictText(unitLabel);
+                // 匹配用法字典文本
+                String methodCode = prescriptionMedicineInfo.getMethodCode();
+                String methodLabel = methodCodeLabel.getOrDefault(methodCode, "");
+                prescriptionMedicineInfo.setMethodCode_dictText(methodLabel);
+
+                switch (prescriptionMedicineInfo.getPharmacologyCategoryCode()) {
+                    case "2": // 麻醉药品
+                        prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("麻醉");
+                    case "3": // 毒性药品
+                        prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("毒性");
+                    case "4": // 一类精神药
+                        prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("精一");
+                    case "5": // 二类精神药
+                        prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("精二");
+                    default: // 普通药品
+                        prescriptionMedicineInfo.setPharmacologyCategoryCode_Text("普通");
+                }
+
+                // 判断是否为慢病
+                if (EncounterYbClass.CHRONIC_DISEASE_OUTPATIENT.getCode()
+                    .equals(prescriptionMedicineInfo.getMedTypeCode())) {
+                    prescriptionMedicineInfo.setChronicDisease(Whether.YES.getInfo());
+                } else {
+                    prescriptionMedicineInfo.setChronicDisease(Whether.NO.getInfo());
+                }
+                // 皮试flag为是时
+                if (Whether.YES.getValue().equals(prescriptionMedicineInfo.getSkinTestFlag())) {
+                    // 获取皮试结果
+                    ServiceRequest serReqObj =
+                        serviceRequestService.selectByMedRequestId(prescriptionMedicineInfo.getRequestId());
+                    if (serReqObj != null) {
+                        Integer clinicalStatus = allergyIntoleranceService.getPsResultByRequestId(serReqObj.getId());
+                        prescriptionMedicineInfo.setPsResult(ClinicalStatus.getByValue(clinicalStatus).getInfo());
+                    }
+                } else {
+                    prescriptionMedicineInfo.setPsResult("无");
+                }
+            }
+        });
+
+        // 计算合计金额
+        if (!prescriptionMedicineInfoList.isEmpty()) {
+            double totalPrice = 0d;
+            for (PrescriptionMedicineInfoDto item : prescriptionMedicineInfoList) {
+                totalPrice += item.getTotalPrice().doubleValue();
+            }
+            prescriptionPatientInfoDto.setTotalPrice(totalPrice);
+        }
+        PrescriptionInfoDto prescriptionInfoDto = new PrescriptionInfoDto();
+        prescriptionInfoDto.setPrescriptionPatientInfoDto(prescriptionPatientInfoDto);
+        prescriptionInfoDto.setPrescriptionMedicineInfoDtoList(prescriptionMedicineInfoList);
+        return R.ok(prescriptionInfoDto);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineDispenseAppServiceImpl.java
new file mode 100644
index 00000000..a936e72e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineDispenseAppServiceImpl.java
@@ -0,0 +1,99 @@
+package com.openhis.web.pharmacymanage.appservice.impl;//package com.openhis.web.pharmacymanage.appservice.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.*;
+import com.core.system.mapper.SysDictDataMapper;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.service.IAccountService;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.administration.service.IEncounterDiagnosisService;
+import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbMdtrtCertType;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.service.IContractService;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.web.pharmacymanage.appservice.IInpatientMedicineDispenseAppService;
+import com.openhis.web.pharmacymanage.dto.*;
+import com.openhis.web.pharmacymanage.mapper.InpatientMedicineDispenseMapper;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.yb.domain.ClinicSettle;
+import com.openhis.yb.dto.Medical3505Param;
+import com.openhis.yb.service.IClinicSettleService;
+import com.openhis.yb.service.YbManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 住院发放 应用实现类
+ *
+ * @author yuxj
+ * @date 2025/6/3
+ */
+@Service public class InpatientMedicineDispenseAppServiceImpl implements IInpatientMedicineDispenseAppService {
+
+    @Autowired
+    private WesternMedicineDispenseMapper westernMedicineDispenseMapper;
+
+    /**
+     * 分页查询发药病人列表
+     *
+     * @param encounterInfoPageDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    @Override
+    public R<?> getEncounterInfoListPage(EncounterInfoPageDto encounterInfoPageDto, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+        // 发药状态初始化
+        Integer statusEnum = encounterInfoPageDto.getStatusEnum();
+        encounterInfoPageDto.setStatusEnum(null);
+        // 构建查询条件
+        QueryWrapper<EncounterInfoPageDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(encounterInfoPageDto, searchKey,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.idCard,
+                    CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
+                request);
+        // 查询就诊病人列表
+        Page<EncounterInfoPageDto> encounterInfoPage = westernMedicineDispenseMapper.selectEncounterInfoListPage(
+            new Page<>(pageNo, pageSize), queryWrapper, statusEnum, DispenseStatus.IN_PROGRESS.getValue(),
+            DispenseStatus.COMPLETED.getValue(), DispenseStatus.PREPARATION.getValue(),
+            DispenseStatus.PREPARED.getValue(), EncounterClass.IMP.getValue());
+        encounterInfoPage.getRecords().forEach(encounterInfo -> {
+            // 性别
+            encounterInfo.setGenderEnum_enumText(
+                EnumUtils.getInfoByValue(AdministrativeGender.class, encounterInfo.getGenderEnum()));
+            // 发药状态
+            encounterInfo
+                .setStatusEnum_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, encounterInfo.getStatusEnum()));
+        });
+        return R.ok(encounterInfoPage);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineSummaryDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineSummaryDispenseAppServiceImpl.java
new file mode 100644
index 00000000..2134a3b7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InpatientMedicineSummaryDispenseAppServiceImpl.java
@@ -0,0 +1,532 @@
+package com.openhis.web.pharmacymanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.constant.HttpStatus;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.administration.domain.*;
+import com.openhis.common.annotation.Dict;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.web.inhospitalnursestation.appservice.IInpatientMedicineCollectionAppService;
+import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacymanage.dto.*;
+import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.SupplyDelivery;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.yb.service.YbManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.core.system.mapper.SysDictDataMapper;
+import com.openhis.administration.service.*;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.financial.service.IContractService;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.web.pharmacymanage.appservice.IInpatientMedicineSummaryDispenseAppService;
+import com.openhis.web.pharmacymanage.mapper.InpatientMedicineSummaryDispenseMapper;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.openhis.workflow.service.ISupplyRequestService;
+import com.openhis.yb.service.IClinicSettleService;
+
+/**
+ * 住院汇总发放 应用实现类
+ *
+ * @author yuxj
+ * @date 2025/6/3
+ */
+@Service
+public class InpatientMedicineSummaryDispenseAppServiceImpl implements IInpatientMedicineSummaryDispenseAppService {
+
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+
+    @Autowired
+    private IInventoryItemService iInventoryItemService;
+
+    @Autowired
+    private InpatientMedicineSummaryDispenseMapper inpatientMedicineDispenseMapper;
+
+    @Autowired
+    private ReturnMedicineMapper returnMedicineMapper;
+
+    @Autowired
+    private ILocationService locationService;
+    @Resource
+    private IPractitionerService practitionerService;
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+    @Resource
+    private ISupplyDeliveryService supplyDeliveryService;
+    @Autowired
+    private ITraceNoManageService traceNoManageService;
+    @Autowired
+    private IWesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppServiceImpl;
+
+    @Autowired
+    private IInpatientMedicineCollectionAppService inpatientMedicineCollectionAppService;
+
+    /**
+     * 获取页面初始化信息
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        InpatientMedicineInitDto initDto = new InpatientMedicineInitDto();
+
+        // // 获取科室下拉选列表 todo 前台直接调用共通方法
+        // List<Organization> organizationList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(),
+        // OrganizationClass.INPATIENT.getValue());
+        // List<InpatientMedicineDispenseInitDto.LongOptions> organizationOptions = organizationList.stream().map(
+        // organization -> new InpatientMedicineDispenseInitDto.LongOptions(organization.getId(),
+        // organization.getName())).collect(Collectors.toList());
+
+        // 未发药原因下拉选列表
+        List<InpatientMedicineInitDto.IntegerOptions> notPerformedReasonOptions =
+            Stream.of(NotPerformedReasonEnum.values())
+                .map(notPerformedReason -> new InpatientMedicineInitDto.IntegerOptions(notPerformedReason.getValue(),
+                    notPerformedReason.getInfo()))
+                .collect(Collectors.toList());
+
+        // 查询领药人列表
+        List<Practitioner> applicantList = practitionerService.getList();
+
+        // 发药状态
+        List<InpatientMedicineInitDto.IntegerOptions> dispenseStatusOptions = new ArrayList<>();
+        dispenseStatusOptions.add(new InpatientMedicineInitDto.IntegerOptions(DispenseStatus.SUMMARIZED.getValue(),
+            DispenseStatus.SUMMARIZED.getInfo()));
+        dispenseStatusOptions.add(new InpatientMedicineInitDto.IntegerOptions(DispenseStatus.COMPLETED.getValue(),
+            DispenseStatus.COMPLETED.getInfo()));
+        dispenseStatusOptions.add(new InpatientMedicineInitDto.IntegerOptions(DispenseStatus.DECLINED.getValue(),
+            DispenseStatus.DECLINED.getInfo()));
+
+        initDto// .setDepartmentOptions(organizationOptions)
+            .setApplicantOptions(applicantList).setDispenseStatusOptions(dispenseStatusOptions)
+            .setNotPerformedReasonOptions(notPerformedReasonOptions);
+        return R.ok(initDto);
+    }
+
+    /**
+     * 汇总医嘱查询
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     */
+    @Override
+    public R<?> getMedicationSummaryInfo(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<InpatientMedicineSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(searchParam, searchKey, null, request);
+        queryWrapper.orderByDesc(CommonConstants.FieldName.applyTime);
+
+        // 查询医嘱详细信息
+        Page<InpatientMedicineSummaryPrescriptionInfoDto> prescriptionItemInfoPageDto =
+            inpatientMedicineDispenseMapper.selectMedicationSummaryInfo(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                SupplyType.DISPENSING_ORDER.getValue(), SupplyCategory.INPATIENT_PATIENT_SUMMARY_DISPENSING.getValue());
+
+        List<InpatientMedicineSummaryPrescriptionInfoDto.Option> unitList;
+        // 个别项目设定
+        for (InpatientMedicineSummaryPrescriptionInfoDto prescriptionInfoDto : prescriptionItemInfoPageDto
+            .getRecords()) {
+            // 状态
+            prescriptionInfoDto.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(DispenseStatus.class, prescriptionInfoDto.getStatusEnum()));
+            // 追溯码单位列表
+            unitList = new ArrayList<>();
+            unitList.add(new InpatientMedicineSummaryPrescriptionInfoDto.Option(prescriptionInfoDto.getMaxUnitCode(),
+                prescriptionInfoDto.getMaxUnitCode_dictText()));
+            unitList.add(new InpatientMedicineSummaryPrescriptionInfoDto.Option(prescriptionInfoDto.getMinUnitCode(),
+                prescriptionInfoDto.getMinUnitCode_dictText()));
+
+            prescriptionInfoDto.setUnitList(unitList);
+        } ;
+
+        return R.ok(prescriptionItemInfoPageDto);
+    }
+
+    /**
+     * 处方单核对发药
+     *
+     * @param searchParam 条件
+     * @return 处理结果
+     */
+    @Override
+    public R<?> medicineDispense(List<InpatientMedicineSearchParam> searchParam) {
+        // 构建供应发放Id到追溯码的映射
+        Map<Long, String> traceNoMap = new HashMap<>();
+        for (InpatientMedicineSearchParam param : searchParam) {
+            if (param != null && param.getDeliveryId() != null) {
+                traceNoMap.put(param.getDeliveryId(), param.getTraceNo());
+            }
+        }
+
+        // 供应发放idList
+        List<Long> deliveryIdList =
+            searchParam.stream().map(InpatientMedicineSearchParam::getDeliveryId).collect(Collectors.toList());
+        // 获取供应发放信息列表
+        List<SupplyDelivery> supplyDeliveryInfoList = supplyDeliveryService.selectByIdList(deliveryIdList);
+        // 供应申请idList
+        List<Long> requestIdList = supplyDeliveryInfoList.stream().map(SupplyDelivery::getRequestId).toList();
+        // 耗材发放ID列表
+        List<Long> devDispenseIdList = new ArrayList<>();
+        // 药品发放ID列表
+        List<Long> medDispenseIdList = new ArrayList<>();
+        List<Long> idList;
+        String[] idArray;
+
+        // 构建项目发放Id到追溯码的映射
+        Map<Long, String> medTraceNoMap = new HashMap<>();
+        Map<Long, String> devTraceNoMap = new HashMap<>();
+
+        for (SupplyDelivery item : supplyDeliveryInfoList) {
+            // 按英文逗号分割字符串，得到数组
+            idArray = item.getBasedOnIds().split(CommonConstants.Common.COMMA);
+            // 流式处理：过滤空值、去除空格、转换为Long
+            idList = Arrays.stream(idArray).map(String::trim) // 去除每个元素前后的空格
+                .filter(str -> !str.isEmpty()) // 过滤空字符串（如连续逗号导致的空值）
+                .map(Long::parseLong) // 转换为Long类型
+                .collect(Collectors.toList()); // 收集为List<Long>
+            // 设置发放ID列表，追溯码映射
+            if (item.getBasedOnTable().equals(CommonConstants.TableName.MED_MEDICATION_DISPENSE)) {
+                // 耗材发放ID列表
+                devDispenseIdList.addAll(idList);
+                // 追溯码映射
+                for (Long id : idList) {
+                    medTraceNoMap.put(id, traceNoMap.get(item.getId()));
+                }
+            } else {
+                // 药品发放ID列表
+                medDispenseIdList.addAll(idList);
+                // 追溯码映射
+                for (Long id : idList) {
+                    devTraceNoMap.put(id, traceNoMap.get(item.getId()));
+                }
+            }
+        }
+
+        // 校验库存
+        R<?> checkInventoryReturn =
+            inpatientMedicineCollectionAppService.checkInventoryItem(devDispenseIdList, medDispenseIdList);
+        if (checkInventoryReturn.getCode() != HttpStatus.SUCCESS) {
+            return checkInventoryReturn;
+        }
+        // 库存信息
+        List<InventoryItem> inventoryItemList = (List<InventoryItem>)checkInventoryReturn.getData();
+
+        // todo 上面一行代码好使的话，就将下面注释的代码删除
+        // // 检查数据类型是否为List<InventoryItem>
+        // if (checkInventoryReturn.getData() instanceof List<?>) {
+        // List<?> rawList = (List<?>)checkInventoryReturn.getData();
+        //
+        // // 进一步检查列表中的元素类型
+        // boolean isInventoryItemList = true;
+        // for (Object item : rawList) {
+        // if (!(item instanceof InventoryItem)) {
+        // isInventoryItemList = false;
+        // break;
+        // }
+        // }
+        //
+        // if (isInventoryItemList) {
+        // // 强制转换为List<InventoryItem>
+        // inventoryItemList = (List<InventoryItem>)rawList;
+        // } else {
+        // // 处理类型不匹配的情况
+        // return R.fail("校验库存列表中包含非InventoryItem类型的元素");
+        // }
+        // } else {
+        // // 处理数据不是List的情况
+        // return R.fail("校验库存返回的数据不是List类型");
+        // }
+
+        // 追溯码列表
+        List<TraceNoManage> tracesNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
+        Date now = DateUtils.getNowDate();
+
+        // 药品发药信息查询
+        List<MedicationDispense> medDispenseList = medicationDispenseService
+            .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, medDispenseIdList));
+        if (medDispenseList != null) {
+            if (medDispenseList.stream().map(MedicationDispense::getStatusEnum)
+                .anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()))) {
+                throw new ServiceException("药品已发放，请勿重复发放");
+            } else {
+                for (MedicationDispense medicationDispense : medDispenseList) {
+                    // 药品发放状态
+                    medicationDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                    // 状态变更时间
+                    medicationDispense.setStatusChangedTime(now);
+                    // 发药数量
+                    medicationDispense.setDispenseQuantity(medicationDispense.getQuantity());
+                    // 发药时间
+                    medicationDispense.setDispenseTime(now);
+                    // 发药人
+                    medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                    // 药品追溯码
+                    medicationDispense.setTraceNo(medTraceNoMap.get(medicationDispense.getId()));
+
+                    // 使用逗号分割追溯码并转换为List
+                    String[] traceNoList = medicationDispense.getTraceNo().split(CommonConstants.Common.COMMA);
+                    for (String item : traceNoList) {
+                        traceNoManage = new TraceNoManage();
+                        // 追溯码处理
+                        traceNoManage.setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+                            // 项目id
+                            .setItemId(medicationDispense.getMedicationId())
+                            // 仓库类型
+                            .setLocationTypeEnum(LocationForm.PHARMACY.getValue())
+                            // 仓库
+                            .setLocationId(medicationDispense.getLocationId())
+                            // 产品批号
+                            .setLotNumber(medicationDispense.getLotNumber())
+                            // 追溯码
+                            .setTraceNo(item)
+                            // 追溯码状态
+                            .setStatusEnum(TraceNoStatus.OUT.getValue())
+                            // 追溯码单位
+                            .setUnitCode(medicationDispense.getUnitCode())
+                            // 操作类型
+                            .setOperationType(SupplyType.DISPENSE_MEDICATION.getValue());
+                        tracesNoManageList.add(traceNoManage);
+                    }
+                }
+                // 药品发放更新
+                medicationDispenseService.updateBatchById(medDispenseList);
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 耗材发药信息查询
+        List<DeviceDispense> devDispenseList = deviceDispenseService
+            .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+        if (devDispenseList != null) {
+            if (devDispenseList.stream().map(DeviceDispense::getStatusEnum)
+                .anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()))) {
+                throw new ServiceException("耗材已发放，请勿重复发放");
+            } else {
+                for (DeviceDispense deviceDispense : devDispenseList) {
+                    // 药品发放状态
+                    deviceDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                    // 发药数量
+                    deviceDispense.setDispenseQuantity(deviceDispense.getQuantity());
+                    // 发药时间
+                    deviceDispense.setDispenseTime(now);
+                    // 发药人
+                    deviceDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId());
+                    // 药品追溯码
+                    deviceDispense.setTraceNo(devTraceNoMap.get(deviceDispense.getId()));
+                    // todo 下面注释的代码是从耗材发放copy过来的，不知道要不要用
+                    // // 发药人（长大写死发耗材人）
+                    // deviceDispense.setPerformerId(CommonConstants.CCU.DisDeviceDoctor);
+                    // // 根据数量设置追溯码
+                    // deviceDispense.setTraceNo(String.join(CommonConstants.Common.COMMA,
+                    // Collections.nCopies(deviceDispense.getQuantity(), CommonConstants.Common.DEV_TRACE_NO)));
+
+                    // todo 耗材追溯码待定
+                    // 使用逗号分割追溯码并转换为List
+                    String[] traceNoList = deviceDispense.getTraceNo().split(CommonConstants.Common.COMMA);
+                    for (String item : traceNoList) {
+                        traceNoManage = new TraceNoManage();
+                        // 追溯码处理
+                        traceNoManage.setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+                            // 项目id
+                            .setItemId(deviceDispense.getDeviceDefId())
+                            // 仓库类型
+                            .setLocationTypeEnum(LocationForm.WAREHOUSE.getValue())
+                            // 仓库
+                            .setLocationId(deviceDispense.getLocationId())
+                            // 产品批号
+                            .setLotNumber(deviceDispense.getLotNumber())
+                            // 追溯码
+                            .setTraceNo(item)
+                            // 追溯码状态
+                            .setStatusEnum(TraceNoStatus.OUT.getValue())
+                            // 追溯码单位
+                            .setUnitCode(deviceDispense.getUnitCode())
+                            // 操作类型
+                            .setOperationType(SupplyType.DISPENSE_MEDICATION.getValue());
+                        tracesNoManageList.add(traceNoManage);
+                    }
+                }
+                // 耗材发放更新
+                deviceDispenseService.updateBatchById(devDispenseList);
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 供应申请表更新
+        supplyRequestService.updateCompletedStatusBatch(requestIdList);
+
+        // 供应发放表更新
+        supplyDeliveryService.updateCompletedStatusBatch(deliveryIdList);
+
+        // 库存更新
+        iInventoryItemService.updateBatchById(inventoryItemList);
+
+        // 追溯码管理表数据追加
+        boolean result = traceNoManageService.saveBatch(tracesNoManageList);
+        if (!result) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // todo 医保进销存 不知道怎么改
+        // 返回信息
+        String returnMsg = null;
+        // 调用医保商品销售接口
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+        if (Whether.YES.getCode().equals(ybSwitch)) {
+            List<String> uploadFailedNoList =
+                westernMedicineDispenseAppServiceImpl.ybMedicineIntegrated(medDispenseIdList, null);
+            if (uploadFailedNoList != null) {
+                returnMsg = "3505商品销售上传错误，错误项目编码" + uploadFailedNoList;
+            } else {
+                returnMsg = "3505商品销售上传成功";
+            }
+        }
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 作废
+     *
+     * @param deliveryIdList 供应发放id
+     * @param notPerformedReasonEnum 未发原因
+     * @return 处理结果
+     */
+    @Override
+    public R<?> medicineCancel(List<Long> deliveryIdList, Integer notPerformedReasonEnum) {
+        // 获取供应发放信息列表
+        List<SupplyDelivery> supplyDeliveryInfoList = supplyDeliveryService.selectByIdList(deliveryIdList);
+        List<SupplyRequest> supplyRequestInfoList;
+        // 耗材发放ID列表
+        List<Long> devDispenseIdList = new ArrayList<>();
+        // 药品发放ID列表
+        List<Long> medDispenseIdList = new ArrayList<>();
+        List<Long> idList;
+        String[] idArray;
+        if (supplyDeliveryInfoList != null) {
+            // 供应申请idList
+            List<Long> requestIdList = supplyDeliveryInfoList.stream().map(SupplyDelivery::getRequestId).toList();
+            // 获取供应发放信息列表
+            supplyRequestInfoList = supplyRequestService.selectByIdList(requestIdList);
+            for (SupplyDelivery item : supplyDeliveryInfoList) {
+                // 按英文逗号分割字符串，得到数组
+                idArray = item.getBasedOnIds().split(CommonConstants.Common.COMMA);
+                // 流式处理：过滤空值、去除空格、转换为Long
+                idList = Arrays.stream(idArray).map(String::trim) // 去除每个元素前后的空格
+                    .filter(str -> !str.isEmpty()) // 过滤空字符串（如连续逗号导致的空值）
+                    .map(Long::parseLong) // 转换为Long类型
+                    .collect(Collectors.toList()); // 收集为List<Long>
+                // 设置发放ID列表，追溯码映射
+                if (item.getBasedOnTable().equals(CommonConstants.TableName.MED_MEDICATION_DISPENSE)) {
+                    // 耗材发放ID列表
+                    devDispenseIdList.addAll(idList);
+                } else {
+                    // 药品发放ID列表
+                    medDispenseIdList.addAll(idList);
+                }
+            }
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        Date now = DateUtils.getNowDate();
+
+        // 获取发药单id列表
+        List<MedicationDispense> medDispenseInfoList = medicationDispenseService.selectByIdList(medDispenseIdList);
+        if (medDispenseInfoList != null) {
+            for (MedicationDispense medicationDispense : medDispenseInfoList) {
+                // 药品发放状态
+                medicationDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
+                // 未发药原因
+                medicationDispense.setNotPerformedReasonEnum(notPerformedReasonEnum);
+                // 状态变更时间
+                medicationDispense.setStatusChangedTime(now);
+            }
+            // 药品发放更新
+            medicationDispenseService.updateBatchById(medDispenseInfoList);
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 获取发耗材单id列表
+        List<DeviceDispense> devDispenseInfoList = deviceDispenseService.selectByIdList(devDispenseIdList);
+        if (devDispenseInfoList != null) {
+            for (DeviceDispense deviceDispense : devDispenseInfoList) {
+                // 耗材发放状态
+                deviceDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
+                // 未发药原因
+                deviceDispense.setNotPerformedReasonEnum(notPerformedReasonEnum);
+            }
+            // 耗材发放更新
+            deviceDispenseService.updateBatchById(devDispenseInfoList);
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        // 更新供应发放信息
+        for (SupplyDelivery deviceDispense : supplyDeliveryInfoList) {
+            // 状态
+            deviceDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
+        }
+        // 更新
+        supplyDeliveryService.updateBatchById(supplyDeliveryInfoList);
+
+        // 更新供应申请信息
+        if (supplyRequestInfoList != null) {
+            for (SupplyRequest deviceDispense : supplyRequestInfoList) {
+                // 状态
+                deviceDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
+            }
+            // 更新
+            supplyRequestService.updateBatchById(supplyRequestInfoList);
+        } else {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+        }
+
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
index 01c9b00e..ec8f6ab2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
@@ -81,7 +81,7 @@ public class MedicationDetailsAppServiceImpl implements IMedicationDetailsAppSer
 
         // 构建查询条件
         QueryWrapper<MedDetailsSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(medDetailsSearchParam,
-            searchKey, new HashSet<>(Arrays.asList("patient_name", "medication_name", "bus_no")), request);
+            searchKey, new HashSet<>(Arrays.asList("patient_name", "medication_name", "bus_no", "py_str")), request);
 
         Page<MedDetailedAccountPageDto> medDetailsPage = medicationDetailsMapper.selectAmbPractitionerDetailPage(
             new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.AMB.getValue(),
@@ -107,7 +107,7 @@ public class MedicationDetailsAppServiceImpl implements IMedicationDetailsAppSer
 
         // 构建查询条件
         QueryWrapper<MedDetailsSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(medDetailsSearchParam,
-            searchKey, new HashSet<>(Arrays.asList("patient_name", "medication_name", "bus_no")), request);
+            searchKey, new HashSet<>(Arrays.asList("patient_name", "medication_name", "bus_no", "py_str")), request);
 
         Page<MedDetailedAccountPageDto> medDetailsPage = medicationDetailsMapper.selectAmbPractitionerDetailPage(
             new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.AMB.getValue(),
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
index 83e11c04..2f581bcc 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
@@ -47,7 +47,7 @@ public class PendingMedicationDetailsAppServiceImpl implements IPendingMedicatio
 
         // 构建查询条件
         QueryWrapper<PendingMedicationSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(
-            pendingMedicationSearchParam, searchKey, new HashSet<>(Arrays.asList("medicine_name", "medicine_no")), request);
+            pendingMedicationSearchParam, searchKey, new HashSet<>(Arrays.asList("medicine_name", "medicine_no", "py_str")), request);
 
         // 查询待发药明细列表
         Page<PendingMedicationPageDto> pendingMedicationPage = pendingMedicationDetailsMapper
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ChineseMedicineDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ChineseMedicineDispenseController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ChineseMedicineDispenseController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ChineseMedicineDispenseController.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/DeviceDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/DeviceDispenseController.java
new file mode 100644
index 00000000..78c553f1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/DeviceDispenseController.java
@@ -0,0 +1,99 @@
+package com.openhis.web.pharmacymanage.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.pharmacymanage.appservice.IDeviceDispenseAppService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.appservice.IDeviceDispenseAppService;
+import com.openhis.web.pharmacymanage.dto.DispenseDeviceDto;
+import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
+import com.openhis.web.pharmacymanage.dto.PrescriptionDeviceInfoDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 材料发送
+ *
+ * @author yuxj
+ * @date 2025/8/21
+ */
+@RestController
+@RequestMapping("/pharmacy-manage/device-dispense")
+@Slf4j
+@AllArgsConstructor
+public class DeviceDispenseController {
+
+    @Autowired
+    public IDeviceDispenseAppService deviceDispenseService;
+
+    /**
+     * 获取页面初始化信息
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> deviceDispenseInit() {
+        return deviceDispenseService.init();
+    }
+
+    /**
+     * 分页查询发药病人列表
+     *
+     * @param encounterInfoPageDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    @GetMapping("/encounter-list")
+    public R<?> getEncounterInfoList(EncounterInfoPageDto encounterInfoPageDto, String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return deviceDispenseService.getEncounterInfoListPage(encounterInfoPageDto, searchKey, pageNo,
+            pageSize, request);
+    }
+
+    /**
+     * 处方单查询
+     *
+     * @param prescriptionDeviceInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
+     */
+    @GetMapping("/prescription-list")
+    public R<?> getPatientInfoList(PrescriptionDeviceInfoDto prescriptionDeviceInfoDto,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return deviceDispenseService.getPrescriptionInfo(prescriptionDeviceInfoDto, pageNo, pageSize);
+    }
+
+    /**
+     * 核对发药
+     *
+     * @param dispenseDeviceList 发药信息
+     * @return 处理结果
+     */
+    @PutMapping("/device-dispense")
+    public R<?> deviceDispense(@RequestBody List<DispenseDeviceDto> dispenseDeviceList) {
+        return deviceDispenseService.deviceDispense(dispenseDeviceList);
+    }
+
+    /**
+     * 作废
+     *
+     * @param dispenseDeviceList 作废信息
+     * @return 处理结果
+     */
+    @PutMapping("/device-cancel")
+    public R<?> deviceCancel(@RequestBody List<DispenseDeviceDto> dispenseDeviceList) {
+        return deviceDispenseService.deviceCancel(dispenseDeviceList);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineDispenseController.java
new file mode 100644
index 00000000..a17c1607
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineDispenseController.java
@@ -0,0 +1,112 @@
+package com.openhis.web.pharmacymanage.controller;//package com.openhis.web.pharmacymanage.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.appservice.IInpatientMedicineDispenseAppService;
+import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
+import com.openhis.web.pharmacymanage.dto.DispenseMedicineDto;
+import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
+import com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 住院发药
+ *
+ * @author yuxj
+ * @date 2025/6/3
+ */
+@RestController
+@RequestMapping("/pharmacy-manage/inpatient-medicine-dispense")
+@Slf4j
+@AllArgsConstructor
+public class InpatientMedicineDispenseController {
+
+    @Resource
+    public IInpatientMedicineDispenseAppService inpatientMedicineDispenseService;
+
+    @Autowired
+    public IWesternMedicineDispenseAppService westernMedicineDispenseService;
+
+    /**
+     * 分页查询发药病人列表
+     *
+     * @param encounterInfoPageDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 发药病人列表
+     */
+    @GetMapping("/encounter-list")
+    public R<?> getEncounterInfoList(EncounterInfoPageDto encounterInfoPageDto, String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return inpatientMedicineDispenseService.getEncounterInfoListPage(encounterInfoPageDto, searchKey, pageNo,
+            pageSize, request);
+    }
+
+    /**
+     * 获取页面初始化信息
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> medicineDispenseInit() {
+        return westernMedicineDispenseService.init();
+    }
+
+    /**
+     * 处方单查询
+     *
+     * @param prescriptionMedicineInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
+     */
+    @GetMapping("/prescription-list")
+    public R<?> getPatientInfoList(PrescriptionMedicineInfoDto prescriptionMedicineInfoDto,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return westernMedicineDispenseService.getPrescriptionInfo(prescriptionMedicineInfoDto, pageNo, pageSize);
+    }
+
+    /**
+     * 配药
+     *
+     * @param dispenseMedicineList 配药信息
+     * @return 处理结果
+     */
+    @PutMapping("/prepare")
+    public R<?> medicinePrepare(@RequestBody List<DispenseMedicineDto> dispenseMedicineList) {
+        return westernMedicineDispenseService.medicinePrepare(dispenseMedicineList);
+    }
+
+    /**
+     * 核对发药
+     *
+     * @param dispenseMedicineList 发药信息
+     * @return 处理结果
+     */
+    @PutMapping("/medicine-dispense")
+    public R<?> medicineDispense(@RequestBody List<DispenseMedicineDto> dispenseMedicineList) {
+        return westernMedicineDispenseService.medicineDispense(dispenseMedicineList);
+    }
+
+    /**
+     * 作废
+     *
+     * @param dispenseMedicineList 作废信息
+     * @return 处理结果
+     */
+    @PutMapping("/medicine-cancel")
+    public R<?> medicineCancel(@RequestBody List<DispenseMedicineDto> dispenseMedicineList) {
+        return westernMedicineDispenseService.medicineCancel(dispenseMedicineList);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineSummaryDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineSummaryDispenseController.java
new file mode 100644
index 00000000..8d14881d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InpatientMedicineSummaryDispenseController.java
@@ -0,0 +1,84 @@
+package com.openhis.web.pharmacymanage.controller;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.pharmacymanage.dto.DispenseMedicineDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.appservice.IInpatientMedicineSummaryDispenseAppService;
+import com.openhis.web.pharmacymanage.dto.InpatientMedicineSearchParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 住院汇总发药
+ *
+ * @author yuxj
+ * @date 2025/6/3
+ */
+@RestController
+@RequestMapping("/pharmacy-manage/inpatient-medicine-summary-dispense")
+@Slf4j
+@AllArgsConstructor
+public class InpatientMedicineSummaryDispenseController {
+
+    @Resource
+    public IInpatientMedicineSummaryDispenseAppService medicineSummaryDispenseService;
+
+    /**
+     * 获取页面初始化信息
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> medicineDispenseInit() {
+        return medicineSummaryDispenseService.init();
+    }
+
+    /**
+     * 住院药品汇总发药单查询
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     */
+    @GetMapping("/medicationSummary-list")
+    public R<?> getMedicationSummaryInfo(InpatientMedicineSearchParam searchParam, String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return medicineSummaryDispenseService.getMedicationSummaryInfo(searchParam, searchKey, pageNo, pageSize,
+            request);
+    }
+
+    /**
+     * 核对发药
+     *
+     * @param searchParam 条件
+     * @return 处理结果
+     */
+    @PutMapping("/medicine-dispense")
+    public R<?> medicineDispense(@RequestBody List<InpatientMedicineSearchParam> searchParam) {
+        return medicineSummaryDispenseService.medicineDispense(searchParam);
+    }
+
+    /**
+     * 作废
+     *
+     * @param deliveryIdList 供应发放id
+     * @param notPerformedReasonEnum 未发原因
+     * @return 处理结果
+     */
+    @PutMapping("/medicine-cancel")
+    public R<?> medicineCancel(@RequestBody List<Long> deliveryIdList, Integer notPerformedReasonEnum) {
+        return medicineSummaryDispenseService.medicineCancel(deliveryIdList, notPerformedReasonEnum);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalConsumablesDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalConsumablesDispenseController.java
new file mode 100644
index 00000000..a3f97815
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalConsumablesDispenseController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.pharmacymanage.appservice.IMedicalConsumablesDispenseAppService;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 耗材发放
+ *
+ * @author zwh
+ * @date 2025-06-20
+ */
+@RestController
+@RequestMapping("/pharmacy-manage/medical-consumables-dispense")
+@Slf4j
+@AllArgsConstructor
+public class MedicalConsumablesDispenseController {
+
+    @Resource
+    public IMedicalConsumablesDispenseAppService medicalConsumablesDispenseAppService;
+
+    /**
+     * 发放耗材
+     *
+     * @param chargeItemIds 耗材收费单ids
+     * @return 处理结果
+     */
+    @PutMapping("/consumables-dispense")
+    public R<?> dispenseMedicalConsumables(@RequestBody List<Long> chargeItemIds) {
+        return medicalConsumablesDispenseAppService.dispenseMedicalConsumables(chargeItemIds);
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
similarity index 94%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
index 79a27065..5e6d09f6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.ReturnMedicineAppService;
+import com.openhis.web.pharmacymanage.appservice.IReturnMedicineAppService;
 import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
 import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto;
 
@@ -28,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 public class ReturnMedicineController {
 
     @Autowired
-    public ReturnMedicineAppService returnMedicineAppService;
+    public IReturnMedicineAppService returnMedicineAppService;
 
     /**
      * 获取页面初始化信息
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
similarity index 70%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
index c3dad44c..70393a1f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
@@ -11,6 +11,7 @@ import com.core.common.core.domain.R;
 import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
 import com.openhis.web.pharmacymanage.dto.DispenseMedicineDto;
 import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
+import com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -61,13 +62,16 @@ public class WesternMedicineDispenseController {
     /**
      * 处方单查询
      *
-     * @param encounterId 就诊Id
-     * @param dispenseStatus 发药id
+     * @param prescriptionMedicineInfoDto 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
      */
     @GetMapping("/prescription-list")
-    public R<?> getPatientInfoList(@RequestParam Long encounterId,
-        @RequestParam Integer dispenseStatus) {
-        return westernMedicineDispenseService.getPrescriptionInfo(encounterId,dispenseStatus);
+    public R<?> getPatientInfoList(PrescriptionMedicineInfoDto prescriptionMedicineInfoDto,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return westernMedicineDispenseService.getPrescriptionInfo(prescriptionMedicineInfoDto, pageNo, pageSize);
     }
 
     /**
@@ -102,4 +106,21 @@ public class WesternMedicineDispenseController {
     public R<?> medicineCancel(@RequestBody List<DispenseMedicineDto> dispenseMedicineList) {
         return westernMedicineDispenseService.medicineCancel(dispenseMedicineList);
     }
+
+    /**
+     * 处方单查询
+     *
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 处方单
+     */
+    @GetMapping("/prescription-list-monthly-settlement")
+    public R<?> getMonthlySettlementPatientInfoList(@RequestParam Long locationId, @RequestParam String startTime,@RequestParam String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return westernMedicineDispenseService.getMonthlySettlementPatientInfoList(locationId, startTime,endTime,pageNo,pageSize);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseDeviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseDeviceDto.java
new file mode 100644
index 00000000..5570adc4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseDeviceDto.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 发材料信息
+ *
+ * @author yuxj
+ * @date 2025-08-21
+ */
+@Data
+@Accessors(chain = true)
+public class DispenseDeviceDto {
+
+    /** 请求ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 配药人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long preparerId;
+
+    /** 发放ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 处方号 */
+    private String prescriptionNo;
+
+    /** 未发原因 */
+    private Integer notPerformedReasonEnum;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
similarity index 89%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
index 4f53441e..803d0010 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
@@ -29,9 +29,9 @@ public class DispenseInventoryDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
-    /** 药品请求表主键ID */
+    /** 请求ID */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long medReqId;
+    private Long reqId;
 
     /** 病人id */
     @JsonSerialize(using = ToStringSerializer.class)
@@ -80,8 +80,8 @@ public class DispenseInventoryDto {
     /** 就诊编号 */
     private String encounterNo;
 
-    /** 药品编码 */
-    private String medicationNo;
+    /** 项目编码 */
+    private String itemNo;
 
     /** 执业资格证号 */
     private String pharPracCertNo;
@@ -100,4 +100,13 @@ public class DispenseInventoryDto {
 
     /** 开方人 */
     private String practitionerName;
+
+    /** 证件号码 */
+    private String idCard;
+
+    /** 患者姓名 */
+    private String patientName;
+
+    /** 所在表名 */
+    private String itemTable;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java
similarity index 88%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java
index d8130aa2..925fdf26 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseMedicineDto.java
@@ -18,7 +18,8 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class DispenseMedicineDto {
-    /** 药品请求ID */
+
+    /** 请求ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long requestId;
 
@@ -26,16 +27,16 @@ public class DispenseMedicineDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long preparerId;
 
-    /** 药品发放ID */
+    /** 发放ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long dispenseId;
 
-    /** 退药追溯码 */
+    /** 追溯码 */
     private String traceNo;
 
     /** 处方号 */
     private String prescriptionNo;
 
-    /** 未发药原因 */
+    /** 未发原因 */
     private Integer notPerformedReasonEnum;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
index 317bead7..eb019e8d 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
@@ -78,4 +78,7 @@ public class EncounterInfoPageDto {
 
     /** 生日 */
     private Date birthDate;
+
+    /** 中药标识 */
+    private Integer tcmFlag;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
similarity index 69%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
index 065f6bbc..9afa47bb 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
@@ -4,7 +4,10 @@
 package com.openhis.web.pharmacymanage.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -18,9 +21,6 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class EncounterInfoSearchParam implements Serializable {
 
-    /** 科室 */
-    private Long departmentId;
-
-    /** 发药状态 */
+    /** 执行状态 */
     private Integer statusEnum;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineInitDto.java
new file mode 100644
index 00000000..3e9bf575
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineInitDto.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.administration.domain.Practitioner;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ *住院发药初期dto
+ *
+ * @author yuxj
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicineInitDto {
+
+    /** 科室列表 */
+    private List<LongOptions> departmentOptions;
+    /** 领药人列表 */
+    private List<Practitioner> applicantOptions;
+
+    /** 发药状态 */
+    private List<IntegerOptions> dispenseStatusOptions;
+
+    /** 未发药原因 */
+    private List<IntegerOptions> notPerformedReasonOptions;
+
+    @Data
+    public static class LongOptions {
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public LongOptions(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    @Data
+    public static class IntegerOptions {
+        private Integer value;
+        private String label;
+
+        public IntegerOptions(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineMapInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineMapInfoDto.java
new file mode 100644
index 00000000..2b7be4f1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineMapInfoDto.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 映射信息
+ *
+ * @author yuxj
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicineMapInfoDto implements Serializable {
+
+    /** 项目发放 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /** 追溯码*/
+    private String traceNo;
+
+    /** 追溯码单位 */
+    @Dict(dictCode = "unit_code")
+    private String traceNoUnitCode;
+    private String traceNoUnitCode_dictText;
+
+    /** 供应发放id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deliveryId;
+
+    /** 发放表名 */
+    private String tableName;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSearchParam.java
new file mode 100644
index 00000000..4297dd64
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSearchParam.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 患者列表查询条件
+ *
+ * @author yuxj
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicineSearchParam implements Serializable {
+
+    /** 科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /** 领药人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+
+    /** 发药状态 */
+    private Integer  statusEnum;
+
+    /** 追溯码*/
+    private String traceNo;
+
+    /** 供应发放id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deliveryId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSummaryPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSummaryPrescriptionInfoDto.java
new file mode 100644
index 00000000..2c47e7f8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InpatientMedicineSummaryPrescriptionInfoDto.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医嘱详细
+ *
+ * @author yuxj
+ * @date 2025-06-03
+ */
+@Data @Accessors(chain = true) public class InpatientMedicineSummaryPrescriptionInfoDto {
+
+    /**
+     * 单据号
+     */
+    private String busNo;
+
+    /** 供应请求id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 供应发放id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deliveryId;
+
+    /**
+     * 项目表
+     */
+    private String itemTable;
+    /**
+     * 项目名
+     */
+    private String itemName;
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /**
+     * 规格
+     */
+    private String totalVolume;
+
+    /**
+     * 批号
+     */
+    private String lotNumber;
+
+    /**
+     * 请求数
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 常规单位 */
+    @Dict(dictCode = "unit_code")
+    private String maxUnitCode;
+    private String maxUnitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 发放地点 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+    private String sourceLocationName;
+
+    /** 申请科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgName;
+
+    /** 领药人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+    private String applicantName;
+
+    /** 申请时间 */
+    private Data applyTime;
+
+    /**
+     * 状态
+     */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 患者信息 */
+    private String patientInfo;
+    /**
+     * 单位列表
+     */
+    private List<InpatientMedicineSummaryPrescriptionInfoDto.Option> unitList;
+
+    @Data
+    public static class Option {
+        @Dict(dictCode = "unit_code")
+        private String value;
+        private String value_dictText;
+        public Option(String value, String value_dictText) {
+            this.value = value;
+            this.value_dictText = value_dictText;
+        }
+        public Option() {
+        }
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java
similarity index 88%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java
index 3f84e700..270574ff 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDto.java
@@ -5,6 +5,7 @@ package com.openhis.web.pharmacymanage.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -25,6 +26,9 @@ public class InventoryDto implements Serializable {
     /** 发药ID */
     private Long dispenseId;
 
+    /** 项目ID */
+    private Long itemId;
+
     /** 拆零单位 */
     private String inventoryUnitCode;
 
@@ -48,4 +52,7 @@ public class InventoryDto implements Serializable {
 
     /** 库存状态 */
     private Integer inventoryStatusEnum;
+
+    /** 有效期至 */
+    private Date expirationDate;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
index 605aeb8e..67922669 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
@@ -39,6 +39,9 @@ public class MedDetailedAccountPageDto {
     /** 药品项目 */
     private String medicationName;
 
+    /** 药品拼音 */
+    private String pyStr;
+
     /** 项目编码 */
     private String busNo;
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedRunningAccountPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedRunningAccountPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedRunningAccountPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedRunningAccountPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionDeviceInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionDeviceInfoDto.java
new file mode 100644
index 00000000..a5032a0b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionDeviceInfoDto.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 处方发材料单
+ *
+ * @author yuxj
+ * @date 2025-08-21
+ */
+@Data
+@Accessors(chain = true)
+public class PrescriptionDeviceInfoDto {
+
+    /**
+     * 科室
+     */
+    private String departmentName;
+
+    /**
+     * 开单医生
+     */
+    private String doctorName;
+
+    /**
+     * 项目类型
+     */
+    @Dict(dictCode = "med_category_code")
+    private String itemType;
+    private String itemType_dictText;
+
+    /**
+     * 诊断名称
+     */
+    private String conditionName;
+
+    /**
+     * 处方号
+     */
+    private String prescriptionNo;
+
+    /**
+     * 批次号
+     */
+    private String lotNumber;
+
+    /**
+     * 请求id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+    /**
+     * 材料id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deviceId;
+
+    /**
+     * 材料名称
+     */
+    private String deviceName;
+
+    /**
+     * 规格
+     */
+    private String totalVolume;
+    /**
+     * 单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /**
+     * 就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+    /**
+     * 发药状态
+     */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+    /**
+     * 用药频次
+     */
+    private String rateCode;
+    /**
+     * 发放药房
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+    /**
+     * 发放id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /**
+     * 发放药房
+     */
+    private String locationName;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 金额
+     */
+    private BigDecimal totalPrice;
+
+    /**
+     * 发药医生
+     */
+    private String dispenseDoctorName;
+    /**
+     * 就诊NO
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String encounterBusNo;
+    /** 开具日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reqAuthoredTime;
+
+    /**
+     * 就诊账户类型
+     */
+    private String chargeType;
+
+    /** 特殊病种标志 */
+    private String medTypeCode;
+
+        /** 慢性病 是/否 */
+        private String chronicDisease;
+
+
+//
+//    /**
+//     * 配药医生
+//     */
+//    private String preparerDoctorName;
+//
+//    /**
+//     * 单次剂量
+//     */
+//    private BigDecimal dose;
+//
+//    /**
+//     * 用法
+//     */
+//    @Dict(dictCode = "method_code")
+//    private String methodCode;
+//    private String methodCode_dictText;
+//
+//    /**
+//     * 剂量单位
+//     */
+//    @Dict(dictCode = "unit_code")
+//    private String doseUnitCode;
+//    private String doseUnitCode_dictText;
+//
+//    /**
+//     * 单次最大剂量
+//     */
+//    private BigDecimal maxDose;
+//
+//    /**
+//     * 首次用量
+//     */
+//    private BigDecimal firstDose;
+//
+//    /**
+//     * 首次持续时间
+//     */
+//    private String firstDuration;
+//
+//    /**
+//     * 给药间隔
+//     */
+//    private String dispenseInterval;
+//
+//    /**
+//     * 单次发药数
+//     */
+//    private Integer dispensePerQuantity;
+//
+//    /**
+//     * 每次发药供应天数
+//     */
+//    private Integer dispensePerDuration;
+//
+//    /**
+//     * 组合号
+//     */
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long groupId;
+//
+//    /** 药品性质 */
+//    private String pharmacologyCategoryCode;
+//
+//    /** 药品性质文本 */
+//    private String pharmacologyCategoryCode_Text;
+//
+//
+//    /** 皮试标志 */
+//    private Integer skinTestFlag;
+//
+//    /** 皮试结果 */
+//    private String psResult;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java
similarity index 84%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java
index 5f6c0762..8d53b386 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java
@@ -24,4 +24,7 @@ public class PrescriptionInfoDto {
 
     /** 处方药品信息 */
     private List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoDtoList;
+
+    /** 处方材料信息 */
+    private List<PrescriptionDeviceInfoDto> prescriptionDeviceInfoDtoList;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
similarity index 74%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
index 2ec96129..c1ad1c17 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.pharmacymanage.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -11,6 +12,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 处方发药单
@@ -46,6 +48,12 @@ public class PrescriptionMedicineInfoDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long requestId;
 
+    /**
+     * 就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
     /**
      * 发放药房
      */
@@ -117,7 +125,9 @@ public class PrescriptionMedicineInfoDto {
     /**
      * 用药频次
      */
+    @Dict(dictCode = "rate_code")
     private String rateCode;
+    private String rateCode_dictText;
 
     /**
      * 用法
@@ -189,4 +199,44 @@ public class PrescriptionMedicineInfoDto {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long groupId;
+
+    /**
+     * 就诊NO
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String encounterBusNo;
+
+    /** 开具日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reqAuthoredTime;
+
+    /**
+     * 就诊账户类型
+     */
+    private String chargeType;
+
+    /** 药品性质 */
+    private String pharmacologyCategoryCode;
+
+    /** 药品性质文本 */
+    private String pharmacologyCategoryCode_Text;
+
+    /** 特殊病种标志 */
+    private String medTypeCode;
+
+    /** 慢性病 是/否 */
+    private String chronicDisease;
+
+    /** 皮试标志 */
+    private Integer skinTestFlag;
+
+    /** 中药标识 */
+    private Integer tcmFlag;
+
+    /** 皮试结果 */
+    private String psResult;
+
+    /** 药品类型 */
+    private Integer type;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
similarity index 61%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
index e2eb1d12..6abea9a8 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
@@ -7,6 +7,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -36,6 +38,7 @@ public class PrescriptionPatientInfoDto {
     /** 合同类型 */
     private Integer categoryEnum;
     private String categoryEnum_enumText;
+    private String contractName;
 
     /** 证件号 */
     private String idCard;
@@ -48,4 +51,26 @@ public class PrescriptionPatientInfoDto {
 
     /** 总金额 */
     private double totalPrice;
+
+    /** 电话 */
+    private String phone;
+
+    /** 医院名字 */
+    private String hospitalName;
+
+    /** 患者院内编码/病历号 */
+    private String  patientBusNo;
+
+    /**
+     * 就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 诊断
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+    private String conditionName;
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
index c7c93029..5adca442 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
@@ -72,4 +72,7 @@ public class ReturnMedicineInfoDto {
     /** 请求数量 */
     private Integer quantity;
 
+    /** 追溯码 */
+    private String traceNo;
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ChineseMedicineDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ChineseMedicineDispenseMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ChineseMedicineDispenseMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ChineseMedicineDispenseMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/IDeviceDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/IDeviceDispenseMapper.java
new file mode 100644
index 00000000..a871465e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/IDeviceDispenseMapper.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto;
+import com.openhis.web.pharmacymanage.dto.PrescriptionDeviceInfoDto;
+import com.openhis.web.pharmacymanage.dto.PrescriptionPatientInfoDto;
+
+@Repository
+public interface IDeviceDispenseMapper {
+
+    /**
+     * 就诊病人列表分页查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param statusEnum 发药状态
+     * @param inProgress 发药状态:待发药
+     * @param completed 发药状态:已发药
+     * @param preparation 发药状态:待配药
+     * @param prepared 发药状态:已配药
+     * @param amb 就诊类型：门诊
+     * @return 就诊病人列表
+     */
+    Page<EncounterInfoPageDto> selectEncounterInfoListPage(@Param("page") Page<EncounterInfoPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoPageDto> queryWrapper,
+        @Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress,
+        @Param("completed") Integer completed, @Param("preparation") Integer preparation,
+        @Param("prepared") Integer prepared, @Param("amb") Integer amb);
+
+    /**
+     * 患者基本信息查询
+     *
+     * @param encounterId 就诊号
+     * @return 患者基本信息
+     */
+    PrescriptionPatientInfoDto selectPrescriptionPatientInfo(@Param("encounterId") Long encounterId,
+        @Param("hospitalId") Long hospitalId);
+
+    /**
+     * 处方单查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param inProgress 发药状态:待发药
+     * @param completed 发药状态:已发药
+     * @param preparation 发药状态:待配药
+     * @param prepared 发药状态:已配药
+     * @param dispenseStatus 发药状态
+     * @return 处方单列表
+     */
+    Page<PrescriptionDeviceInfoDto> selectPrescriptionDeviceInfoList(
+        @Param("page") Page<PrescriptionDeviceInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PrescriptionDeviceInfoDto> queryWrapper,
+        @Param("inProgress") Integer inProgress, @Param("completed") Integer completed,
+        @Param("preparation") Integer preparation, @Param("prepared") Integer prepared,
+        @Param("dispenseStatus") Integer dispenseStatus);
+
+    /**
+     * 获取配药人下拉选列表
+     *
+     * @param pharmacist 参与者类型：药师
+     * @return 配药人下拉选列表
+     */
+    List<Practitioner> getPreparerDoctorList(@Param("pharmacist") String pharmacist);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineDispenseMapper.java
new file mode 100644
index 00000000..ff38534e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineDispenseMapper.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InpatientMedicineDispenseMapper {
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineSummaryDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineSummaryDispenseMapper.java
new file mode 100644
index 00000000..94b60ec8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InpatientMedicineSummaryDispenseMapper.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.openhis.web.inhospitalnursestation.dto.InpatientMedicinePrescriptionInfoDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.openhis.web.pharmacymanage.dto.*;
+
+@Repository
+public interface InpatientMedicineSummaryDispenseMapper {
+
+    /**
+     * 医嘱列表查询
+     *
+       * @param page 分页
+       * @param queryWrapper 查询条件
+     * @param medicationDefinition 药品定义
+     * @param deviceDefinition 耗材定义
+     * @return 医嘱信息
+     */
+    Page<InpatientMedicineSummaryPrescriptionInfoDto> selectMedicationSummaryInfo(
+        @Param("page") Page<InpatientMedicinePrescriptionInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InpatientMedicineSearchParam> queryWrapper,
+       @Param("medicationDefinition") String medicationDefinition,
+        @Param("deviceDefinition") String deviceDefinition, @Param("typeEnum") Integer typeEnum,@Param("categoryEnum") Integer categoryEnum
+      );
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicineConsumablesDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalConsumablesDispenseAppMapper.java
similarity index 96%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicineConsumablesDispenseMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalConsumablesDispenseAppMapper.java
index 3d10d553..1554cf9f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicineConsumablesDispenseMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalConsumablesDispenseAppMapper.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface MedicineConsumablesDispenseMapper {
+public interface MedicalConsumablesDispenseAppMapper {
 
     /**
      * 就诊病人列表分页查询
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
index 2675732f..4509b186 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
@@ -21,10 +21,11 @@ public interface ReturnMedicineMapper {
      *
      * @param page 分页
      * @param queryWrapper 查询条件
+     * @param amb 就诊类型：门诊
      * @return 退药患者分页列表
      */
     Page<EncounterInfoPageDto> selectEncounterInfoListPage(@Param("page") Page<EncounterInfoPageDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoPageDto> queryWrapper);
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoPageDto> queryWrapper, @Param("amb") Integer amb);
 
     /**
      * 申请退药清单查询
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
similarity index 70%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
index d7a06a0c..05fa6dd8 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
@@ -30,13 +30,14 @@ public interface WesternMedicineDispenseMapper {
      * @param completed 发药状态:已发药
      * @param preparation 发药状态:待配药
      * @param prepared 发药状态:已配药
+     * @param amb 就诊类型：门诊
      * @return 就诊病人列表
      */
     Page<EncounterInfoPageDto> selectEncounterInfoListPage(@Param("page") Page<EncounterInfoPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoPageDto> queryWrapper,
         @Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress,
         @Param("completed") Integer completed, @Param("preparation") Integer preparation,
-        @Param("prepared") Integer prepared);
+        @Param("prepared") Integer prepared, @Param("amb") Integer amb);
 
     /**
      * 患者基本信息查询
@@ -44,12 +45,14 @@ public interface WesternMedicineDispenseMapper {
      * @param encounterId 就诊号
      * @return 患者基本信息
      */
-    PrescriptionPatientInfoDto selectPrescriptionPatientInfo(@Param("encounterId") Long encounterId);
+    PrescriptionPatientInfoDto selectPrescriptionPatientInfo(@Param("encounterId") Long encounterId,
+        @Param("hospitalId") Long hospitalId);
 
     /**
      * 处方单查询
      *
-     * @param encounterId 就诊号
+     * @param page 分页
+     * @param queryWrapper 查询条件
      * @param inProgress 发药状态:待发药
      * @param completed 发药状态:已发药
      * @param preparation 发药状态:待配药
@@ -57,7 +60,9 @@ public interface WesternMedicineDispenseMapper {
      * @param dispenseStatus 发药状态
      * @return 处方单列表
      */
-    List<PrescriptionMedicineInfoDto> selectPrescriptionMedicineInfoList(@Param("encounterId") Long encounterId,
+    Page<PrescriptionMedicineInfoDto> selectPrescriptionMedicineInfoList(
+        @Param("page") Page<PrescriptionMedicineInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<PrescriptionMedicineInfoDto> queryWrapper,
         @Param("inProgress") Integer inProgress, @Param("completed") Integer completed,
         @Param("preparation") Integer preparation, @Param("prepared") Integer prepared,
         @Param("dispenseStatus") Integer dispenseStatus);
@@ -79,4 +84,22 @@ public interface WesternMedicineDispenseMapper {
      * @return 配药人下拉选列表
      */
     List<Practitioner> getPreparerDoctorList(@Param("pharmacist") String pharmacist);
+
+    /**
+     * 处方单查询
+     *
+     * @param page 分页
+     * @param locationId 库房id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param completed 发药状态:已发药
+     * @param medicine 药品
+     * @param device 耗材
+     * @return 处方单列表
+     */
+    Page<PrescriptionMedicineInfoDto> selectMonthlySettlementPatientInfoList(
+        @Param("page") Page<PrescriptionMedicineInfoDto> page,
+        @Param("locationId") Long locationId, @Param("startTime") String startTime,
+        @Param("endTime") String endTime, @Param("completed") Integer completed,
+        @Param("medicine") Integer medicine, @Param("device") Integer device);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java
new file mode 100644
index 00000000..00f48ba1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java
@@ -0,0 +1,73 @@
+package com.openhis.web.regdoctorstation.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto;
+
+/**
+ * 医嘱管理 应用Service
+ */
+public interface IAdviceManageAppService {
+
+    /**
+     * 查询住院患者信息
+     *
+     * @param regPatientMainInfoDto 住院患者信息 dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 住院患者信息
+     */
+    IPage<RegPatientMainInfoDto> getRegPatientMainInfo(RegPatientMainInfoDto regPatientMainInfoDto, Integer status,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 住院保存医嘱
+     * 
+     * @param regAdviceSaveParam 住院医嘱表单信息
+     * @param adviceOpType 医嘱操作类型
+     * @return 结果
+     */
+    R<?> saveRegAdvice(RegAdviceSaveParam regAdviceSaveParam, String adviceOpType);
+
+    /**
+     * 查询住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @return 住院医嘱请求数据
+     */
+    R<?> getRegRequestBaseInfo(Long encounterId);
+
+    /**
+     * 查询历史住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @param patientId 病人id
+     * @return 历史住院医嘱请求数据
+     */
+    R<?> getRegRequestHistoryInfo(Long patientId, Long encounterId);
+
+    /**
+     * 住院医嘱签退
+     *
+     * @param paramList 签退参数
+     * @return 结果
+     */
+    R<?> signOffRegAdvice(List<AdviceBatchOpParam> paramList);
+
+    /**
+     * 住院医嘱停止
+     *
+     * @param paramList 停嘱
+     * @return 结果
+     */
+    R<?> stopRegAdvice(List<AdviceBatchOpParam> paramList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
new file mode 100644
index 00000000..7157a765
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
@@ -0,0 +1,32 @@
+package com.openhis.web.regdoctorstation.appservice;
+
+import java.util.List;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto;
+
+/**
+ * 申请单管理 应用Service
+ */
+public interface IRequestFormManageAppService {
+
+    /**
+     * 保存申请单
+     * 
+     * @param requestFormSaveDto 申请单保存dto
+     * @param typeCode 申请单类型
+     * @return 结果
+     */
+    R<?> saveRequestForm(RequestFormSaveDto requestFormSaveDto, String typeCode);
+
+    /**
+     * 查询申请单
+     * 
+     * @param encounterId 就诊id
+     * @param typeCode 申请单类型
+     * @return 检查申请单
+     */
+    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
new file mode 100644
index 00000000..2085ae07
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
@@ -0,0 +1,36 @@
+package com.openhis.web.regdoctorstation.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.dto.NursingOrdersDto;
+import com.openhis.web.regdoctorstation.dto.NursingOrdersEncounterDto;
+import com.openhis.web.regdoctorstation.dto.NursingOrdersSaveDto;
+
+/**
+ * 特殊医嘱 应用Service
+ */
+public interface ISpecialAdviceAppService {
+
+    /**
+     * 查询护理医嘱信息
+     *
+     * @return 护理医嘱信息
+     */
+    NursingOrdersDto getNursingOrdersInfos();
+
+    /**
+     * 保存护理医嘱
+     *
+     * @param nursingOrdersSaveDto 护理医嘱保存dto
+     * @return 结果
+     */
+    R<?> saveNursingOrders(NursingOrdersSaveDto nursingOrdersSaveDto);
+
+    /**
+     * 查询就诊护理医嘱
+     *
+     * @param encounterId 就诊id
+     * @return 就诊护理医嘱
+     */
+    NursingOrdersEncounterDto getEncounterNursingOrdersInfos(Long encounterId);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
new file mode 100644
index 00000000..c6271f6f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -0,0 +1,701 @@
+package com.openhis.web.regdoctorstation.appservice.impl;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams;
+import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+import com.openhis.web.doctorstation.utils.AdviceUtils;
+import com.openhis.web.regdoctorstation.appservice.IAdviceManageAppService;
+import com.openhis.web.regdoctorstation.dto.*;
+import com.openhis.web.regdoctorstation.mapper.AdviceManageAppMapper;
+import com.openhis.web.regdoctorstation.utils.RegPrescriptionUtils;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.workflow.service.IServiceRequestService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 医嘱管理 应用实现类
+ */
+@Slf4j
+@Service
+public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
+
+    @Resource
+    AdviceUtils adviceUtils;
+
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    RegPrescriptionUtils regPrescriptionUtils;
+
+    @Resource
+    AdviceManageAppMapper adviceManageAppMapper;
+
+    @Resource
+    IChargeItemService iChargeItemService;
+
+    @Resource
+    IMedicationRequestService iMedicationRequestService;
+
+    @Resource
+    IMedicationDispenseService iMedicationDispenseService;
+
+    @Resource
+    IServiceRequestService iServiceRequestService;
+
+    @Resource
+    IActivityDefinitionService iActivityDefinitionService;
+
+    /**
+     * 查询住院患者信息
+     *
+     * @param regPatientMainInfoDto 住院患者信息 dto
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 住院患者信息
+     */
+    @Override
+    public IPage<RegPatientMainInfoDto> getRegPatientMainInfo(RegPatientMainInfoDto regPatientMainInfoDto,
+        Integer status, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<RegPatientMainInfoDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(regPatientMainInfoDto, searchKey,
+                new HashSet<>(Arrays.asList("bus_no", "patient_name", "inHospital_org_name", "house_name")), request);
+
+        IPage<RegPatientMainInfoDto> regPatientMainInfo = adviceManageAppMapper.getRegPatientMainInfo(
+            new Page<>(pageNo, pageSize), SecurityUtils.getLoginUser().getPractitionerId(),
+            LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(),
+            EncounterLocationStatus.ACTIVE.getValue(), EncounterClass.IMP.getValue(), status, Whether.YES.getValue(),
+            AccountType.PERSONAL_CASH_ACCOUNT.getCode(), queryWrapper);
+        regPatientMainInfo.getRecords().forEach(e -> {
+            // 性别
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
+        });
+        return regPatientMainInfo;
+    }
+
+    /**
+     * 住院保存医嘱
+     *
+     * @param regAdviceSaveParam 住院医嘱表单信息
+     * @param adviceOpType 医嘱操作类型
+     * @return 结果
+     */
+    @Override
+    public R<?> saveRegAdvice(RegAdviceSaveParam regAdviceSaveParam, String adviceOpType) {
+        // 当前时间
+        Date curDate = new Date();
+        // 医嘱开始时间
+        Date startTime = regAdviceSaveParam.getStartTime();
+        if (startTime == null) {
+            startTime = curDate;
+        }
+        // 医嘱签发时间
+        Date authoredTime = regAdviceSaveParam.getAuthoredTime();
+        if (authoredTime == null) {
+            authoredTime = curDate;
+        }
+
+        // 患者住院入科室id
+        Long organizationId = regAdviceSaveParam.getOrganizationId();
+        // 医嘱分类信息
+        List<RegAdviceSaveDto> regAdviceSaveList = regAdviceSaveParam.getRegAdviceSaveList();
+        // 药品
+        List<RegAdviceSaveDto> medicineList = regAdviceSaveList.stream()
+            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        // 耗材
+        // List<RegAdviceSaveDto> deviceList = regAdviceSaveList.stream()
+        // .filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        // 诊疗活动
+        List<RegAdviceSaveDto> activityList = regAdviceSaveList.stream()
+            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+
+        // 保存时,校验临时医嘱库存
+        if (AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType)) {
+            List<RegAdviceSaveDto> tempCheckList = regAdviceSaveList.stream()
+                .filter(e -> TherapyTimeType.TEMPORARY.getValue().equals(e.getTherapyEnum())
+                    && !DbOpType.DELETE.getCode().equals(e.getDbOpType())
+                    && !ItemType.ACTIVITY.getValue().equals(e.getAdviceType()))
+                .collect(Collectors.toList());
+            List<AdviceSaveDto> needCheckList = new ArrayList<>(tempCheckList);
+            // 校验库存
+            String tipRes = adviceUtils.checkInventory(needCheckList);
+            if (tipRes != null) {
+                return R.fail(null, tipRes);
+            }
+        }
+        // 医嘱签发编码
+        String signCode = assignSeqUtil.getSeq(AssignSeqEnum.ADVICE_SIGN.getPrefix(), 10);
+
+        /**
+         * 处理药品请求
+         */
+        this.handMedication(medicineList, startTime, authoredTime, curDate, adviceOpType, organizationId, signCode);
+
+        /**
+         * 处理诊疗项目请求
+         */
+        this.handService(activityList, startTime, authoredTime, curDate, adviceOpType, organizationId, signCode);
+
+        // 签发时,把草稿状态的账单更新为待收费
+        if (AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType) && !regAdviceSaveList.isEmpty()) {
+            // 签发的医嘱id集合
+            List<Long> requestIds = regAdviceSaveList.stream()
+                .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
+                .collect(Collectors.toList()).stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
+            Long encounterId = regAdviceSaveList.get(0).getEncounterId();// 就诊id
+            iChargeItemService.update(new LambdaUpdateWrapper<ChargeItem>()
+                .set(ChargeItem::getStatusEnum, ChargeItemStatus.PLANNED.getValue())
+                .eq(ChargeItem::getEncounterId, encounterId)
+                .eq(ChargeItem::getStatusEnum, ChargeItemStatus.DRAFT.getValue())
+                .in(ChargeItem::getServiceId, requestIds));
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"住院医嘱"}));
+    }
+
+    /**
+     * 处理药品
+     */
+    private void handMedication(List<RegAdviceSaveDto> medicineList, Date startTime, Date authoredTime, Date curDate,
+        String adviceOpType, Long organizationId, String signCode) {
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 保存操作
+        boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType);
+        // 签发操作
+        boolean is_sign = AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType);
+
+        // 删除
+        List<RegAdviceSaveDto> deleteList = medicineList.stream()
+            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+        for (RegAdviceSaveDto regAdviceSaveDto : deleteList) {
+            iMedicationRequestService.removeById(regAdviceSaveDto.getRequestId());
+            // 删除已经产生的药品发放信息
+            iMedicationDispenseService.deleteMedicationDispense(regAdviceSaveDto.getRequestId());
+            // 删除费用项
+            iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.MED_MEDICATION_REQUEST,
+                regAdviceSaveDto.getRequestId());
+        }
+
+        // 当前时间毫秒值
+        Long currentTimeMillis = System.currentTimeMillis();
+        // 签发时统一处理组号 (排除删除操作,包括长期和临时)
+        List<RegAdviceSaveDto> exceptDelList = medicineList.stream()
+            .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+        if (is_sign) {
+            Long i = 1L;
+            for (RegAdviceSaveDto regAdviceSaveDto : exceptDelList) {
+                // 输液标记
+                if (Whether.YES.getValue().equals(regAdviceSaveDto.getInjectFlag())) {
+                    if (regAdviceSaveDto.getGroupId() == null) {
+                        regAdviceSaveDto.setGroupId(currentTimeMillis + i);
+                    } else {
+                        regAdviceSaveDto.setGroupId(currentTimeMillis + regAdviceSaveDto.getGroupId());
+                    }
+                }
+                i = ++i;
+            }
+            // 生成住院处方号
+            regPrescriptionUtils.generatePrescriptionNumbers(exceptDelList);
+        }
+
+        // 声明长期医嘱药品请求
+        MedicationRequest longMedicationRequest;
+        // 新增 + 修改 (长期医嘱)
+        List<RegAdviceSaveDto> longInsertOrUpdateList = medicineList.stream().filter(e -> TherapyTimeType.LONG_TERM
+            .getValue().equals(e.getTherapyEnum())
+            && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
+            .collect(Collectors.toList());
+
+        for (RegAdviceSaveDto regAdviceSaveDto : longInsertOrUpdateList) {
+            longMedicationRequest = new MedicationRequest();
+            longMedicationRequest.setId(regAdviceSaveDto.getRequestId()); // 主键id
+            longMedicationRequest
+                .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
+            longMedicationRequest.setPrescriptionNo(regAdviceSaveDto.getPrescriptionNo()); // 处方号
+            longMedicationRequest.setGroupId(regAdviceSaveDto.getGroupId()); // 组号
+            if (is_sign) {
+                longMedicationRequest.setReqAuthoredTime(authoredTime); // 医嘱签发时间
+                longMedicationRequest.setSignCode(signCode);
+            }
+            // 保存时处理的字段属性
+            if (is_save) {
+                longMedicationRequest.setEffectiveDoseStart(startTime); // 医嘱开始时间
+                longMedicationRequest
+                    .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                longMedicationRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
+                longMedicationRequest.setExecuteNum(regAdviceSaveDto.getExecuteNum()); // 执行次数
+                longMedicationRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
+                longMedicationRequest.setLotNumber(regAdviceSaveDto.getLotNumber()); // 产品批号
+                longMedicationRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
+                longMedicationRequest.setMedicationId(regAdviceSaveDto.getAdviceDefinitionId());// 医嘱定义id
+                longMedicationRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
+                longMedicationRequest.setPractitionerId(regAdviceSaveDto.getPractitionerId()); // 开方医生
+                longMedicationRequest.setOrgId(regAdviceSaveDto.getFounderOrgId()); // 开方人科室
+                longMedicationRequest.setReqAuthoredTime(curDate); // 请求开始时间
+                longMedicationRequest.setPerformLocation(regAdviceSaveDto.getLocationId()); // 发放药房
+                longMedicationRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
+                longMedicationRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
+                longMedicationRequest.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                longMedicationRequest.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型,长期(需要前端传)
+                longMedicationRequest.setMethodCode(regAdviceSaveDto.getMethodCode()); // 用法
+                longMedicationRequest.setRateCode(regAdviceSaveDto.getRateCode()); // 用药频次
+                longMedicationRequest.setDose(regAdviceSaveDto.getDose()); // 单次剂量
+                longMedicationRequest.setDoseUnitCode(regAdviceSaveDto.getDoseUnitCode()); // 剂量单位
+                longMedicationRequest.setFirstDose(regAdviceSaveDto.getFirstDose()); // 首次用量
+                longMedicationRequest.setDispensePerDuration(regAdviceSaveDto.getDispensePerDuration()); // 每次发药供应天数
+                longMedicationRequest.setPackageId(regAdviceSaveDto.getPackageId()); // 组套id
+                longMedicationRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
+                longMedicationRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
+                longMedicationRequest.setSkinTestFlag(regAdviceSaveDto.getSkinTestFlag()); // 皮试标志
+                longMedicationRequest.setInfusionFlag(regAdviceSaveDto.getInjectFlag()); // 输液标志
+                longMedicationRequest.setSortNumber(regAdviceSaveDto.getSortNumber()); // 排序号
+            }
+            iMedicationRequestService.saveOrUpdate(longMedicationRequest);
+        }
+
+        // 声明临时医嘱药品请求
+        MedicationRequest tempMedicationRequest;
+        // 声明临时医嘱费用项
+        ChargeItem chargeItem;
+        // 新增 + 修改 (临时医嘱)
+        List<RegAdviceSaveDto> tempInsertOrUpdateList = medicineList.stream().filter(e -> TherapyTimeType.TEMPORARY
+            .getValue().equals(e.getTherapyEnum())
+            && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
+            .collect(Collectors.toList());
+        for (RegAdviceSaveDto regAdviceSaveDto : tempInsertOrUpdateList) {
+            tempMedicationRequest = new MedicationRequest();
+            tempMedicationRequest.setId(regAdviceSaveDto.getRequestId()); // 主键id
+            tempMedicationRequest
+                .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
+            tempMedicationRequest.setPrescriptionNo(regAdviceSaveDto.getPrescriptionNo()); // 处方号
+            tempMedicationRequest.setGroupId(regAdviceSaveDto.getGroupId()); // 组号
+            if (is_sign) {
+                tempMedicationRequest.setReqAuthoredTime(authoredTime); // 医嘱签发时间
+                tempMedicationRequest.setSignCode(signCode);
+            }
+            // 保存时处理的字段属性
+            if (is_save) {
+                tempMedicationRequest.setEffectiveDoseStart(startTime); // 医嘱开始时间
+                tempMedicationRequest
+                    .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                tempMedicationRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
+                tempMedicationRequest.setExecuteNum(regAdviceSaveDto.getExecuteNum()); // 执行次数
+                tempMedicationRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
+                tempMedicationRequest.setLotNumber(regAdviceSaveDto.getLotNumber()); // 产品批号
+                tempMedicationRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
+                tempMedicationRequest.setMedicationId(regAdviceSaveDto.getAdviceDefinitionId());// 医嘱定义id
+                tempMedicationRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
+                tempMedicationRequest.setPractitionerId(regAdviceSaveDto.getPractitionerId()); // 开方医生
+                tempMedicationRequest.setOrgId(regAdviceSaveDto.getFounderOrgId()); // 开方人科室
+                tempMedicationRequest.setReqAuthoredTime(curDate); // 请求开始时间
+                tempMedicationRequest.setPerformLocation(regAdviceSaveDto.getLocationId()); // 发放药房
+                tempMedicationRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
+                tempMedicationRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
+                tempMedicationRequest.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                tempMedicationRequest.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型,临时(需要前端传)
+                tempMedicationRequest.setMethodCode(regAdviceSaveDto.getMethodCode()); // 用法
+                tempMedicationRequest.setRateCode(regAdviceSaveDto.getRateCode()); // 用药频次
+                tempMedicationRequest.setDose(regAdviceSaveDto.getDose()); // 单次剂量
+                tempMedicationRequest.setDoseUnitCode(regAdviceSaveDto.getDoseUnitCode()); // 剂量单位
+                tempMedicationRequest.setDispensePerDuration(regAdviceSaveDto.getDispensePerDuration()); // 每次发药供应天数
+                tempMedicationRequest.setPackageId(regAdviceSaveDto.getPackageId()); // 组套id
+                tempMedicationRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
+                tempMedicationRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
+                tempMedicationRequest.setSkinTestFlag(regAdviceSaveDto.getSkinTestFlag()); // 皮试标志
+                tempMedicationRequest.setInfusionFlag(regAdviceSaveDto.getInjectFlag()); // 输液标志
+                tempMedicationRequest.setSortNumber(regAdviceSaveDto.getSortNumber()); // 排序号
+            }
+            iMedicationRequestService.saveOrUpdate(tempMedicationRequest);
+            // 第一次保存时,如果药品请求为皮试或输液,自动开立对应绑定的诊疗请求
+            if (regAdviceSaveDto.getRequestId() == null) {
+                if (is_save && (Whether.YES.getValue().equals(regAdviceSaveDto.getSkinTestFlag())
+                    || Whether.YES.getValue().equals(regAdviceSaveDto.getInjectFlag()))) {
+                    // 查询已经存在的当前数据
+                    tempMedicationRequest = iMedicationRequestService.getById(tempMedicationRequest.getId());
+                    adviceUtils.generateActRequestByMedicationFlag(tempMedicationRequest, organizationId,
+                        regAdviceSaveDto);
+                }
+            }
+            // 保存时 处理药品发放 和 保存药品费用项
+            if (is_save) {
+                // 处理药品发放
+                iMedicationDispenseService.handleMedicationDispense(tempMedicationRequest,
+                    regAdviceSaveDto.getDbOpType());
+                // 保存药品费用项
+                chargeItem = new ChargeItem();
+                chargeItem.setId(regAdviceSaveDto.getChargeItemId()); // 费用项id
+                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(tempMedicationRequest.getBusNo()));
+                chargeItem.setPrescriptionNo(regAdviceSaveDto.getPrescriptionNo()); // 处方号
+                chargeItem.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
+                chargeItem.setContextEnum(regAdviceSaveDto.getAdviceType()); // 类型
+                chargeItem.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
+                chargeItem.setDefinitionId(regAdviceSaveDto.getDefinitionId()); // 费用定价ID
+                chargeItem.setDefDetailId(regAdviceSaveDto.getDefinitionDetailId()); // 定价子表主键
+                chargeItem.setEntererId(regAdviceSaveDto.getPractitionerId());// 开立人ID
+                chargeItem.setRequestingOrgId(orgId); // 开立科室
+                chargeItem.setEnteredDate(curDate); // 开立时间
+                chargeItem.setServiceTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);// 医疗服务类型
+                chargeItem.setServiceId(tempMedicationRequest.getId()); // 医疗服务ID
+                chargeItem.setProductTable(regAdviceSaveDto.getAdviceTableName());// 产品所在表
+                chargeItem.setProductId(regAdviceSaveDto.getAdviceDefinitionId());// 收费项id
+                chargeItem.setAccountId(regAdviceSaveDto.getAccountId());// 关联账户ID
+                chargeItem.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
+                chargeItem.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+
+                chargeItem.setQuantityValue(regAdviceSaveDto.getQuantity()); // 数量
+                chargeItem.setQuantityUnit(regAdviceSaveDto.getUnitCode()); // 单位
+                chargeItem.setUnitPrice(regAdviceSaveDto.getUnitPrice()); // 单价
+                chargeItem.setTotalPrice(regAdviceSaveDto.getTotalPrice()); // 总价
+
+                iChargeItemService.saveOrUpdate(chargeItem);
+            }
+        }
+    }
+
+    /**
+     * 处理诊疗
+     */
+    private void handService(List<RegAdviceSaveDto> activityList, Date startTime, Date authoredTime, Date curDate,
+        String adviceOpType, Long organizationId, String signCode) {
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 保存操作
+        boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType);
+        // 签发操作
+        boolean is_sign = AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType);
+
+        // 删除
+        List<AdviceSaveDto> deleteList = activityList.stream()
+            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+        for (AdviceSaveDto adviceSaveDto : deleteList) {
+            iServiceRequestService.removeById(adviceSaveDto.getRequestId());
+            // 删除费用项
+            iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST,
+                adviceSaveDto.getRequestId());
+        }
+
+        // 声明长期医嘱诊疗请求
+        ServiceRequest longServiceRequest;
+        // 新增 + 修改 (长期医嘱)
+        List<RegAdviceSaveDto> longInsertOrUpdateList = activityList.stream().filter(e -> TherapyTimeType.LONG_TERM
+            .getValue().equals(e.getTherapyEnum())
+            && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
+            .collect(Collectors.toList());
+        for (RegAdviceSaveDto regAdviceSaveDto : longInsertOrUpdateList) {
+            longServiceRequest = new ServiceRequest();
+            longServiceRequest.setId(regAdviceSaveDto.getRequestId()); // 主键id
+            longServiceRequest
+                .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态
+            if (is_sign) {
+                longServiceRequest.setAuthoredTime(authoredTime); // 医嘱签发时间
+                longServiceRequest.setSignCode(signCode);
+            }
+            // 保存时处理的字段属性
+            if (is_save) {
+                longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
+                longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                longServiceRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
+                longServiceRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
+                longServiceRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
+                longServiceRequest.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型,长期(需要前端传)
+                longServiceRequest.setActivityId(regAdviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
+                longServiceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
+                longServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
+                longServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
+                // longServiceRequest.setAuthoredTime(curDate); // 请求签发时间
+                longServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                longServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
+                longServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
+                longServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
+                longServiceRequest.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+            }
+            iServiceRequestService.saveOrUpdate(longServiceRequest);
+        }
+
+        // 声明临时医嘱诊疗请求
+        ServiceRequest tempServiceRequest;
+        // 声明临时医嘱费用项
+        ChargeItem chargeItem;
+        // 新增 + 修改 (临时医嘱)
+        List<RegAdviceSaveDto> tempInsertOrUpdateList = activityList.stream().filter(e -> TherapyTimeType.TEMPORARY
+            .getValue().equals(e.getTherapyEnum())
+            && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
+            .collect(Collectors.toList());
+        for (RegAdviceSaveDto regAdviceSaveDto : tempInsertOrUpdateList) {
+            tempServiceRequest = new ServiceRequest();
+            tempServiceRequest.setId(regAdviceSaveDto.getRequestId()); // 主键id
+            tempServiceRequest
+                .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态
+            if (is_sign) {
+                tempServiceRequest.setAuthoredTime(authoredTime); // 医嘱签发时间
+                tempServiceRequest.setSignCode(signCode);
+            }
+            // 保存时处理的字段属性
+            if (is_save) {
+                tempServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
+                tempServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                tempServiceRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
+                tempServiceRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
+                tempServiceRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
+                tempServiceRequest.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型,临时(需要前端传)
+                tempServiceRequest.setActivityId(regAdviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
+                tempServiceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
+                tempServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
+                tempServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
+                tempServiceRequest.setAuthoredTime(curDate); // 请求签发时间
+                tempServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                tempServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
+                tempServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
+                tempServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
+                tempServiceRequest.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+            }
+            iServiceRequestService.saveOrUpdate(tempServiceRequest);
+
+            // 保存时,保存诊疗费用项
+            if (is_save) {
+                chargeItem = new ChargeItem();
+                chargeItem.setId(regAdviceSaveDto.getChargeItemId()); // 费用项id
+                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(tempServiceRequest.getBusNo()));
+                chargeItem.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
+                chargeItem.setContextEnum(regAdviceSaveDto.getAdviceType()); // 类型
+                chargeItem.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
+                chargeItem.setDefinitionId(regAdviceSaveDto.getDefinitionId()); // 费用定价ID
+                chargeItem.setDefDetailId(regAdviceSaveDto.getDefinitionDetailId()); // 定价子表主键
+                chargeItem.setEntererId(regAdviceSaveDto.getPractitionerId());// 开立人ID
+                chargeItem.setEnteredDate(curDate); // 开立时间
+                chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
+                chargeItem.setServiceId(tempServiceRequest.getId()); // 医疗服务ID
+                chargeItem.setProductTable(regAdviceSaveDto.getAdviceTableName());// 产品所在表
+                chargeItem.setProductId(regAdviceSaveDto.getAdviceDefinitionId());// 收费项id
+                chargeItem.setAccountId(regAdviceSaveDto.getAccountId());// 关联账户ID
+                chargeItem.setRequestingOrgId(orgId); // 开立科室
+                chargeItem.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
+                chargeItem.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                chargeItem.setQuantityValue(regAdviceSaveDto.getQuantity()); // 数量
+                chargeItem.setQuantityUnit(regAdviceSaveDto.getUnitCode()); // 单位
+                chargeItem.setUnitPrice(regAdviceSaveDto.getUnitPrice()); // 单价
+                chargeItem.setTotalPrice(regAdviceSaveDto.getTotalPrice()); // 总价
+
+                iChargeItemService.saveOrUpdate(chargeItem);
+
+                // 第一次保存时,处理诊疗套餐的子项信息
+                if (regAdviceSaveDto.getRequestId() == null) {
+                    ActivityDefinition activityDefinition =
+                        iActivityDefinitionService.getById(regAdviceSaveDto.getAdviceDefinitionId());
+                    String childrenJson = activityDefinition.getChildrenJson();
+                    if (childrenJson != null) {
+                        // 诊疗子项参数类
+                        ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
+                        activityChildrenJsonParams.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型
+                        activityChildrenJsonParams.setPatientId(tempServiceRequest.getPatientId()); // 患者
+                        activityChildrenJsonParams.setEncounterId(tempServiceRequest.getEncounterId()); // 就诊id
+                        activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
+                        activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
+                        adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
+                    }
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 查询住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @return 住院医嘱请求数据
+     */
+    @Override
+    public R<?> getRegRequestBaseInfo(Long encounterId) {
+        // 当前账号的参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 住院医嘱请求数据
+        List<RegRequestBaseDto> regRequestBaseInfo = adviceManageAppMapper.getRegRequestBaseInfo(encounterId, null,
+            CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+            CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
+            EncounterClass.IMP.getValue());
+        for (RegRequestBaseDto regRequestBaseDto : regRequestBaseInfo) {
+            // 请求状态
+            regRequestBaseDto.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(RequestStatus.class, regRequestBaseDto.getStatusEnum()));
+            // 是否皮试
+            regRequestBaseDto
+                .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getSkinTestFlag()));
+            // 是否为注射药物
+            regRequestBaseDto
+                .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getInjectFlag()));
+            // 收费状态
+            regRequestBaseDto.setChargeStatus_enumText(
+                EnumUtils.getInfoByValue(ChargeItemStatus.class, regRequestBaseDto.getChargeStatus()));
+            // 治疗类型
+            regRequestBaseDto.setTherapyEnum_enumText(
+                EnumUtils.getInfoByValue(TherapyTimeType.class, regRequestBaseDto.getTherapyEnum()));
+        }
+        return R.ok(regRequestBaseInfo);
+    }
+
+    /**
+     * 查询历史住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @param patientId 病人id
+     * @return 历史住院医嘱请求数据
+     */
+    @Override
+    public R<?> getRegRequestHistoryInfo(Long patientId, Long encounterId) {
+        // 当前账号的参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 住院医嘱请求数据
+        List<RegRequestBaseDto> regRequestBaseInfo = adviceManageAppMapper.getRegRequestBaseInfo(encounterId, patientId,
+            CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+            CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode(),
+            EncounterClass.IMP.getValue());
+        for (RegRequestBaseDto regRequestBaseDto : regRequestBaseInfo) {
+            // 请求状态
+            regRequestBaseDto.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(RequestStatus.class, regRequestBaseDto.getStatusEnum()));
+            // 是否皮试
+            regRequestBaseDto
+                .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getSkinTestFlag()));
+            // 是否为注射药物
+            regRequestBaseDto
+                .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getInjectFlag()));
+            // 收费状态
+            regRequestBaseDto.setChargeStatus_enumText(
+                EnumUtils.getInfoByValue(ChargeItemStatus.class, regRequestBaseDto.getChargeStatus()));
+            // 治疗类型
+            regRequestBaseDto.setTherapyEnum_enumText(
+                EnumUtils.getInfoByValue(TherapyTimeType.class, regRequestBaseDto.getTherapyEnum()));
+        }
+        return R.ok(regRequestBaseInfo);
+    }
+
+    /**
+     * 住院医嘱签退
+     *
+     * @param paramList 签退参数
+     * @return 结果
+     */
+    @Override
+    public R<?> signOffRegAdvice(List<AdviceBatchOpParam> paramList) {
+        // 药品
+        List<AdviceBatchOpParam> medicineList = paramList.stream()
+            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        List<Long> medicineRequestIds =
+            medicineList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+        // 诊疗
+        List<AdviceBatchOpParam> activityList = paramList.stream()
+            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        List<Long> activityRequestIds =
+            activityList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+        // 查询已完成的药品请求
+        List<MedicationRequest> medicineCompleteList = new ArrayList<>();
+        if (!medicineRequestIds.isEmpty()) {
+            medicineCompleteList = iMedicationRequestService.list(new LambdaQueryWrapper<MedicationRequest>()
+                .eq(MedicationRequest::getStatusEnum, RequestStatus.COMPLETED.getValue())
+                .in(MedicationRequest::getId, medicineRequestIds));
+        }
+        // 查询已完成的诊疗请求
+        List<ServiceRequest> activityCompleteList = new ArrayList<>();
+        if (!activityRequestIds.isEmpty()) {
+            activityCompleteList = iServiceRequestService.list(new LambdaQueryWrapper<ServiceRequest>()
+                .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue())
+                .in(ServiceRequest::getId, activityRequestIds));
+        }
+        if (!medicineCompleteList.isEmpty() || !activityCompleteList.isEmpty()) {
+            throw new ServiceException("存在已完成的医嘱，请重新选择");
+        }
+        if (!medicineRequestIds.isEmpty()) {
+            // 根据请求id更新请求状态
+            iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null);
+        }
+        if (!activityRequestIds.isEmpty()) {
+            // 根据请求id更新请求状态
+            iServiceRequestService.updateDraftStatusBatch(activityRequestIds);
+        }
+        List<Long> requestIdList = new ArrayList<>();
+        requestIdList.addAll(medicineRequestIds);
+        requestIdList.addAll(activityRequestIds);
+        // 根据请求编号列表查询收费项目信息
+        List<ChargeItem> chargeItemList = iChargeItemService.getChargeItemInfoByReqId(requestIdList);
+        List<Long> chargeItemIdList = chargeItemList.stream().map(ChargeItem::getId).collect(Collectors.toList());
+        // 根据id更新收费项目状态 , 撤回后需要更新为草稿
+        if (!chargeItemIdList.isEmpty()) {
+            iChargeItemService.updatePaymentStatus(chargeItemIdList, ChargeItemStatus.DRAFT.getValue());
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"医嘱签退"}));
+    }
+
+    /**
+     * 住院医嘱停止
+     *
+     * @param paramList 停嘱
+     * @return 结果
+     */
+    @Override
+    public R<?> stopRegAdvice(List<AdviceBatchOpParam> paramList) {
+        // 当前时间
+        Date date = new Date();
+        // 药品
+        List<AdviceBatchOpParam> medicineList = paramList.stream()
+            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        List<Long> medicineRequestIds =
+            medicineList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+        // 诊疗
+        List<AdviceBatchOpParam> activityList = paramList.stream()
+            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        List<Long> activityRequestIds =
+            activityList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+        if (!medicineRequestIds.isEmpty()) {
+            iMedicationRequestService.update(new LambdaUpdateWrapper<MedicationRequest>()
+                .in(MedicationRequest::getId, medicineRequestIds).set(MedicationRequest::getEffectiveDoseEnd, date)
+                .set(MedicationRequest::getStatusEnum, RequestStatus.STOPPED.getValue()));
+        }
+        if (!activityRequestIds.isEmpty()) {
+            iServiceRequestService.update(new LambdaUpdateWrapper<ServiceRequest>()
+                .in(ServiceRequest::getId, activityRequestIds).set(ServiceRequest::getOccurrenceEndTime, date)
+                .set(ServiceRequest::getStatusEnum, RequestStatus.STOPPED.getValue()));
+        }
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"医嘱停止"}));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
new file mode 100644
index 00000000..3196e0f2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -0,0 +1,187 @@
+package com.openhis.web.regdoctorstation.appservice.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.ChargeItemStatus;
+import com.openhis.common.enums.RequestStatus;
+import com.openhis.common.enums.TherapyTimeType;
+import com.openhis.document.domain.RequestForm;
+import com.openhis.document.service.IRequestFormService;
+import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams;
+import com.openhis.web.doctorstation.utils.AdviceUtils;
+import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.openhis.web.regdoctorstation.dto.ActivitySaveDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto;
+import com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.workflow.service.IServiceRequestService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 申请单管理 应用实现类
+ */
+@Slf4j
+@Service
+public class RequestFormManageAppServiceImpl implements IRequestFormManageAppService {
+
+    @Resource
+    RequestFormManageAppMapper requestFormManageAppMapper;
+
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    AdviceUtils adviceUtils;
+
+    @Resource
+    IRequestFormService iRequestFormService;
+
+    @Resource
+    IServiceRequestService iServiceRequestService;
+
+    @Resource
+    IChargeItemService iChargeItemService;
+
+    @Resource
+    IActivityDefinitionService iActivityDefinitionService;
+
+    /**
+     * 保存申请单
+     *
+     * @param requestFormSaveDto 申请单保存dto
+     * @param typeCode 申请单类型
+     * @return 结果
+     */
+    @Override
+    public R<?> saveRequestForm(RequestFormSaveDto requestFormSaveDto, String typeCode) {
+        // 当前时间
+        Date curDate = new Date();
+        // 请求类型,用于区分 住院还是门诊
+        Integer categoryEnum = requestFormSaveDto.getCategoryEnum();
+        // 当前登录账号的科室id
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // 当前参与者ID
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 就诊ID
+        Long encounterId = requestFormSaveDto.getEncounterId();
+        // 患者ID
+        Long patientId = requestFormSaveDto.getPatientId();
+        // 患者挂号对应的科室id 或 住院科室id
+        Long organizationId = requestFormSaveDto.getOrganizationId();
+        // 诊疗处方号
+        String prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
+
+        // 声明申请单信息
+        RequestForm requestForm = new RequestForm();
+        requestForm.setTypeCode(typeCode); // 申请单类型
+        requestForm.setPrescriptionNo(prescriptionNo); // 处方号
+        requestForm.setName(requestFormSaveDto.getName()); // 名称
+        requestForm.setEncounterId(encounterId); // 就诊ID
+        requestForm.setRequesterId(practitionerId); // 申请人
+        requestForm.setDescJson(requestFormSaveDto.getDescJson()); // 描述内容
+        iRequestFormService.save(requestForm);
+
+        ServiceRequest serviceRequest;
+        ChargeItem chargeItem;
+        // 诊疗集合
+        List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
+        for (ActivitySaveDto activitySaveDto : activityList) {
+            serviceRequest = new ServiceRequest();
+            serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());
+            serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+            serviceRequest.setQuantity(activitySaveDto.getQuantity()); // 请求数量
+            serviceRequest.setUnitCode(activitySaveDto.getUnitCode()); // 请求单位编码
+            serviceRequest.setCategoryEnum(categoryEnum); // 请求类型
+            serviceRequest.setActivityId(activitySaveDto.getAdviceDefinitionId());// 诊疗定义id
+            serviceRequest.setPatientId(patientId); // 患者
+            serviceRequest.setRequesterId(practitionerId); // 开方医生
+            serviceRequest.setEncounterId(encounterId); // 就诊id
+            serviceRequest.setAuthoredTime(curDate); // 请求签发时间
+            serviceRequest.setOrgId(activitySaveDto.getPositionId()); // 执行科室
+            serviceRequest.setYbClassEnum(activitySaveDto.getYbClassEnum());// 类别医保编码
+            serviceRequest.setConditionId(activitySaveDto.getConditionId()); // 诊断id
+            serviceRequest.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+            iServiceRequestService.save(serviceRequest);
+
+            chargeItem = new ChargeItem();
+            chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+            chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+            chargeItem.setPatientId(patientId); // 患者
+            chargeItem.setContextEnum(activitySaveDto.getAdviceType()); // 类型
+            chargeItem.setEncounterId(encounterId); // 就诊id
+            chargeItem.setDefinitionId(activitySaveDto.getDefinitionId()); // 费用定价ID
+            chargeItem.setDefDetailId(activitySaveDto.getDefinitionDetailId()); // 定价子表主键
+            chargeItem.setEntererId(practitionerId);// 开立人ID
+            chargeItem.setEnteredDate(curDate); // 开立时间
+            chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
+            chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
+            chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);// 产品所在表
+            chargeItem.setProductId(activitySaveDto.getAdviceDefinitionId());// 收费项id
+            chargeItem.setAccountId(activitySaveDto.getAccountId());// 关联账户ID
+            chargeItem.setRequestingOrgId(orgId); // 开立科室
+            chargeItem.setConditionId(activitySaveDto.getConditionId()); // 诊断id
+            chargeItem.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+            chargeItem.setQuantityValue(activitySaveDto.getQuantity()); // 数量
+            chargeItem.setQuantityUnit(activitySaveDto.getUnitCode()); // 单位
+            chargeItem.setUnitPrice(activitySaveDto.getUnitPrice()); // 单价
+            chargeItem.setTotalPrice(activitySaveDto.getTotalPrice()); // 总价
+            iChargeItemService.save(chargeItem);
+
+            // 处理诊疗套餐的子项信息
+            ActivityDefinition activityDefinition =
+                iActivityDefinitionService.getById(activitySaveDto.getAdviceDefinitionId());
+            String childrenJson = activityDefinition.getChildrenJson();
+            if (childrenJson != null) {
+                // 诊疗子项参数类
+                ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
+                activityChildrenJsonParams.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
+                activityChildrenJsonParams.setPatientId(serviceRequest.getPatientId()); // 患者
+                activityChildrenJsonParams.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
+                activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
+                activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
+                adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
+            }
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"申请单"}));
+    }
+
+    /**
+     * 查询申请单
+     *
+     * @param encounterId 就诊id
+     * @param typeCode 申请单类型
+     * @return 检查申请单
+     */
+    @Override
+    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode) {
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode);
+        for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
+            // 查询处方详情
+            List<RequestFormDetailQueryDto> requestFormDetail =
+                requestFormManageAppMapper.getRequestFormDetail(requestFormQueryDto.getPrescriptionNo());
+            requestFormQueryDto.setRequestFormDetailList(requestFormDetail);
+        }
+        return requestFormList;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
new file mode 100644
index 00000000..fee7f636
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
@@ -0,0 +1,283 @@
+package com.openhis.web.regdoctorstation.appservice.impl;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.openhis.web.regdoctorstation.appservice.ISpecialAdviceAppService;
+import com.openhis.web.regdoctorstation.dto.*;
+import com.openhis.web.regdoctorstation.mapper.SpecialAdviceAppMapper;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IServiceRequestService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 特殊医嘱 应用实现类
+ */
+@Slf4j
+@Service
+public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
+
+    @Resource
+    SpecialAdviceAppMapper specialAdviceAppMapper;
+
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    IServiceRequestService iServiceRequestService;
+
+    @Resource
+    IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
+
+    /**
+     * 查询护理医嘱信息
+     *
+     * @return 护理医嘱信息
+     */
+    @Override
+    public NursingOrdersDto getNursingOrdersInfos() {
+        NursingOrdersDto nursingOrdersDto = new NursingOrdersDto();
+        // 类型为护理医嘱的编码集合
+        List<String> categoryCodeList =
+            Arrays.stream(NursingOrdersClass.values()).map(NursingOrdersClass::getCode).collect(Collectors.toList());
+        List<NursingOrdersDetailDto> nursingOrdersInfos =
+            specialAdviceAppMapper.getNursingOrdersInfos(categoryCodeList);
+        // 按categoryCode进行分组
+        Map<String, List<NursingOrdersDetailDto>> groupedByCategory =
+            nursingOrdersInfos.stream().collect(Collectors.groupingBy(NursingOrdersDetailDto::getCategoryCode));
+        // 根据不同的categoryCode赋值给对应的List
+        for (Map.Entry<String, List<NursingOrdersDetailDto>> entry : groupedByCategory.entrySet()) {
+            String categoryCode = entry.getKey();
+            List<NursingOrdersDetailDto> detailList = entry.getValue();
+            switch (categoryCode) {
+                case "26": // 护理
+                    nursingOrdersDto.setNursingList(detailList);
+                    break;
+                case "38": // 病情
+                    nursingOrdersDto.setConditionList(detailList);
+                    break;
+                case "39": // 护理常规
+                    nursingOrdersDto.setNursingRoutineList(detailList);
+                    break;
+                case "27": // 膳食
+                    nursingOrdersDto.setDietList(detailList);
+                    break;
+                case "40": // 体位
+                    nursingOrdersDto.setPositionList(detailList);
+                    break;
+                case "41": // 陪护
+                    nursingOrdersDto.setCompanionCareList(detailList);
+                    break;
+                case "42": // 隔离等级
+                    nursingOrdersDto.setIsolationLevelList(detailList);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return nursingOrdersDto;
+    }
+
+    /**
+     * 保存护理医嘱
+     *
+     * @param nursingOrdersSaveDto 护理医嘱保存dto
+     * @return 结果
+     */
+    @Override
+    public R<?> saveNursingOrders(NursingOrdersSaveDto nursingOrdersSaveDto) {
+        // 当前登录账号参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 当前时间
+        Date curDate = new Date();
+        // 医嘱开始时间
+        Date startTime = nursingOrdersSaveDto.getStartTime();
+        if (startTime == null) {
+            startTime = curDate;
+        }
+        // 就诊id
+        Long encounterId = nursingOrdersSaveDto.getEncounterId();
+        // 患者
+        Long patientId = nursingOrdersSaveDto.getPatientId();
+        // 诊断ID
+        Long conditionId = nursingOrdersSaveDto.getConditionId();
+        // 就诊诊断id
+        Long encounterDiagnosisId = nursingOrdersSaveDto.getEncounterDiagnosisId();
+        // 患者入院科室id
+        Long organizationId = nursingOrdersSaveDto.getOrganizationId();
+        // 护理医嘱详情保存集合
+        List<NursingOrdersSaveDetailDto> nursingOrdersSaveDetailDtoList =
+            nursingOrdersSaveDto.getNursingOrdersSaveDetailDtoList();
+        // 声明长期医嘱诊疗请求
+        ServiceRequest longServiceRequest;
+        // 已经存在的有效医嘱
+        ServiceRequest alreadyExistsLongServiceRequest;
+        // 医嘱定义id
+        Long definitionId;
+        AdviceBaseDto adviceBaseDto;
+        AdviceBaseDto activityAdviceBaseDto;
+        for (NursingOrdersSaveDetailDto nursingOrdersSaveDetailDto : nursingOrdersSaveDetailDtoList) {
+            definitionId = nursingOrdersSaveDetailDto.getDefinitionId();
+            Integer categoryEnum = nursingOrdersSaveDetailDto.getCategoryEnum();
+            // 查询已经存在的有效医嘱
+            LambdaQueryWrapper<ServiceRequest> lambdaQuery = new LambdaQueryWrapper<>();
+            lambdaQuery.eq(ServiceRequest::getEncounterId, encounterId)
+                .eq(ServiceRequest::getCategoryEnum, categoryEnum)
+                .and(wrapper -> wrapper.eq(ServiceRequest::getStatusEnum, RequestStatus.DRAFT.getValue()).or()
+                    .eq(ServiceRequest::getStatusEnum, RequestStatus.ACTIVE.getValue()).or()
+                    .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue()))
+                .orderByDesc(ServiceRequest::getCreateTime).last("LIMIT 1");
+            alreadyExistsLongServiceRequest = iServiceRequestService.getOne(lambdaQuery);
+
+            longServiceRequest = new ServiceRequest();
+
+            if (alreadyExistsLongServiceRequest == null) {
+                if (definitionId != null) {
+                    adviceBaseDto = new AdviceBaseDto();
+                    adviceBaseDto.setAdviceDefinitionId(definitionId); // 医嘱定义id
+                    // 对应的诊疗医嘱信息
+                    activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null,
+                        null, organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+                    // 逻辑1---------------------直接新增
+                    longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
+                    longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
+                    longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                    longServiceRequest.setQuantity(1); // 请求数量
+                    longServiceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+                    longServiceRequest.setCategoryEnum(categoryEnum); // 请求类型
+                    longServiceRequest.setTherapyEnum(TherapyTimeType.LONG_TERM.getValue()); // 治疗类型
+                    longServiceRequest.setActivityId(definitionId);// 诊疗定义id
+                    longServiceRequest.setPatientId(patientId); // 患者
+                    longServiceRequest.setRequesterId(practitionerId); // 开方医生
+                    longServiceRequest.setEncounterId(encounterId); // 就诊id
+                    longServiceRequest.setOrgId(organizationId); // 执行科室
+                    // longServiceRequest.setYbClassEnum();// 类别医保编码
+                    longServiceRequest.setConditionId(conditionId); // 诊断id
+                    longServiceRequest.setEncounterDiagnosisId(encounterDiagnosisId); // 就诊诊断id
+                    iServiceRequestService.save(longServiceRequest);
+                }
+                // definitionId == null 时什么也不做，跳出本次循环
+                continue;
+            }
+            // alreadyExistsLongServiceRequest != null 的情况
+            if (definitionId == null) {
+                // 逻辑2---------------------停掉原有的
+                iServiceRequestService.update(new LambdaUpdateWrapper<ServiceRequest>()
+                    .eq(ServiceRequest::getId, alreadyExistsLongServiceRequest.getId())
+                    .set(ServiceRequest::getOccurrenceEndTime, curDate)
+                    .set(ServiceRequest::getStatusEnum, RequestStatus.STOPPED.getValue()));
+                continue;
+            }
+
+            if (alreadyExistsLongServiceRequest.getActivityId().equals(definitionId)) {
+                // 逻辑3---------------------没有变化,跳出本次循环
+                continue;
+            }
+            // 逻辑4---------------------先停掉原有的,再新增
+            iServiceRequestService.update(new LambdaUpdateWrapper<ServiceRequest>()
+                .eq(ServiceRequest::getId, alreadyExistsLongServiceRequest.getId())
+                .set(ServiceRequest::getOccurrenceEndTime, curDate)
+                .set(ServiceRequest::getStatusEnum, RequestStatus.STOPPED.getValue()));
+
+            adviceBaseDto = new AdviceBaseDto();
+            adviceBaseDto.setAdviceDefinitionId(definitionId); // 医嘱定义id
+            // 对应的诊疗医嘱信息
+            activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null, null,
+                organizationId, 1, 1, Whether.NO.getValue(), List.of(1, 2, 3)).getRecords().get(0);
+
+            longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
+            longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
+            longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+            longServiceRequest.setQuantity(1); // 请求数量
+            longServiceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+            longServiceRequest.setCategoryEnum(categoryEnum); // 请求类型
+            longServiceRequest.setTherapyEnum(TherapyTimeType.LONG_TERM.getValue()); // 治疗类型
+            longServiceRequest.setActivityId(definitionId);// 诊疗定义id
+            longServiceRequest.setPatientId(patientId); // 患者
+            longServiceRequest.setRequesterId(practitionerId); // 开方医生
+            longServiceRequest.setEncounterId(encounterId); // 就诊id
+            longServiceRequest.setOrgId(organizationId); // 执行科室
+            // longServiceRequest.setYbClassEnum();// 类别医保编码
+            longServiceRequest.setConditionId(conditionId); // 诊断id
+            longServiceRequest.setEncounterDiagnosisId(encounterDiagnosisId); // 就诊诊断id
+            iServiceRequestService.save(longServiceRequest);
+
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"护理医嘱"}));
+    }
+
+    /**
+     * 查询就诊护理医嘱
+     *
+     * @param encounterId 就诊id
+     * @return 就诊护理医嘱
+     */
+    @Override
+    public NursingOrdersEncounterDto getEncounterNursingOrdersInfos(Long encounterId) {
+        NursingOrdersEncounterDto nursingOrdersEncounterDto = new NursingOrdersEncounterDto();
+        // 类型为护理医嘱的枚举集合
+        List<Integer> categoryEnumList =
+            Arrays.stream(NursingOrdersClass.values()).map(NursingOrdersClass::getValue).collect(Collectors.toList());
+        // 查询查询就诊护理医嘱 ; 为了排除可能存在的数据问题,每个categoryEnum按创建时间取最新的一条
+        List<NursingOrdersEncounterDetailDto> encounterNursingOrdersInfos =
+            specialAdviceAppMapper.getEncounterNursingOrdersInfos(encounterId, RequestStatus.DRAFT.getValue(),
+                RequestStatus.ACTIVE.getValue(), RequestStatus.COMPLETED.getValue(), categoryEnumList);
+        if (!encounterNursingOrdersInfos.isEmpty()) {
+            // 按categoryEnum进行分组
+            Map<Integer, List<NursingOrdersEncounterDetailDto>> groupedByCategory = encounterNursingOrdersInfos.stream()
+                .collect(Collectors.groupingBy(NursingOrdersEncounterDetailDto::getCategoryEnum));
+            // 根据不同的categoryCode赋值给对应的List
+            for (Map.Entry<Integer, List<NursingOrdersEncounterDetailDto>> entry : groupedByCategory.entrySet()) {
+                Integer categoryEnum = entry.getKey();
+                NursingOrdersEncounterDetailDto detail = entry.getValue().get(0);
+                switch (categoryEnum) {
+                    case 26: // 护理
+                        nursingOrdersEncounterDto.setNursing(detail);
+                        break;
+                    case 38: // 病情
+                        nursingOrdersEncounterDto.setCondition(detail);
+                        break;
+                    case 39: // 护理常规
+                        nursingOrdersEncounterDto.setNursingRoutine(detail);
+                        break;
+                    case 27: // 膳食
+                        nursingOrdersEncounterDto.setDiet(detail);
+                        break;
+                    case 40: // 体位
+                        nursingOrdersEncounterDto.setPosition(detail);
+                        break;
+                    case 41: // 陪护
+                        nursingOrdersEncounterDto.setCompanionCare(detail);
+                        break;
+                    case 42: // 隔离等级
+                        nursingOrdersEncounterDto.setIsolationLevel(detail);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        return nursingOrdersEncounterDto;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java
new file mode 100644
index 00000000..3a76cff4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.regdoctorstation.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.AdviceOpType;
+import com.openhis.web.regdoctorstation.appservice.IAdviceManageAppService;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.openhis.web.regdoctorstation.dto.RegDoctorStationInitDto;
+import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 医嘱管理 controller
+ */
+@RestController
+@RequestMapping("/reg-doctorstation/advice-manage")
+@Slf4j
+@AllArgsConstructor
+public class AdviceManageController {
+
+    private final IAdviceManageAppService iAdviceManageAppService;
+
+    /**
+     * 住院基础数据初始化
+     *
+     * @return 基础数据
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return R.ok(new RegDoctorStationInitDto());
+    }
+
+    /**
+     * 查询在科住院患者信息
+     * 
+     * @param regPatientMainInfoDto 住院患者信息 dto
+     * @param status 状态 - 在科
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 在科住院患者信息
+     */
+    @GetMapping(value = "/reg-patient-zk")
+    public R<?> getRegPatientZkInfo(RegPatientMainInfoDto regPatientMainInfoDto,
+        @RequestParam(value = "status") Integer status,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(iAdviceManageAppService.getRegPatientMainInfo(regPatientMainInfoDto, status, searchKey, pageNo,
+            pageSize, request));
+    }
+
+    /**
+     * 查询出院住院患者信息
+     *
+     * @param regPatientMainInfoDto 住院患者信息 dto
+     * @param status 状态 - 出院
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 出院住院患者信息
+     */
+    @GetMapping(value = "/reg-patient-cy")
+    public R<?> getRegPatientCyInfo(RegPatientMainInfoDto regPatientMainInfoDto,
+        @RequestParam(value = "status") Integer status,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(iAdviceManageAppService.getRegPatientMainInfo(regPatientMainInfoDto, status, searchKey, pageNo,
+            pageSize, request));
+    }
+
+    /**
+     * 住院保存医嘱
+     *
+     * @param regAdviceSaveParam 医嘱表单信息
+     * @return 结果
+     */
+    @PostMapping(value = "/save-reg-advice")
+    public R<?> saveRegAdvice(@RequestBody RegAdviceSaveParam regAdviceSaveParam) {
+        return iAdviceManageAppService.saveRegAdvice(regAdviceSaveParam, AdviceOpType.SAVE_ADVICE.getCode());
+    }
+
+    /**
+     * 住院签发医嘱
+     *
+     * @param regAdviceSaveParam 医嘱表单信息
+     * @return 结果
+     */
+    @PostMapping(value = "/sign-reg-advice")
+    public R<?> signRegAdvice(@RequestBody RegAdviceSaveParam regAdviceSaveParam) {
+        return iAdviceManageAppService.saveRegAdvice(regAdviceSaveParam, AdviceOpType.SIGN_ADVICE.getCode());
+    }
+
+    /**
+     * 查询住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @return 住院医嘱请求数据
+     */
+    @GetMapping(value = "/reg-request-base-info")
+    public R<?> getRegRequestBaseInfo(@RequestParam Long encounterId) {
+        return iAdviceManageAppService.getRegRequestBaseInfo(encounterId);
+    }
+
+    /**
+     * 查询历史住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @param patientId 病人id
+     * @return 历史住院医嘱请求数据
+     */
+    @GetMapping(value = "/reg-request-history-info")
+    public R<?> getRegRequestHistoryInfo(@RequestParam Long patientId, Long encounterId) {
+        return iAdviceManageAppService.getRegRequestHistoryInfo(patientId, encounterId);
+    }
+
+    /**
+     * 住院医嘱签退
+     * 
+     * @param paramList 签退参数
+     * @return 结果
+     */
+    @PostMapping(value = "/sign-off-reg")
+    public R<?> signOffRegAdvice(@RequestBody List<AdviceBatchOpParam> paramList) {
+        return iAdviceManageAppService.signOffRegAdvice(paramList);
+    }
+
+    /**
+     * 住院医嘱停止
+     * 
+     * @param paramList 停嘱
+     * @return 结果
+     */
+    @PostMapping(value = "/stop-reg-advice")
+    public R<?> stopRegAdvice(@RequestBody List<AdviceBatchOpParam> paramList) {
+        return iAdviceManageAppService.stopRegAdvice(paramList);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
new file mode 100644
index 00000000..952b2d4b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.regdoctorstation.controller;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.enums.RequestFormType;
+import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 申请单管理 controller
+ */
+@RestController
+@RequestMapping("/reg-doctorstation/request-form")
+@Slf4j
+@AllArgsConstructor
+public class RequestFormManageController {
+
+    private final IRequestFormManageAppService iRequestFormManageAppService;
+
+    /**
+     * 保存检查申请单
+     * 
+     * @param requestFormSaveDto 申请单保存dto
+     * @return 结果
+     */
+    @PostMapping(value = "/save-check")
+    public R<?> saveCheckRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, RequestFormType.CHECK.getCode());
+    }
+
+    /**
+     * 保存检验申请单
+     *
+     * @param requestFormSaveDto 申请单保存dto
+     * @return 结果
+     */
+    @PostMapping(value = "/save-inspection")
+    public R<?> saveInspectionRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, RequestFormType.INSPECTION.getCode());
+    }
+
+    /**
+     * 保存输血申请单
+     *
+     * @param requestFormSaveDto 申请单保存dto
+     * @return 结果
+     */
+    @PostMapping(value = "/save-blood-transfusion")
+    public R<?> saveBloodTransfusionRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto,
+            RequestFormType.BLOOD_TRANSFUSION.getCode());
+    }
+
+    /**
+     * 保存手术申请单
+     *
+     * @param requestFormSaveDto 申请单保存dto
+     * @return 结果
+     */
+    @PostMapping(value = "/save-surgery")
+    public R<?> saveSurgeryRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, RequestFormType.SURGERY.getCode());
+    }
+
+    /**
+     * 查询检查申请单
+     * 
+     * @param encounterId 就诊id
+     * @return 检查申请单
+     */
+    @GetMapping(value = "/get-check")
+    public R<?> getCheckRequestForm(@RequestParam Long encounterId) {
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.CHECK.getCode()));
+    }
+
+    /**
+     * 查询检验申请单
+     *
+     * @param encounterId 就诊id
+     * @return 检验申请单
+     */
+    @GetMapping(value = "/get-inspection")
+    public R<?> getInspectionRequestForm(@RequestParam Long encounterId) {
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.INSPECTION.getCode()));
+    }
+
+    /**
+     * 查询输血申请单
+     *
+     * @param encounterId 就诊id
+     * @return 输血申请单
+     */
+    @GetMapping(value = "/get-blood-transfusion")
+    public R<?> getBloodTransfusionRequestForm(@RequestParam Long encounterId) {
+        return R
+            .ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.BLOOD_TRANSFUSION.getCode()));
+    }
+
+    /**
+     * 查询手术申请单
+     *
+     * @param encounterId 就诊id
+     * @return 手术申请单
+     */
+    @GetMapping(value = "/get-surgery")
+    public R<?> getSurgeryRequestForm(@RequestParam Long encounterId) {
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.SURGERY.getCode()));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java
new file mode 100644
index 00000000..e5e00412
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.regdoctorstation.controller;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.appservice.ISpecialAdviceAppService;
+import com.openhis.web.regdoctorstation.dto.NursingOrdersSaveDto;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 特殊医嘱 controller
+ */
+@RestController
+@RequestMapping("/reg-doctorstation/special-advice")
+@Slf4j
+@AllArgsConstructor
+public class SpecialAdviceController {
+
+    private final ISpecialAdviceAppService iSpecialAdviceAppService;
+
+    /**
+     * 查询护理医嘱信息
+     * 
+     * @return 护理医嘱信息
+     */
+    @GetMapping(value = "/nursing-orders")
+    public R<?> getNursingOrdersInfos() {
+        return R.ok(iSpecialAdviceAppService.getNursingOrdersInfos());
+    }
+
+    /**
+     * 保存护理医嘱
+     * 
+     * @param nursingOrdersSaveDto 护理医嘱保存dto
+     * @return 结果
+     */
+    @PostMapping(value = "/nursing-orders")
+    public R<?> saveNursingOrders(@RequestBody NursingOrdersSaveDto nursingOrdersSaveDto) {
+        return iSpecialAdviceAppService.saveNursingOrders(nursingOrdersSaveDto);
+    }
+
+    /**
+     * 查询就诊护理医嘱
+     * 
+     * @param encounterId 就诊id
+     * @return 就诊护理医嘱
+     */
+    @GetMapping(value = "/encounter-nursing-orders")
+    public R<?> getEncounterNursingOrdersInfos(@RequestParam Long encounterId) {
+        return R.ok(iSpecialAdviceAppService.getEncounterNursingOrdersInfos(encounterId));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java
new file mode 100644
index 00000000..1b06883f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java
@@ -0,0 +1,82 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.ChargeItemContext;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 诊疗保存dto
+ */
+@Data
+@Accessors(chain = true)
+public class ActivitySaveDto {
+
+    /** 诊疗定义id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long adviceDefinitionId;
+
+    /** 请求数量 */
+    private Integer quantity;
+
+    /** 请求单位编码 */
+    private String unitCode;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /**
+     * 执行科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long positionId;
+
+    /**
+     * 类别医保编码
+     */
+    private Integer ybClassEnum;
+
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
+    /**
+     * 就诊诊断id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterDiagnosisId;
+
+    /** 医嘱类型 */
+    private Integer adviceType;
+
+    /** 费用定价主表ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /** 费用定价子表ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionDetailId;
+
+    /**
+     * 账户id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+    /**
+     * 构造函数设置默认值
+     */
+    public ActivitySaveDto() {
+        this.adviceType = ChargeItemContext.ACTIVITY.getValue();
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java
new file mode 100644
index 00000000..296da298
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java
@@ -0,0 +1,25 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医嘱批量操作参数类
+ */
+@Data
+@Accessors(chain = true)
+public class AdviceBatchOpParam {
+
+    /** 医嘱类型 */
+    private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目
+
+    /**
+     * 请求id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java
new file mode 100644
index 00000000..b50931ab
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java
@@ -0,0 +1,35 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 护理医嘱详情dto
+ */
+@Data
+@Accessors(chain = true)
+public class NursingOrdersDetailDto {
+
+    /** 医嘱定义id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 分类枚举
+     */
+    private Integer categoryEnum;
+
+    /**
+     * 护理医嘱名称
+     */
+    private String nursingOrderName;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java
new file mode 100644
index 00000000..c1866a3d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java
@@ -0,0 +1,50 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 护理医嘱dto
+ */
+@Data
+@Accessors(chain = true)
+public class NursingOrdersDto {
+
+    /**
+     * 护理
+     */
+    private List<NursingOrdersDetailDto> NursingList;
+
+    /**
+     * 病情
+     */
+    private List<NursingOrdersDetailDto> ConditionList;
+
+    /**
+     * 护理常规
+     */
+    private List<NursingOrdersDetailDto> NursingRoutineList;
+
+    /**
+     * 膳食
+     */
+    private List<NursingOrdersDetailDto> DietList;
+
+    /**
+     * 体位
+     */
+    private List<NursingOrdersDetailDto> PositionList;
+
+    /**
+     * 陪护
+     */
+    private List<NursingOrdersDetailDto> CompanionCareList;
+
+    /**
+     * 隔离等级
+     */
+    private List<NursingOrdersDetailDto> IsolationLevelList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
new file mode 100644
index 00000000..f4ea699d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
@@ -0,0 +1,25 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊护理医嘱详情dto
+ */
+@Data
+@Accessors(chain = true)
+public class NursingOrdersEncounterDetailDto {
+
+    /** 医嘱定义id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /**
+     * 分类枚举
+     */
+    private Integer categoryEnum;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
new file mode 100644
index 00000000..3bca9da8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
@@ -0,0 +1,48 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊护理医嘱dto
+ */
+@Data
+@Accessors(chain = true)
+public class NursingOrdersEncounterDto {
+
+    /**
+     * 护理
+     */
+    private NursingOrdersEncounterDetailDto Nursing;
+
+    /**
+     * 病情
+     */
+    private NursingOrdersEncounterDetailDto Condition;
+
+    /**
+     * 护理常规
+     */
+    private NursingOrdersEncounterDetailDto NursingRoutine;
+
+    /**
+     * 膳食
+     */
+    private NursingOrdersEncounterDetailDto Diet;
+
+    /**
+     * 体位
+     */
+    private NursingOrdersEncounterDetailDto Position;
+
+    /**
+     * 陪护
+     */
+    private NursingOrdersEncounterDetailDto CompanionCare;
+
+    /**
+     * 隔离等级
+     */
+    private NursingOrdersEncounterDetailDto IsolationLevel;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
new file mode 100644
index 00000000..0b2e15f3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
@@ -0,0 +1,27 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 护理医嘱详情保存dto
+ */
+@Data
+@Accessors(chain = true)
+public class NursingOrdersSaveDetailDto {
+
+    /**
+     * 医嘱定义id | 单选或者不选,不选的时候传null (传null表示没有该医嘱,或者是停掉原有医嘱)
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /**
+     * 分类枚举 | 必传
+     */
+    private Integer categoryEnum;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java
new file mode 100644
index 00000000..3cf60e2f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java
@@ -0,0 +1,60 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 护理医嘱保存dto
+ */
+@Data
+@Accessors(chain = true)
+public class NursingOrdersSaveDto {
+
+    /** 就诊id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 患者 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
+    /**
+     * 就诊诊断id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterDiagnosisId;
+
+    /**
+     * 患者入院科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /**
+     * 医嘱开始时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 护理医嘱详情保存集合
+     */
+    private List<NursingOrdersSaveDetailDto> nursingOrdersSaveDetailDtoList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
new file mode 100644
index 00000000..109f979a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
@@ -0,0 +1,18 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院医嘱保存 dto
+ */
+@Data
+@Accessors(chain = true)
+public class RegAdviceSaveDto extends AdviceSaveDto {
+
+    /** 请求类型 */
+    private Integer categoryEnum;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java
new file mode 100644
index 00000000..477ffd61
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java
@@ -0,0 +1,47 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院医嘱保存参数类
+ */
+@Data
+@Accessors(chain = true)
+public class RegAdviceSaveParam {
+
+    /**
+     * 患者住院入科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /**
+     * 医嘱开始时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 医嘱签发时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date authoredTime;
+
+    /**
+     * 保存住院医嘱 dto
+     */
+    private List<RegAdviceSaveDto> regAdviceSaveList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java
new file mode 100644
index 00000000..418cfeac
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java
@@ -0,0 +1,50 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.openhis.common.enums.EncounterStatus;
+
+import com.openhis.common.enums.EncounterZyStatus;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院医生站 init基础数据
+ */
+@Data
+@Accessors(chain = true)
+public class RegDoctorStationInitDto {
+
+    private List<RegPatientEncounterStatusOption> regPatientEncounterStatusOptions;
+
+    /**
+     * 住院患者就诊状态
+     */
+    @Data
+    public static class RegPatientEncounterStatusOption {
+        private Integer value;
+        private String label;
+
+        public RegPatientEncounterStatusOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    /**
+     * 设置默认值
+     */
+    public RegDoctorStationInitDto() {
+        List<RegPatientEncounterStatusOption> options = new ArrayList<>();
+        // 已入院
+        options.add(new RegPatientEncounterStatusOption(EncounterZyStatus.ADMITTED_TO_THE_HOSPITAL.getValue(),
+            EncounterZyStatus.ADMITTED_TO_THE_HOSPITAL.getInfo()));
+        // 已出院
+        options.add(new RegPatientEncounterStatusOption(EncounterZyStatus.DISCHARGED_FROM_HOSPITAL.getValue(),
+            EncounterZyStatus.DISCHARGED_FROM_HOSPITAL.getInfo()));
+
+        this.regPatientEncounterStatusOptions = options;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java
new file mode 100644
index 00000000..c73426e5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java
@@ -0,0 +1,135 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院患者信息 dto
+ */
+@Data
+@Accessors(chain = true)
+public class RegPatientMainInfoDto {
+
+    /**
+     * 住院就诊id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 住院就诊状态
+     */
+    private Integer statusEnum;
+
+    /**
+     * 住院号
+     */
+    private String busNo;
+
+    /**
+     * 入院时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inHospitalTime;
+
+    /**
+     * 出院时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date outHospitalTime;
+
+    /**
+     * 患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 患者
+     */
+    private String patientName;
+
+    /**
+     * 性别编码
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 生日
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 病区
+     */
+    private String wardName;
+
+    /**
+     * 病房
+     */
+    private String houseName;
+
+    /**
+     * 床位
+     */
+    private String bedName;
+
+    /**
+     * 入科时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inOrgTime;
+
+    /**
+     * 入院天数
+     */
+    private Integer inHospitalDays;
+
+    /**
+     * 入院科室
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inHospitalOrgId;
+    private String inHospitalOrgName;
+
+    /**
+     * 费用(合同)编码
+     */
+    private String contractNo;
+
+    /**
+     * 费用(合同)名称
+     */
+    private String contractName;
+
+    /**
+     * 住院诊断名称
+     */
+    private String regDiagnosisName;
+
+    /**
+     * 账号id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
new file mode 100644
index 00000000..c4e69049
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
@@ -0,0 +1,54 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+import com.openhis.web.doctorstation.dto.RequestBaseDto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院医嘱请求基础 dto
+ */
+@Data
+@Accessors(chain = true)
+public class RegRequestBaseDto extends RequestBaseDto {
+
+    /** 治疗类型 */
+    private Integer therapyEnum;
+    private String therapyEnum_enumText;
+
+    /**
+     * 请求人id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_practitioner", dictCode = "id", dictText = "name")
+    private Long requesterId;
+    private String requesterId_dictText;
+
+    /** 请求单位编码 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /**
+     * 用法
+     */
+    @Dict(dictCode = "method_code")
+    private String methodCode;
+    private String methodCode_dictText;
+
+    /**
+     * 使用频次
+     */
+    @Dict(dictCode = "rate_code")
+    private String rateCode;
+    private String rateCode_dictText;
+
+    /** 剂量单位 */
+    @Dict(dictCode = "unit_code")
+    private String doseUnitCode;
+    private String doseUnitCode_dictText;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
new file mode 100644
index 00000000..1df0b812
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
@@ -0,0 +1,33 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.math.BigDecimal;
+
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 申请单详细查询dto
+ */
+@Data
+@Accessors(chain = true)
+public class RequestFormDetailQueryDto {
+
+    /** 医嘱名称 */
+    private String adviceName;
+
+    /** 请求数量 */
+    private Integer quantity;
+
+    /** 请求单位编码 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /**
+     * 总价
+     */
+    private BigDecimal totalPrice;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java
new file mode 100644
index 00000000..eed4af05
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java
@@ -0,0 +1,65 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 申请单查询dto
+ */
+@Data
+@Accessors(chain = true)
+public class RequestFormQueryDto {
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 患者名称
+     */
+    private String patientName;
+
+    /** 处方号 */
+    private String prescriptionNo;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述内容
+     */
+    private String descJson;
+
+    /** 申请人 */
+    @Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requesterId;
+    private String requesterId_dictText;
+
+    /**
+     * 申请时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 申请单详情
+     */
+    private List<RequestFormDetailQueryDto> requestFormDetailList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java
new file mode 100644
index 00000000..b1af223e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java
@@ -0,0 +1,59 @@
+package com.openhis.web.regdoctorstation.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 申请单保存dto
+ */
+@Data
+@Accessors(chain = true)
+public class RequestFormSaveDto {
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 患者 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 患者挂号对应的科室id 或 住院科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述内容
+     */
+    private String descJson;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 请求类型
+     */
+    private Integer categoryEnum; // 住院传 1 , 门诊传 2
+
+    /**
+     * 诊疗参数集合
+     */
+    private List<ActivitySaveDto> activityList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java
new file mode 100644
index 00000000..10a2668d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java
@@ -0,0 +1,64 @@
+package com.openhis.web.regdoctorstation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto;
+import com.openhis.web.regdoctorstation.dto.RegRequestBaseDto;
+
+/**
+ * 医嘱管理 应用Mapper
+ */
+@Repository
+public interface AdviceManageAppMapper {
+
+    /**
+     * 查询住院患者信息
+     * 
+     * @param page 分页参数
+     * @param practitionerId 当前参与者id
+     * @param wardEnum 病区
+     * @param houseEnum 病房
+     * @param bedEnum 床位
+     * @param encounterLocationStatus 使用状态
+     * @param classEnum 就诊类型
+     * @param status 住院就诊状态
+     * @param maindiseFlag 主诊断标识
+     * @param accountTypeCode 个人现金账号
+     * @param queryWrapper 查询条件
+     * @return 住院患者信息
+     */
+    IPage<RegPatientMainInfoDto> getRegPatientMainInfo(@Param("page") Page<RegPatientMainInfoDto> page,
+        @Param("practitionerId") Long practitionerId, @Param("wardEnum") Integer wardEnum,
+        @Param("houseEnum") Integer houseEnum, @Param("bedEnum") Integer bedEnum,
+        @Param("encounterLocationStatus") Integer encounterLocationStatus, @Param("classEnum") Integer classEnum,
+        @Param("status") Integer status, @Param("maindiseFlag") Integer maindiseFlag,
+        @Param("accountTypeCode") String accountTypeCode,
+        @Param(Constants.WRAPPER) QueryWrapper<RegPatientMainInfoDto> queryWrapper);
+
+    /**
+     * 查询住院医嘱请求数据
+     *
+     * @param encounterId 就诊id
+     * @param patientId 患者id
+     * @param MED_MEDICATION_REQUEST 药品请求表名
+     * @param WOR_DEVICE_REQUEST 耗材请求表名
+     * @param WOR_SERVICE_REQUEST 诊疗请求表名
+     * @param practitionerId 当前账号的参与者id
+     * @param historyFlag 历史医嘱标记
+     * @param categoryEnum 请求类型为住院
+     * @return 住院医嘱请求数据
+     */
+    List<RegRequestBaseDto> getRegRequestBaseInfo(@Param("encounterId") Long encounterId,
+        @Param("patientId") Long patientId, @Param("MED_MEDICATION_REQUEST") String MED_MEDICATION_REQUEST,
+        @Param("WOR_DEVICE_REQUEST") String WOR_DEVICE_REQUEST,
+        @Param("WOR_SERVICE_REQUEST") String WOR_SERVICE_REQUEST, @Param("practitionerId") Long practitionerId,
+        @Param("historyFlag") String historyFlag, @Param("categoryEnum") Integer categoryEnum);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
new file mode 100644
index 00000000..96407418
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
@@ -0,0 +1,34 @@
+package com.openhis.web.regdoctorstation.mapper;
+
+import com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 申请单管理 应用Mapper
+ */
+@Repository
+public interface RequestFormManageAppMapper {
+
+    /**
+     * 查询申请单
+     *
+     * @param encounterId 就诊id
+     * @param typeCode 申请单类型
+     * @return 检查申请单
+     */
+    List<RequestFormQueryDto> getRequestForm(@Param("encounterId") Long encounterId,
+        @Param("typeCode") String typeCode);
+
+    /**
+     * 查询申请单详情
+     * 
+     * @param prescriptionNo 申请单处方号
+     * @return 申请单详情
+     */
+    List<RequestFormDetailQueryDto> getRequestFormDetail(@Param("prescriptionNo") String prescriptionNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
new file mode 100644
index 00000000..005039e8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
@@ -0,0 +1,39 @@
+package com.openhis.web.regdoctorstation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.openhis.web.regdoctorstation.dto.NursingOrdersDetailDto;
+import com.openhis.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto;
+
+/**
+ * 特殊医嘱 应用Mapper
+ */
+@Repository
+public interface SpecialAdviceAppMapper {
+
+    /**
+     * 查询护理医嘱信息
+     * 
+     * @param categoryCodeList 类型为护理医嘱的编码集合
+     * @return 理医嘱信息
+     */
+    List<NursingOrdersDetailDto> getNursingOrdersInfos(@Param("categoryCodeList") List<String> categoryCodeList);
+
+    /**
+     * 查询就诊护理医嘱
+     * 
+     * @param encounterId 就诊id
+     * @param draft 待发送
+     * @param active 已发送
+     * @param completed 已完成
+     * @param categoryEnumList 类型为护理医嘱的枚举集合
+     * @return 就诊护理医嘱
+     */
+    List<NursingOrdersEncounterDetailDto> getEncounterNursingOrdersInfos(@Param("encounterId") Long encounterId,
+        @Param("draft") Integer draft, @Param("active") Integer active, @Param("completed") Integer completed,
+        @Param("categoryEnumList") List<Integer> categoryEnumList);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java
new file mode 100644
index 00000000..f929f977
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java
@@ -0,0 +1,79 @@
+package com.openhis.web.regdoctorstation.utils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Component;
+
+import com.core.common.utils.AssignSeqUtil;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveDto;
+
+/**
+ * 住院处方号工具类
+ */
+@Component
+public class RegPrescriptionUtils {
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 主入口：生成处方号
+     */
+    public void generatePrescriptionNumbers(List<RegAdviceSaveDto> medicineList) {
+        if (medicineList == null || medicineList.isEmpty()) {
+            return;
+        }
+        // 1. 按诊断ID分组（不同诊断必须分开）
+        Map<Long, List<RegAdviceSaveDto>> diagnosisGroups =
+            medicineList.stream().collect(Collectors.groupingBy(RegAdviceSaveDto::getConditionDefinitionId));
+        // 2. 处理每个诊断组
+        diagnosisGroups.values().forEach(this::processDiagnosisGroup);
+    }
+
+    /**
+     * 处理单个诊断组
+     */
+    private void processDiagnosisGroup(List<RegAdviceSaveDto> diagnosisGroup) {
+        if (diagnosisGroup.isEmpty()) {
+            return;
+        }
+        // 1. 按药品性质分组
+        Map<String, List<RegAdviceSaveDto>> pharmacologyGroups =
+            diagnosisGroup.stream().collect(Collectors.groupingBy(RegAdviceSaveDto::getPharmacologyCategoryCode));
+        // 2. 处理每个药品性质组
+        pharmacologyGroups.values().forEach(pharmaGroup -> {
+            // 2.1 按治疗类型分组
+            Map<Integer, List<RegAdviceSaveDto>> therapyGroups =
+                pharmaGroup.stream().collect(Collectors.groupingBy(RegAdviceSaveDto::getTherapyEnum));
+            // 2.2 为每组治疗类型生成唯一处方号
+            therapyGroups.forEach((therapyEnum, group) -> {
+                String prescriptionNo = generatePrescriptionNo(pharmaGroup.get(0).getPharmacologyCategoryCode());
+                group.forEach(medicine -> medicine.setPrescriptionNo(prescriptionNo));
+            });
+        });
+    }
+
+    /**
+     * 根据药品性质生成处方号（前缀规则与原工具类一致）
+     */
+    private String generatePrescriptionNo(String pharmacologyCategoryCode) {
+        switch (pharmacologyCategoryCode) {
+            case "2": // 麻醉药品
+                return assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_NARCOTIC_NO.getPrefix(), 8);
+            case "3": // 毒性药品
+                return assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_TOXIC_NO.getPrefix(), 8);
+            case "4": // 一类精神药
+                return assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_A_PSYCHOTROPIC_NO.getPrefix(), 8);
+            case "5": // 二类精神药
+                return assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_B_PSYCHOTROPIC_NO.getPrefix(), 8);
+            default: // 普通药品
+                return assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_COMMON_NO.getPrefix(), 8);
+        }
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
similarity index 68%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
index a5dc3926..836e319c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
@@ -35,4 +35,17 @@ public interface IInboundReportAppService {
      */
     R<?> getPage(InboundReportSearchParam inboundReportSearchParam, Integer pageNo, Integer pageSize, String searchKey,
         HttpServletRequest request);
+
+    /**
+     * 导出
+     *
+     * @param inboundReportSearchParam 入库明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(InboundReportSearchParam inboundReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
index a3771d74..12a09626 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 
 /**
  * 库存商品明细报表 appService
@@ -28,4 +29,17 @@ public interface IInventoryProductReportAppService {
      */
     R<?> getPage(InventoryProductReportSearchParam inventoryProductReportSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
+
+    /**
+     * 导出
+     *
+     * @param inventoryProductReportSearchParam 库存商品明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(InventoryProductReportSearchParam inventoryProductReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
similarity index 64%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
index 937becc1..0a4fe39a 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.reportmanage.dto.LossReportSearchParam;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
 
 /**
@@ -29,4 +30,17 @@ public interface ILossReportAppService {
      */
     R<?> getPage(LossReportSearchParam lossReportSearchParam, Integer pageNo, Integer pageSize, String searchKey,
         HttpServletRequest request);
+
+    /**
+     * 导出
+     *
+     * @param lossReportSearchParam 报损明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(LossReportSearchParam lossReportSearchParam, Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
new file mode 100644
index 00000000..40f4f993
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice;
+
+import com.core.common.core.domain.R;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 药品院内开立情况 appService
+ *
+ * @author liuhr
+ * @date 2025-07-15
+ */
+public interface IMedicationDeviceReportAppService {
+
+    /**
+     * 药品耗材日结/周结/月结算（统计筛选时间区内）
+     *
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @return 药品耗材日结/周结/月结算单
+     */
+    R<?> selectMedDevReport(String dispenseDateSTime, String dispenseDateETime);
+
+    /**
+     * 药品耗材日结/周结/月结算 明细清单
+     *
+     * @param orgId 科室
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 药品耗材日结/周结/月结算单
+     */
+    R<?> selectMedDdevInfo(Long orgId, String name, String dispenseDateSTime, String dispenseDateETime,Integer pageNo, Integer pageSize);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
new file mode 100644
index 00000000..915eea6a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice;
+
+import com.core.common.core.domain.R;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 月末结算报表 appService
+ *
+ * @author liuhr
+ * @date 2025-07-25
+ */
+public interface IMonthlySettlementReportAppService {
+    /**
+     * 页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> init();
+
+    /**
+     * 月末结算报表（统计筛选时间区内）
+     *
+     * @param locationId 库房
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 月末结算报表
+     */
+    R<?> selectMonthlySettlementReport(Long locationId, String startTime, String endTime);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
similarity index 63%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
index 6a741802..cc61da4e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
@@ -3,6 +3,7 @@ package com.openhis.web.reportmanage.appservice;
 import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 
 /**
@@ -33,4 +34,16 @@ public interface IOutboundReportAppService {
     R<?> getPage(OutboundReportSearchParam outboundReportSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
 
+    /**
+     * 导出
+     *
+     * @param outboundReportSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(OutboundReportSearchParam outboundReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
similarity index 64%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
index d6e8ca9f..0ab47dc0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
@@ -3,6 +3,7 @@ package com.openhis.web.reportmanage.appservice;
 import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam;
 
 /**
@@ -33,4 +34,16 @@ public interface IReturnIssueReportAppService {
     R<?> getPage(ReturnIssueReportSearchParam returnIssueReportSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
 
+    /**
+     * 导出
+     *
+     * @param returnIssueReportSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(ReturnIssueReportSearchParam returnIssueReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
index 89c69a23..ea2b4801 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
@@ -6,6 +6,7 @@ package com.openhis.web.reportmanage.appservice;
 import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
 
 /**
@@ -28,4 +29,17 @@ public interface IStocktakingReportAppService {
      */
     R<?> getPage(StocktakingReportSearchParam stocktakingReportSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
+
+    /**
+     * 导出
+     *
+     * @param stocktakingReportSearchParam 库存盘点明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(StocktakingReportSearchParam stocktakingReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
similarity index 62%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
index db9786db..59427fb5 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
@@ -6,6 +6,7 @@ package com.openhis.web.reportmanage.appservice;
 import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.TransferReportSearchParam;
 
 /**
@@ -28,4 +29,17 @@ public interface ITransferReportAppService {
      */
     R<?> getPage(TransferReportSearchParam transferReportSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
+
+    /**
+     * 导出
+     *
+     * @param transferReportSearchParam 商品调拨明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(TransferReportSearchParam transferReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
new file mode 100644
index 00000000..de3883a4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 住院病案首页采集 appService
+ *
+ * @author yuxj
+ * @date 2025-08-25
+ */
+public interface InpatientMedicalRecordHomePageCollectionAppService {
+
+
+    /**
+     * 住院病案csv做成
+     *
+     * @param encounterIdList 就诊idList
+     * @return 执行结果
+     */
+    R<?> makeCsvFile(List<Long> encounterIdList);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
similarity index 58%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
index a9f9e33d..492847f2 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
@@ -6,6 +6,7 @@ package com.openhis.web.reportmanage.appservice;
 import javax.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
 
 /**
@@ -33,6 +34,19 @@ public interface PurchaseReturnReportAppService {
      * @param request 请求数据
      * @return 采购退货明细
      */
-    R<?> getPage(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam, Integer pageNo, Integer pageSize, String searchKey,
-                 HttpServletRequest request);
+    R<?> getPage(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 导出
+     *
+     * @param purchaseReturnReportSearchParam 采购退货明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    R<?> makeExcelFile(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
index 22903f83..ef4f1054 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
@@ -102,7 +102,8 @@ public class ChargeReportAppServiceImpl implements IChargeReportAppService {
                     CommonConstants.FieldName.Name, CommonConstants.FieldName.ClinicalName,
                     CommonConstants.FieldName.ClinicalNo)),
                 request);
-        queryWrapper.orderByAsc(CommonConstants.FieldName.BusNo);
+        queryWrapper.orderByDesc(CommonConstants.FieldName.BusNo).orderByAsc(CommonConstants.FieldName.ChargeId)
+                .orderByAsc(CommonConstants.FieldName.ChargeTime);
 
 
         // 最终返回结果
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
similarity index 36%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
index 950b4f4c..faad386f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
@@ -3,19 +3,24 @@
  */
 package com.openhis.web.reportmanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
 import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IPractitionerService;
 import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 import com.openhis.web.reportmanage.dto.InboundReportInitDto;
-import com.openhis.web.reportmanage.dto.OutboundReportInitDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +28,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.reportmanage.appservice.IInboundReportAppService;
 import com.openhis.web.reportmanage.dto.InboundReportPageDto;
@@ -45,6 +49,11 @@ public class InboundReportAppServiceImpl implements IInboundReportAppService {
     @Resource
     private ISupplierService supplierService;
 
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
     /**
      * 入库明细页面初始化
      *
@@ -59,8 +68,8 @@ public class InboundReportAppServiceImpl implements IInboundReportAppService {
 
         // 供应商信息
         List<InboundReportInitDto.supplierListOption> supplierListOptions = supplierList.stream()
-                .map(supplier -> new InboundReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
-                .collect(Collectors.toList());
+            .map(supplier -> new InboundReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
 
         initDto.setSupplierListOptions(supplierListOptions);
 
@@ -89,8 +98,99 @@ public class InboundReportAppServiceImpl implements IInboundReportAppService {
         Page<InboundReportPageDto> inboundReportPage = inboundReportMapperMapper.selectInboundReportPage(
             new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
             CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.PURCHASE_INVENTORY.getValue(),
-            SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
 
         return R.ok(inboundReportPage);
     }
+
+    /**
+     * 导出
+     *
+     * @param inboundReportSearchParam 入库明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(InboundReportSearchParam inboundReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<InboundReportSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(inboundReportSearchParam,
+            searchKey, new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
+
+        // 查询入库明细分页列表
+        Page<InboundReportPageDto> inboundReportPage = inboundReportMapperMapper.selectInboundReportPage(
+            new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.PURCHASE_INVENTORY.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        List<InboundReportPageDto> receiptDetailList = inboundReportPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 做成参与者List
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> practitionerToNameMap = practitionerList.stream()
+            .collect(Collectors.toMap(Practitioner::getId, Practitioner::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+            detail.setApproverId_dictText(practitionerToNameMap.get(detail.getApproverId()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("supplyBusno", "单据号");
+            headers.put("name", "药品名称");
+            headers.put("busNo", "编码");
+            headers.put("lotNumber", "生产批号");
+            headers.put("locationName", "存放仓库");
+            headers.put("locationStoreName", "货位");
+            headers.put("unitCode_dictText", "计量单位");
+            headers.put("quantity", "采购数量");
+            headers.put("price", "采购单价");
+            headers.put("totalPrice", "采购金额");
+            headers.put("salePrice", "售价");
+            headers.put("totalSalePrice", "售价金额");
+            headers.put("supplier", "供应商");
+            headers.put("approverId_dictText", "审核人");
+            headers.put("createTime", "制单日期");
+            headers.put("approvalTime", "审核日期");
+
+            BigDecimal totalPrice =
+                receiptDetailList.stream().filter(Objects::nonNull).map(InboundReportPageDto::getTotalPrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 表头上的字段
+            Map<String, Object> totalValues = new LinkedHashMap<>();
+            totalValues.put("合计金额", totalPrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.PURCHASE_INVENTORY.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, totalValues);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
new file mode 100644
index 00000000..148875ef
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
@@ -0,0 +1,360 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice.impl;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import com.alibaba.fastjson2.JSONObject;
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService;
+import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto;
+import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto;
+import com.openhis.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollectionMapper;
+import com.openhis.web.reportmanage.utils.CsvFillerUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.core.common.core.domain.R;
+import java.util.stream.Collectors;
+
+/**
+ * 住院病案首页采集 impl
+ *
+ * @author yuxj
+ * @date 2025-08-25
+ */
+@Service
+public class InpatientMedicalRecordHomePageCollectionAppServiceImpl
+    implements InpatientMedicalRecordHomePageCollectionAppService {
+
+    @Autowired
+    private InpatientMedicalRecordHomePageCollectionMapper inpatientMedicalRecordHomePageCollectionMapper;
+    @Resource
+    IPractitionerService practitionerService;
+    @Resource
+    IEncounterService encounterService;
+
+    /**
+     * 住院病案csv做成
+     *
+     * @param encounterIdList 就诊idList
+     * @return 执行结果
+     */
+    @Override
+    public R<?> makeCsvFile(List<Long> encounterIdList) {
+
+        // // 格式 (7,2)：最大整数位 7，固定小数位 2
+        // DecimalFormat df7_2 = new DecimalFormat();
+        // df7_2.setMaximumIntegerDigits(7); // 最大整数位 7
+        // df7_2.setMinimumFractionDigits(2); // 最小小数位 2（不足补 0）
+        // df7_2.setMaximumFractionDigits(2); // 最大小数位 2（超出四舍五入）
+        // 格式 (4,1)：最大整数位 4，固定小数位 1
+        DecimalFormat df4_1 = new DecimalFormat();
+        df4_1.setMaximumIntegerDigits(4);
+        df4_1.setMinimumFractionDigits(1);
+        df4_1.setMaximumFractionDigits(1);
+        // 格式 (8,2)：最大整数位 8，固定小数位 2
+        DecimalFormat df8_2 = new DecimalFormat();
+        df8_2.setMaximumIntegerDigits(8);
+        df8_2.setMinimumFractionDigits(2);
+        df8_2.setMaximumFractionDigits(2);
+        // 格式 (11,2)：最大整数位 11，固定小数位 2
+        DecimalFormat df11_2 = new DecimalFormat();
+        df11_2.setMaximumIntegerDigits(11);
+        df11_2.setMinimumFractionDigits(2);
+        df11_2.setMaximumFractionDigits(2);
+        // 格式 (10,2)：最大整数位 10，固定小数位 2
+        DecimalFormat df10_2 = new DecimalFormat();
+        df10_2.setMaximumIntegerDigits(10);
+        df10_2.setMinimumFractionDigits(2);
+        df10_2.setMaximumFractionDigits(2);
+
+        // // 获取当前登陆用户信息
+        // LoginUser loginUser = SecurityUtils.getLoginUser();
+        // Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
+
+        // 获取系统信息
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+
+        // todo test数据
+        encounterIdList.add(1927295460902035458L);
+        encounterIdList.add(1927897518316187649L);
+        encounterIdList.add(1928275772621451265L);
+        encounterIdList.add(1927930956645658626L);
+
+        // 住院病案csv参数
+        InpatientMedicalRecordHomePageCollectionDto medicalRecordHomePage =
+            new InpatientMedicalRecordHomePageCollectionDto();
+        List<InpatientMedicalRecordHomePageCollectionDto> medicalRecordHomePageList = new ArrayList<>();
+        // 搜索csv所需数据  todo sql没写完
+        List<InpatientMedicalRecordHomePageMakeDto> medicalRecordHomePageMakeList =
+            inpatientMedicalRecordHomePageCollectionMapper.getInfo(encounterIdList);
+
+        for (InpatientMedicalRecordHomePageMakeDto item : medicalRecordHomePageMakeList) {
+            // 组织机构代码 字符 30 必填
+            medicalRecordHomePage.setA01(optionJson.getString("fixmedinsCode"));
+            // 医疗机构名称 A02 字符 80 必填
+            medicalRecordHomePage.setA02(optionJson.getString("fixmedinsName"));
+            // 病案号 A48 字符 50 必填
+            medicalRecordHomePage.setA48(item.getA48());
+            // 住院次数 A49 数字 4 必填
+            medicalRecordHomePage.setA49(item.getA49() == null ? 0 : item.getA49());
+            // 入院时间 B12 日期时间 必填
+            medicalRecordHomePage.setB12(item.getB12());
+            // 出院时间 B15 日期时间 必填
+            medicalRecordHomePage.setB15(item.getB15());
+            // 医疗付费方式 A46C 字符 3 必填
+            medicalRecordHomePage.setA46C(item.getA46C());
+            // 姓名 A11 字符 40 必填
+            medicalRecordHomePage.setA11(item.getA11());
+            // 性别 A12C 数字 1 必填 未查询到时：9 - 未说明的性别
+            medicalRecordHomePage.setA12C(item.getA12C() == null ? 9 : item.getA12C());
+            // 出生日期 A13 日期 10 必填
+            medicalRecordHomePage.setA13(item.getA13());
+            // 年龄（岁） A14 数字 3 必填
+            medicalRecordHomePage.setA14(AgeCalculatorUtil.calculateAge(medicalRecordHomePage.getA13()));
+            // 国籍 A15C 字符 40 必填
+            medicalRecordHomePage.setA15C(item.getA15C());
+            // 婚姻 A21C 字符 1 必填
+            medicalRecordHomePage.setA21C(item.getA21C());
+            // 职业 A38C 字符 2 必填
+            medicalRecordHomePage.setA38C(item.getA38C());
+            // 民族 A19C 字符 2 必填
+            medicalRecordHomePage.setA19C(item.getA19C());
+            // 证件类别 A20N 字符 1 必填  1：居民身份证  todo 是否
+            medicalRecordHomePage.setA20N("1");
+            // 证件号码 A20 字符 18 必填
+            medicalRecordHomePage.setA20(item.getA20());
+            // 出生地址 A22 字符 200 必填
+            medicalRecordHomePage.setA22(item.getA22()== null ? CommonConstants.Common.DASH:item.getA22());
+            // 籍贯省（自治区、直辖市） A23C 字符 50 必填
+            medicalRecordHomePage.setA23C(item.getA23C());
+            // 户口地址 A24 字符 200 必填
+            medicalRecordHomePage.setA24(item.getA24()== null ? CommonConstants.Common.DASH:item.getA24());
+            // 户口地址邮政编码 A25C 字符 6 必填
+            medicalRecordHomePage.setA25C(item.getA25C());
+            // 现住址 A26 字符 200 必填
+            medicalRecordHomePage.setA26(item.getA26()== null ? CommonConstants.Common.DASH:item.getA26());
+            // 现住址电话 A27 字符 40 必填
+            medicalRecordHomePage.setA27(item.getA27()== null ? CommonConstants.Common.DASH:item.getA27());
+            // 现住址邮政编码 A28C 字符 6 必填
+            medicalRecordHomePage.setA28C(item.getA28C());
+            // 工作单位及地址 A29 字符 200 必填
+            medicalRecordHomePage.setA29(item.getA29()== null ? CommonConstants.Common.DASH:item.getA29());
+            // 工作单位电话 A30 字符 20 必填
+            medicalRecordHomePage.setA30(item.getA30()== null ? CommonConstants.Common.DASH:item.getA30());
+            // 工作单位邮政编码 A31C 字符 6 必填
+            medicalRecordHomePage.setA31C(item.getA31C());
+            // 联系人姓名 A32 字符 40 必填
+            medicalRecordHomePage.setA32(item.getA32());
+            // 联系人关系 A33C 字符 1 必填
+            medicalRecordHomePage.setA33C(item.getA33C());
+            // 联系人地址 A34 字符 200 必填
+            medicalRecordHomePage.setA34(item.getA34()== null ? CommonConstants.Common.DASH:item.getA34());
+            // 联系人电话 A35 字符 40 必填
+            medicalRecordHomePage.setA35(item.getA35());
+            // 是否为日间手术 B38 字符 1 必填
+            medicalRecordHomePage.setB38(item.getB38());
+            // 入院途径 B11C 字符 1 必填
+            medicalRecordHomePage.setB11C(item.getB11C());
+            // 入院科别 B13C 字符 6 必填
+            medicalRecordHomePage.setB13C(item.getB13C());
+            // 入院病房 B14 字符 30 必填
+            medicalRecordHomePage.setB14(item.getB14());
+            // 转科科别 B21C 集合 可以多选 必填
+            medicalRecordHomePage.setB21C(String.join(CommonConstants.Common.COMMA, item.getB21C()));
+            // 出院科别 B16C 字符 6 必填
+            medicalRecordHomePage.setB16C(item.getB16C());
+            // 出院病房 B17 字符 30 必填
+            medicalRecordHomePage.setB17(item.getB17());
+            // 实际住院（天） B20 数字 6 必填
+            medicalRecordHomePage.setB20(item.getB20() == null ? 0 : item.getB20());
+            // 门（急）诊诊断编码 C01C 字符 20 必填
+            medicalRecordHomePage.setC01C(item.getC01C());
+            // 门（急）诊诊断名称 C02N 字符 100 必填
+            medicalRecordHomePage.setC02N(item.getC02N());
+            // 出院主要诊断编码 C03C 字符 20 必填
+            medicalRecordHomePage.setC03C(item.getC03C());
+            // 出院主要诊断名称 C04N 字符 100 必填
+            medicalRecordHomePage.setC04N(item.getC04N());
+            // 出院主要诊断入院病情 C05C 字符 1 必填
+            medicalRecordHomePage.setC05C(item.getC05C());
+            String c03c = medicalRecordHomePage.getC03C();
+            if (c03c != null && !c03c.isEmpty()) {
+                char firstChar = c03c.charAt(0);
+                // 主要诊断ICD编码首字母为C或D00-D48时必填。
+                if (firstChar == 'C' || (c03c.length() >= 3 && c03c.matches("D(0[0-9]|[1-3][0-9]|4[0-8]).*"))) {
+                    // 病理诊断编码 C09C 字符 20 条件必填
+                    medicalRecordHomePage.setC09C(item.getC09C());
+                    // 病理诊断名称 C10N 字符 100 条件必填
+                    medicalRecordHomePage.setC10N(item.getC10N());
+                    // 病理号 C11 字符 50 条件必填
+                    medicalRecordHomePage.setC11(item.getC11());
+                }
+                // 主要诊断ICD编码首字母为S或T时必填
+                if (firstChar == 'S' || firstChar == 'T') {
+                    // 损伤、中毒外部原因编码 C12C 字符 20 条件必填
+                    medicalRecordHomePage.setC12C(item.getC12C());
+                    // 损伤、中毒外部原因名称 C13N 字符 100 条件必填
+                    medicalRecordHomePage.setC13N(item.getC13N());
+                }
+            }
+            // 有无药物过敏 C24C 字符 1 必填
+            medicalRecordHomePage.setC24C(item.getC24C());
+            // “有无药物过敏”为“有”时必填；多种药物用英文逗号进行分隔
+            if (medicalRecordHomePage.getC24C().equals("2")) {
+                // 过敏药物名称 C25 字符 200 条件必填
+                medicalRecordHomePage.setC25(item.getC25());
+            }
+            // 科主任编码 B22C 字符 30 必填
+            medicalRecordHomePage.setB22C(item.getB22C());
+            // 科主任 B22 字符 40 必填
+            medicalRecordHomePage.setB22(item.getB22());
+            // 主（副主）任医师编码 B23C 字符 30 必填
+            medicalRecordHomePage.setB23C(item.getB23C());
+            // 主（副主）任医师 B23 字符 40 必填
+            medicalRecordHomePage.setB23(item.getB23());
+            // 主治医师编码 B24C 字符 30 必填
+            medicalRecordHomePage.setB24C(item.getB24C());
+            // 主治医师 B24 字符 40 必填
+            medicalRecordHomePage.setB24(item.getB24());
+            // 住院医师编码 B25C 字符 30 必填
+            medicalRecordHomePage.setB25C(item.getB25C());
+            // 住院医师 B25 字符 40 必填
+            medicalRecordHomePage.setB25(item.getB25());
+            // 责任护士编码 B26C 字符 30 必填
+            medicalRecordHomePage.setB26C(item.getB26C());
+            // 责任护士 B26 字符 40 必填
+            medicalRecordHomePage.setB26(item.getB26());
+            // 编码员 B29 字符 40 必填
+            medicalRecordHomePage.setB29(item.getB29());
+            // ABO血型 C26C 字符 1 必填
+            medicalRecordHomePage.setC26C(item.getC26C());
+            // Rh血型 C27C 字符 1 必填
+            medicalRecordHomePage.setC27C(item.getC27C());
+            // 主要手术操作编码 C14x01C 字符 20 必填
+            medicalRecordHomePage.setC14x01C(item.getC14x01C());
+            // 主要手术操作名称 C15x01N 字符 100 必填
+            medicalRecordHomePage.setC15x01N(item.getC15x01N());
+            // 主要手术操作日期 C16x01 日期时间 必填
+            medicalRecordHomePage.setC16x01(item.getC16x01());
+            // 手术操作编码属性为手术或介入治疗代码时必填 todo 手术或介入治疗代码
+            if (medicalRecordHomePage.getC14x01C().equals("") || medicalRecordHomePage.getC14x01C().equals("")) {
+                // 主要手术操作级别 C17x01 字符 1 条件必填
+                medicalRecordHomePage.setC17x01(item.getC17x01());
+                // 主要手术操作术者 C18x01 字符 40 条件必填
+                medicalRecordHomePage.setC18x01(item.getC18x01());
+                // 主要手术操作Ⅰ助 C19x01 字符 40 条件必填
+                medicalRecordHomePage.setC19x01(item.getC19x01());
+                // 主要手术操作Ⅱ助 C20x01 字符 40 条件必填
+                medicalRecordHomePage.setC20x01(item.getC20x01());
+                // 手术编码属性为手术时必填 todo 手术代码
+                if (medicalRecordHomePage.getC14x01C().equals("")) {
+                    // 主要手术操作切口愈合等级 C21x01C 字符 2 条件必填
+                    medicalRecordHomePage.setC21x01C(item.getC21x01C());
+                    // 主要手术操作麻醉方式 C22x01C 字符 6 条件必填
+                    medicalRecordHomePage.setC22x01C(item.getC22x01C());
+                    // 主要手术操作麻醉医师 C23x01 字符 40 条件必填
+                    medicalRecordHomePage.setC23x01(item.getC23x01());
+                }
+            }
+
+            // 16.血费 D26 数字 (10,2)
+            medicalRecordHomePage.setD26(item.getD26() == null ? BigDecimal.ZERO : item.getD26());
+            // 血费>0,则必填，没有可以填0或英文横杠”-”
+            if (medicalRecordHomePage.getD26().compareTo(BigDecimal.ZERO) > 0) {
+                // 输血反应 F21 数字 1 条件必填
+                medicalRecordHomePage.setF21(item.getF21() == null ? 0 : item.getF21());
+                // 红细胞 F22 数字 (4,1) 条件必填
+                medicalRecordHomePage.setF22(item.getF22() == null ? BigDecimal.ZERO : item.getF22());
+                // 血小板 F23 数字 (4,1) 条件必填
+                medicalRecordHomePage.setF23(item.getF23() == null ? BigDecimal.ZERO : item.getF23());
+                // 血浆 F24 数字 (8,2) 条件必填
+                medicalRecordHomePage.setF24(item.getF24() == null ? BigDecimal.ZERO : item.getF24());
+                // 全血 F25 数字 (8,2) 条件必填
+                medicalRecordHomePage.setF25(item.getF25() == null ? BigDecimal.ZERO : item.getF25());
+                // 自体血回输 F26 数字 (4,1) 条件必填
+                medicalRecordHomePage.setF26(item.getF26() == null ? BigDecimal.ZERO : item.getF26());
+            } else {
+                // 输血反应 F21 数字 1 条件必填
+                medicalRecordHomePage.setF21(0);
+                // 红细胞 F22 数字 (4,1) 条件必填
+                medicalRecordHomePage.setF22(BigDecimal.ZERO);
+                // 血小板 F23 数字 (4,1) 条件必填
+                medicalRecordHomePage.setF23(BigDecimal.ZERO);
+                // 血浆 F24 数字 (8,2) 条件必填
+                medicalRecordHomePage.setF24(BigDecimal.ZERO);
+                // 全血 F25 数字 (8,2) 条件必填
+                medicalRecordHomePage.setF25(BigDecimal.ZERO);
+                // 自体血回输 F26 数字 (4,1) 条件必填
+                medicalRecordHomePage.setF26(BigDecimal.ZERO);
+            }
+            if (medicalRecordHomePage.getA14().equals(0)) {
+                // 年龄不足1周岁的年龄（天） A16 数字 3 条件必填②
+                medicalRecordHomePage.setA16(item.getA16() == null ? 0 : item.getA16());
+            }
+            // 产妇和新生儿病案填写 todo 产妇怎么判断
+            // if(){
+            // 新生儿出生体重（克） A18x01 数字 6 条件必填②
+            medicalRecordHomePage.setA18x01(item.getA18x01() == null ? 0 : item.getA18x01());
+            // }
+            // “新生儿入院体重”与“年龄不足1周岁的年龄（天）”互为逻辑校验项，小于等于28天的新生儿必填。
+            if (medicalRecordHomePage.getA16() != null && medicalRecordHomePage.getA16() <= 28) {
+                // 新生儿入院体重（克） A17 数字 6 条件必填②
+                medicalRecordHomePage.setA17(item.getA17() == null ? 0 : item.getA17());
+            }
+            // 颅脑损伤患者入院前昏迷时间（天） C28 数字 5 必填
+            medicalRecordHomePage.setC28(item.getC28() == null ? 0 : item.getC28());
+            // 颅脑损伤患者入院前昏迷时间（小时） C29 数字 2 必填
+            medicalRecordHomePage.setC29(item.getC29() == null ? 0 : item.getC29());
+            // 颅脑损伤患者入院前昏迷时间（分钟） C30 数字 2 必填
+            medicalRecordHomePage.setC30(item.getC30() == null ? 0 : item.getC30());
+            // 颅脑损伤患者入院后昏迷时间（天） C31 数字 5 必填
+            medicalRecordHomePage.setC31(item.getC31() == null ? 0 : item.getC31());
+            // 颅脑损伤患者入院后昏迷时间（小时） C32 数字 2 必填
+            medicalRecordHomePage.setC32(item.getC32() == null ? 0 : item.getC32());
+            // 颅脑损伤患者入院后昏迷时间（分钟） C33 数字 2 必填
+            medicalRecordHomePage.setC33(item.getC33() == null ? 0 : item.getC33());
+            // 是否有出院31日内再住院计划 B36C 数字 1 必填
+            medicalRecordHomePage.setB36C(item.getB36C() == null ? 0 : item.getB36C());
+            // 是否有出院31日内再住院计划填“有”时必填。
+            if (medicalRecordHomePage.getB36C().equals(2)) {
+                // 出院31天再住院计划目的 B37 字符 100 条件必填
+                medicalRecordHomePage.setB37(item.getB37());
+            }
+            // 离院方式 B34C 字符 1 必填
+            medicalRecordHomePage.setB34C(item.getB34C());
+            // 离院方式为医嘱转院或医嘱转社区患者必填
+            if (medicalRecordHomePage.getB34C().equals("2") || medicalRecordHomePage.getB34C().equals("3")) {
+                // 医嘱转院、转社区卫生服务机构/乡镇卫生院名称 B35 字符 100 条件必填
+                medicalRecordHomePage.setB35(item.getB35());
+            }
+            // 住院总费用 D01 数字 (11,2) 必填
+            medicalRecordHomePage.setD01(item.getD01() == null ? BigDecimal.ZERO : item.getD01());
+            // 住院总费用其中自付金额 D09 数字 (10,2) 必填
+            medicalRecordHomePage.setD09(item.getD09() == null ? BigDecimal.ZERO : item.getD09());
+
+            medicalRecordHomePageList.add(medicalRecordHomePage);
+        }
+        try {
+            // 做成csv文件 todo 文件路径
+            // CsvFillerUtil.makeCsvFile(optionJson.getString("CsvOutputPath()"), medicalRecordHomePageList);
+            CsvFillerUtil.makeCsvFile("E:\\qqqqqqqqqq\\", medicalRecordHomePageList);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.err.println("写入csv时发生错误：" + e.getMessage());
+            return R.fail("写入csv时发生错误：" + e.getMessage());
+        }
+
+        return R.ok();
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
similarity index 30%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
index 4a882af5..a9c6333a 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
@@ -3,18 +3,27 @@
  */
 package com.openhis.web.reportmanage.appservice.impl;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.web.reportmanage.dto.OutboundReportPageDto;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.CategoryType;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.LocationForm;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.reportmanage.appservice.IInventoryProductReportAppService;
@@ -22,7 +31,9 @@ import com.openhis.web.reportmanage.dto.InventoryProductReportPageDto;
 import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam;
 import com.openhis.web.reportmanage.mapper.InventoryProductReportMapper;
 
-import java.util.HashSet;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 库存商品明细报表 impl
@@ -36,6 +47,11 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
     @Autowired
     private InventoryProductReportMapper inventoryProductReportMapper;
 
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
     /**
      * 库存商品明细列表
      *
@@ -60,7 +76,7 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
 
         // 查询库存商品明细分页列表
         Page<InventoryProductReportPageDto> productReportPage = inventoryProductReportMapper.selectProductReportPage(
-            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER.getValue().toString());
+            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString());
 
         productReportPage.getRecords().forEach(e -> {
             // 药品类型
@@ -70,4 +86,103 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
         });
         return R.ok(productReportPage);
     }
+
+    /**
+     * 导出
+     *
+     * @param inventoryProductReportSearchParam 库存商品明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(InventoryProductReportSearchParam inventoryProductReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 设置模糊查询的字段名
+        HashSet<String> searchFields = new HashSet<>();
+        searchFields.add(CommonConstants.FieldName.BusNo);
+
+        // 构建查询条件
+        QueryWrapper<InventoryProductReportSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(inventoryProductReportSearchParam, searchKey, searchFields, request);
+
+        // 查询库存商品明细分页列表
+        Page<InventoryProductReportPageDto> productReportPage = inventoryProductReportMapper.selectProductReportPage(
+            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString());
+
+        productReportPage.getRecords().forEach(e -> {
+            // 药品类型
+            e.setItemTableText(EnumUtils.getInfoByValue(CategoryType.class, e.getItemTable()));
+            // 仓库类型
+            e.setPurposeTypeEnum_enumText(EnumUtils.getInfoByValue(LocationForm.class, e.getPurposeTypeEnum()));
+        });
+
+        List<InventoryProductReportPageDto> receiptDetailList = productReportPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+            detail.setMinPackageUnit_dictText(unitCodeToNameMap.get(detail.getMinPackageUnit()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("busNo", "药品编码");
+            headers.put("name", "药品名称");
+            headers.put("lotNumber", "生产批号");
+            headers.put("manufacturerText", "厂家/产地");
+            headers.put("itemTableText", "药品类型");
+            headers.put("itemQuantity", "库存数量");
+            headers.put("unitCode_dictText", "计量单位");
+            headers.put("minPackageQuantity", "小包装库存数");
+            headers.put("minPackageUnit_dictText", "小包装单位");
+            headers.put("price", "进价");
+            headers.put("salePrice", "售价");
+            headers.put("partPrice", "拆零进价");
+            headers.put("partSalePrice", "拆零售价");
+            headers.put("totalPrice", "进价金额");
+            headers.put("totalSalePrice", "售价金额");
+            headers.put("purposeTypeEnum_enumText", "仓库类型");
+            headers.put("locationName", "仓库名称");
+            headers.put("locationStoreName", "货位名称");
+            headers.put("expirationDate", "有效期至");
+            // 计算合计
+            BigDecimal totalPrice =
+                receiptDetailList.stream().filter(Objects::nonNull).map(InventoryProductReportPageDto::getTotalPrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalSalePrice = receiptDetailList.stream().filter(Objects::nonNull)
+                .map(InventoryProductReportPageDto::getTotalSalePrice).filter(Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 表头上的字段
+            Map<String, Object> totalValues = new LinkedHashMap<>();
+            totalValues.put("进价金额合计", totalPrice);
+            totalValues.put("售价金额合计", totalSalePrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.INVENTORY_PRODUCT.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, totalValues);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
similarity index 33%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
index 1f2a564f..a6fd2f3a 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
@@ -3,15 +3,19 @@
  */
 package com.openhis.web.reportmanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.web.reportmanage.appservice.ILossReportAppService;
-import com.openhis.web.reportmanage.dto.LossReportPageDto;
-import com.openhis.web.reportmanage.dto.LossReportSearchParam;
-import com.openhis.web.reportmanage.mapper.LossReportMapper;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,14 +23,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.DispenseStatus;
 import com.openhis.common.enums.SupplyStatus;
 import com.openhis.common.enums.SupplyType;
 import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService;
-import com.openhis.web.reportmanage.dto.StocktakingReportPageDto;
-import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
-import com.openhis.web.reportmanage.mapper.StocktakingReportMapper;
+import com.openhis.web.reportmanage.appservice.ILossReportAppService;
+import com.openhis.web.reportmanage.dto.LossReportPageDto;
+import com.openhis.web.reportmanage.dto.LossReportSearchParam;
+import com.openhis.web.reportmanage.mapper.LossReportMapper;
 
 /**
  * 报损明细报表 impl
@@ -40,6 +44,11 @@ public class LossReportAppServiceImpl implements ILossReportAppService {
     @Autowired
     private LossReportMapper lossReportMapper;
 
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
     /**
      * 报损明细列表
      *
@@ -62,8 +71,84 @@ public class LossReportAppServiceImpl implements ILossReportAppService {
         Page<LossReportPageDto> lossReportPage = lossReportMapper.selectLossReportPage(new Page<>(pageNo, pageSize),
             queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
             CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.LOSS_REPORT_FORM.getValue(),
-            SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
 
         return R.ok(lossReportPage);
     }
+
+    /**
+     * 导出
+     *
+     * @param lossReportSearchParam 报损明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(LossReportSearchParam lossReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<LossReportSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(lossReportSearchParam,
+            searchKey, new HashSet<>(Arrays.asList("name", "bus_no")), request);
+
+        // 查询报损明细分页列表
+        Page<LossReportPageDto> lossReportPage = lossReportMapper.selectLossReportPage(new Page<>(pageNo, pageSize),
+            queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.LOSS_REPORT_FORM.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        List<LossReportPageDto> receiptDetailList = lossReportPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("busNo", "编码");
+            headers.put("name", "项目名称");
+            headers.put("totalVolume", "规格");
+            headers.put("manufacturerText", "厂家/产地");
+            headers.put("lotNumber", "生产批号");
+            headers.put("locationName", "仓库");
+            headers.put("unitCode_dictText", "单位");
+            headers.put("itemQuantity", "报损数量");
+            headers.put("approvalTime", "报损日期");
+
+            // BigDecimal totalPrice = receiptDetailList.stream()
+            // .filter(Objects::nonNull)
+            // .map(LossReportPageDto::getTotalPrice)
+            // .filter(Objects::nonNull)
+            // .reduce(BigDecimal.ZERO, BigDecimal::add);
+            // // 表头上的字段
+            // Map<String, Object> totalValues = new LinkedHashMap<>();
+            // totalValues.put("合计金额", totalPrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.LOSS_REPORT_FORM.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
new file mode 100644
index 00000000..8ce31825
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.reportmanage.dto.MedUseReportInfoDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.RequestStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService;
+import com.openhis.web.reportmanage.mapper.MedicationDeviceReportMapper;
+
+/**
+ * 药品耗材统计查询用 impl
+ *
+ * @author liuhr
+ * @date 2025-07-15
+ */
+@Service
+public class MedicationDeviceReportAppServiceImpl implements IMedicationDeviceReportAppService {
+
+    @Autowired
+    private MedicationDeviceReportMapper medicationDeviceReportMapper;
+
+    /**
+     * 药品耗材日结/周结/月结算（统计筛选时间区内）
+     *
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @return 药品耗材日结/周结/月结算单
+     */
+    @Override
+    public R<?> selectMedDevReport(String dispenseDateSTime, String dispenseDateETime) {
+
+        return R.ok(medicationDeviceReportMapper.selectMedDevReport(CommonConstants.TableName.MED_MEDICATION_REQUEST,
+            CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, RequestStatus.COMPLETED.getValue(),
+            DispenseStatus.COMPLETED.getValue(), dispenseDateSTime, dispenseDateETime));
+    }
+
+    /**
+     * 药品耗材日结/周结/月结算 明细清单
+     *
+     * @param orgId 科室
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 药品耗材日结/周结/月结算单
+     */
+    @Override
+    public R<?> selectMedDdevInfo(Long orgId, String name, String dispenseDateSTime, String dispenseDateETime,
+        Integer pageNo, Integer pageSize) {
+
+        Page<MedUseReportInfoDto> medUseReportInfoDto = medicationDeviceReportMapper.selectMedDdevInfo(
+            new Page<>(pageNo, pageSize), CommonConstants.TableName.MED_MEDICATION_REQUEST,
+            CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, RequestStatus.COMPLETED.getValue(),
+            DispenseStatus.COMPLETED.getValue(), SupplyType.ISSUE_INVENTORY.getValue(),
+            SupplyType.RETURN_ISSUE.getValue(), orgId, name, dispenseDateSTime, dispenseDateETime);
+
+        return R.ok(medUseReportInfoDto);
+    }
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
new file mode 100644
index 00000000..4399109b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.web.reportmanage.dto.InboundReportInitDto;
+import com.openhis.web.reportmanage.dto.MonthlySettlementInitDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.RequestStatus;
+import com.openhis.common.enums.SupplyStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService;
+import com.openhis.web.reportmanage.dto.AmountNumberDto;
+import com.openhis.web.reportmanage.dto.MonthlySettlementDto;
+import com.openhis.web.reportmanage.mapper.MonthlySettlementReportMapper;
+
+/**
+ * 月末结算报表 impl
+ *
+ * @author liuhr
+ * @date 2025-07-15
+ */
+@Service
+public class MonthlySettlementReportAppServiceImpl implements IMonthlySettlementReportAppService {
+
+    @Autowired
+    private MonthlySettlementReportMapper monthlySettlementReportMapper;
+    @Autowired
+    private ILocationService locationService;
+
+
+    /**
+     * 页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+        MonthlySettlementInitDto initDto = new MonthlySettlementInitDto();
+
+        // 查询库房列表
+        List<Location> locationList = locationService.getPharmacyCabinetList();
+
+        // 库房信息
+        List<MonthlySettlementInitDto.locationListOption> LocationListOptions = locationList.stream()
+            .map(supplier -> new MonthlySettlementInitDto.locationListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
+
+        initDto.setLocationListOptions(LocationListOptions);
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 月末结算报表（统计筛选时间区内）
+     *
+     * @param locationId 库房
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 月末结算报表
+     */
+    @Override
+    public R<?> selectMonthlySettlementReport(Long locationId, String startTime, String endTime) {
+        MonthlySettlementDto monthlySettlementDto = new MonthlySettlementDto();
+        monthlySettlementDto.setLocationId(locationId);
+
+        // 期初金额
+        monthlySettlementDto.setInitialAmount(monthlySettlementReportMapper.selectAmount(locationId, startTime));
+        // 期末金额
+        monthlySettlementDto.setFinalAmount(monthlySettlementReportMapper.selectAmount(locationId, endTime));
+        // 采购入库,typeEnum=1 采购入库
+        AmountNumberDto purchaseInObj =
+            monthlySettlementReportMapper.selectAmountNumber(locationId, SupplyType.PURCHASE_INVENTORY.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 采购退货,typeEnum=5 采购退货
+        AmountNumberDto purchaseReturnObj =
+            monthlySettlementReportMapper.selectAmountNumber(locationId, SupplyType.PRODUCT_RETURN.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 领用出库,typeEnum=7 领用出库
+        AmountNumberDto applyOutObj =
+            monthlySettlementReportMapper.selectAmountNumber(locationId, SupplyType.ISSUE_INVENTORY.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 领用退货,typeEnum=9 领用退货
+        AmountNumberDto applyReturnObj =
+            monthlySettlementReportMapper.selectAmountNumber(locationId, SupplyType.RETURN_ISSUE.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 调拨入库,typeEnum=2,8 商品调拨,商品批量调拨
+        AmountNumberDto transferInObj = monthlySettlementReportMapper.selectTransferInAmountNumber(locationId,
+            SupplyType.PRODUCT_TRANSFER.getValue(), SupplyType.PRODUCT_BATCH_TRANSFER.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 调拨出库,typeEnum=2,8 商品调拨,商品批量调拨
+        AmountNumberDto transferOutObj = monthlySettlementReportMapper.selectTransferInAmountNumber(locationId,
+            SupplyType.PRODUCT_TRANSFER.getValue(), SupplyType.PRODUCT_BATCH_TRANSFER.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 盘点出库,typeEnum=4,10 商品盘点,商品批量盘点
+        AmountNumberDto profitLossObj = monthlySettlementReportMapper.selectTransferOutAmountNumber(locationId,
+            SupplyType.PRODUCT_STOCKTAKING.getValue(), SupplyType.PRODUCT_BATCH_STOCKTAKING.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 报损单,typeEnum=6 报损单
+        AmountNumberDto lossObj =
+            monthlySettlementReportMapper.selectLossAmountNumber(locationId, SupplyType.LOSS_REPORT_FORM.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue(), startTime, endTime);
+        // 药品和耗材发放金额
+        monthlySettlementDto.setDrugIssueAmount(monthlySettlementReportMapper.selectDrugIssue(locationId,
+            RequestStatus.COMPLETED.getValue(), CommonConstants.TableName.MED_MEDICATION_REQUEST,
+            CommonConstants.TableName.WOR_DEVICE_REQUEST, startTime, endTime));
+
+        // 预期期末金额 = 期初金额 + 采购入库金额 - 领用出库金额 + 领用退货金额 + 调拨入库金额 - 调拨出库金额 - 报损单金额 - 药品和耗材发放金额
+        BigDecimal expectFinalAmount = monthlySettlementDto.getInitialAmount().add(purchaseInObj.getTotalAmount())
+            .subtract(applyOutObj.getTotalAmount()).add(applyReturnObj.getTotalAmount())
+            .add(transferInObj.getTotalAmount()).subtract(transferOutObj.getTotalAmount())
+            .subtract(lossObj.getTotalAmount()).subtract(monthlySettlementDto.getDrugIssueAmount());
+
+        // 偏移量 = 实际期末金额 - 预期期末金额
+        BigDecimal offsetAmount = monthlySettlementDto.getFinalAmount().subtract(expectFinalAmount);
+
+        // 实体类赋值
+        monthlySettlementDto.setPurchaseInAmount(purchaseInObj.getTotalAmount())
+            .setPurchaseInNumber(purchaseInObj.getTotalNumber())
+            .setPurchaseReturnAmount(purchaseReturnObj.getTotalAmount())
+            .setPurchaseReturnNumber(purchaseReturnObj.getTotalNumber()).setApplyOutAmount(applyOutObj.getTotalAmount())
+            .setApplyOutNumber(applyOutObj.getTotalNumber()).setApplyReturnAmount(applyReturnObj.getTotalAmount())
+            .setApplyReturnNumber(applyReturnObj.getTotalNumber()).setTransferInAmount(transferInObj.getTotalAmount())
+            .setTransferInNumber(transferInObj.getTotalNumber()).setTransferOutAmount(transferOutObj.getTotalAmount())
+            .setTransferOutNumber(transferOutObj.getTotalNumber())
+            .setCheckProfitLossAmount(profitLossObj.getTotalAmount())
+            .setCheckProfitLossNumber(profitLossObj.getTotalNumber()).setLossAmount(lossObj.getTotalAmount())
+            .setLossNumber(lossObj.getTotalNumber()).setExpectFinalAmount(expectFinalAmount)
+            .setOffsetAmount(offsetAmount);
+
+        return R.ok(monthlySettlementDto);
+    }
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
new file mode 100644
index 00000000..d4c5cdf3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
@@ -0,0 +1,200 @@
+package com.openhis.web.reportmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.openhis.web.reportmanage.dto.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.reportmanage.appservice.IOutboundReportAppService;
+import com.openhis.web.reportmanage.mapper.OutboundReportMapper;
+
+/**
+ * 入库明细 应用实现类
+ *
+ * @author yuanzs
+ * @date 2025/4/21
+ */
+@Service
+public class OutboundReportAppServiceImpl implements IOutboundReportAppService {
+
+    @Autowired
+    OutboundReportMapper outboundReportMapper;
+
+    @Resource
+    private ISupplierService supplierService;
+
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
+    /**
+     * 出库明细页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        OutboundReportInitDto initDto = new OutboundReportInitDto();
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+
+        // 供应商信息
+        List<OutboundReportInitDto.supplierListOption> supplierListOptions = supplierList.stream()
+            .map(supplier -> new OutboundReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
+
+        initDto.setSupplierListOptions(supplierListOptions);
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 出库明细
+     *
+     * @param outboundReportSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 出库明细分页列表
+     */
+    @Override
+    public R<?> getPage(OutboundReportSearchParam outboundReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<OutboundReportSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(outboundReportSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
+
+        // 查询出库明细分页列表
+        Page<OutboundReportPageDto> medDetailsPage = outboundReportMapper.selectOutboundReportPage(
+            new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.ISSUE_INVENTORY.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        return R.ok(medDetailsPage);
+    }
+
+    /**
+     * 导出
+     *
+     * @param outboundReportSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(OutboundReportSearchParam outboundReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<OutboundReportSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(outboundReportSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
+
+        // 查询出库明细分页列表
+        Page<OutboundReportPageDto> medDetailsPage = outboundReportMapper.selectOutboundReportPage(
+            new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.ISSUE_INVENTORY.getValue(),
+            SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        List<OutboundReportPageDto> receiptDetailList = medDetailsPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 做成参与者List
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> practitionerToNameMap = practitionerList.stream()
+            .collect(Collectors.toMap(Practitioner::getId, Practitioner::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> supplierToNameMap = supplierList.stream()
+            .collect(Collectors.toMap(Supplier::getId, Supplier::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+            detail.setApproverId_dictText(practitionerToNameMap.get(detail.getApproverId()));
+            detail.setSupplierId_dictText(supplierToNameMap.get(detail.getSupplierId()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("supplyBusno", "单据号");
+            headers.put("name", "药品名称");
+            headers.put("busNo", "编码");
+            headers.put("lotNumber", "生产批号");
+            headers.put("sourceLocationName", "存放库房");
+            headers.put("sourceLocationStoreName", "货位");
+            headers.put("unitCode_dictText", "计量单位");
+            headers.put("itemQuantity", "出库数量");
+            headers.put("purchasePrice", "采购单价");
+            headers.put("price", "领用单价");
+            headers.put("totalPrice", "金额");
+            headers.put("purposeLocationName", "领用科室");
+            headers.put("supplierId_dictText", "供应商");
+            headers.put("approverId_dictText", "审核人");
+            headers.put("approvalTime", "审核日期");
+            headers.put("remake", "备注");
+
+            BigDecimal totalPrice =
+                receiptDetailList.stream().filter(Objects::nonNull).map(OutboundReportPageDto::getTotalPrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 表头上的字段
+            Map<String, Object> totalValues = new LinkedHashMap<>();
+            totalValues.put("合计金额", totalPrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.ISSUE_INVENTORY.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, totalValues);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
new file mode 100644
index 00000000..0d05f1be
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.web.reportmanage.dto.*;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.SupplyStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService;
+import com.openhis.web.reportmanage.mapper.PurchaseReturnReportMapper;
+
+/**
+ * 采购退货明细报表 impl
+ *
+ * @author ym
+ * @date 2025-05-23
+ */
+@Service
+public class PurchaseReturnReportAppServiceImpl implements PurchaseReturnReportAppService {
+
+    @Autowired
+    private PurchaseReturnReportMapper purchaseReturnReportMapper;
+
+    @Resource
+    private ISupplierService supplierService;
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
+    /**
+     * 采购退货明细页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> init() {
+
+        PurchaseReturnReportInitDto initDto = new PurchaseReturnReportInitDto();
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+
+        // 供应商信息
+        List<PurchaseReturnReportInitDto.supplierListOption> supplierListOptions = supplierList.stream()
+            .map(supplier -> new PurchaseReturnReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
+
+        initDto.setSupplierListOptions(supplierListOptions);
+
+        return R.ok(initDto);
+    }
+
+    /**
+     * 采购退货明细列表
+     *
+     * @param purchaseReturnReportSearchParam 采购退货明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 采购退货明细
+     */
+    @Override
+    public R<?> getPage(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<PurchaseReturnReportSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseReturnReportSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
+
+        // 查询采购退货明细分页列表
+        Page<PurchaseReturnReportPageDto> purchaseReturnReportPageDto =
+            purchaseReturnReportMapper.selectPurchaseReturnReportPage(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                SupplyType.PRODUCT_RETURN.getValue(), SupplyStatus.AGREE.getValue(),
+                DispenseStatus.COMPLETED.getValue());
+
+        return R.ok(purchaseReturnReportPageDto);
+    }
+
+    /**
+     * 导出
+     *
+     * @param purchaseReturnReportSearchParam 采购退货明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<PurchaseReturnReportSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(purchaseReturnReportSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
+
+        // 查询采购退货明细分页列表
+        Page<PurchaseReturnReportPageDto> purchaseReturnReportPageDto =
+            purchaseReturnReportMapper.selectPurchaseReturnReportPage(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                SupplyType.PRODUCT_RETURN.getValue(), SupplyStatus.AGREE.getValue(),
+                DispenseStatus.COMPLETED.getValue());
+
+        List<PurchaseReturnReportPageDto> receiptDetailList = purchaseReturnReportPageDto.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 做成参与者List
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> practitionerToNameMap = practitionerList.stream()
+            .collect(Collectors.toMap(Practitioner::getId, Practitioner::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+            detail.setApproverId_dictText(practitionerToNameMap.get(detail.getApproverId()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("supplyBusno", "单据号");
+            headers.put("name", "药品名称");
+            headers.put("busNo", "编码");
+            headers.put("originalBusNo", "采购单据号");
+            headers.put("lotNumber", "生产批号");
+            headers.put("locationName", "存放仓库");
+            headers.put("locationStoreName", "货位");
+            headers.put("unitCode_dictText", "计量单位");
+            headers.put("quantity", "退货数量");
+            headers.put("price", "采购单价");
+            headers.put("returnPrice", "退货单价");
+            headers.put("totalPrice", "退货金额");
+            headers.put("supplier", "供应商");
+            headers.put("approverId_dictText", "审核人");
+            headers.put("createTime", "制单日期");
+            headers.put("approvalTime", "审核日期");
+
+            BigDecimal totalPrice =
+                receiptDetailList.stream().filter(Objects::nonNull).map(PurchaseReturnReportPageDto::getTotalPrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 表头上的字段
+            Map<String, Object> totalValues = new LinkedHashMap<>();
+            totalValues.put("合计金额", totalPrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.PRODUCT_RETURN.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, totalValues);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
similarity index 98%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
index cd9fd660..541a8553 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
@@ -88,6 +88,7 @@ public class RegisterReportAppServiceImpl implements IRegisterReportAppService {
         // 构建查询条件
         QueryWrapper<RegisterReportSearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(registerReportSearchParam, searchKey, null, request);
+        queryWrapper.orderByDesc(CommonConstants.FieldName.BusNo);
 
         // 查询挂号明细分页列表
         Page<RegisterReportPageDto> registerReportPage =
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
similarity index 31%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
index 10a24bf1..610d75ed 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
@@ -1,16 +1,20 @@
 package com.openhis.web.reportmanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.web.reportmanage.dto.*;
-import com.openhis.web.reportmanage.mapper.ReturnIssueReportMapper;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,10 +24,12 @@ import com.core.common.core.domain.R;
 import com.openhis.administration.domain.Supplier;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.DispenseStatus;
 import com.openhis.common.enums.SupplyStatus;
 import com.openhis.common.enums.SupplyType;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService;
+import com.openhis.web.reportmanage.mapper.ReturnIssueReportMapper;
 
 /**
  * 领用退库明细 应用实现类
@@ -40,6 +46,11 @@ public class ReturnIssueReportAppServiceImpl implements IReturnIssueReportAppSer
     @Resource
     private ISupplierService supplierService;
 
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
     /**
      * 退库明细页面初始化
      *
@@ -54,8 +65,8 @@ public class ReturnIssueReportAppServiceImpl implements IReturnIssueReportAppSer
 
         // 供应商信息
         List<ReturnIssueReportInitDto.supplierListOption> supplierListOptions = supplierList.stream()
-                .map(supplier -> new ReturnIssueReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
-                .collect(Collectors.toList());
+            .map(supplier -> new ReturnIssueReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
 
         initDto.setSupplierListOptions(supplierListOptions);
 
@@ -74,7 +85,7 @@ public class ReturnIssueReportAppServiceImpl implements IReturnIssueReportAppSer
      */
     @Override
     public R<?> getPage(ReturnIssueReportSearchParam returnIssueReportSearchParam, Integer pageNo, Integer pageSize,
-                        String searchKey, HttpServletRequest request) {
+        String searchKey, HttpServletRequest request) {
 
         // 构建查询条件
         QueryWrapper<ReturnIssueReportSearchParam> queryWrapper =
@@ -83,11 +94,107 @@ public class ReturnIssueReportAppServiceImpl implements IReturnIssueReportAppSer
 
         // 查询退库明细分页列表
         Page<ReturnIssueReportPageDto> medDetailsPage =
-                returnIssueReportMapper.selectReturnIssueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
+            returnIssueReportMapper.selectReturnIssueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
-                SupplyType.RETURN_ISSUE.getValue(), SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
+                SupplyType.RETURN_ISSUE.getValue(), SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
 
         return R.ok(medDetailsPage);
     }
 
+    /**
+     * 导出
+     *
+     * @param returnIssueReportSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(ReturnIssueReportSearchParam returnIssueReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<ReturnIssueReportSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(returnIssueReportSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
+
+        // 查询退库明细分页列表
+        Page<ReturnIssueReportPageDto> medDetailsPage =
+            returnIssueReportMapper.selectReturnIssueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                SupplyType.RETURN_ISSUE.getValue(), SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        List<ReturnIssueReportPageDto> receiptDetailList = medDetailsPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 做成参与者List
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> practitionerToNameMap = practitionerList.stream()
+            .collect(Collectors.toMap(Practitioner::getId, Practitioner::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> supplierToNameMap = supplierList.stream()
+            .collect(Collectors.toMap(Supplier::getId, Supplier::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+            detail.setApproverId_dictText(practitionerToNameMap.get(detail.getApproverId()));
+            detail.setSupplierId_dictText(supplierToNameMap.get(detail.getSupplierId()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("supplyBusno", "单据号");
+            headers.put("name", "药品名称");
+            headers.put("busNo", "编码");
+            headers.put("lotNumber", "生产批号");
+            headers.put("purposeLocationName", "库房");
+            headers.put("purposeLocationStoreName", "货位");
+            headers.put("unitCode_dictText", "计量单位");
+            headers.put("itemQuantity", "退库数量");
+            headers.put("purchasePrice", "采购单价");
+            headers.put("price", "退库单价");
+            headers.put("totalPrice", "金额");
+            headers.put("sourceLocationName", "科室");
+            headers.put("supplierId_dictText", "供应商");
+            headers.put("approverId_dictText", "审核人");
+            headers.put("approvalTime", "审核日期");
+            headers.put("remake", "备注");
+
+            BigDecimal totalPrice =
+                receiptDetailList.stream().filter(Objects::nonNull).map(ReturnIssueReportPageDto::getTotalPrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 表头上的字段
+            Map<String, Object> totalValues = new LinkedHashMap<>();
+            totalValues.put("合计金额", totalPrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.RETURN_ISSUE.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, totalValues);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
similarity index 37%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
index a043f39c..4d8c85dc 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
@@ -3,13 +3,23 @@
  */
 package com.openhis.web.reportmanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.common.enums.EventStatus;
-import com.openhis.web.inventorymanage.dto.ProductDetailsSearchParam;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.web.reportmanage.dto.OutboundReportPageDto;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,10 +27,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.CategoryType;
+import com.openhis.common.enums.DispenseStatus;
 import com.openhis.common.enums.SupplyStatus;
 import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService;
 import com.openhis.web.reportmanage.dto.StocktakingReportPageDto;
@@ -38,6 +47,10 @@ public class StocktakingReportAppServiceImpl implements IStocktakingReportAppSer
 
     @Autowired
     private StocktakingReportMapper stocktakingReportMapper;
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
 
     /**
      * 库存盘点明细列表
@@ -62,7 +75,7 @@ public class StocktakingReportAppServiceImpl implements IStocktakingReportAppSer
             stocktakingReportMapper.selectStocktakingReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
                 SupplyType.PRODUCT_STOCKTAKING.getValue(), SupplyType.PRODUCT_BATCH_STOCKTAKING.getValue(),
-                SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
 
         // stocktakingReportPage.getRecords().forEach(e -> {
         // // 药品类型
@@ -70,4 +83,72 @@ public class StocktakingReportAppServiceImpl implements IStocktakingReportAppSer
         // });
         return R.ok(stocktakingReportPage);
     }
+
+    /**
+     * 导出
+     *
+     * @param stocktakingReportSearchParam 库存盘点明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(StocktakingReportSearchParam stocktakingReportSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<StocktakingReportSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(
+            stocktakingReportSearchParam, searchKey, new HashSet<>(Arrays.asList("name", "bus_no")), request);
+
+        // 查询库存盘点明细分页列表
+        Page<StocktakingReportPageDto> stocktakingReportPage =
+            stocktakingReportMapper.selectStocktakingReportPage(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                SupplyType.PRODUCT_STOCKTAKING.getValue(), SupplyType.PRODUCT_BATCH_STOCKTAKING.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        List<StocktakingReportPageDto> receiptDetailList = stocktakingReportPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("busNo", "编码");
+            headers.put("name", "项目名称");
+            headers.put("totalVolume", "规格");
+            headers.put("manufacturerText", "厂家/产地");
+            headers.put("lotNumber", "生产批号");
+            headers.put("locationName", "仓库");
+            headers.put("unitCode_dictText", "单位");
+            headers.put("itemQuantity", "盈亏数量");
+            headers.put("approvalTime", "盘点日期");
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.PRODUCT_STOCKTAKING.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
similarity index 30%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
index 1ae099e1..8ed6ae95 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
@@ -3,12 +3,20 @@
  */
 package com.openhis.web.reportmanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.common.enums.EventStatus;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.MessageUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.CategoryType;
+import com.openhis.common.enums.DispenseStatus;
 import com.openhis.common.enums.SupplyStatus;
 import com.openhis.common.enums.SupplyType;
 import com.openhis.common.utils.EnumUtils;
@@ -38,6 +46,11 @@ public class TransferReportAppServiceImpl implements ITransferReportAppService {
     @Autowired
     private TransferReportMapper transferReportMapper;
 
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Resource
+    private IPractitionerService practitionerService;
+
     /**
      * 商品调拨明细列表
      *
@@ -61,7 +74,7 @@ public class TransferReportAppServiceImpl implements ITransferReportAppService {
             transferReportMapper.selectTransferReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
                 SupplyType.PRODUCT_TRANSFER.getValue(), SupplyType.PRODUCT_BATCH_TRANSFER.getValue(),
-                SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
 
         transferReportPage.getRecords().forEach(e -> {
             // 单据状态
@@ -69,4 +82,102 @@ public class TransferReportAppServiceImpl implements ITransferReportAppService {
         });
         return R.ok(transferReportPage);
     }
+
+    /**
+     * 导出
+     *
+     * @param transferReportSearchParam 商品调拨明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @Override
+    public R<?> makeExcelFile(TransferReportSearchParam transferReportSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<TransferReportSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(
+            transferReportSearchParam, searchKey, new HashSet<>(Arrays.asList("name", "supply_bus_no")), request);
+
+        // 查询商品调拨明细分页列表
+        Page<TransferReportPageDto> transferReportPage =
+            transferReportMapper.selectTransferReportPage(new Page<>(pageNo, pageSize), queryWrapper,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                SupplyType.PRODUCT_TRANSFER.getValue(), SupplyType.PRODUCT_BATCH_TRANSFER.getValue(),
+                SupplyStatus.AGREE.getValue(), DispenseStatus.COMPLETED.getValue());
+
+        transferReportPage.getRecords().forEach(e -> {
+            // 单据状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+        });
+
+        List<TransferReportPageDto> receiptDetailList = transferReportPage.getRecords();
+
+        if (receiptDetailList.isEmpty()) {
+            System.out.printf("导出Excel失败,无数据。");
+            return R.fail("导出Excel失败,无数据。");
+        }
+        // 获取药品分类
+        List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+        // 创建单位代码到单位名称的映射
+        Map<String, String> unitCodeToNameMap = unitCodeList.stream().collect(
+            Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 做成参与者List
+        List<Practitioner> practitionerList = practitionerService.getList();
+        // 创建id到名字的映射
+        Map<Long, String> practitionerToNameMap = practitionerList.stream()
+            .collect(Collectors.toMap(Practitioner::getId, Practitioner::getName, (oldValue, newValue) -> oldValue // 冲突时保留旧值（第一个）
+            ));
+        // 遍历赋值
+        receiptDetailList.forEach(detail -> {
+            detail.setUnitCode_dictText(unitCodeToNameMap.get(detail.getUnitCode()));
+            detail.setApplicantId_dictText(practitionerToNameMap.get(detail.getApplicantId()));
+            detail.setApproverId_dictText(practitionerToNameMap.get(detail.getApproverId()));
+        });
+
+        try {
+            // 准备表头（key对应DTO的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("supplyBusNo", "单据号");
+            headers.put("name", "药品");
+            headers.put("statusEnum_enumText", "是否调拨"); // TODO 画面的已调拨是前台又转换的吗
+            headers.put("lotNumber", "生产批号");
+            headers.put("sourceLocationName", "源仓库");
+            headers.put("sourceLocationStoreName", "源货位");
+            headers.put("purposeLocationName", "目的仓库");
+            headers.put("purposeLocationStoreName", "目的货位");
+            headers.put("itemQuantity", "调拨数量");
+            headers.put("unitCode_dictText", "计量单位");
+            headers.put("price", "单价");
+            headers.put("totalPrice", "合计金额");
+            headers.put("applicantId_dictText", "制单人");
+            headers.put("approverId_dictText", "审核人");
+            headers.put("createTime", "制单日期");
+            headers.put("applyTime", "申请日期");
+            headers.put("approvalTime", "调拨日期");
+
+            BigDecimal totalPrice =
+                receiptDetailList.stream().filter(Objects::nonNull).map(TransferReportPageDto::getTotalPrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 表头上的字段
+            Map<String, Object> totalValues = new LinkedHashMap<>();
+            totalValues.put("合计金额", totalPrice);
+
+            // 文件名，只传文字部分
+            String excelName = SupplyType.PRODUCT_TRANSFER.getInfo();
+            // TODO 文件路径
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(receiptDetailList, headers, "E:\\qqqqqqqqqq\\", excelName, totalValues);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.printf("导出Excel失败：" + e.getMessage());
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
similarity index 71%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
index f862ae2c..a81efbf7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
@@ -58,4 +58,23 @@ public class InboundReportController {
         @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
         return inboundReportAppService.getPage(inboundReportSearchParam, pageNo, pageSize, searchKey, request);
     }
+
+    /**
+     * 导出
+     *
+     * @param inboundReportSearchParam 入库明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(InboundReportSearchParam inboundReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return inboundReportAppService.makeExcelFile(inboundReportSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
new file mode 100644
index 00000000..e6a7bff7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.appservice.ITransferReportAppService;
+import com.openhis.web.reportmanage.dto.TransferReportSearchParam;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 住院病案首页采集 controller
+ *
+ * @author yuxj
+ * @date 2025-08-25
+ */
+@RestController
+@RequestMapping("/medicalRecordHomePage-manage/collection")
+@Slf4j
+public class InpatientMedicalRecordHomePageCollectionController {
+
+    @Autowired
+    private InpatientMedicalRecordHomePageCollectionAppService inpatientMedicalRecordHomePageCollectionAppService;
+
+    /**
+     * 住院病案csv做成
+     *
+     * @param encounterIdList 就诊idList
+     * @return 执行结果
+     */
+    @GetMapping(value = "/make-csvFile")
+    public R<?> makeCsvFile(@RequestParam List<Long> encounterIdList) {
+        return inpatientMedicalRecordHomePageCollectionAppService.makeCsvFile(encounterIdList);
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
similarity index 67%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
index b36d41a4..1f3fec3e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
@@ -5,6 +5,7 @@ package com.openhis.web.reportmanage.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,4 +50,23 @@ public class InventoryProductReportController {
         return inventoryProductReportAppService.getPage(inventoryProductReportSearchParam, pageNo, pageSize, searchKey,
             request);
     }
+
+    /**
+     * 导出
+     *
+     * @param inventoryProductReportSearchParam 库存商品明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(InventoryProductReportSearchParam inventoryProductReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return inventoryProductReportAppService.makeExcelFile(inventoryProductReportSearchParam, pageNo, pageSize,
+            searchKey, request);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
similarity index 58%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
index 618cec94..90faa105 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.openhis.web.reportmanage.appservice.ILossReportAppService;
 import com.openhis.web.reportmanage.dto.LossReportSearchParam;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,9 +47,27 @@ public class LossReportController {
      */
     @GetMapping(value = "/report-loss-page")
     public R<?> getPage(LossReportSearchParam lossReportSearchParam,
-                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
         return lossReportAppService.getPage(lossReportSearchParam, pageNo, pageSize, searchKey, request);
     }
+
+    /**
+     * 导出
+     *
+     * @param lossReportSearchParam 报损明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(LossReportSearchParam lossReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return lossReportAppService.makeExcelFile(lossReportSearchParam, pageNo, pageSize, searchKey, request);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java
new file mode 100644
index 00000000..ad0c05ea
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 药品耗材统计查询用 controller
+ *
+ * @author liuhr
+ * @date 2025-07-15
+ */
+@RestController
+@RequestMapping("/report-manage/medication-device")
+@Slf4j
+public class MedicationDeviceReportController {
+
+    @Autowired
+    private IMedicationDeviceReportAppService medicationDeviceReportAppService;
+
+    /**
+     * 药品耗材日结/周结/月结算（统计筛选时间区内）
+     *
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @return 药品耗材日结/周结/月结算单
+     */
+    @GetMapping(value = "/med-dev-all")
+    public R<?> selectMedDevReport(@RequestParam String dispenseDateSTime, @RequestParam String dispenseDateETime) {
+
+        return R.ok(medicationDeviceReportAppService.selectMedDevReport(dispenseDateSTime, dispenseDateETime));
+    }
+
+    /**
+     * 药品耗材日结/周结/月结算 明细清单
+     *
+     * @param orgId 科室
+     * @param name 项目名称
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateETime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 药品耗材日结/周结/月结算单
+     */
+    @GetMapping(value = "/med-dev-info")
+    public R<?> selectMedDdevInfo(@RequestParam Long orgId, @RequestParam String dispenseDateSTime,
+        @RequestParam String dispenseDateETime, @RequestParam(name = "name", required = false) String name,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return R
+            .ok(medicationDeviceReportAppService.selectMedDdevInfo(orgId, name, dispenseDateSTime, dispenseDateETime,pageNo,pageSize));
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java
new file mode 100644
index 00000000..67ec9c4a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ *   controller
+ *
+ * @author liuhr
+ * @date 2025-07-25
+ */
+@RestController
+@RequestMapping("/report-manage/monthly-settlement")
+@Slf4j
+public class MonthlySettlementController {
+
+    @Autowired
+    private IMonthlySettlementReportAppService monthlySettlementReportAppService;
+
+    /**
+     * 页面初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> init() {
+        return monthlySettlementReportAppService.init();
+    }
+    /**
+     * 月末结算报表（统计筛选时间区内）
+     *
+     * @param locationId 库房
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 月末结算报表
+     */
+    @GetMapping(value = "/month")
+    public R<?> selectMonthlySettlementReport(@RequestParam Long locationId, @RequestParam String startTime,
+        @RequestParam String endTime) {
+
+        return R.ok(monthlySettlementReportAppService.selectMonthlySettlementReport(locationId, startTime, endTime));
+    }
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
similarity index 69%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
index 8967e1ce..1c327a03 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
@@ -3,6 +3,7 @@ package com.openhis.web.reportmanage.controller;
 import javax.servlet.http.HttpServletRequest;
 
 import com.openhis.web.reportmanage.appservice.IOutboundReportAppService;
+import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,4 +59,22 @@ public class OutboundReportController {
         return outboundReportAppService.getPage(outboundReportSearchParam, pageNo, pageSize, searchKey, request);
     }
 
+    /**
+     * 导出
+     *
+     * @param outboundReportSearchParam 出库明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(OutboundReportSearchParam outboundReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return outboundReportAppService.makeExcelFile(outboundReportSearchParam, pageNo, pageSize, searchKey, request);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
similarity index 58%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
index 8710a701..53b821ef 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
@@ -6,6 +6,7 @@ package com.openhis.web.reportmanage.controller;
 import javax.servlet.http.HttpServletRequest;
 
 import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -53,9 +54,29 @@ public class PurchaseReturnReportController {
      */
     @GetMapping(value = "/report-purchase-return")
     public R<?> getPage(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam,
-                        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return purchaseReturnReportAppService.getPage(purchaseReturnReportSearchParam, pageNo, pageSize, searchKey, request);
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return purchaseReturnReportAppService.getPage(purchaseReturnReportSearchParam, pageNo, pageSize, searchKey,
+            request);
+    }
+
+    /**
+     * 导出
+     *
+     * @param purchaseReturnReportSearchParam 采购退货明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return purchaseReturnReportAppService.makeExcelFile(purchaseReturnReportSearchParam, pageNo, pageSize,
+            searchKey, request);
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
similarity index 69%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
index daca16f4..44c08a50 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
@@ -3,6 +3,7 @@ package com.openhis.web.reportmanage.controller;
 import javax.servlet.http.HttpServletRequest;
 
 import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService;
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,4 +59,23 @@ public class ReturnIssueReportController {
         return returnIssueReportAppService.getPage(returnIssueReportSearchParam, pageNo, pageSize, searchKey, request);
     }
 
+    /**
+     * 导出
+     *
+     * @param returnIssueReportSearchParam 领用退库明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(ReturnIssueReportSearchParam returnIssueReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return returnIssueReportAppService.makeExcelFile(returnIssueReportSearchParam, pageNo, pageSize, searchKey,
+            request);
+    }
+
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
similarity index 66%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
index 5258d8af..45ae5225 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
@@ -5,6 +5,7 @@ package com.openhis.web.reportmanage.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,4 +49,23 @@ public class StocktakingReportController {
         @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
         return stocktakingReportAppService.getPage(stocktakingReportSearchParam, pageNo, pageSize, searchKey, request);
     }
+
+    /**
+     * 导出
+     *
+     * @param stocktakingReportSearchParam 库存盘点明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(StocktakingReportSearchParam stocktakingReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return stocktakingReportAppService.makeExcelFile(stocktakingReportSearchParam, pageNo, pageSize, searchKey,
+            request);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
similarity index 67%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
index a0cc49a8..f385133f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
@@ -5,6 +5,7 @@ package com.openhis.web.reportmanage.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,4 +49,22 @@ public class TransferReportController {
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
         return transferReportAppService.getPage(transferReportSearchParam, pageNo, pageSize, searchKey, request);
     }
+
+    /**
+     * 导出
+     *
+     * @param transferReportSearchParam 商品调拨明细查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 单据详情
+     */
+    @GetMapping(value = "/excel-out")
+    public R<?> makeExcelFile(TransferReportSearchParam transferReportSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return transferReportAppService.makeExcelFile(transferReportSearchParam, pageNo, pageSize, searchKey, request);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java
similarity index 40%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDetailDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java
index 1c0f11f5..aab341ce 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDetailDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java
@@ -1,34 +1,27 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-
 /**
- * 支付详情
+ * 金额数量 dto
  *
- * @author SunJQ
- * @date 2025-03-29
+ * @author liuhr
+ * @date 2025-07-28
  */
 @Data
 @Accessors(chain = true)
-public class PaymentDetailDto {
-
-
-    /** 支付类型 */
-    private Integer payEnum;
+public class AmountNumberDto {
 
     /** 金额 */
-    private BigDecimal amount;
-
-    /** 找零 */
-    private BigDecimal returnAmount;
+    private BigDecimal totalAmount;
 
-    /** 交款 */
-    private BigDecimal chargeAmount;
+    /** 单据数 */
+    private Integer totalNumber;
 
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
new file mode 100644
index 00000000..c8fdd0f4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
@@ -0,0 +1,1642 @@
+package com.openhis.web.reportmanage.dto;
+
+
+import java.util.Date;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+
+/**
+ * 住院病案首页采集信息
+ *
+ * @author yuxj
+ * @date 2025/8/25
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicalRecordHomePageCollectionDto {
+
+    // 组织机构代码 字符 30 必填
+    private String A01;
+    // 医疗机构名称 A02 字符 80 必填
+    private String A02;
+    // 病案号 A48 字符 50 必填
+    private String A48;
+    // 住院次数 A49 数字 4 必填
+    private Integer A49;
+    // 入院时间 B12 日期时间 必填
+    private Date B12;
+    // 出院时间 B15 日期时间 必填
+    private Date B15;
+    // 健康卡号 A47 字符 50
+    private String A47;
+    // 医疗付费方式 A46C 字符 3 必填
+    private String A46C;
+    // 姓名 A11 字符 40 必填
+    private String A11;
+    // 性别 A12C 数字 1 必填
+    private Integer A12C;
+    // 出生日期 A13 日期 10 必填
+    private Date A13;
+    // 年龄（岁） A14 数字 3 必填
+    private Integer A14;
+    // 国籍 A15C 字符 40 必填
+    private String A15C;
+    // 婚姻 A21C 字符 1 必填
+    private String A21C;
+    // 职业 A38C 字符 2 必填
+    private String A38C;
+    // 民族 A19C 字符 2 必填
+    private String A19C;
+    // 证件类别 A20N 字符 1 必填
+    private String A20N;
+    // 证件号码 A20 字符 18 必填
+    private String A20;
+    // 出生地址 A22 字符 200 必填
+    private String A22;
+    // 籍贯省（自治区、直辖市） A23C 字符 50 必填
+    private String A23C;
+    // 户口地址 A24 字符 200 必填
+    private String A24;
+    // 户口地址邮政编码 A25C 字符 6 必填
+    private String A25C;
+    // 现住址 A26 字符 200 必填
+    private String A26;
+    // 现住址电话 A27 字符 40 必填
+    private String A27;
+    // 现住址邮政编码 A28C 字符 6 必填
+    private String A28C;
+    // 工作单位及地址 A29 字符 200 必填
+    private String A29;
+    // 工作单位电话 A30 字符 20 必填
+    private String A30;
+    // 工作单位邮政编码 A31C 字符 6 必填
+    private String A31C;
+    // 联系人姓名 A32 字符 40 必填
+    private String A32;
+    // 联系人关系 A33C 字符 1 必填
+    private String A33C;
+    // 联系人地址 A34 字符 200 必填
+    private String A34;
+    // 联系人电话 A35 字符 40 必填
+    private String A35;
+    // 是否为日间手术 B38 字符 1 必填
+    private String B38;
+    // 入院途径 B11C 字符 1 必填
+    private String B11C;
+    // 入院科别 B13C 字符 6 必填
+    private String B13C;
+    // 入院病房 B14 字符 30 必填
+    private String B14;
+    // 转科科别 B21C 集合 可以多选 必填
+    private String B21C;
+    // 出院科别 B16C 字符 6 必填
+    private String B16C;
+    // 出院病房 B17 字符 30 必填
+    private String B17;
+    // 实际住院（天） B20 数字 6 必填
+    private Integer B20;
+    // 门（急）诊诊断编码 C01C 字符 20 必填
+    private String C01C;
+    // 门（急）诊诊断名称 C02N 字符 100 必填
+    private String C02N;
+    // 入院时情况 F01 字符 1
+    private String F01;
+    // 入院诊断编码 F02C 字符 20
+    private String F02C;
+    // 入院诊断名称 F03N 字符 100
+    private String F03N;
+    // 入院后确诊日期 F04 日期
+    private Date F04;
+    // 出院主要诊断编码 C03C 字符 20 必填
+    private String C03C;
+    // 出院主要诊断名称 C04N 字符 100 必填
+    private String C04N;
+    // 出院主要诊断入院病情 C05C 字符 1 必填
+    private String C05C;
+    // 主要诊断出院情况 F05 字符 1
+    private String F05;
+    // 出院其他诊断编码1 C06x01C 字符 20
+    private String C06x01C;
+    // 出院其他诊断名称1 C07x01N 字符 100
+    private String C07x01N;
+    // 出院其他诊断入院病情1 C08x01C 字符 1
+    private String C08x01C;
+    // 其他诊断出院情况1 F06x01 字符 1
+    private String F06x01;
+    // 出院其他诊断编码2 C06x02C 字符 20
+    private String C06x02C;
+    // 出院其他诊断名称2 C07x02N 字符 100
+    private String C07x02N;
+    // 出院其他诊断入院病情2 C08x02C 字符 1
+    private String C08x02C;
+    // 其他诊断出院情况2 F06x02 字符 1
+    private String F06x02;
+    // 出院其他诊断编码3 C06x03C 字符 20
+    private String C06x03C;
+    // 出院其他诊断名称3 C07x03N 字符 100
+    private String C07x03N;
+    // 出院其他诊断入院病情3 C08x03C 字符 1
+    private String C08x03C;
+    // 其他诊断出院情况3 F06x03 字符 1
+    private String F06x03;
+    // 出院其他诊断编码4 C06x04C 字符 20
+    private String C06x04C;
+    // 出院其他诊断名称4 C07x04N 字符 100
+    private String C07x04N;
+    // 出院其他诊断入院病情4 C08x04C 字符 1
+    private String C08x04C;
+    // 其他诊断出院情况4 F06x04 字符 1
+    private String F06x04;
+    // 出院其他诊断编码5 C06x05C 字符 20
+    private String C06x05C;
+    // 出院其他诊断名称5 C07x05N 字符 100
+    private String C07x05N;
+    // 出院其他诊断入院病情5 C08x05C 字符 1
+    private String C08x05C;
+    // 其他诊断出院情况5 F06x05 字符 1
+    private String F06x05;
+    // 出院其他诊断编码6 C06x06C 字符 20
+    private String C06x06C;
+    // 出院其他诊断名称6 C07x06N 字符 100
+    private String C07x06N;
+    // 出院其他诊断入院病情6 C08x06C 字符 1
+    private String C08x06C;
+    // 其他诊断出院情况6 F06x06 字符 1
+    private String F06x06;
+    // 出院其他诊断编码7 C06x07C 字符 20
+    private String C06x07C;
+    // 出院其他诊断名称7 C07x07N 字符 100
+    private String C07x07N;
+    // 出院其他诊断入院病情7 C08x07C 字符 1
+    private String C08x07C;
+    // 其他诊断出院情况7 F06x07 字符 1
+    private String F06x07;
+    // 出院其他诊断编码8 C06x08C 字符 20
+    private String C06x08C;
+    // 出院其他诊断名称8 C07x08N 字符 100
+    private String C07x08N;
+    // 出院其他诊断入院病情8 C08x08C 字符 1
+    private String C08x08C;
+    // 其他诊断出院情况8 F06x08 字符 1
+    private String F06x08;
+    // 出院其他诊断编码9 C06x09C 字符 20
+    private String C06x09C;
+    // 出院其他诊断名称9 C07x09N 字符 100
+    private String C07x09N;
+    // 出院其他诊断入院病情9 C08x09C 字符 1
+    private String C08x09C;
+    // 其他诊断出院情况9 F06x09 字符 1
+    private String F06x09;
+    // 出院其他诊断编码10 C06x10C 字符 20
+    private String C06x10C;
+    // 出院其他诊断名称10 C07x10N 字符 100
+    private String C07x10N;
+    // 出院其他诊断入院病情10 C08x10C 字符 1
+    private String C08x10C;
+    // 其他诊断出院情况10 F06x10 字符 1
+    private String F06x10;
+    // 出院其他诊断编码11 C06x11C 字符 20
+    private String C06x11C;
+    // 出院其他诊断名称11 C07x11N 字符 100
+    private String C07x11N;
+    // 出院其他诊断入院病情11 C08x11C 字符 1
+    private String C08x11C;
+    // 其他诊断出院情况11 F06x11 字符 1
+    private String F06x11;
+    // 出院其他诊断编码12 C06x12C 字符 20
+    private String C06x12C;
+    // 出院其他诊断名称12 C07x12N 字符 100
+    private String C07x12N;
+    // 出院其他诊断入院病情12 C08x12C 字符 1
+    private String C08x12C;
+    // 其他诊断出院情况12 F06x12 字符 1
+    private String F06x12;
+    // 出院其他诊断编码13 C06x13C 字符 20
+    private String C06x13C;
+    // 出院其他诊断名称13 C07x13N 字符 100
+    private String C07x13N;
+    // 出院其他诊断入院病情13 C08x13C 字符 1
+    private String C08x13C;
+    // 其他诊断出院情况13 F06x13 字符 1
+    private String F06x13;
+    // 出院其他诊断编码14 C06x14C 字符 20
+    private String C06x14C;
+    // 出院其他诊断名称14 C07x14N 字符 100
+    private String C07x14N;
+    // 出院其他诊断入院病情14 C08x14C 字符 1
+    private String C08x14C;
+    // 其他诊断出院情况14 F06x14 字符 1
+    private String F06x14;
+    // 出院其他诊断编码15 C06x15C 字符 20
+    private String C06x15C;
+    // 出院其他诊断名称15 C07x15N 字符 100
+    private String C07x15N;
+    // 出院其他诊断入院病情15 C08x15C 字符 1
+    private String C08x15C;
+    // 其他诊断出院情况15 F06x15 字符 1
+    private String F06x15;
+    // 出院其他诊断编码16 C06x16C 字符 20
+    private String C06x16C;
+    // 出院其他诊断名称16 C07x16N 字符 100
+    private String C07x16N;
+    // 出院其他诊断入院病情16 C08x16C 字符 1
+    private String C08x16C;
+    // 其他诊断出院情况16 F06x16 字符 1
+    private String F06x16;
+    // 出院其他诊断编码17 C06x17C 字符 20
+    private String C06x17C;
+    // 出院其他诊断名称17 C07x17N 字符 100
+    private String C07x17N;
+    // 出院其他诊断入院病情17 C08x17C 字符 1
+    private String C08x17C;
+    // 其他诊断出院情况17 F06x17 字符 1
+    private String F06x17;
+    // 出院其他诊断编码18 C06x18C 字符 20
+    private String C06x18C;
+    // 出院其他诊断名称18 C07x18N 字符 100
+    private String C07x18N;
+    // 出院其他诊断入院病情18 C08x18C 字符 1
+    private String C08x18C;
+    // 其他诊断出院情况18 F06x18 字符 1
+    private String F06x18;
+    // 出院其他诊断编码19 C06x19C 字符 20
+    private String C06x19C;
+    // 出院其他诊断名称19 C07x19N 字符 100
+    private String C07x19N;
+    // 出院其他诊断入院病情19 C08x19C 字符 1
+    private String C08x19C;
+    // 其他诊断出院情况19 F06x19 字符 1
+    private String F06x19;
+    // 出院其他诊断编码20 C06x20C 字符 20
+    private String C06x20C;
+    // 出院其他诊断名称20 C07x20N 字符 100
+    private String C07x20N;
+    // 出院其他诊断入院病情20 C08x20C 字符 1
+    private String C08x20C;
+    // 其他诊断出院情况20 F06x20 字符 1
+    private String F06x20;
+    // 出院其他诊断编码21 C06x21C 字符 20
+    private String C06x21C;
+    // 出院其他诊断名称21 C07x21N 字符 100
+    private String C07x21N;
+    // 出院其他诊断入院病情21 C08x21C 字符 1
+    private String C08x21C;
+    // 其他诊断出院情况21 F06x21 字符 1
+    private String F06x21;
+    // 出院其他诊断编码22 C06x22C 字符 20
+    private String C06x22C;
+    // 出院其他诊断名称22 C07x22N 字符 100
+    private String C07x22N;
+    // 出院其他诊断入院病情22 C08x22C 字符 1
+    private String C08x22C;
+    // 其他诊断出院情况22 F06x22 字符 1
+    private String F06x22;
+    // 出院其他诊断编码23 C06x23C 字符 20
+    private String C06x23C;
+    // 出院其他诊断名称23 C07x23N 字符 100
+    private String C07x23N;
+    // 出院其他诊断入院病情23 C08x23C 字符 1
+    private String C08x23C;
+    // 其他诊断出院情况23 F06x23 字符 1
+    private String F06x23;
+    // 出院其他诊断编码24 C06x24C 字符 20
+    private String C06x24C;
+    // 出院其他诊断名称24 C07x24N 字符 100
+    private String C07x24N;
+    // 出院其他诊断入院病情24 C08x24C 字符 1
+    private String C08x24C;
+    // 其他诊断出院情况24 F06x24 字符 1
+    private String F06x24;
+    // 出院其他诊断编码25 C06x25C 字符 20
+    private String C06x25C;
+    // 出院其他诊断名称25 C07x25N 字符 100
+    private String C07x25N;
+    // 出院其他诊断入院病情25 C08x25C 字符 1
+    private String C08x25C;
+    // 其他诊断出院情况25 F06x25 字符 1
+    private String F06x25;
+    // 出院其他诊断编码26 C06x26C 字符 20
+    private String C06x26C;
+    // 出院其他诊断名称26 C07x26N 字符 100
+    private String C07x26N;
+    // 出院其他诊断入院病情26 C08x26C 字符 1
+    private String C08x26C;
+    // 其他诊断出院情况26 F06x26 字符 1
+    private String F06x26;
+    // 出院其他诊断编码27 C06x27C 字符 20
+    private String C06x27C;
+    // 出院其他诊断名称27 C07x27N 字符 100
+    private String C07x27N;
+    // 出院其他诊断入院病情27 C08x27C 字符 1
+    private String C08x27C;
+    // 其他诊断出院情况27 F06x27 字符 1
+    private String F06x27;
+    // 出院其他诊断编码28 C06x28C 字符 20
+    private String C06x28C;
+    // 出院其他诊断名称28 C07x28N 字符 100
+    private String C07x28N;
+    // 出院其他诊断入院病情28 C08x28C 字符 1
+    private String C08x28C;
+    // 其他诊断出院情况28 F06x28 字符 1
+    private String F06x28;
+    // 出院其他诊断编码29 C06x29C 字符 20
+    private String C06x29C;
+    // 出院其他诊断名称29 C07x29N 字符 100
+    private String C07x29N;
+    // 出院其他诊断入院病情29 C08x29C 字符 1
+    private String C08x29C;
+    // 其他诊断出院情况29 F06x29 字符 1
+    private String F06x29;
+    // 出院其他诊断编码30 C06x30C 字符 20
+    private String C06x30C;
+    // 出院其他诊断名称30 C07x30N 字符 100
+    private String C07x30N;
+    // 出院其他诊断入院病情30 C08x30C 字符 1
+    private String C08x30C;
+    // 其他诊断出院情况30 F06x30 字符 1
+    private String F06x30;
+    // 出院其他诊断编码31 C06x31C 字符 20
+    private String C06x31C;
+    // 出院其他诊断名称31 C07x31N 字符 100
+    private String C07x31N;
+    // 出院其他诊断入院病情31 C08x31C 字符 1
+    private String C08x31C;
+    // 其他诊断出院情况31 F06x31 字符 1
+    private String F06x31;
+    // 出院其他诊断编码32 C06x32C 字符 20
+    private String C06x32C;
+    // 出院其他诊断名称32 C07x32N 字符 100
+    private String C07x32N;
+    // 出院其他诊断入院病情32 C08x32C 字符 1
+    private String C08x32C;
+    // 其他诊断出院情况32 F06x32 字符 1
+    private String F06x32;
+    // 出院其他诊断编码33 C06x33C 字符 20
+    private String C06x33C;
+    // 出院其他诊断名称33 C07x33N 字符 100
+    private String C07x33N;
+    // 出院其他诊断入院病情33 C08x33C 字符 1
+    private String C08x33C;
+    // 其他诊断出院情况33 F06x33 字符 1
+    private String F06x33;
+    // 出院其他诊断编码34 C06x34C 字符 20
+    private String C06x34C;
+    // 出院其他诊断名称34 C07x34N 字符 100
+    private String C07x34N;
+    // 出院其他诊断入院病情34 C08x34C 字符 1
+    private String C08x34C;
+    // 其他诊断出院情况34 F06x34 字符 1
+    private String F06x34;
+    // 出院其他诊断编码35 C06x35C 字符 20
+    private String C06x35C;
+    // 出院其他诊断名称35 C07x35N 字符 100
+    private String C07x35N;
+    // 出院其他诊断入院病情35 C08x35C 字符 1
+    private String C08x35C;
+    // 其他诊断出院情况35 F06x35 字符 1
+    private String F06x35;
+    // 出院其他诊断编码36 C06x36C 字符 20
+    private String C06x36C;
+    // 出院其他诊断名称36 C07x36N 字符 100
+    private String C07x36N;
+    // 出院其他诊断入院病情36 C08x36C 字符 1
+    private String C08x36C;
+    // 其他诊断出院情况36 F06x36 字符 1
+    private String F06x36;
+    // 出院其他诊断编码37 C06x37C 字符 20
+    private String C06x37C;
+    // 出院其他诊断名称37 C07x37N 字符 100
+    private String C07x37N;
+    // 出院其他诊断入院病情37 C08x37C 字符 1
+    private String C08x37C;
+    // 其他诊断出院情况37 F06x37 字符 1
+    private String F06x37;
+    // 出院其他诊断编码38 C06x38C 字符 20
+    private String C06x38C;
+    // 出院其他诊断名称38 C07x38N 字符 100
+    private String C07x38N;
+    // 出院其他诊断入院病情38 C08x38C 字符 1
+    private String C08x38C;
+    // 其他诊断出院情况38 F06x38 字符 1
+    private String F06x38;
+    // 出院其他诊断编码39 C06x39C 字符 20
+    private String C06x39C;
+    // 出院其他诊断名称39 C07x39N 字符 100
+    private String C07x39N;
+    // 出院其他诊断入院病情39 C08x39C 字符 1
+    private String C08x39C;
+    // 其他诊断出院情况39 F06x39 字符 1
+    private String F06x39;
+    // 出院其他诊断编码40 C06x40C 字符 20
+    private String C06x40C;
+    // 出院其他诊断名称40 C07x40N 字符 100
+    private String C07x40N;
+    // 出院其他诊断入院病情40 C08x40C 字符 1
+    private String C08x40C;
+    // 其他诊断出院情况40 F06x40 字符 1
+    private String F06x40;
+    // 病理诊断编码 C09C 字符 20 条件必填
+    private String C09C;
+    // 病理诊断名称 C10N 字符 100 条件必填
+    private String C10N;
+    // 病理号 C11 字符 50 条件必填
+    private String C11;
+    // 病理诊断编码1 F07x01C 字符 20
+    private String F07x01C;
+    // 病理诊断名称1 F08x01N 字符 100
+    private String F08x01N;
+    // 病理号1 F09x01 字符 50
+    private String F09x01;
+    // 病理诊断编码2 F07x02C 字符 20
+    private String F07x02C;
+    // 病理诊断名称2 F08x02N 字符 100
+    private String F08x02N;
+    // 病理号2 F09x02 字符 50
+    private String F09x02;
+    // 损伤、中毒外部原因编码 C12C 字符 20 条件必填
+    private String C12C;
+    // 损伤、中毒外部原因名称 C13N 字符 100 条件必填
+    private String C13N;
+    // 有无药物过敏 C24C 字符 1 必填
+    private String C24C;
+    // 过敏药物名称 C25 字符 200 条件必填
+    private String C25;
+    // HBsAg F10 字符 1
+    private String F10;
+    // HCV-Ab F11 字符 1
+    private String F11;
+    // HIV-Ab F12 字符 1
+    private String F12;
+    // 科主任编码 B22C 字符 30 必填
+    private String B22C;
+    // 科主任 B22 字符 40 必填
+    private String B22;
+    // 主（副主）任医师编码 B23C 字符 30 必填
+    private String B23C;
+    // 主（副主）任医师 B23 字符 40 必填
+    private String B23;
+    // 主治医师编码 B24C 字符 30 必填
+    private String B24C;
+    // 主治医师 B24 字符 40 必填
+    private String B24;
+    // 住院医师编码 B25C 字符 30 必填
+    private String B25C;
+    // 住院医师 B25 字符 40 必填
+    private String B25;
+    // 责任护士编码 B26C 字符 30 必填
+    private String B26C;
+    // 责任护士 B26 字符 40 必填
+    private String B26;
+    // 进修医师 B27 字符 40
+    private String B27;
+    // 实习医师 B28 字符 40
+    private String B28;
+    // 编码员 B29 字符 40 必填
+    private String B29;
+    // 病案质量 B30C 字符 1
+    private String B30C;
+    // 质控医师 B31 字符 40
+    private String B31;
+    // 质控护师 B32 字符 40
+    private String B32;
+    // 质控日期 B33 日期
+    private Date B33;
+    // 死亡患者尸检 C34C 字符 1
+    private String C34C;
+    // ABO血型 C26C 字符 1 必填
+    private String C26C;
+    // Rh血型 C27C 字符 1 必填
+    private String C27C;
+    // 主要手术操作编码 C14x01C 字符 20 必填
+    private String C14x01C;
+    // 主要手术操作名称 C15x01N 字符 100 必填
+    private String C15x01N;
+    // 主要手术操作日期 C16x01 日期时间 必填
+    private Date C16x01;
+    // 主要手术操作级别 C17x01 字符 1 条件必填
+    private String C17x01;
+    // 主要手术持续时间 F13 数字 (7,2)
+    private BigDecimal F13;
+    // 主要手术操作术者 C18x01 字符 40 条件必填
+    private String C18x01;
+    // 主要手术操作Ⅰ助 C19x01 字符 40 条件必填
+    private String C19x01;
+    // 主要手术操作Ⅱ助 C20x01 字符 40 条件必填
+    private String C20x01;
+    // 主要手术操作切口愈合等级 C21x01C 字符 2 条件必填
+    private String C21x01C;
+    // 主要手术操作麻醉方式 C22x01C 字符 6 条件必填
+    private String C22x01C;
+    // 主要手术麻醉分级 F15 字符 1
+    private String F15;
+    // 主要手术操作麻醉医师 C23x01 字符 40 条件必填
+    private String C23x01;
+    // 其他手术操作编码1 C35x01C 字符 20
+    private String C35x01C;
+    // 其他手术操作名称1 C36x01N 字符 100
+    private String C36x01N;
+    // 其他手术操作日期1 C37x01 日期时间
+    private Date C37x01;
+    // 其他手术操作级别1 C38x01 字符 1
+    private String C38x01;
+    // 其他手术持续时间1 F14x01 数字 (7,2)
+    private BigDecimal F14x01;
+    // 其他手术操作术者1 C39x01 字符 40
+    private String C39x01;
+    // 其他手术操作Ⅰ助1 C40x01 字符 40
+    private String C40x01;
+    // 其他手术操作Ⅱ助1 C41x01 字符 40
+    private String C41x01;
+    // 其他手术操作切口愈合等级1 C42x01C 字符 2
+    private String C42x01C;
+    // 其他手术操作麻醉方式1 C43x01C 字符 6
+    private String C43x01C;
+    // 其他手术麻醉分级1 F16x01 字符 1
+    private String F16x01;
+    // 其他手术操作麻醉医师1 C44x01 字符 40
+    private String C44x01;
+    // 其他手术操作编码2 C35x02C 字符 20
+    private String C35x02C;
+    // 其他手术操作名称2 C36x02N 字符 100
+    private String C36x02N;
+    // 其他手术操作日期2 C37x02 日期时间
+    private Date C37x02;
+    // 其他手术操作级别2 C38x02 字符 1
+    private String C38x02;
+    // 其他手术持续时间2 F14x02 数字 (7,2)
+    private BigDecimal F14x02;
+    // 其他手术操作术者2 C39x02 字符 40
+    private String C39x02;
+    // 其他手术操作Ⅰ助2 C40x02 字符 40
+    private String C40x02;
+    // 其他手术操作Ⅱ助2 C41x02 字符 40
+    private String C41x02;
+    // 其他手术操作切口愈合等级2 C42x02C 字符 2
+    private String C42x02C;
+    // 其他手术操作麻醉方式2 C43x02C 字符 6
+    private String C43x02C;
+    // 其他手术麻醉分级2 F16x02 字符 1
+    private String F16x02;
+    // 其他手术操作麻醉医师2 C44x02 字符 40
+    private String C44x02;
+    // 其他手术操作编码3 C35x03C 字符 20
+    private String C35x03C;
+    // 其他手术操作名称3 C36x03N 字符 100
+    private String C36x03N;
+    // 其他手术操作日期3 C37x03 日期时间
+    private Date C37x03;
+    // 其他手术操作级别3 C38x03 字符 1
+    private String C38x03;
+    // 其他手术持续时间3 F14x03 数字 (7,2)
+    private BigDecimal F14x03;
+    // 其他手术操作术者3 C39x03 字符 40
+    private String C39x03;
+    // 其他手术操作Ⅰ助3 C40x03 字符 40
+    private String C40x03;
+    // 其他手术操作Ⅱ助3 C41x03 字符 40
+    private String C41x03;
+    // 其他手术操作切口愈合等级3 C42x03C 字符 2
+    private String C42x03C;
+    // 其他手术操作麻醉方式3 C43x03C 字符 6
+    private String C43x03C;
+    // 其他手术麻醉分级3 F16x03 字符 1
+    private String F16x03;
+    // 其他手术操作麻醉医师3 C44x03 字符 40
+    private String C44x03;
+    // 其他手术操作编码4 C35x04C 字符 20
+    private String C35x04C;
+    // 其他手术操作名称4 C36x04N 字符 100
+    private String C36x04N;
+    // 其他手术操作日期4 C37x04 日期时间
+    private Date C37x04;
+    // 其他手术操作级别4 C38x04 字符 1
+    private String C38x04;
+    // 其他手术持续时间4 F14x04 数字 (7,2)
+    private BigDecimal F14x04;
+    // 其他手术操作术者4 C39x04 字符 40
+    private String C39x04;
+    // 其他手术操作Ⅰ助4 C40x04 字符 40
+    private String C40x04;
+    // 其他手术操作Ⅱ助4 C41x04 字符 40
+    private String C41x04;
+    // 其他手术操作切口愈合等级4 C42x04C 字符 2
+    private String C42x04C;
+    // 其他手术操作麻醉方式4 C43x04C 字符 6
+    private String C43x04C;
+    // 其他手术麻醉分级4 F16x04 字符 1
+    private String F16x04;
+    // 其他手术操作麻醉医师4 C44x04 字符 40
+    private String C44x04;
+    // 其他手术操作编码5 C35x05C 字符 20
+    private String C35x05C;
+    // 其他手术操作名称5 C36x05N 字符 100
+    private String C36x05N;
+    // 其他手术操作日期5 C37x05 日期时间
+    private Date C37x05;
+    // 其他手术操作级别5 C38x05 字符 1
+    private String C38x05;
+    // 其他手术持续时间5 F14x05 数字 (7,2)
+    private BigDecimal F14x05;
+    // 其他手术操作术者5 C39x05 字符 40
+    private String C39x05;
+    // 其他手术操作Ⅰ助5 C40x05 字符 40
+    private String C40x05;
+    // 其他手术操作Ⅱ助5 C41x05 字符 40
+    private String C41x05;
+    // 其他手术操作切口愈合等级5 C42x05C 字符 2
+    private String C42x05C;
+    // 其他手术操作麻醉方式5 C43x05C 字符 6
+    private String C43x05C;
+    // 其他手术麻醉分级5 F16x05 字符 1
+    private String F16x05;
+    // 其他手术操作麻醉医师5 C44x05 字符 40
+    private String C44x05;
+    // 其他手术操作编码6 C35x06C 字符 20
+    private String C35x06C;
+    // 其他手术操作名称6 C36x06N 字符 100
+    private String C36x06N;
+    // 其他手术操作日期6 C37x06 日期时间
+    private Date C37x06;
+    // 其他手术操作级别6 C38x06 字符 1
+    private String C38x06;
+    // 其他手术持续时间6 F14x06 数字 (7,2)
+    private BigDecimal F14x06;
+    // 其他手术操作术者6 C39x06 字符 40
+    private String C39x06;
+    // 其他手术操作Ⅰ助6 C40x06 字符 40
+    private String C40x06;
+    // 其他手术操作Ⅱ助6 C41x06 字符 40
+    private String C41x06;
+    // 其他手术操作切口愈合等级6 C42x06C 字符 2
+    private String C42x06C;
+    // 其他手术操作麻醉方式6 C43x06C 字符 6
+    private String C43x06C;
+    // 其他手术麻醉分级6 F16x06 字符 1
+    private String F16x06;
+    // 其他手术操作麻醉医师6 C44x06 字符 40
+    private String C44x06;
+    // 其他手术操作编码7 C35x07C 字符 20
+    private String C35x07C;
+    // 其他手术操作名称7 C36x07N 字符 100
+    private String C36x07N;
+    // 其他手术操作日期7 C37x07 日期时间
+    private Date C37x07;
+    // 其他手术操作级别7 C38x07 字符 1
+    private String C38x07;
+    // 其他手术持续时间7 F14x07 数字 (7,2)
+    private BigDecimal F14x07;
+    // 其他手术操作术者7 C39x07 字符 40
+    private String C39x07;
+    // 其他手术操作Ⅰ助7 C40x07 字符 40
+    private String C40x07;
+    // 其他手术操作Ⅱ助7 C41x07 字符 40
+    private String C41x07;
+    // 其他手术操作切口愈合等级7 C42x07C 字符 2
+    private String C42x07C;
+    // 其他手术操作麻醉方式7 C43x07C 字符 6
+    private String C43x07C;
+    // 其他手术麻醉分级7 F16x07 字符 1
+    private String F16x07;
+    // 其他手术操作麻醉医师7 C44x07 字符 40
+    private String C44x07;
+    // 其他手术操作编码8 C35x08C 字符 20
+    private String C35x08C;
+    // 其他手术操作名称8 C36x08N 字符 100
+    private String C36x08N;
+    // 其他手术操作日期8 C37x08 日期时间
+    private Date C37x08;
+    // 其他手术操作级别8 C38x08 字符 1
+    private String C38x08;
+    // 其他手术持续时间8 F14x08 数字 (7,2)
+    private BigDecimal F14x08;
+    // 其他手术操作术者8 C39x08 字符 40
+    private String C39x08;
+    // 其他手术操作Ⅰ助8 C40x08 字符 40
+    private String C40x08;
+    // 其他手术操作Ⅱ助8 C41x08 字符 40
+    private String C41x08;
+    // 其他手术操作切口愈合等级8 C42x08C 字符 2
+    private String C42x08C;
+    // 其他手术操作麻醉方式8 C43x08C 字符 6
+    private String C43x08C;
+    // 其他手术麻醉分级8 F16x08 字符 1
+    private String F16x08;
+    // 其他手术操作麻醉医师8 C44x08 字符 40
+    private String C44x08;
+    // 其他手术操作编码9 C35x09C 字符 20
+    private String C35x09C;
+    // 其他手术操作名称9 C36x09N 字符 100
+    private String C36x09N;
+    // 其他手术操作日期9 C37x09 日期时间
+    private Date C37x09;
+    // 其他手术操作级别9 C38x09 字符 1
+    private String C38x09;
+    // 其他手术持续时间9 F14x09 数字 (7,2)
+    private BigDecimal F14x09;
+    // 其他手术操作术者9 C39x09 字符 40
+    private String C39x09;
+    // 其他手术操作Ⅰ助9 C40x09 字符 40
+    private String C40x09;
+    // 其他手术操作Ⅱ助9 C41x09 字符 40
+    private String C41x09;
+    // 其他手术操作切口愈合等级9 C42x09C 字符 2
+    private String C42x09C;
+    // 其他手术操作麻醉方式9 C43x09C 字符 6
+    private String C43x09C;
+    // 其他手术麻醉分级9 F16x09 字符 1
+    private String F16x09;
+    // 其他手术操作麻醉医师9 C44x09 字符 40
+    private String C44x09;
+    // 其他手术操作编码10 C35x10C 字符 20
+    private String C35x10C;
+    // 其他手术操作名称10 C36x10N 字符 100
+    private String C36x10N;
+    // 其他手术操作日期10 C37x10 日期时间
+    private Date C37x10;
+    // 其他手术操作级别10 C38x10 字符 1
+    private String C38x10;
+    // 其他手术持续时间10 F14x10 数字 (7,2)
+    private BigDecimal F14x10;
+    // 其他手术操作术者10 C39x10 字符 40
+    private String C39x10;
+    // 其他手术操作Ⅰ助10 C40x10 字符 40
+    private String C40x10;
+    // 其他手术操作Ⅱ助10 C41x10 字符 40
+    private String C41x10;
+    // 其他手术操作切口愈合等级10 C42x10C 字符 2
+    private String C42x10C;
+    // 其他手术操作麻醉方式10 C43x10C 字符 6
+    private String C43x10C;
+    // 其他手术麻醉分级10 F16x10 字符 1
+    private String F16x10;
+    // 其他手术操作麻醉医师10 C44x10 字符 40
+    private String C44x10;
+    // 其他手术操作编码11 C35x11C 字符 20
+    private String C35x11C;
+    // 其他手术操作名称11 C36x11N 字符 100
+    private String C36x11N;
+    // 其他手术操作日期11 C37x11 日期时间
+    private Date C37x11;
+    // 其他手术操作级别11 C38x11 字符 1
+    private String C38x11;
+    // 其他手术持续时间11 F14x11 数字 (7,2)
+    private BigDecimal F14x11;
+    // 其他手术操作术者11 C39x11 字符 40
+    private String C39x11;
+    // 其他手术操作Ⅰ助11 C40x11 字符 40
+    private String C40x11;
+    // 其他手术操作Ⅱ助11 C41x11 字符 40
+    private String C41x11;
+    // 其他手术操作切口愈合等级11 C42x11C 字符 2
+    private String C42x11C;
+    // 其他手术操作麻醉方式11 C43x11C 字符 6
+    private String C43x11C;
+    // 其他手术麻醉分级11 F16x11 字符 1
+    private String F16x11;
+    // 其他手术操作麻醉医师11 C44x11 字符 40
+    private String C44x11;
+    // 其他手术操作编码12 C35x12C 字符 20
+    private String C35x12C;
+    // 其他手术操作名称12 C36x12N 字符 100
+    private String C36x12N;
+    // 其他手术操作日期12 C37x12 日期时间
+    private Date C37x12;
+    // 其他手术操作级别12 C38x12 字符 1
+    private String C38x12;
+    // 其他手术持续时间12 F14x12 数字 (7,2)
+    private BigDecimal F14x12;
+    // 其他手术操作术者12 C39x12 字符 40
+    private String C39x12;
+    // 其他手术操作Ⅰ助12 C40x12 字符 40
+    private String C40x12;
+    // 其他手术操作Ⅱ助12 C41x12 字符 40
+    private String C41x12;
+    // 其他手术操作切口愈合等级12 C42x12C 字符 2
+    private String C42x12C;
+    // 其他手术操作麻醉方式12 C43x12C 字符 6
+    private String C43x12C;
+    // 其他手术麻醉分级12 F16x12 字符 1
+    private String F16x12;
+    // 其他手术操作麻醉医师12 C44x12 字符 40
+    private String C44x12;
+    // 其他手术操作编码13 C35x13C 字符 20
+    private String C35x13C;
+    // 其他手术操作名称13 C36x13N 字符 100
+    private String C36x13N;
+    // 其他手术操作日期13 C37x13 日期时间
+    private Date C37x13;
+    // 其他手术操作级别13 C38x13 字符 1
+    private String C38x13;
+    // 其他手术持续时间13 F14x13 数字 (7,2)
+    private BigDecimal F14x13;
+    // 其他手术操作术者13 C39x13 字符 40
+    private String C39x13;
+    // 其他手术操作Ⅰ助13 C40x13 字符 40
+    private String C40x13;
+    // 其他手术操作Ⅱ助13 C41x13 字符 40
+    private String C41x13;
+    // 其他手术操作切口愈合等级13 C42x13C 字符 2
+    private String C42x13C;
+    // 其他手术操作麻醉方式13 C43x13C 字符 6
+    private String C43x13C;
+    // 其他手术麻醉分级13 F16x13 字符 1
+    private String F16x13;
+    // 其他手术操作麻醉医师13 C44x13 字符 40
+    private String C44x13;
+    // 其他手术操作编码14 C35x14C 字符 20
+    private String C35x14C;
+    // 其他手术操作名称14 C36x14N 字符 100
+    private String C36x14N;
+    // 其他手术操作日期14 C37x14 日期时间
+    private Date C37x14;
+    // 其他手术操作级别14 C38x14 字符 1
+    private String C38x14;
+    // 其他手术持续时间14 F14x14 数字 (7,2)
+    private BigDecimal F14x14;
+    // 其他手术操作术者14 C39x14 字符 40
+    private String C39x14;
+    // 其他手术操作Ⅰ助14 C40x14 字符 40
+    private String C40x14;
+    // 其他手术操作Ⅱ助14 C41x14 字符 40
+    private String C41x14;
+    // 其他手术操作切口愈合等级14 C42x14C 字符 2
+    private String C42x14C;
+    // 其他手术操作麻醉方式14 C43x14C 字符 6
+    private String C43x14C;
+    // 其他手术麻醉分级14 F16x14 字符 1
+    private String F16x14;
+    // 其他手术操作麻醉医师14 C44x14 字符 40
+    private String C44x14;
+    // 其他手术操作编码15 C35x15C 字符 20
+    private String C35x15C;
+    // 其他手术操作名称15 C36x15N 字符 100
+    private String C36x15N;
+    // 其他手术操作日期15 C37x15 日期时间
+    private Date C37x15;
+    // 其他手术操作级别15 C38x15 字符 1
+    private String C38x15;
+    // 其他手术持续时间15 F14x15 数字 (7,2)
+    private BigDecimal F14x15;
+    // 其他手术操作术者15 C39x15 字符 40
+    private String C39x15;
+    // 其他手术操作Ⅰ助15 C40x15 字符 40
+    private String C40x15;
+    // 其他手术操作Ⅱ助15 C41x15 字符 40
+    private String C41x15;
+    // 其他手术操作切口愈合等级15 C42x15C 字符 2
+    private String C42x15C;
+    // 其他手术操作麻醉方式15 C43x15C 字符 6
+    private String C43x15C;
+    // 其他手术麻醉分级15 F16x15 字符 1
+    private String F16x15;
+    // 其他手术操作麻醉医师15 C44x15 字符 40
+    private String C44x15;
+    // 其他手术操作编码16 C35x16C 字符 20
+    private String C35x16C;
+    // 其他手术操作名称16 C36x16N 字符 100
+    private String C36x16N;
+    // 其他手术操作日期16 C37x16 日期时间
+    private Date C37x16;
+    // 其他手术操作级别16 C38x16 字符 1
+    private String C38x16;
+    // 其他手术持续时间16 F14x16 数字 (7,2)
+    private BigDecimal F14x16;
+    // 其他手术操作术者16 C39x16 字符 40
+    private String C39x16;
+    // 其他手术操作Ⅰ助16 C40x16 字符 40
+    private String C40x16;
+    // 其他手术操作Ⅱ助16 C41x16 字符 40
+    private String C41x16;
+    // 其他手术操作切口愈合等级16 C42x16C 字符 2
+    private String C42x16C;
+    // 其他手术操作麻醉方式16 C43x16C 字符 6
+    private String C43x16C;
+    // 其他手术麻醉分级16 F16x16 字符 1
+    private String F16x16;
+    // 其他手术操作麻醉医师16 C44x16 字符 40
+    private String C44x16;
+    // 其他手术操作编码17 C35x17C 字符 20
+    private String C35x17C;
+    // 其他手术操作名称17 C36x17N 字符 100
+    private String C36x17N;
+    // 其他手术操作日期17 C37x17 日期时间
+    private Date C37x17;
+    // 其他手术操作级别17 C38x17 字符 1
+    private String C38x17;
+    // 其他手术持续时间17 F14x17 数字 (7,2)
+    private BigDecimal F14x17;
+    // 其他手术操作术者17 C39x17 字符 40
+    private String C39x17;
+    // 其他手术操作Ⅰ助17 C40x17 字符 40
+    private String C40x17;
+    // 其他手术操作Ⅱ助17 C41x17 字符 40
+    private String C41x17;
+    // 其他手术操作切口愈合等级17 C42x17C 字符 2
+    private String C42x17C;
+    // 其他手术操作麻醉方式17 C43x17C 字符 6
+    private String C43x17C;
+    // 其他手术麻醉分级17 F16x17 字符 1
+    private String F16x17;
+    // 其他手术操作麻醉医师17 C44x17 字符 40
+    private String C44x17;
+    // 其他手术操作编码18 C35x18C 字符 20
+    private String C35x18C;
+    // 其他手术操作名称18 C36x18N 字符 100
+    private String C36x18N;
+    // 其他手术操作日期18 C37x18 日期时间
+    private Date C37x18;
+    // 其他手术操作级别18 C38x18 字符 1
+    private String C38x18;
+    // 其他手术持续时间18 F14x18 数字 (7,2)
+    private BigDecimal F14x18;
+    // 其他手术操作术者18 C39x18 字符 40
+    private String C39x18;
+    // 其他手术操作Ⅰ助18 C40x18 字符 40
+    private String C40x18;
+    // 其他手术操作Ⅱ助18 C41x18 字符 40
+    private String C41x18;
+    // 其他手术操作切口愈合等级18 C42x18C 字符 2
+    private String C42x18C;
+    // 其他手术操作麻醉方式18 C43x18C 字符 6
+    private String C43x18C;
+    // 其他手术麻醉分级18 F16x18 字符 1
+    private String F16x18;
+    // 其他手术操作麻醉医师18 C44x18 字符 40
+    private String C44x18;
+    // 其他手术操作编码19 C35x19C 字符 20
+    private String C35x19C;
+    // 其他手术操作名称19 C36x19N 字符 100
+    private String C36x19N;
+    // 其他手术操作日期19 C37x19 日期时间
+    private Date C37x19;
+    // 其他手术操作级别19 C38x19 字符 1
+    private String C38x19;
+    // 其他手术持续时间19 F14x19 数字 (7,2)
+    private BigDecimal F14x19;
+    // 其他手术操作术者19 C39x19 字符 40
+    private String C39x19;
+    // 其他手术操作Ⅰ助19 C40x19 字符 40
+    private String C40x19;
+    // 其他手术操作Ⅱ助19 C41x19 字符 40
+    private String C41x19;
+    // 其他手术操作切口愈合等级19 C42x19C 字符 2
+    private String C42x19C;
+    // 其他手术操作麻醉方式19 C43x19C 字符 6
+    private String C43x19C;
+    // 其他手术麻醉分级19 F16x19 字符 1
+    private String F16x19;
+    // 其他手术操作麻醉医师19 C44x19 字符 40
+    private String C44x19;
+    // 其他手术操作编码20 C35x20C 字符 20
+    private String C35x20C;
+    // 其他手术操作名称20 C36x20N 字符 100
+    private String C36x20N;
+    // 其他手术操作日期20 C37x20 日期时间
+    private Date C37x20;
+    // 其他手术操作级别20 C38x20 字符 1
+    private String C38x20;
+    // 其他手术持续时间20 F14x20 数字 (7,2)
+    private BigDecimal F14x20;
+    // 其他手术操作术者20 C39x20 字符 40
+    private String C39x20;
+    // 其他手术操作Ⅰ助20 C40x20 字符 40
+    private String C40x20;
+    // 其他手术操作Ⅱ助20 C41x20 字符 40
+    private String C41x20;
+    // 其他手术操作切口愈合等级20 C42x20C 字符 2
+    private String C42x20C;
+    // 其他手术操作麻醉方式20 C43x20C 字符 6
+    private String C43x20C;
+    // 其他手术麻醉分级20 F16x20 字符 1
+    private String F16x20;
+    // 其他手术操作麻醉医师20 C44x20 字符 40
+    private String C44x20;
+    // 其他手术操作编码21 C35x21C 字符 20
+    private String C35x21C;
+    // 其他手术操作名称21 C36x21N 字符 100
+    private String C36x21N;
+    // 其他手术操作日期21 C37x21 日期时间
+    private Date C37x21;
+    // 其他手术操作级别21 C38x21 字符 1
+    private String C38x21;
+    // 其他手术持续时间21 F14x21 数字 (7,2)
+    private BigDecimal F14x21;
+    // 其他手术操作术者21 C39x21 字符 40
+    private String C39x21;
+    // 其他手术操作Ⅰ助21 C40x21 字符 40
+    private String C40x21;
+    // 其他手术操作Ⅱ助21 C41x21 字符 40
+    private String C41x21;
+    // 其他手术操作切口愈合等级21 C42x21C 字符 2
+    private String C42x21C;
+    // 其他手术操作麻醉方式21 C43x21C 字符 6
+    private String C43x21C;
+    // 其他手术麻醉分级21 F16x21 字符 1
+    private String F16x21;
+    // 其他手术操作麻醉医师21 C44x21 字符 40
+    private String C44x21;
+    // 其他手术操作编码22 C35x22C 字符 20
+    private String C35x22C;
+    // 其他手术操作名称22 C36x22N 字符 100
+    private String C36x22N;
+    // 其他手术操作日期22 C37x22 日期时间
+    private Date C37x22;
+    // 其他手术操作级别22 C38x22 字符 1
+    private String C38x22;
+    // 其他手术持续时间22 F14x22 数字 (7,2)
+    private BigDecimal F14x22;
+    // 其他手术操作术者22 C39x22 字符 40
+    private String C39x22;
+    // 其他手术操作Ⅰ助22 C40x22 字符 40
+    private String C40x22;
+    // 其他手术操作Ⅱ助22 C41x22 字符 40
+    private String C41x22;
+    // 其他手术操作切口愈合等级22 C42x22C 字符 2
+    private String C42x22C;
+    // 其他手术操作麻醉方式22 C43x22C 字符 6
+    private String C43x22C;
+    // 其他手术麻醉分级22 F16x22 字符 1
+    private String F16x22;
+    // 其他手术操作麻醉医师22 C44x22 字符 40
+    private String C44x22;
+    // 其他手术操作编码23 C35x23C 字符 20
+    private String C35x23C;
+    // 其他手术操作名称23 C36x23N 字符 100
+    private String C36x23N;
+    // 其他手术操作日期23 C37x23 日期时间
+    private Date C37x23;
+    // 其他手术操作级别23 C38x23 字符 1
+    private String C38x23;
+    // 其他手术持续时间23 F14x23 数字 (7,2)
+    private BigDecimal F14x23;
+    // 其他手术操作术者23 C39x23 字符 40
+    private String C39x23;
+    // 其他手术操作Ⅰ助23 C40x23 字符 40
+    private String C40x23;
+    // 其他手术操作Ⅱ助23 C41x23 字符 40
+    private String C41x23;
+    // 其他手术操作切口愈合等级23 C42x23C 字符 2
+    private String C42x23C;
+    // 其他手术操作麻醉方式23 C43x23C 字符 6
+    private String C43x23C;
+    // 其他手术麻醉分级23 F16x23 字符 1
+    private String F16x23;
+    // 其他手术操作麻醉医师23 C44x23 字符 40
+    private String C44x23;
+    // 其他手术操作编码24 C35x24C 字符 20
+    private String C35x24C;
+    // 其他手术操作名称24 C36x24N 字符 100
+    private String C36x24N;
+    // 其他手术操作日期24 C37x24 日期时间
+    private Date C37x24;
+    // 其他手术操作级别24 C38x24 字符 1
+    private String C38x24;
+    // 其他手术持续时间24 F14x24 数字 (7,2)
+    private BigDecimal F14x24;
+    // 其他手术操作术者24 C39x24 字符 40
+    private String C39x24;
+    // 其他手术操作Ⅰ助24 C40x24 字符 40
+    private String C40x24;
+    // 其他手术操作Ⅱ助24 C41x24 字符 40
+    private String C41x24;
+    // 其他手术操作切口愈合等级24 C42x24C 字符 2
+    private String C42x24C;
+    // 其他手术操作麻醉方式24 C43x24C 字符 6
+    private String C43x24C;
+    // 其他手术麻醉分级24 F16x24 字符 1
+    private String F16x24;
+    // 其他手术操作麻醉医师24 C44x24 字符 40
+    private String C44x24;
+    // 其他手术操作编码25 C35x25C 字符 20
+    private String C35x25C;
+    // 其他手术操作名称25 C36x25N 字符 100
+    private String C36x25N;
+    // 其他手术操作日期25 C37x25 日期时间
+    private Date C37x25;
+    // 其他手术操作级别25 C38x25 字符 1
+    private String C38x25;
+    // 其他手术持续时间25 F14x25 数字 (7,2)
+    private BigDecimal F14x25;
+    // 其他手术操作术者25 C39x25 字符 40
+    private String C39x25;
+    // 其他手术操作Ⅰ助25 C40x25 字符 40
+    private String C40x25;
+    // 其他手术操作Ⅱ助25 C41x25 字符 40
+    private String C41x25;
+    // 其他手术操作切口愈合等级25 C42x25C 字符 2
+    private String C42x25C;
+    // 其他手术操作麻醉方式25 C43x25C 字符 6
+    private String C43x25C;
+    // 其他手术麻醉分级25 F16x25 字符 1
+    private String F16x25;
+    // 其他手术操作麻醉医师25 C44x25 字符 40
+    private String C44x25;
+    // 其他手术操作编码26 C35x26C 字符 20
+    private String C35x26C;
+    // 其他手术操作名称26 C36x26N 字符 100
+    private String C36x26N;
+    // 其他手术操作日期26 C37x26 日期时间
+    private Date C37x26;
+    // 其他手术操作级别26 C38x26 字符 1
+    private String C38x26;
+    // 其他手术持续时间26 F14x26 数字 (7,2)
+    private BigDecimal F14x26;
+    // 其他手术操作术者26 C39x26 字符 40
+    private String C39x26;
+    // 其他手术操作Ⅰ助26 C40x26 字符 40
+    private String C40x26;
+    // 其他手术操作Ⅱ助26 C41x26 字符 40
+    private String C41x26;
+    // 其他手术操作切口愈合等级26 C42x26C 字符 2
+    private String C42x26C;
+    // 其他手术操作麻醉方式26 C43x26C 字符 6
+    private String C43x26C;
+    // 其他手术麻醉分级26 F16x26 字符 1
+    private String F16x26;
+    // 其他手术操作麻醉医师26 C44x26 字符 40
+    private String C44x26;
+    // 其他手术操作编码27 C35x27C 字符 20
+    private String C35x27C;
+    // 其他手术操作名称27 C36x27N 字符 100
+    private String C36x27N;
+    // 其他手术操作日期27 C37x27 日期时间
+    private Date C37x27;
+    // 其他手术操作级别27 C38x27 字符 1
+    private String C38x27;
+    // 其他手术持续时间27 F14x27 数字 (7,2)
+    private BigDecimal F14x27;
+    // 其他手术操作术者27 C39x27 字符 40
+    private String C39x27;
+    // 其他手术操作Ⅰ助27 C40x27 字符 40
+    private String C40x27;
+    // 其他手术操作Ⅱ助27 C41x27 字符 40
+    private String C41x27;
+    // 其他手术操作切口愈合等级27 C42x27C 字符 2
+    private String C42x27C;
+    // 其他手术操作麻醉方式27 C43x27C 字符 6
+    private String C43x27C;
+    // 其他手术麻醉分级27 F16x27 字符 1
+    private String F16x27;
+    // 其他手术操作麻醉医师27 C44x27 字符 40
+    private String C44x27;
+    // 其他手术操作编码28 C35x28C 字符 20
+    private String C35x28C;
+    // 其他手术操作名称28 C36x28N 字符 100
+    private String C36x28N;
+    // 其他手术操作日期28 C37x28 日期时间
+    private Date C37x28;
+    // 其他手术操作级别28 C38x28 字符 1
+    private String C38x28;
+    // 其他手术持续时间28 F14x28 数字 (7,2)
+    private BigDecimal F14x28;
+    // 其他手术操作术者28 C39x28 字符 40
+    private String C39x28;
+    // 其他手术操作Ⅰ助28 C40x28 字符 40
+    private String C40x28;
+    // 其他手术操作Ⅱ助28 C41x28 字符 40
+    private String C41x28;
+    // 其他手术操作切口愈合等级28 C42x28C 字符 2
+    private String C42x28C;
+    // 其他手术操作麻醉方式28 C43x28C 字符 6
+    private String C43x28C;
+    // 其他手术麻醉分级28 F16x28 字符 1
+    private String F16x28;
+    // 其他手术操作麻醉医师28 C44x28 字符 40
+    private String C44x28;
+    // 其他手术操作编码29 C35x29C 字符 20
+    private String C35x29C;
+    // 其他手术操作名称29 C36x29N 字符 100
+    private String C36x29N;
+    // 其他手术操作日期29 C37x29 日期时间
+    private Date C37x29;
+    // 其他手术操作级别29 C38x29 字符 1
+    private String C38x29;
+    // 其他手术持续时间29 F14x29 数字 (7,2)
+    private BigDecimal F14x29;
+    // 其他手术操作术者29 C39x29 字符 40
+    private String C39x29;
+    // 其他手术操作Ⅰ助29 C40x29 字符 40
+    private String C40x29;
+    // 其他手术操作Ⅱ助29 C41x29 字符 40
+    private String C41x29;
+    // 其他手术操作切口愈合等级29 C42x29C 字符 2
+    private String C42x29C;
+    // 其他手术操作麻醉方式29 C43x29C 字符 6
+    private String C43x29C;
+    // 其他手术麻醉分级29 F16x29 字符 1
+    private String F16x29;
+    // 其他手术操作麻醉医师29 C44x29 字符 40
+    private String C44x29;
+    // 其他手术操作编码30 C35x30C 字符 20
+    private String C35x30C;
+    // 其他手术操作名称30 C36x30N 字符 100
+    private String C36x30N;
+    // 其他手术操作日期30 C37x30 日期时间
+    private Date C37x30;
+    // 其他手术操作级别30 C38x30 字符 1
+    private String C38x30;
+    // 其他手术持续时间30 F14x30 数字 (7,2)
+    private BigDecimal F14x30;
+    // 其他手术操作术者30 C39x30 字符 40
+    private String C39x30;
+    // 其他手术操作Ⅰ助30 C40x30 字符 40
+    private String C40x30;
+    // 其他手术操作Ⅱ助30 C41x30 字符 40
+    private String C41x30;
+    // 其他手术操作切口愈合等级30 C42x30C 字符 2
+    private String C42x30C;
+    // 其他手术操作麻醉方式30 C43x30C 字符 6
+    private String C43x30C;
+    // 其他手术麻醉分级30 F16x30 字符 1
+    private String F16x30;
+    // 其他手术操作麻醉医师30 C44x30 字符 40
+    private String C44x30;
+    // 其他手术操作编码31 C35x31C 字符 20
+    private String C35x31C;
+    // 其他手术操作名称31 C36x31N 字符 100
+    private String C36x31N;
+    // 其他手术操作日期31 C37x31 日期时间
+    private Date C37x31;
+    // 其他手术操作级别31 C38x31 字符 1
+    private String C38x31;
+    // 其他手术持续时间31 F14x31 数字 (7,2)
+    private BigDecimal F14x31;
+    // 其他手术操作术者31 C39x31 字符 40
+    private String C39x31;
+    // 其他手术操作Ⅰ助31 C40x31 字符 40
+    private String C40x31;
+    // 其他手术操作Ⅱ助31 C41x31 字符 40
+    private String C41x31;
+    // 其他手术操作切口愈合等级31 C42x31C 字符 2
+    private String C42x31C;
+    // 其他手术操作麻醉方式31 C43x31C 字符 6
+    private String C43x31C;
+    // 其他手术麻醉分级31 F16x31 字符 1
+    private String F16x31;
+    // 其他手术操作麻醉医师31 C44x31 字符 40
+    private String C44x31;
+    // 其他手术操作编码32 C35x32C 字符 20
+    private String C35x32C;
+    // 其他手术操作名称32 C36x32N 字符 100
+    private String C36x32N;
+    // 其他手术操作日期32 C37x32 日期时间
+    private Date C37x32;
+    // 其他手术操作级别32 C38x32 字符 1
+    private String C38x32;
+    // 其他手术持续时间32 F14x32 数字 (7,2)
+    private BigDecimal F14x32;
+    // 其他手术操作术者32 C39x32 字符 40
+    private String C39x32;
+    // 其他手术操作Ⅰ助32 C40x32 字符 40
+    private String C40x32;
+    // 其他手术操作Ⅱ助32 C41x32 字符 40
+    private String C41x32;
+    // 其他手术操作切口愈合等级32 C42x32C 字符 2
+    private String C42x32C;
+    // 其他手术操作麻醉方式32 C43x32C 字符 6
+    private String C43x32C;
+    // 其他手术麻醉分级32 F16x32 字符 1
+    private String F16x32;
+    // 其他手术操作麻醉医师32 C44x32 字符 40
+    private String C44x32;
+    // 其他手术操作编码33 C35x33C 字符 20
+    private String C35x33C;
+    // 其他手术操作名称33 C36x33N 字符 100
+    private String C36x33N;
+    // 其他手术操作日期33 C37x33 日期时间
+    private Date C37x33;
+    // 其他手术操作级别33 C38x33 字符 1
+    private String C38x33;
+    // 其他手术持续时间33 F14x33 数字 (7,2)
+    private BigDecimal F14x33;
+    // 其他手术操作术者33 C39x33 字符 40
+    private String C39x33;
+    // 其他手术操作Ⅰ助33 C40x33 字符 40
+    private String C40x33;
+    // 其他手术操作Ⅱ助33 C41x33 字符 40
+    private String C41x33;
+    // 其他手术操作切口愈合等级33 C42x33C 字符 2
+    private String C42x33C;
+    // 其他手术操作麻醉方式33 C43x33C 字符 6
+    private String C43x33C;
+    // 其他手术麻醉分级33 F16x33 字符 1
+    private String F16x33;
+    // 其他手术操作麻醉医师33 C44x33 字符 40
+    private String C44x33;
+    // 其他手术操作编码34 C35x34C 字符 20
+    private String C35x34C;
+    // 其他手术操作名称34 C36x34N 字符 100
+    private String C36x34N;
+    // 其他手术操作日期34 C37x34 日期时间
+    private Date C37x34;
+    // 其他手术操作级别34 C38x34 字符 1
+    private String C38x34;
+    // 其他手术持续时间34 F14x34 数字 (7,2)
+    private BigDecimal F14x34;
+    // 其他手术操作术者34 C39x34 字符 40
+    private String C39x34;
+    // 其他手术操作Ⅰ助34 C40x34 字符 40
+    private String C40x34;
+    // 其他手术操作Ⅱ助34 C41x34 字符 40
+    private String C41x34;
+    // 其他手术操作切口愈合等级34 C42x34C 字符 2
+    private String C42x34C;
+    // 其他手术操作麻醉方式34 C43x34C 字符 6
+    private String C43x34C;
+    // 其他手术麻醉分级34 F16x34 字符 1
+    private String F16x34;
+    // 其他手术操作麻醉医师34 C44x34 字符 40
+    private String C44x34;
+    // 其他手术操作编码35 C35x35C 字符 20
+    private String C35x35C;
+    // 其他手术操作名称35 C36x35N 字符 100
+    private String C36x35N;
+    // 其他手术操作日期35 C37x35 日期时间
+    private Date C37x35;
+    // 其他手术操作级别35 C38x35 字符 1
+    private String C38x35;
+    // 其他手术持续时间35 F14x35 数字 (7,2)
+    private BigDecimal F14x35;
+    // 其他手术操作术者35 C39x35 字符 40
+    private String C39x35;
+    // 其他手术操作Ⅰ助35 C40x35 字符 40
+    private String C40x35;
+    // 其他手术操作Ⅱ助35 C41x35 字符 40
+    private String C41x35;
+    // 其他手术操作切口愈合等级35 C42x35C 字符 2
+    private String C42x35C;
+    // 其他手术操作麻醉方式35 C43x35C 字符 6
+    private String C43x35C;
+    // 其他手术麻醉分级35 F16x35 字符 1
+    private String F16x35;
+    // 其他手术操作麻醉医师35 C44x35 字符 40
+    private String C44x35;
+    // 其他手术操作编码36 C35x36C 字符 20
+    private String C35x36C;
+    // 其他手术操作名称36 C36x36N 字符 100
+    private String C36x36N;
+    // 其他手术操作日期36 C37x36 日期时间
+    private Date C37x36;
+    // 其他手术操作级别36 C38x36 字符 1
+    private String C38x36;
+    // 其他手术持续时间36 F14x36 数字 (7,2)
+    private BigDecimal F14x36;
+    // 其他手术操作术者36 C39x36 字符 40
+    private String C39x36;
+    // 其他手术操作Ⅰ助36 C40x36 字符 40
+    private String C40x36;
+    // 其他手术操作Ⅱ助36 C41x36 字符 40
+    private String C41x36;
+    // 其他手术操作切口愈合等级36 C42x36C 字符 2
+    private String C42x36C;
+    // 其他手术操作麻醉方式36 C43x36C 字符 6
+    private String C43x36C;
+    // 其他手术麻醉分级36 F16x36 字符 1
+    private String F16x36;
+    // 其他手术操作麻醉医师36 C44x36 字符 40
+    private String C44x36;
+    // 其他手术操作编码37 C35x37C 字符 20
+    private String C35x37C;
+    // 其他手术操作名称37 C36x37N 字符 100
+    private String C36x37N;
+    // 其他手术操作日期37 C37x37 日期时间
+    private Date C37x37;
+    // 其他手术操作级别37 C38x37 字符 1
+    private String C38x37;
+    // 其他手术持续时间37 F14x37 数字 (7,2)
+    private BigDecimal F14x37;
+    // 其他手术操作术者37 C39x37 字符 40
+    private String C39x37;
+    // 其他手术操作Ⅰ助37 C40x37 字符 40
+    private String C40x37;
+    // 其他手术操作Ⅱ助37 C41x37 字符 40
+    private String C41x37;
+    // 其他手术操作切口愈合等级37 C42x37C 字符 2
+    private String C42x37C;
+    // 其他手术操作麻醉方式37 C43x37C 字符 6
+    private String C43x37C;
+    // 其他手术麻醉分级37 F16x37 字符 1
+    private String F16x37;
+    // 其他手术操作麻醉医师37 C44x37 字符 40
+    private String C44x37;
+    // 其他手术操作编码38 C35x38C 字符 20
+    private String C35x38C;
+    // 其他手术操作名称38 C36x38N 字符 100
+    private String C36x38N;
+    // 其他手术操作日期38 C37x38 日期时间
+    private Date C37x38;
+    // 其他手术操作级别38 C38x38 字符 1
+    private String C38x38;
+    // 其他手术持续时间38 F14x38 数字 (7,2)
+    private BigDecimal F14x38;
+    // 其他手术操作术者38 C39x38 字符 40
+    private String C39x38;
+    // 其他手术操作Ⅰ助38 C40x38 字符 40
+    private String C40x38;
+    // 其他手术操作Ⅱ助38 C41x38 字符 40
+    private String C41x38;
+    // 其他手术操作切口愈合等级38 C42x38C 字符 2
+    private String C42x38C;
+    // 其他手术操作麻醉方式38 C43x38C 字符 6
+    private String C43x38C;
+    // 其他手术麻醉分级38 F16x38 字符 1
+    private String F16x38;
+    // 其他手术作麻醉医师38 C44x38 字符 40
+    private String C44x38;
+    // 其他手术操作编码39 C35x39C 字符 20
+    private String C35x39C;
+    // 其他手术操作名称39 C36x39N 字符 100
+    private String C36x39N;
+    // 其他手术操作日期39 C37x39 日期时间
+    private Date C37x39;
+    // 其他手术操作级别39 C38x39 字符 1
+    private String C38x39;
+    // 其他手术持续时间39 F14x39 数字 (7,2)
+    private BigDecimal F14x39;
+    // 其他手术操作术者39 C39x39 字符 40
+    private String C39x39;
+    // 其他手术操作Ⅰ助39 C40x39 字符 40
+    private String C40x39;
+    // 其他手术操作Ⅱ助39 C41x39 字符 40
+    private String C41x39;
+    // 其他手术操作切口愈合等级39 C42x39C 字符 2
+    private String C42x39C;
+    // 其他手术操作麻醉方式39 C43x39C 字符 6
+    private String C43x39C;
+    // 其他手术麻醉分级39 F16x39 字符 1
+    private String F16x39;
+    // 其他手术操作麻醉医师39 C44x39 字符 40
+    private String C44x39;
+    // 其他手术操作编码40 C35x40C 字符 20
+    private String C35x40C;
+    // 其他手术操作名称40 C36x40N 字符 100
+    private String C36x40N;
+    // 其他手术操作日期40 C37x40 日期时间
+    private Date C37x40;
+    // 其他手术操作级别40 C38x40 字符 1
+    private String C38x40;
+    // 其他手术持续时间40 F14x40 数字 (7,2)
+    private BigDecimal F14x40;
+    // 其他手术操作术者40 C39x40 字符 40
+    private String C39x40;
+    // 其他手术操作Ⅰ助40 C40x40 字符 40
+    private String C40x40;
+    // 其他手术操作Ⅱ助40 C41x40 字符 40
+    private String C41x40;
+    // 其他手术操作切口愈合等级40 C42x40C 字符 2
+    private String C42x40C;
+    // 其他手术操作麻醉方式40 C43x40C 字符 6
+    private String C43x40C;
+    // 其他手术麻醉分级40 F16x40 字符 1
+    private String F16x40;
+    // 其他手术操作麻醉医师40 C44x40 字符 40
+    private String C44x40;
+    // 特级护理天数 F17 数字 6
+    private Integer F17;
+    // 一级护理天数 F18 数字 6
+    private Integer F18;
+    // 二级护理天数 F19 数字 6
+    private Integer F19;
+    // 三级护理天数 F20 数字 6
+    private Integer F20;
+    // 输血反应 F21 数字 1 条件必填
+    private Integer F21;
+    // 红细胞 F22 数字 (4,1) 条件必填
+    private BigDecimal F22;
+    // 血小板 F23 数字 (4,1) 条件必填
+    private BigDecimal F23;
+    // 血浆 F24 数字 (8,2) 条件必填
+    private BigDecimal F24;
+    // 全血 F25 数字 (8,2) 条件必填
+    private BigDecimal F25;
+    // 自体血回输 F26 数字 (4,1) 条件必填
+    private BigDecimal F26;
+    // 年龄不足1周岁的年龄（天） A16 数字 3 条件必填②
+    private Integer A16;
+    // 新生儿出生体重（克） A18x01 数字 6 条件必填②
+    private Integer A18x01;
+    // 新生儿出生体重（克）2 A18x02 数字 6
+    private Integer A18x02;
+    // 新生儿出生体重（克）3 A18x03 数字 6
+    private Integer A18x03;
+    // 新生儿出生体重（克）4 A18x04 数字 6
+    private Integer A18x04;
+    // 新生儿出生体重（克）5 A18x05 数字 6
+    private Integer A18x05;
+    // 新生儿入院体重（克） A17 数字 6 条件必填②
+    private Integer A17;
+    // 颅脑损伤患者入院前昏迷时间（天） C28 数字 5 必填
+    private Integer C28;
+    // 颅脑损伤患者入院前昏迷时间（小时） C29 数字 2 必填
+    private Integer C29;
+    // 颅脑损伤患者入院前昏迷时间（分钟） C30 数字 2 必填
+    private Integer C30;
+    // 颅脑损伤患者入院后昏迷时间（天） C31 数字 5 必填
+    private Integer C31;
+    // 颅脑损伤患者入院后昏迷时间（小时） C32 数字 2 必填
+    private Integer C32;
+    // 颅脑损伤患者入院后昏迷时间（分钟） C33 数字 2 必填
+    private Integer C33;
+    // 有创呼吸机使用时间 C47 数字 6
+    private Integer C47;
+    // 重症监护室名称1 C48x01C 字符 2
+    private String C48x01C;
+    // 进入时间1 C49x01 日期时间
+    private Date C49x01;
+    // 退出时间1 C50x01 日期时间
+    private Date C50x01;
+    // 重症监护室名称2 C48x02C 字符 2
+    private String C48x02C;
+    // 进入时间2 C49x02 日期时间
+    private Date C49x02;
+    // 退出时间2 C50x02 日期时间
+    private Date C50x02;
+    // 重症监护室名称3 C48x03C 字符 2
+    private String C48x03C;
+    // 进入时间3 C49x03 日期时间
+    private Date C49x03;
+    // 退出时间3 C50x03 日期时间
+    private Date C50x03;
+    // 重症监护室名称4 C48x04C 字符 2
+    private String C48x04C;
+    // 进入时间4 C49x04 日期时间
+    private Date C49x04;
+    // 退出时间4 C50x04 日期时间
+    private Date C50x04;
+    // 重症监护室名称5 C48x05C 字符 2
+    private String C48x05C;
+    // 进入时间5 C49x05 日期时间
+    private Date C49x05;
+    // 退出时间5 C50x05 日期时间
+    private Date C50x05;
+    // 是否有出院31日内再住院计划 B36C 数字 1 必填
+    private Integer B36C;
+    // 出院31天再住院计划目的 B37 字符 100 条件必填
+    private String B37;
+    // 离院方式 B34C 字符 1 必填
+    private String B34C;
+    // 医嘱转院、转社区卫生服务机构/乡镇卫生院名称 B35 字符 100 条件必填
+    private String B35;
+    // 住院总费用 D01 数字 (11,2) 必填
+    private BigDecimal D01;
+    // 住院总费用其中自付金额 D09 数字 (10,2) 必填
+    private BigDecimal D09;
+    // 1.一般医疗服务费 D11 数字 (10,2)
+    private BigDecimal D11;
+    // 2.一般治疗操作费 D12 数字 (10,2)
+    private BigDecimal D12;
+    // 3.护理费 D13 数字 (10,2)
+    private BigDecimal D13;
+    // 4.综合医疗服务类其他费用 D14 数字 (10,2)
+    private BigDecimal D14;
+    // 5.病理诊断费 D15 数字 (10,2)
+    private BigDecimal D15;
+    // 6.实验室诊断费 D16 数字 (10,2)
+    private BigDecimal D16;
+    // 7.影像学诊断费 D17 数字 (10,2)
+    private BigDecimal D17;
+    // 8.临床诊断项目费 D18 数字 (10,2)
+    private BigDecimal D18;
+    // 9.非手术治疗项目费 D19 数字 (10,2)
+    private BigDecimal D19;
+    // 其中：临床物理治疗费 D19x01 数字 (10,2)
+    private BigDecimal D19x01;
+    // 10.手术治疗费 D20 数字 (10,2)
+    private BigDecimal D20;
+    // 其中：麻醉费 D20x01 数字 (10,2)
+    private BigDecimal D20x01;
+    // 其中：手术费 D20x02 数字 (10,2)
+    private BigDecimal D20x02;
+    // 11.康复费 D21 数字 (10,2)
+    private BigDecimal D21;
+    // 12.中医治疗费 D22 数字 (10,2)
+    private BigDecimal D22;
+    // 13.西药费 D23 数字 (10,2)
+    private BigDecimal D23;
+    // 其中：抗菌药物费 D23x01 数字 (10,2)
+    private BigDecimal D23x01;
+    // 14.中成药费 D24 数字 (10,2)
+    private BigDecimal D24;
+    // 15.中草药费 D25 数字 (10,2)
+    private BigDecimal D25;
+    // 16.血费 D26 数字 (10,2)
+    private BigDecimal D26;
+    // 17.白蛋白类制品费 D27 数字 (10,2)
+    private BigDecimal D27;
+    // 18.球蛋白类制品费 D28 数字 (10,2)
+    private BigDecimal D28;
+    // 19.凝血因子类制品费 D29 数字 (10,2)
+    private BigDecimal D29;
+    // 20.细胞因子类制品费 D30 数字 (10,2)
+    private BigDecimal D30;
+    // 21.检查用一次性医用材料费 D31 数字 (10,2)
+    private BigDecimal D31;
+    // 22.治疗用一次性医用材料费 D32 数字 (10,2)
+    private BigDecimal D32;
+    // 23.手术用一次性医用材料费 D33 数字 (10,2)
+    private BigDecimal D33;
+    // 24.其他费： D34 数字 (10,2)
+    private BigDecimal D34;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
new file mode 100644
index 00000000..2a8f6bcd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
@@ -0,0 +1,212 @@
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 住院病案首页采集信息搜索
+ *
+ * @author yuxj
+ * @date 2025/8/25
+ */
+@Data
+@Accessors(chain = true)
+public class InpatientMedicalRecordHomePageMakeDto {
+
+    // 组织机构代码 字符 30 必填
+    private String A01;
+    // 医疗机构名称 A02 字符 80 必填
+    private String A02;
+    // 病案号 A48 字符 50 必填
+    private String A48;
+    // 住院次数 A49 数字 4 必填
+    private Integer A49;
+    // 入院时间 B12 日期时间 必填
+    private Date B12;
+    // 出院时间 B15 日期时间 必填
+    private Date B15;
+    // 医疗付费方式 A46C 字符 3 必填
+    private String A46C;
+    // 姓名 A11 字符 40 必填
+    private String A11;
+    // 性别 A12C 数字 1 必填
+    private Integer A12C;
+    // 出生日期 A13 日期 10 必填
+    private Date A13;
+    // 年龄（岁） A14 数字 3 必填
+    private Integer A14;
+    // 国籍 A15C 字符 40 必填
+    private String A15C;
+    // 婚姻 A21C 字符 1 必填
+    private String A21C;
+    // 职业 A38C 字符 2 必填
+    private String A38C;
+    // 民族 A19C 字符 2 必填
+    private String A19C;
+    // 证件类别 A20N 字符 1 必填
+    private String A20N;
+    // 证件号码 A20 字符 18 必填
+    private String A20;
+    // 出生地址 A22 字符 200 必填
+    private String A22;
+    // 籍贯省（自治区、直辖市） A23C 字符 50 必填
+    private String A23C;
+    // 户口地址 A24 字符 200 必填
+    private String A24;
+    // 户口地址邮政编码 A25C 字符 6 必填
+    private String A25C;
+    // 现住址 A26 字符 200 必填
+    private String A26;
+    // 现住址电话 A27 字符 40 必填
+    private String A27;
+    // 现住址邮政编码 A28C 字符 6 必填
+    private String A28C;
+    // 工作单位及地址 A29 字符 200 必填
+    private String A29;
+    // 工作单位电话 A30 字符 20 必填
+    private String A30;
+    // 工作单位邮政编码 A31C 字符 6 必填
+    private String A31C;
+    // 联系人姓名 A32 字符 40 必填
+    private String A32;
+    // 联系人关系 A33C 字符 1 必填
+    private String A33C;
+    // 联系人地址 A34 字符 200 必填
+    private String A34;
+    // 联系人电话 A35 字符 40 必填
+    private String A35;
+    // 是否为日间手术 B38 字符 1 必填
+    private String B38;
+    // 入院途径 B11C 字符 1 必填
+    private String B11C;
+    // 入院科别 B13C 字符 6 必填
+    private String B13C;
+    // 入院病房 B14 字符 30 必填
+    private String B14;
+    // 转科科别 B21C 集合 可以多选 必填
+    private List<String> B21C;
+    // 出院科别 B16C 字符 6 必填
+    private String B16C;
+    // 出院病房 B17 字符 30 必填
+    private String B17;
+    // 实际住院（天） B20 数字 6 必填
+    private Integer B20;
+    // 门（急）诊诊断编码 C01C 字符 20 必填
+    private String C01C;
+    // 门（急）诊诊断名称 C02N 字符 100 必填
+    private String C02N;
+    // 出院主要诊断编码 C03C 字符 20 必填
+    private String C03C;
+    // 出院主要诊断名称 C04N 字符 100 必填
+    private String C04N;
+    // 出院主要诊断入院病情 C05C 字符 1 必填
+    private String C05C;
+    // 病理诊断编码 C09C 字符 20 条件必填
+    private String C09C;
+    // 病理诊断名称 C10N 字符 100 条件必填
+    private String C10N;
+    // 病理号 C11 字符 50 条件必填
+    private String C11;
+    // 损伤、中毒外部原因编码 C12C 字符 20 条件必填
+    private String C12C;
+    // 损伤、中毒外部原因名称 C13N 字符 100 条件必填
+    private String C13N;
+    // 有无药物过敏 C24C 字符 1 必填
+    private String C24C;
+    // 过敏药物名称 C25 字符 200 条件必填
+    private String C25;
+    // 科主任编码 B22C 字符 30 必填
+    private String B22C;
+    // 科主任 B22 字符 40 必填
+    private String B22;
+    // 主（副主）任医师编码 B23C 字符 30 必填
+    private String B23C;
+    // 主（副主）任医师 B23 字符 40 必填
+    private String B23;
+    // 主治医师编码 B24C 字符 30 必填
+    private String B24C;
+    // 主治医师 B24 字符 40 必填
+    private String B24;
+    // 住院医师编码 B25C 字符 30 必填
+    private String B25C;
+    // 住院医师 B25 字符 40 必填
+    private String B25;
+    // 责任护士编码 B26C 字符 30 必填
+    private String B26C;
+    // 责任护士 B26 字符 40 必填
+    private String B26;
+    // 编码员 B29 字符 40 必填
+    private String B29;
+    // ABO血型 C26C 字符 1 必填
+    private String C26C;
+    // Rh血型 C27C 字符 1 必填
+    private String C27C;
+    // 主要手术操作编码 C14x01C 字符 20 必填
+    private String C14x01C;
+    // 主要手术操作名称 C15x01N 字符 100 必填
+    private String C15x01N;
+    // 主要手术操作日期 C16x01 日期时间 必填
+    private Date C16x01;
+    // 主要手术操作级别 C17x01 字符 1 条件必填
+    private String C17x01;
+    // 主要手术操作术者 C18x01 字符 40 条件必填
+    private String C18x01;
+    // 主要手术操作Ⅰ助 C19x01 字符 40 条件必填
+    private String C19x01;
+    // 主要手术操作Ⅱ助 C20x01 字符 40 条件必填
+    private String C20x01;
+    // 主要手术操作切口愈合等级 C21x01C 字符 2 条件必填
+    private String C21x01C;
+    // 主要手术操作麻醉方式 C22x01C 字符 6 条件必填
+    private String C22x01C;
+    // 主要手术操作麻醉医师 C23x01 字符 40 条件必填
+    private String C23x01;
+    // 输血反应 F21 数字 1 条件必填
+    private Integer F21;
+    // 红细胞 F22 数字 (4,1) 条件必填
+    private BigDecimal F22;
+    // 血小板 F23 数字 (4,1) 条件必填
+    private BigDecimal F23;
+    // 血浆 F24 数字 (8,2) 条件必填
+    private BigDecimal F24;
+    // 全血 F25 数字 (8,2) 条件必填
+    private BigDecimal F25;
+    // 自体血回输 F26 数字 (4,1) 条件必填
+    private BigDecimal F26;
+    // 年龄不足1周岁的年龄（天） A16 数字 3 条件必填②
+    private Integer A16;
+    // 新生儿出生体重（克） A18x01 数字 6 条件必填②
+    private Integer A18x01;
+    // 新生儿入院体重（克） A17 数字 6 条件必填②
+    private Integer A17;
+    // 颅脑损伤患者入院前昏迷时间（天） C28 数字 5 必填
+    private Integer C28;
+    // 颅脑损伤患者入院前昏迷时间（小时） C29 数字 2 必填
+    private Integer C29;
+    // 颅脑损伤患者入院前昏迷时间（分钟） C30 数字 2 必填
+    private Integer C30;
+    // 颅脑损伤患者入院后昏迷时间（天） C31 数字 5 必填
+    private Integer C31;
+    // 颅脑损伤患者入院后昏迷时间（小时） C32 数字 2 必填
+    private Integer C32;
+    // 颅脑损伤患者入院后昏迷时间（分钟） C33 数字 2 必填
+    private Integer C33;
+    // 是否有出院31日内再住院计划 B36C 数字 1 必填
+    private Integer B36C;
+    // 出院31天再住院计划目的 B37 字符 100 条件必填
+    private String B37;
+    // 离院方式 B34C 字符 1 必填
+    private String B34C;
+    // 医嘱转院、转社区卫生服务机构/乡镇卫生院名称 B35 字符 100 条件必填
+    private String B35;
+    // 住院总费用 D01 数字 (11,2) 必填
+    private BigDecimal D01;
+    // 住院总费用其中自付金额 D09 数字 (10,2) 必填
+    private BigDecimal D09;
+    // 16.血费 D26 数字 (10,2)
+    private BigDecimal D26;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
similarity index 91%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
index c9ea6c39..db6073fb 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
+import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -49,13 +50,17 @@ public class InventoryProductReportPageDto {
     private BigDecimal itemQuantity;
 
     /** 计量单位 */
+    @Dict(dictCode = "unit_code")
     private String unitCode;
+    private String unitCode_dictText;
 
     /** 小包装库存数 */
     private BigDecimal minPackageQuantity;
 
     /** 小包装单位 */
+    @Dict(dictCode = "unit_code")
     private String minPackageUnit;
+    private String minPackageUnit_dictText;
 
     /** 进价(采购单价) */
     private BigDecimal price;
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java
new file mode 100644
index 00000000..61ae4cca
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品、耗材月结（筛选统计时间区间内的） dto
+ *
+ * @author liuhr
+ * @date 2025-07-15
+ */
+@Data
+@Accessors(chain = true)
+public class MedDevUseReportDto {
+
+    /** 科室总金额统计 */
+    private BigDecimal totalMoney;
+
+    /** 统计科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    //@Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    private Long orgId;
+    private String orgName;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java
new file mode 100644
index 00000000..8fd4a912
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 统计科室药品开立情况 dto
+ *
+ * @author liuhr
+ * @date 2025-07-15
+ */
+@Data
+@Accessors(chain = true)
+public class MedUseReportInfoDto {
+
+    /** 项目名称 */
+    private String name;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 发放数量 */
+    private BigDecimal totalQuantity;
+
+    /** 计量单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+    /** 项目单价 */
+    private BigDecimal unitPrice;
+
+    /** 项目总价 */
+    private BigDecimal totalMoney;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 厂家 */
+    private String manufacturerText;
+
+    /** 开单科室 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /** 发放时间 */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date dispenseTime;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java
new file mode 100644
index 00000000..8a1e2b67
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 月末结算报表 dto
+ *
+ * @author liuhr
+ * @date 2025-07-25
+ */
+@Data
+@Accessors(chain = true)
+public class MonthlySettlementDto {
+
+    /** 库房 */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 期初金额 */
+    private BigDecimal initialAmount;
+
+    /** 期末金额 */
+    private BigDecimal finalAmount;
+
+    /** 预期期末金额 */
+    private BigDecimal expectFinalAmount;
+
+    /** 偏移量 */
+    private BigDecimal offsetAmount;
+
+    /** 采购入库金额 */
+    private BigDecimal purchaseInAmount;
+    /** 采购入库单据数 */
+    private Integer purchaseInNumber;
+
+    /** 采购出库金额 */
+    private BigDecimal purchaseReturnAmount;
+    /** 采购出库单据数 */
+    private Integer purchaseReturnNumber;
+
+    /** 领用出库金额 */
+    private BigDecimal applyOutAmount;
+    /** 领用出库单据数 */
+    private Integer applyOutNumber;
+
+    /** 领用退货金额 */
+    private BigDecimal applyReturnAmount;
+    /** 领用退货单据数 */
+    private Integer applyReturnNumber;
+
+    /** 调拨入库金额 */
+    private BigDecimal transferInAmount;
+    /** 调拨入库单据数 */
+    private Integer transferInNumber;
+
+    /** 调拨出库金额 */
+    private BigDecimal transferOutAmount;
+    /** 调拨出库单据数 */
+    private Integer transferOutNumber;
+
+    /** 盘点盈亏金额（盘盈+ / 盘亏-） */
+    private BigDecimal checkProfitLossAmount;
+    /** 盘点盈亏单据数 */
+    private Integer checkProfitLossNumber;
+
+    /** 报损金额 */
+    private BigDecimal lossAmount;
+    /** 报损单据数 */
+    private Integer lossNumber;
+
+    /** 药品发放金额 */
+    private BigDecimal drugIssueAmount;
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java
similarity index 50%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java
index d8af5bfb..473ef3ab 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInitDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java
@@ -1,38 +1,43 @@
-package com.openhis.web.outpatientmanage.dto;
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
 
 import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 门诊处置
+ * 月末结算报表 dto
  *
- * @author yuxj
- * @date 2025/4/10
+ * @author ym
+ * @date 2025-05-23
  */
 @Data
 @Accessors(chain = true)
-public class OutpatientDisposalInitDto {
+public class MonthlySettlementInitDto {
 
-    /** 科室列表 */
-    private List<OutpatientDisposalInitDto.DepartmentOption> departmentOptions;
+    /**
+     * 库房
+     */
+    private List<MonthlySettlementInitDto.locationListOption> locationListOptions;
 
-    /** 科室列表 */
+    /**
+     * 库房
+     */
     @Data
-    public static class DepartmentOption {
-
+    public static class locationListOption {
         @JsonSerialize(using = ToStringSerializer.class)
         private Long value;
         private String label;
 
-        public DepartmentOption(Long value, String label) {
+        public locationListOption(Long value, String label) {
             this.value = value;
             this.label = label;
         }
     }
-
-
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
similarity index 97%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
index 394782dc..de2584e5 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
@@ -73,7 +73,7 @@ public class PrescriptionPrintDto {
     private Date reqAuthoredTime;
 
     /** 科室 */
-    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
     private String departId;
     private String departId_dictText;
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
new file mode 100644
index 00000000..3eef5f9d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.mapper;
+
+import com.openhis.web.reportmanage.dto.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+
+/**
+ * 住院病案首页采集 mapper
+ *
+ * @author yuxj
+ * @date 2025-08-25
+ */
+@Repository
+public interface InpatientMedicalRecordHomePageCollectionMapper {
+
+    /**
+     * 获取住院病案首页采集信息
+     *
+     * @param encounterIdList 就诊idList
+     * @return 住院病案首页采集信息
+     */
+    List<InpatientMedicalRecordHomePageMakeDto> getInfo(@Param("encounterIdList") List<Long> encounterIdList);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java
new file mode 100644
index 00000000..ed9ae0be
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.openhis.web.reportmanage.dto.MedDevUseReportDto;
+import com.openhis.web.reportmanage.dto.MedUseReportInfoDto;
+
+/**
+ * 药品耗材统计查询用 mapper
+ *
+ * @author liuhr
+ * @date 2025-05-21
+ */
+@Repository
+public interface MedicationDeviceReportMapper {
+
+    /**
+     * 药品耗材日结/周结/月结算 明细清单
+     *
+     * @param orgId 科室
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @param medReqTableName 结束时间
+     * @param devReqTableName 结束时间
+     * @param medDefTableName 结束时间
+     * @param devDefTableName 结束时间
+     * @param completed 请求状态:已完成
+     * @param eventStatus 事件状态:已完成
+     * @param issueInventory 单据类型:领用出库
+     * @param returnIssue 单据类型:领用退货
+     * @return 药品耗材日结/周结/月结算单
+     */
+    Page<MedUseReportInfoDto> selectMedDdevInfo(@Param("page") Page<MedUseReportInfoDto> page,
+        @Param("medReqTableName") String medReqTableName, @Param("devReqTableName") String devReqTableName,
+        @Param("medDefTableName") String medDefTableName, @Param("devDefTableName") String devDefTableName,
+        @Param("completed") Integer completed, @Param("eventStatus") Integer eventStatus,
+        @Param("issueInventory") Integer issueInventory, @Param("returnIssue") Integer returnIssue,
+        @Param("orgId") Long orgId, @Param("name") String name, @Param("dispenseDateSTime") String dispenseDateSTime,
+        @Param("dispenseDateETime") String dispenseDateETime);
+
+    /**
+     * 药品耗材日结/周结/月结算（统计筛选时间区内）
+     *
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @param dispenseDateSTime 开始时间
+     * @param dispenseDateSTime 结束时间
+     * @param medReqTableName 结束时间
+     * @param devReqTableName 结束时间
+     * @param medDefTableName 结束时间
+     * @param devDefTableName 结束时间
+     * @param completed 请求状态:已完成
+     * @param eventStatus 事件状态:已完成
+     * @return 药品耗材日结/周结/月结算单
+     */
+    List<MedDevUseReportDto> selectMedDevReport(@Param("medReqTableName") String medReqTableName,
+        @Param("devReqTableName") String devReqTableName, @Param("medDefTableName") String medDefTableName,
+        @Param("devDefTableName") String devDefTableName, @Param("completed") Integer completed,
+        @Param("eventStatus") Integer eventStatus, @Param("dispenseDateSTime") String dispenseDateSTime,
+        @Param("dispenseDateETime") String dispenseDateETime);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java
new file mode 100644
index 00000000..751f49fe
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.mapper;
+
+import java.math.BigDecimal;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.openhis.web.reportmanage.dto.AmountNumberDto;
+
+/**
+ * 月末结算报表 mapper
+ *
+ * @author liuhr
+ * @date 2025-07-25
+ */
+@Repository
+public interface MonthlySettlementReportMapper {
+
+    /**
+     * 期初，期末金额查询
+     *
+     * @param locationId 库房名称
+     * @param time 时间
+     * @return 期初，期末金额查询
+     */
+    BigDecimal selectAmount(@Param("locationId") Long locationId, @Param("time") String time);
+
+    /**
+     * 采购入库查询
+     *
+     * @param locationId 库房名称
+     * @param typeEnum 类型（采购入库:1,）
+     * @param agree 单据状态：同意
+     * @param completed 事件状态：已完成
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 采购金额单据数查询
+     */
+    AmountNumberDto selectAmountNumber(@Param("locationId") Long locationId, @Param("typeEnum") Integer typeEnum,
+        @Param("agree") Integer agree, @Param("completed") Integer completed, @Param("startTime") String startTime,
+        @Param("endTime") String endTime);
+
+    /**
+     * 调拨入库查询
+     *
+     * @param locationId 库房名称
+     * @param productTransfer 商品调拨
+     * @param productBatchTransfer 商品批量调拨
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 调拨入库金额单据数查询
+     */
+    AmountNumberDto selectTransferInAmountNumber(@Param("locationId") Long locationId,
+        @Param("productTransfer") Integer productTransfer, @Param("productBatchTransfer") Integer productBatchTransfer,
+        @Param("agree") Integer agree, @Param("completed") Integer completed, @Param("startTime") String startTime,
+        @Param("endTime") String endTime);
+
+    /**
+     * 调拨出库查询
+     *
+     * @param locationId 库房名称
+     * @param productTransfer 商品调拨
+     * @param productBatchTransfer 商品批量调拨
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 调拨金额单据数查询
+     */
+    AmountNumberDto selectTransferOutAmountNumber(@Param("locationId") Long locationId,
+        @Param("productTransfer") Integer productTransfer, @Param("productBatchTransfer") Integer productBatchTransfer,
+        @Param("agree") Integer agree, @Param("completed") Integer completed, @Param("startTime") String startTime,
+        @Param("endTime") String endTime);
+
+    /**
+     * 盘点查询
+     *
+     * @param locationId 库房名称
+     * @param productStocktaking 商品盘点
+     * @param productBatchStocktaking 商品批量盘点
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 盘点金额单据数查询
+     */
+    AmountNumberDto selectProfitLossAmountNumber(@Param("locationId") Long locationId,
+        @Param("productStocktaking") Integer productStocktaking,
+        @Param("productBatchStocktaking") Integer productBatchStocktaking, @Param("agree") Integer agree,
+        @Param("completed") Integer completed, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    /**
+     * 报损查询
+     *
+     * @param locationId 库房名称
+     * @param lossReportForm 报损单
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 报损金额单据数查询
+     */
+    AmountNumberDto selectLossAmountNumber(@Param("locationId") Long locationId,
+        @Param("lossReportForm") Integer lossReportForm, @Param("agree") Integer agree,
+        @Param("completed") Integer completed, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    /**
+     * 药品耗材发放查询
+     *
+     * @param locationId 库房名称
+     * @param medReqTableName 药品请求
+     * @param devReqTableName 耗材请求
+     * @param completed 请求状态:已完成
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 药品耗材发放金额查询
+     */
+    BigDecimal selectDrugIssue(@Param("locationId") Long locationId, @Param("completed") Integer completed,
+        @Param("medReqTableName") String medReqTableName, @Param("devReqTableName") String devReqTableName,
+        @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java
new file mode 100644
index 00000000..77205e1b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java
@@ -0,0 +1,201 @@
+package com.openhis.web.reportmanage.utils;
+
+import com.core.common.core.domain.R;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto;
+import org.apache.logging.log4j.util.Supplier;
+import org.dom4j.DocumentException;
+
+import java.awt.*;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.lang.reflect.Field;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.List;
+
+/**
+ * 住院病案csv做成
+ *
+ * @author yuxj
+ * @date 2025-08-25
+ */
+public final class CsvFillerUtil {
+
+    // 表头
+    public static final String headers =
+        "A01,A02,A48,A49,B12,B15,A47,A46C,A11,A12C,A13,A14,A15C,A21C,A38C,A19C,A20N,A20,A22,A23C,A24,A25C,A26,A27,A28C,A29,A30,A31C,A32,A33C,A34,A35,B38,B11C,B13C,B14,B21C,B16C,B17,B20,C01C,C02N,F01,F02C,F03N,F04,C03C,C04N,C05C,F05,C06x01C,C07x01N,C08x01C,F06x01,C06x02C,C07x02N,C08x02C,F06x02,C06x03C,C07x03N,C08x03C,F06x03,C06x04C,C07x04N,C08x04C,F06x04,C06x05C,C07x05N,C08x05C,F06x05,C06x06C,C07x06N,C08x06C,F06x06,C06x07C,C07x07N,C08x07C,F06x07,C06x08C,C07x08N,C08x08C,F06x08,C06x09C,C07x09N,C08x09C,F06x09,C06x10C,C07x10N,C08x10C,F06x10,C06x11C,C07x11N,C08x11C,F06x11,C06x12C,C07x12N,C08x12C,F06x12,C06x13C,C07x13N,C08x13C,F06x13,C06x14C,C07x14N,C08x14C,F06x14,C06x15C,C07x15N,C08x15C,F06x15,C06x16C,C07x16N,C08x16C,F06x16,C06x17C,C07x17N,C08x17C,F06x17,C06x18C,C07x18N,C08x18C,F06x18,C06x19C,C07x19N,C08x19C,F06x19,C06x20C,C07x20N,C08x20C,F06x20,C06x21C,C07x21N,C08x21C,F06x21,C06x22C,C07x22N,C08x22C,F06x22,C06x23C,C07x23N,C08x23C,F06x23,C06x24C,C07x24N,C08x24C,F06x24,C06x25C,C07x25N,C08x25C,F06x25,C06x26C,C07x26N,C08x26C,F06x26,C06x27C,C07x27N,C08x27C,F06x27,C06x28C,C07x28N,C08x28C,F06x28,C06x29C,C07x29N,C08x29C,F06x29,C06x30C,C07x30N,C08x30C,F06x30,C06x31C,C07x31N,C08x31C,F06x31,C06x32C,C07x32N,C08x32C,F06x32,C06x33C,C07x33N,C08x33C,F06x33,C06x34C,C07x34N,C08x34C,F06x34,C06x35C,C07x35N,C08x35C,F06x35,C06x36C,C07x36N,C08x36C,F06x36,C06x37C,C07x37N,C08x37C,F06x37,C06x38C,C07x38N,C08x38C,F06x38,C06x39C,C07x39N,C08x39C,F06x39,C06x40C,C07x40N,C08x40C,F06x40,C09C,C10N,C11,F07x01C,F08x01N,F09x01,F07x02C,F08x02N,F09x02,C12C,C13N,C24C,C25,F10,F11,F12,B22C,B22,B23C,B23,B24C,B24,B25C,B25,B26C,B26,B27,B28,B29,B30C,B31,B32,B33,C34C,C26C,C27C,C14x01C,C15x01N,C16x01,C17x01,F13,C18x01,C19x01,C20x01,C21x01C,C22x01C,F15,C23x01,C35x01C,C36x01N,C37x01,C38x01,F14x01,C39x01,C40x01,C41x01,C42x01C,C43x01C,F16x01,C44x01,C35x02C,C36x02N,C37x02,C38x02,F14x02,C39x02,C40x02,C41x02,C42x02C,C43x02C,F16x02,C44x02,C35x03C,C36x03N,C37x03,C38x03,F14x03,C39x03,C40x03,C41x03,C42x03C,C43x03C,F16x03,C44x03,C35x04C,C36x04N,C37x04,C38x04,F14x04,C39x04,C40x04,C41x04,C42x04C,C43x04C,F16x04,C44x04,C35x05C,C36x05N,C37x05,C38x05,F14x05,C39x05,C40x05,C41x05,C42x05C,C43x05C,F16x05,C44x05,C35x06C,C36x06N,C37x06,C38x06,F14x06,C39x06,C40x06,C41x06,C42x06C,C43x06C,F16x06,C44x06,C35x07C,C36x07N,C37x07,C38x07,F14x07,C39x07,C40x07,C41x07,C42x07C,C43x07C,F16x07,C44x07,C35x08C,C36x08N,C37x08,C38x08,F14x08,C39x08,C40x08,C41x08,C42x08C,C43x08C,F16x08,C44x08,C35x09C,C36x09N,C37x09,C38x09,F14x09,C39x09,C40x09,C41x09,C42x09C,C43x09C,F16x09,C44x09,C35x10C,C36x10N,C37x10,C38x10,F14x10,C39x10,C40x10,C41x10,C42x10C,C43x10C,F16x10,C44x10,C35x11C,C36x11N,C37x11,C38x11,F14x11,C39x11,C40x11,C41x11,C42x11C,C43x11C,F16x11,C44x11,C35x12C,C36x12N,C37x12,C38x12,F14x12,C39x12,C40x12,C41x12,C42x12C,C43x12C,F16x12,C44x12,C35x13C,C36x13N,C37x13,C38x13,F14x13,C39x13,C40x13,C41x13,C42x13C,C43x13C,F16x13,C44x13,C35x14C,C36x14N,C37x14,C38x14,F14x14,C39x14,C40x14,C41x14,C42x14C,C43x14C,F16x14,C44x14,C35x15C,C36x15N,C37x15,C38x15,F14x15,C39x15,C40x15,C41x15,C42x15C,C43x15C,F16x15,C44x15,C35x16C,C36x16N,C37x16,C38x16,F14x16,C39x16,C40x16,C41x16,C42x16C,C43x16C,F16x16,C44x16,C35x17C,C36x17N,C37x17,C38x17,F14x17,C39x17,C40x17,C41x17,C42x17C,C43x17C,F16x17,C44x17,C35x18C,C36x18N,C37x18,C38x18,F14x18,C39x18,C40x18,C41x18,C42x18C,C43x18C,F16x18,C44x18,C35x19C,C36x19N,C37x19,C38x19,F14x19,C39x19,C40x19,C41x19,C42x19C,C43x19C,F16x19,C44x19,C35x20C,C36x20N,C37x20,C38x20,F14x20,C39x20,C40x20,C41x20,C42x20C,C43x20C,F16x20,C44x20,C35x21C,C36x21N,C37x21,C38x21,F14x21,C39x21,C40x21,C41x21,C42x21C,C43x21C,F16x21,C44x21,C35x22C,C36x22N,C37x22,C38x22,F14x22,C39x22,C40x22,C41x22,C42x22C,C43x22C,F16x22,C44x22,C35x23C,C36x23N,C37x23,C38x23,F14x23,C39x23,C40x23,C41x23,C42x23C,C43x23C,F16x23,C44x23,C35x24C,C36x24N,C37x24,C38x24,F14x24,C39x24,C40x24,C41x24,C42x24C,C43x24C,F16x24,C44x24,C35x25C,C36x25N,C37x25,C38x25,F14x25,C39x25,C40x25,C41x25,C42x25C,C43x25C,F16x25,C44x25,C35x26C,C36x26N,C37x26,C38x26,F14x26,C39x26,C40x26,C41x26,C42x26C,C43x26C,F16x26,C44x26,C35x27C,C36x27N,C37x27,C38x27,F14x27,C39x27,C40x27,C41x27,C42x27C,C43x27C,F16x27,C44x27,C35x28C,C36x28N,C37x28,C38x28,F14x28,C39x28,C40x28,C41x28,C42x28C,C43x28C,F16x28,C44x28,C35x29C,C36x29N,C37x29,C38x29,F14x29,C39x29,C40x29,C41x29,C42x29C,C43x29C,F16x29,C44x29,C35x30C,C36x30N,C37x30,C38x30,F14x30,C39x30,C40x30,C41x30,C42x30C,C43x30C,F16x30,C44x30,C35x31C,C36x31N,C37x31,C38x31,F14x31,C39x31,C40x31,C41x31,C42x31C,C43x31C,F16x31,C44x31,C35x32C,C36x32N,C37x32,C38x32,F14x32,C39x32,C40x32,C41x32,C42x32C,C43x32C,F16x32,C44x32,C35x33C,C36x33N,C37x33,C38x33,F14x33,C39x33,C40x33,C41x33,C42x33C,C43x33C,F16x33,C44x33,C35x34C,C36x34N,C37x34,C38x34,F14x34,C39x34,C40x34,C41x34,C42x34C,C43x34C,F16x34,C44x34,C35x35C,C36x35N,C37x35,C38x35,F14x35,C39x35,C40x35,C41x35,C42x35C,C43x35C,F16x35,C44x35,C35x36C,C36x36N,C37x36,C38x36,F14x36,C39x36,C40x36,C41x36,C42x36C,C43x36C,F16x36,C44x36,C35x37C,C36x37N,C37x37,C38x37,F14x37,C39x37,C40x37,C41x37,C42x37C,C43x37C,F16x37,C44x37,C35x38C,C36x38N,C37x38,C38x38,F14x38,C39x38,C40x38,C41x38,C42x38C,C43x38C,F16x38,C44x38,C35x39C,C36x39N,C37x39,C38x39,F14x39,C39x39,C40x39,C41x39,C42x39C,C43x39C,F16x39,C44x39,C35x40C,C36x40N,C37x40,C38x40,F14x40,C39x40,C40x40,C41x40,C42x40C,C43x40C,F16x40,C44x40,F17,F18,F19,F20,F21,F22,F23,F24,F25,F26,A16,A18x01,A18x02,A18x03,A18x04,A18x05,A17,C28,C29,C30,C31,C32,C33,C47,C48x01C,C49x01,C50x01,C48x02C,C49x02,C50x02,C48x03C,C49x03,C50x03,C48x04C,C49x04,C50x04,C48x05C,C49x05,C50x05,B36C,B37,B34C,B35,D01,D09,D11,D12,D13,D14,D15,D16,D17,D18,D19,D19x01,D20,D20x01,D20x02,D21,D22,D23,D23x01,D24,D25,D26,D27,D28,D29,D30,D31,D32,D33,D34";
+
+    // 时间戳格式：年月日时分秒（确保文件名唯一）
+    private static final SimpleDateFormat TIME_FORMATTER = new SimpleDateFormat("yyyyMMddHHmmss");
+
+    /**
+     * 住院病案csv做成
+     *
+     * @param outPath 文件路径
+     * @param dto 文件内容
+     *
+     */
+    public static void makeCsvFile(String outPath, List<InpatientMedicalRecordHomePageCollectionDto> dto)
+        throws IOException {
+
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 定义格式（yyyyMMdd）
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        // 格式化日期
+        String formattedDate = currentDate.format(formatter);
+        // 时间戳日期
+        String timestamp = TIME_FORMATTER.format(new Date());
+
+        // 创建日期文件夹
+        Boolean pathFlg = makePath(outPath, formattedDate);
+        if (!pathFlg) {
+            System.err.println("创建文件夹时发生错误");
+        }
+
+        // 生成的pdf模板文件全路径
+        String outputPath = outPath + formattedDate + "\\hqmsts_" + timestamp + ".csv";
+
+        // 检查文件是否存在
+        File targetFile = new File(outputPath);
+        handleExistingFile(targetFile);
+
+        // 使用try-with-resources确保资源自动关闭
+        // try (BufferedWriter writer = new BufferedWriter(new FileWriter(outputPath))) {
+        try (BufferedWriter writer =
+            new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputPath), StandardCharsets.UTF_8))) {
+            // 写入UTF-8 BOM，解决Excel打开乱码问题
+            writer.write('\ufeff');
+
+            // 写入表头
+            writer.write(headers);
+            writer.newLine();
+
+            int totalCount = 0;
+            // 写入数据行
+            if (dto != null && !dto.isEmpty()) {
+                for (InpatientMedicalRecordHomePageCollectionDto row : dto) {
+                    writer.write(convert(row));
+                    writer.newLine();
+
+                    totalCount++;
+                }
+            }
+            System.out.printf("CSV文件生成完成，共写入 %d 条记录%n", totalCount);
+        } catch (IOException e) {
+            System.out.printf("做成csv时发生错误：" + e.getMessage());
+        }
+
+    }
+
+    /**
+     * 处理已存在的文件：重命名为原文件名+时间戳
+     * 
+     * @param targetFile 目标文件
+     */
+    private static void handleExistingFile(File targetFile) {
+        if (targetFile.exists()) {
+            // 获取文件路径和名称
+            String parentPath = targetFile.getParent();
+            String fileName = targetFile.getName();
+
+            // 分离文件名和扩展名
+            int dotIndex = fileName.lastIndexOf(".");
+            String baseName = (dotIndex > 0) ? fileName.substring(0, dotIndex) : fileName;
+            String extension = (dotIndex > 0) ? fileName.substring(dotIndex) : "";
+
+            // 生成带时间戳的新文件名
+            String timestamp = TIME_FORMATTER.format(new Date());
+            String newFileName = baseName + "_" + timestamp + extension;
+            File renamedFile = new File(parentPath, newFileName);
+
+            // 重命名文件
+            boolean renamed = targetFile.renameTo(renamedFile);
+            if (renamed) {
+                System.out.println("文件已存在，已重命名为：" + renamedFile.getAbsolutePath());
+            } else {
+                throw new RuntimeException("无法重命名已存在的文件：" + targetFile.getAbsolutePath());
+            }
+        }
+    }
+
+    /**
+     * 将DTO对象转换为逗号分隔的字符串（适用于无嵌套结构的DTO）
+     * 
+     * @param dto 要转换的DTO对象
+     * @return 逗号分隔的字符串
+     */
+    public static String convert(Object dto) {
+        if (dto == null) {
+            return "";
+        }
+
+        List<String> fieldValues = new ArrayList<>();
+        // 获取当前类的所有声明字段（不包含父类，如需包含可修改）
+        Field[] fields = dto.getClass().getDeclaredFields();
+
+        for (Field field : fields) {
+            try {
+                // 设置可访问私有字段
+                field.setAccessible(true);
+                Object value = field.get(dto);
+
+                // 转换为字符串并处理特殊字符
+                String strValue = value != null ? value.toString() : "";
+
+                // 处理CSV中的特殊字符
+                // 如果包含逗号、引号或换行符，需要用引号包裹
+                if (strValue.contains(",") || strValue.contains("\"") || strValue.contains("\n")
+                    || strValue.contains("\r")) {
+                    // 转义双引号为两个双引号
+                    fieldValues.add("\"" + strValue.replace("\"", "\"\"") + "\"");
+                } else {
+                    fieldValues.add(strValue);
+                }
+            } catch (IllegalAccessException e) {
+                // 处理访问异常，可根据需要调整
+                fieldValues.add("");
+            }
+        }
+
+        // 用逗号连接所有字段值
+        return String.join(CommonConstants.Common.COMMA, fieldValues);
+    }
+
+    /**
+     * 创建当天日期的文件夹
+     *
+     * @param outputPath 父文件夹
+     * @param datePathName 日期文件夹名
+     */
+    public static Boolean makePath(String outputPath, String datePathName) {
+        try {
+            // 构建代表新文件夹的File对象
+            File newDir = new File(outputPath, datePathName);
+
+            // 检查新文件夹是否已存在
+            if (!newDir.exists()) {
+                // 创建新文件夹
+                boolean created = newDir.mkdir();
+
+                if (created) {
+                    System.out.println("文件夹创建成功：" + newDir.getAbsolutePath());
+                    return true;
+                } else {
+                    System.out.println("文件夹创建失败，可能是父文件夹不存在或者没有写入权限：" + newDir.getAbsolutePath());
+                    return false;
+                }
+            } else {
+                System.out.println("文件夹已存在,不创建新的文件夹：" + newDir.getAbsolutePath());
+                return true;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java
new file mode 100644
index 00000000..d6b59030
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java
@@ -0,0 +1,263 @@
+package com.openhis.web.reportmanage.utils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+/**
+ * excel报表做成
+ *
+ * @author yuxj
+ * @date 2025-08-25
+ */
+public final class ExcelFillerUtil {
+
+    // 时间戳格式：年月日时分秒（确保文件名唯一）
+    private static final SimpleDateFormat TIME_FORMATTER = new SimpleDateFormat("yyyyMMddHHmmss");
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    /**
+     * excel报表做成
+     *
+     * @param dataList DTO对象列表
+     * @param headers 表头信息，key为DTO字段名，value为列标题
+     * @param fileName 导出的文件名称
+     * @param outputPath 导出的文件所在文件夹
+     * @param totalValues 表头上的数据，key为DTO字段名，value为值
+     * @throws IOException IO异常
+     * @throws IllegalAccessException 反射访问异常
+     */
+    public static void makeExcelFile(List<?> dataList, Map<String, String> headers, String outputPath, String fileName,
+        Map<String, Object> totalValues) throws IOException, IllegalAccessException {
+
+        fileName = fileName + "_" + TIME_FORMATTER.format(new Date()) + ".xlsx";
+
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 定义格式（yyyyMMdd）
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        // 格式化日期
+        String formattedDate = currentDate.format(formatter);
+        // 创建日期文件夹
+        Boolean pathFlg = makePath(outputPath, formattedDate);
+        if (!pathFlg) {
+            System.err.println("创建文件夹时发生错误");
+        }
+        // 路径加文件名
+        String pathName = outputPath + formattedDate + "\\" + fileName;
+        // 转换为泛型列表
+        List<Object> genericList = new ArrayList<>(dataList);
+
+        // 创建工作簿
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("数据");
+
+        // 创建行（第0行，Excel行索引从0开始）
+        int index = 0;
+        int columnIndex;
+        if (totalValues != null) {
+            // 设置表头上的样式
+            CellStyle headerUpStyle = setCellStyle(workbook, BorderStyle.MEDIUM, true);
+            headerUpStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); // 1. 启用实心填充模式（否则背景色不显示）
+            headerUpStyle.setFillForegroundColor(IndexedColors.GREY_40_PERCENT.getIndex());
+            // 设置表头上的样式
+            CellStyle headerUpDateStyle = setCellStyle(workbook, BorderStyle.MEDIUM, true);
+
+            // 填充表头上的数据
+            for (Map.Entry<String, Object> entry : totalValues.entrySet()) {
+                Row totalRow = sheet.createRow(index);
+                columnIndex = 0;
+                index++;
+
+                Cell cell = totalRow.createCell(columnIndex);
+                // 项目名
+                cell.setCellValue(entry.getKey());
+                cell.setCellStyle(headerUpStyle);
+                columnIndex++;
+                // 项目值
+                cell = setDate(totalRow.createCell(columnIndex), entry.getValue(), sheet, columnIndex);
+                cell.setCellStyle(headerUpDateStyle);
+            }
+
+            // 加一个空白行
+            index++;
+        }
+
+        // 创建表头样式
+        CellStyle headerStyle = setCellStyle(workbook, BorderStyle.THIN, true);
+        headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); // 1. 启用实心填充模式（否则背景色不显示）
+        headerStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        // 创建数据单元格样式
+        CellStyle dataStyle = setCellStyle(workbook, BorderStyle.THIN, false);
+
+        // 创建表头行
+        Row headerRow = sheet.createRow(index);
+        columnIndex = 0;
+
+        // 填充表头
+        for (Map.Entry<String, String> entry : headers.entrySet()) {
+            Cell cell = headerRow.createCell(columnIndex);// 创建单元格
+            cell.setCellValue(entry.getValue());// 设置列标题
+            cell.setCellStyle(headerStyle);// 应用表头样式
+            // 调整合计值列宽度
+            if (entry.getValue() != null) {
+                int totalWidth = entry.getValue().getBytes().length * 256;
+                if (sheet.getColumnWidth(columnIndex) < totalWidth) {
+                    sheet.setColumnWidth(columnIndex, totalWidth);
+                }
+            }
+            columnIndex++;
+        }
+        index++;
+        // 填充数据（通过反射获取DTO字段值）
+        for (int i = 0; i < genericList.size(); i++) {
+            Row dataRow = sheet.createRow(i + index);// 数据行
+            Object dto = genericList.get(i);// 获取当前DTO对象
+            Class<?> dtoClass = dto.getClass();// 获取DTO的类对象
+            columnIndex = 0;
+
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                String fieldName = entry.getKey();// 获取DTO字段名
+                Object value = null;
+
+                try {
+                    // 通过反射获取字段值
+                    Field field = dtoClass.getDeclaredField(fieldName);
+                    field.setAccessible(true); // 允许访问私有字段
+                    value = field.get(dto); // 获取字段值
+                } catch (NoSuchFieldException e) {
+                    // 如果字段不存在，输出警告信息
+                    System.err.println("DTO中不存在字段: " + fieldName);
+                }
+
+                Cell cell = setDate(dataRow.createCell(columnIndex), value, sheet, columnIndex);
+                cell.setCellStyle(dataStyle);// 应用数据样式
+                columnIndex++;
+            }
+        }
+
+        // 写入文件
+        try (FileOutputStream outputStream = new FileOutputStream(pathName)) {
+            workbook.write(outputStream);
+            System.out.print("导出Excel完成");
+        } catch (IOException e) {
+            System.out.printf("导出Excel失败：" + e.getMessage());
+        }
+
+        // 关闭工作簿
+        workbook.close();
+    }
+
+    /**
+     * 设置单元格样式
+     *
+     * @param workbook 工作簿
+     * @param borderStyle 边框样式
+     * @param bold 是否加粗
+     */
+    public static CellStyle setCellStyle(Workbook workbook, BorderStyle borderStyle, boolean bold) {
+        CellStyle style = workbook.createCellStyle();
+        Font font = workbook.createFont();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderBottom(borderStyle);
+        style.setBorderLeft(borderStyle);
+        style.setBorderRight(borderStyle);
+        style.setBorderTop(borderStyle);
+        if (bold) {
+            font.setBold(true);// 加粗
+            style.setFont(font);
+        }
+        return style;
+    }
+
+    /**
+     * 根据值的类型设置单元格内容
+     *
+     * @param cell 工作行
+     * @param value 项目值
+     * @param sheet 工作页
+     * @param columnIndex 工作列
+     */
+    public static Cell setDate(Cell cell, Object value, Sheet sheet, int columnIndex) {
+        if (value != null) {
+            // 根据值的类型设置单元格内容
+            if (value instanceof BigDecimal) {
+                // 保留3位小数，使用HALF_UP模式四舍五入
+                BigDecimal scaled = ((BigDecimal)value).setScale(5, RoundingMode.HALF_UP);
+                String bdStr = scaled.toPlainString();
+                cell.setCellValue(bdStr); // 用字符串写入，避免科学计数法
+            } else if (value instanceof Number) {
+                cell.setCellValue(((Number)value).doubleValue()); // 数字类型
+                if (value instanceof Integer) {
+                    cell.setCellValue((Integer)value);
+                } else if (value instanceof Long) {
+                    cell.setCellValue((Long)value);
+                } else {
+                    cell.setCellValue(((Number)value).doubleValue());
+                }
+            } else if (value instanceof Boolean) {
+                cell.setCellValue((Boolean)value);// 布尔类型
+            } else if (value instanceof Date) {
+                String dateStr = DATE_FORMAT.format((Date)value);
+                cell.setCellValue(dateStr); // 直接写入原生格式字符串
+            } else {
+                cell.setCellValue(value.toString());// 其他类型转为字符串
+            }
+
+            // 计算内容宽度并调整列宽（中文字符需要特殊处理）
+            int contentWidth = value.toString().getBytes().length * 256;
+            if (sheet.getColumnWidth(columnIndex) < contentWidth) {
+                sheet.setColumnWidth(columnIndex, contentWidth);
+            }
+        } else {
+            cell.setCellValue("");
+        }
+        return cell;
+    }
+
+    /**
+     * 创建当天日期的文件夹
+     *
+     * @param outputPath 父文件夹
+     * @param datePathName 日期文件夹名
+     */
+    public static Boolean makePath(String outputPath, String datePathName) {
+        try {
+            // 构建代表新文件夹的File对象
+            File newDir = new File(outputPath, datePathName);
+
+            // 检查新文件夹是否已存在
+            if (!newDir.exists()) {
+                // 创建新文件夹
+                boolean created = newDir.mkdir();
+
+                if (created) {
+                    System.out.println("文件夹创建成功：" + newDir.getAbsolutePath());
+                    return true;
+                } else {
+                    System.out.println("文件夹创建失败，可能是父文件夹不存在或者没有写入权限：" + newDir.getAbsolutePath());
+                    return false;
+                }
+            } else {
+                System.out.println("文件夹已存在,不创建新的文件夹：" + newDir.getAbsolutePath());
+                return true;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
similarity index 56%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
index 60691d3b..795456ca 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
@@ -5,6 +5,8 @@ package com.openhis.web.ybmanage.controller;
 
 import java.io.*;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -14,39 +16,41 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.Encounter;
 import com.openhis.administration.domain.Patient;
 import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.IPatientService;
 import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.service.IContractService;
+import com.openhis.web.ybmanage.dto.Financial3202WebParam;
+import com.openhis.web.ybmanage.dto.FinancialHand3203AWebParam;
+import com.openhis.web.ybmanage.service.IYbService;
+import com.openhis.yb.domain.FinancialApplyRecord;
 import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.dto.Catalogue1312Output;
-import com.openhis.yb.dto.Clearing3205AWebParma;
-import com.openhis.yb.dto.Financial3203AWebParam;
-import com.openhis.yb.dto.Info1101Output;
-import com.openhis.yb.dto.PatientInfoDto;
-import com.openhis.yb.dto.Result;
-import com.openhis.yb.dto.Settlement3201WebParam;
-import com.openhis.yb.dto.Settlement3202WebParam;
-import com.openhis.yb.dto.Settlement3209AWebParam;
+import com.openhis.yb.dto.*;
 import com.openhis.yb.service.IPerinfoService;
 import com.openhis.yb.service.YbDao;
 import com.openhis.yb.service.YbHttpUtils;
 import com.openhis.yb.util.CommonConstant;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.core.common.core.domain.R;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.yb.dto.*;
 
 /**
  * 医保接口
@@ -69,16 +73,19 @@ public class YbController {
     @Autowired
     IEncounterService iEncounterService;
     @Autowired
+    IContractService iContractService;
+    @Autowired
     IConditionDefinitionService iConditionDefinitionService;
     @Autowired
     ResourceLoader resourceLoader;
-
+    @Autowired
+    IYbService ybService;
 
     /**
      * 【9001】
      *
      * @param practitionerId 参与者Id
-     * @param mac            加密后的mac地址
+     * @param mac 加密后的mac地址
      * @return 结果
      */
     @PostMapping("/sign")
@@ -87,19 +94,27 @@ public class YbController {
         if (signParam == null) {
             throw new ServiceException("未生成签到参数");
         }
-        Sign9001Result signResult = ybHttpUtils.sign(signParam);
-        if (signResult != null) {
-            ybDao.saveSign(signParam, signResult);
-            return R.ok(signResult);
+        List<Contract> contractList = iContractService.getContractListByYb();
+        List<Sign9001Result> signResultList = new ArrayList<>();
+        for (Contract contract : contractList) {
+            Sign9001Result signResult = ybHttpUtils.sign(signParam, contract);
+            if (signResult != null) {
+                ybDao.saveSign(signParam, signResult);
+                signResultList.add(signResult);
+            }
+        }
+        if (contractList.size() == signResultList.size()) {
+            return R.ok("签到成功");
+        } else {
+            return R.fail("签到失败");
         }
-        return R.fail();
     }
 
     /**
      * 【1101】
      *
      * @param certType 就诊id
-     * @param certNo   租户id
+     * @param certNo 租户id
      * @return 结果
      */
     @PostMapping("/per-info")
@@ -132,7 +147,8 @@ public class YbController {
         if (patient == null) {
             throw new ServiceException("未获取到患者信息");
         }
-        InfoPerson perinfo = iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
+        InfoPerson perinfo =
+            iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
         if (perinfo == null) {
             throw new ServiceException("未连接医保获取患者信息");
         }
@@ -157,7 +173,9 @@ public class YbController {
         }
         List<ConditionDefinition> conditionDefinitions = null;
         if (!currentRangeResults.isEmpty()) {
-            conditionDefinitions = iConditionDefinitionService.list(new LambdaUpdateWrapper<ConditionDefinition>().in(ConditionDefinition::getYbNo, currentRangeResults.stream().map(Info5301SpecialConditionResult::getOpspDiseCode).collect(Collectors.toList())));
+            conditionDefinitions = iConditionDefinitionService.list(
+                new LambdaUpdateWrapper<ConditionDefinition>().in(ConditionDefinition::getYbNo, currentRangeResults
+                    .stream().map(Info5301SpecialConditionResult::getOpspDiseCode).collect(Collectors.toList())));
         }
         return R.ok(conditionDefinitions);
     }
@@ -166,7 +184,7 @@ public class YbController {
      * 【3301】目录对照
      *
      * @param tableName 就诊id
-     * @param id        付款id
+     * @param id 付款id
      * @return 结果
      */
     @PostMapping("/directory-cross-check")
@@ -187,7 +205,7 @@ public class YbController {
      * 【3302】目录对照撤销
      *
      * @param tableName 就诊id
-     * @param id        付款id
+     * @param id 付款id
      * @return 结果
      */
     @PostMapping("/directory-un-check")
@@ -212,11 +230,12 @@ public class YbController {
     public R<?> reconcileGeneralLedger(@RequestBody Settlement3201WebParam settlement3201WebParam) {
         Financial3201Param financial3201Param = ybDao.getFinancial3201Param(settlement3201WebParam);
         Result result = ybHttpUtils.reconcileGeneralLedger(financial3201Param);
-        if(result.getCode().equals(CommonConstant.SC_OK_200)){
-            //System.out.println(JSON.parseObject(JSON.toJSONString(result.getResult())));
-            Financial3201Output financial3201Output = JSON.parseObject(JSON.toJSONString(result.getResult()), Financial3201Output.class);
-            ybDao.saveReconcileGeneralLedger(financial3201Output);
-            if("0".equals(financial3201Output.getStmtRslt())){
+        if (result.getCode().equals(CommonConstant.SC_OK_200)) {
+            // System.out.println(JSON.parseObject(JSON.toJSONString(result.getResult())));
+            Financial3201Output financial3201Output =
+                JSON.parseObject(JSON.toJSONString(result.getResult()), Financial3201Output.class);
+            ybDao.saveReconcileGeneralLedger(financial3201Output, financial3201Param);
+            if ("0".equals(financial3201Output.getStmtRslt())) {
                 return R.ok("OK");
             }
             return R.ok(financial3201Output.getStmtRsltDscr());
@@ -246,9 +265,9 @@ public class YbController {
     public R<?> reconcileGeneralLedgerDetail(@RequestBody Settlement3202WebParam settlement3202WebParam) {
         List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlement3202WebParam);
 
-        //FinancialSettlement3202Param financial3202Param =
-        //        ybDao.getFinancialSettlement3202Param(settlement3202WebParam);
-        //FinancialSettlement3202Result resultInfo = ybHttpUtils.reconcileGeneralLedgerDetail(financial3202Param);
+        // FinancialSettlement3202Param financial3202Param =
+        // ybDao.getFinancialSettlement3202Param(settlement3202WebParam);
+        // FinancialSettlement3202Result resultInfo = ybHttpUtils.reconcileGeneralLedgerDetail(financial3202Param);
 
         return R.ok(financial3202FileParams);
     }
@@ -256,35 +275,88 @@ public class YbController {
     /**
      * 【3202】生成txt文件
      *
-     * @param settlementIdList 3202查询数据
+     * @param financial3202WebParam 3202查询数据
      * @return 结果
      */
     @PostMapping("/reconcile-detail-txt")
-    public R<?> reconcileGeneralLedgerDetailTxt(List<String> settlementIdList) throws IOException {
-        List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlementIdList);
-        String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new Date().getTime()+".txt";
-        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
+    public void reconcileGeneralLedgerDetailTxt(@RequestBody Financial3202WebParam financial3202WebParam,
+        HttpServletResponse response) throws IOException {
+        List<Financial3202FileParam> financial3202FileParams =
+            ybDao.paymentCompareYbSettle(financial3202WebParam.getSettlementIdList());
+        // String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new
+        // Date().getTime()+".txt";
+        // String filePath = "C:\\Users\\bjbUser\\Desktop\\"+new Date().getTime()+".txt";
+        // try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
+        // for (Financial3202FileParam item : financial3202FileParams) {
+        // // 假设每个实体都有toString()方法返回逗号分隔的属性
+        // // 或者你可以自定义获取属性的方式
+        // System.out.println(item.toString());
+        // String line = item.getTxt();
+        // writer.write(line);
+        // writer.newLine();
+        // }
+        // }
+        // return R.ok("生成txt文件成功，文件路径："+filePath);
+
+        // 2. 设置响应头（强制下载，指定文件名）
+        String fileName = "financial_report_" + System.currentTimeMillis() + ".txt";
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Disposition",
+            "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8").replace("+", "%20") + "\"");
+
+        // 3. 直接通过输出流写入数据（避免创建临时文件）
+        try (OutputStream os = response.getOutputStream();
+            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
+
             for (Financial3202FileParam item : financial3202FileParams) {
-                // 假设每个实体都有toString()方法返回逗号分隔的属性
-                // 或者你可以自定义获取属性的方式
-                String line = item.toString().replace(",", "\t");
-                writer.write(line);
-                writer.newLine();
+                writer.write(item.getTxt()); // 写入每行数据
+                writer.newLine(); // 换行
             }
+            writer.flush();
+        }
+        System.out.println(fileName);
+        // return R.ok("生成txt文件成功，文件名称："+fileName);
+    }
+
+    /**
+     *
+     * @param file 文件流
+     * @param filename 文件名
+     * @return
+     */
+    @PostMapping(value = "/file-up")
+    public R<?> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("filename") String filename) {
+        // 1. 基础校验
+        if (file.isEmpty()) {
+            return R.fail("文件不能为空");
+        }
+        if (!file.getOriginalFilename().endsWith(".zip")) {
+            return R.fail("仅支持ZIP格式文件");
+        }
+
+        // 2. 调用Service处理业务逻辑
+        try {
+            ResponseEntity<String> fileResult = ybHttpUtils.upload9101(file, filename);
+            return R.ok(fileResult);
+        } catch (Exception e) {
+            return R.fail("处理失败: " + e.getMessage());
         }
-        return R.ok("生成txt文件成功，文件路径："+filePath);
     }
 
     /**
      * 触发3202接口
+     * 
      * @param settlementIdList 3202查询数据
      * @return
      * @throws IOException
      */
     @PostMapping("/reconcile-general")
-    public R<?> reconcileGeneral(List<String> settlementIdList, String filePath, String fileQuryNo, String setlOptins, String clrType) {
-        //todo:这里需要考虑3302接口的参数是后台合计还是由前台传入，因为这个参数还要和txt文件对应（既需要txt中的数据还需要db表中的一些数据），
-        //String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new Date().getTime()+".txt";
+    public R<?> reconcileGeneral(List<String> settlementIdList, String filePath, String fileQuryNo, String setlOptins,
+        String clrType) {
+        // todo:这里需要考虑3302接口的参数是后台合计还是由前台传入，因为这个参数还要和txt文件对应（既需要txt中的数据还需要db表中的一些数据），
+        // String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new
+        // Date().getTime()+".txt";
         List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
         Resource resource = resourceLoader.getResource(filePath); // 或使用 "file:" 读取绝对路径
 
@@ -297,21 +369,22 @@ public class YbController {
                         BigDecimal medfeeSumamt = new BigDecimal(fields[3]);
                         BigDecimal fundPaySumamt = new BigDecimal(fields[4]);
                         BigDecimal acctPay = new BigDecimal(fields[5]);
-                        Financial3202FileParam person = new Financial3202FileParam(fields[0], fields[1], fields[2], medfeeSumamt, fundPaySumamt, acctPay, fields[6]);
+                        Financial3202FileParam person = new Financial3202FileParam(fields[0], fields[1], fields[2],
+                            medfeeSumamt, fundPaySumamt, acctPay, fields[6]);
                         financial3202FileParamList.add(person);
                     }
                 }
             }
         } catch (IOException e) {
             e.printStackTrace();
-            throw new ServiceException("IO异常，异常信息："+e.getMessage());
+            throw new ServiceException("IO异常，异常信息：" + e.getMessage());
         }
 
-        BigDecimal medfeeSumamt = BigDecimal.ZERO;//医疗费总额
-        BigDecimal fundPaySumamt = BigDecimal.ZERO;//基金支付
-        //Integer fixmedinsSetlCnt = 0;//结算笔数
+        BigDecimal medfeeSumamt = BigDecimal.ZERO;// 医疗费总额
+        BigDecimal fundPaySumamt = BigDecimal.ZERO;// 基金支付
+        // Integer fixmedinsSetlCnt = 0;//结算笔数
 
-        if(financial3202FileParamList.isEmpty()){
+        if (financial3202FileParamList.isEmpty()) {
             throw new ServiceException("未获取txt文件中实体");
         }
         for (Financial3202FileParam financial3202FileParam : financial3202FileParamList) {
@@ -319,23 +392,23 @@ public class YbController {
             fundPaySumamt = fundPaySumamt.add(financial3202FileParam.getFundPaySumamt());
         }
 
-        FinancialSettlement3202Param financialSettlement3202Param = ybDao.getFinancialSettlement3202Param(settlementIdList, medfeeSumamt, fundPaySumamt);
-        if(financialSettlement3202Param==null){
+        FinancialSettlement3202Param financialSettlement3202Param =
+            ybDao.getFinancialSettlement3202Param(settlementIdList, medfeeSumamt, fundPaySumamt);
+        if (financialSettlement3202Param == null) {
             throw new ServiceException("未生成3202参数");
         }
         financialSettlement3202Param.setClrType(clrType).setFileQuryNo(fileQuryNo)
-                .setRefdSetlFlag(financial3202FileParamList.get(0).getRefdSetlFlag()).setSetlOptins(setlOptins);
+            .setRefdSetlFlag(financial3202FileParamList.get(0).getRefdSetlFlag()).setSetlOptins(setlOptins);
 
-        FinancialSettlement3202Result financialSettlement3202Result = ybHttpUtils.reconcileGeneralLedgerDetail(financialSettlement3202Param);
-        if(financialSettlement3202Result==null){
+        FinancialSettlement3202Result financialSettlement3202Result =
+            ybHttpUtils.reconcileGeneralLedgerDetail(financialSettlement3202Param);
+        if (financialSettlement3202Result == null) {
             throw new ServiceException("未收到3202参数");
         }
 
         return R.ok(financialSettlement3202Result);
     }
 
-
-
     /**
      * 【3209A】第三方数据查询
      *
@@ -346,7 +419,7 @@ public class YbController {
     public R<?> threePartSearch(Settlement3209AWebParam settlement3209AWebParam) {
 
         FinancialSettlement3209AParam financialSettlement3209AParam =
-                ybDao.getFinancialSettlement3209AParam(settlement3209AWebParam);
+            ybDao.getFinancialSettlement3209AParam(settlement3209AWebParam);
         List<FinancialSettlement3209AResult> list = ybHttpUtils.threePartSearch(financialSettlement3209AParam);
 
         return R.ok();
@@ -359,14 +432,15 @@ public class YbController {
      * @return 结果
      */
     @PostMapping("/apply-financial-clearing")
-    public R<?> applyFinancialClearing(Financial3203AWebParam financial3203AWebParam) {
+    public R<?> applyFinancialClearing(@RequestBody Financial3203AWebParam financial3203AWebParam) {
         Financial3203AParam financial3203AParam = ybDao.getFinancial3203AParam(financial3203AWebParam);
         String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
-        if(!StringUtils.isEmpty(s)){
+        if (!StringUtils.isEmpty(s)) {
             Result<?> result = JSON.parseObject(s, Result.class);
             if (result != null) {
                 if (result.getCode() == 200) {
-                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam, s);
+                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
+                        String.valueOf(result.getResult()));
                     return R.ok(result);
                 }
             }
@@ -374,23 +448,106 @@ public class YbController {
         return R.fail(s);
     }
 
+    /**
+     * 【3203A】清算申请(吉林省)
+     *
+     * @param financialClearing3203AWebParam 3203A入参条件
+     * @return 结果
+     */
+    @PostMapping("/auto-apply-financial-clearing")
+    public R<?> autoApplyFinancialClearing(@RequestBody FinancialClearing3203AWebParam financialClearing3203AWebParam) {
+
+        Settlement3202WebParam settlement3202WebParam = new Settlement3202WebParam();
+        settlement3202WebParam.setStmtBegnDate(String.valueOf(financialClearing3203AWebParam.getStmtBegnDate()));
+        settlement3202WebParam.setStmtEndDate(String.valueOf(financialClearing3203AWebParam.getStmtEndDate()));
+        settlement3202WebParam.setClrType(financialClearing3203AWebParam.getClrType());
+        settlement3202WebParam.setSetlOptins(financialClearing3203AWebParam.getSetlOptins());
+        List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlement3202WebParam);
+
+        Financial3203AParam financial3203AParam = ybDao.getFinancial3203AParam(financial3202FileParams,
+            String.valueOf(financialClearing3203AWebParam.getStmtBegnDate()),
+            String.valueOf(financialClearing3203AWebParam.getStmtEndDate()),
+            financialClearing3203AWebParam.getClrType(), financialClearing3203AWebParam.getSetlOptins());
+        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
+        if (!StringUtils.isEmpty(s)) {
+            Result<?> result = JSON.parseObject(s, Result.class);
+            if (result != null) {
+                if (result.getCode() == 200) {
+                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
+                        String.valueOf(result.getResult()));
+                    return R.ok(result);
+                }
+            }
+        }
+        return R.fail(s);
+    }
+
+    /**
+     * 【3203A】手动清算申请(吉林省)
+     *
+     * @param financialHand3203AWebParam 3203A入参条件
+     * @return 结果
+     */
+    @PostMapping("/hand-operated-apply-financial-clearing")
+    public R<?> handOperatedApplyFinancialClearing(@RequestBody FinancialHand3203AWebParam financialHand3203AWebParam) {
+
+        Financial3203AParam financial3203AParam = new Financial3203AParam();
+
+        financial3203AParam.setClrType(financialHand3203AWebParam.getClrType());
+        financial3203AParam.setMedfeeSumamt(financialHand3203AWebParam.getMedfeeSumamt());
+        financial3203AParam.setMedSumfee(financialHand3203AWebParam.getMedSumfee());
+        financial3203AParam.setAcctPay(financialHand3203AWebParam.getAcctPay());
+        financial3203AParam.setCashPayamt(financialHand3203AWebParam.getCashPayamt());
+        financial3203AParam.setFundAppySum(financialHand3203AWebParam.getFundAppySum());
+        financial3203AParam.setClrOptins(financialHand3203AWebParam.getClrOptins());
+
+        ybDao.getFinancial3203AParamForTime(financial3203AParam,
+            String.valueOf(financialHand3203AWebParam.getBegndate()),
+            String.valueOf(financialHand3203AWebParam.getEnddate()));
+        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
+        if (!StringUtils.isEmpty(s)) {
+            Result<?> result = JSON.parseObject(s, Result.class);
+            if (result != null) {
+                if (result.getCode() == 200) {
+                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
+                        String.valueOf(result.getResult()));
+                    return R.ok(result);
+                }
+            }
+        }
+        return R.fail(s);
+    }
+
+    /**
+     * 清算申请记录(吉林省)
+     *
+     * @param
+     * @return 结果
+     */
+    @GetMapping("/apply-financial-clearing-list")
+    public R<?> getApplyFinancialClearingList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(ybDao.getFinancial3203APage(searchKey, pageNo, pageSize, request));
+    }
+
     /**
      * 【3204A】清算申请撤销(吉林省)
      *
      * @param clrAppyEvtId 3203A入参条件
      * @return 结果
      */
-    @PostMapping("/apply-un-clearing")
+    @GetMapping("/apply-un-clearing")
     public R<?> cancelFinancialClearing(String clrAppyEvtId, String clrOptins) {
-
         Financial3204Param financial3204Param = new Financial3204Param();
-        financial3204Param.setClrOptins(clrOptins).setClrAppyEvtId(clrAppyEvtId);
+        FinancialApplyRecord financialApplyRecord = ybDao.getFinancial3204ParamByClrAppyEvtId(clrAppyEvtId);
+        financial3204Param.setClrOptins(clrOptins).setClrAppyEvtId(financialApplyRecord.getOutResult());
         Result resultInfo = ybHttpUtils.cancelFinancialClearing(financial3204Param);
         if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
             ybDao.save3204AFinancialClearingApplycation(clrAppyEvtId, clrOptins);
-            return R.ok();
+            return R.ok("撤销成功");
         }
-        return R.fail();
+        return R.fail("撤销失败");
     }
 
     /**
@@ -418,7 +575,7 @@ public class YbController {
     public R<?> uploadInventoryCount(Long id) {
 
         MedicalInventory3501Param medicalInventory3501Param =
-                ybDao.getMedicalInventory3501Param(id, SecurityUtils.getLoginUser().getTenantId());
+            ybDao.getMedicalInventory3501Param(id, SecurityUtils.getLoginUser().getTenantId());
         Result resultInfo = ybHttpUtils.uploadInventoryCount(medicalInventory3501Param);
         if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
             ybDao.saveInventoryCheckRecord(medicalInventory3501Param, resultInfo.getMessage());
@@ -431,7 +588,7 @@ public class YbController {
     /**
      * 【3502】商品信息变更
      *
-     * @param id         供应申请id
+     * @param id 供应申请id
      * @param invChgType 变更类型 参考枚举
      * @return 结果
      */
@@ -439,7 +596,7 @@ public class YbController {
     public R<?> updateInventoryCount(Long id, String invChgType) {
 
         MedicalInventory3502Param medicalInventory3502Param =
-                ybDao.getMedicalInventory3502Param(id, invChgType, SecurityUtils.getLoginUser().getTenantId());
+            ybDao.getMedicalInventory3502Param(id, invChgType, SecurityUtils.getLoginUser().getTenantId());
         Result resultInfo = ybHttpUtils.updateInventoryCount(medicalInventory3502Param);
         if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
             ybDao.saveInventoryChangeRecord(medicalInventory3502Param, resultInfo.getMessage());
@@ -457,8 +614,7 @@ public class YbController {
     @PostMapping("/procurement")
     public R<?> procurement(Long id) {
 
-        Medical3503Param medical3503Param =
-                ybDao.getMedical3503Param(id, SecurityUtils.getLoginUser().getTenantId());
+        Medical3503Param medical3503Param = ybDao.getMedical3503Param(id, SecurityUtils.getLoginUser().getTenantId());
         Result resultInfo = ybHttpUtils.procurement(medical3503Param);
         if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
             ybDao.saveInventoryPurchaseRecord(medical3503Param, resultInfo.getMessage());
@@ -477,7 +633,7 @@ public class YbController {
     public R<?> cancelProcurement(Long id) {
 
         MedicalPurchase3504Param medicalPurchase3504Param =
-                ybDao.getMedicalPurchase3504Param(id, SecurityUtils.getLoginUser().getTenantId());
+            ybDao.getMedicalPurchase3504Param(id, SecurityUtils.getLoginUser().getTenantId());
         Result resultInfo = ybHttpUtils.cancelProcurement(medicalPurchase3504Param);
         if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
             ybDao.saveInventoryPurchaseReturnRecord(medicalPurchase3504Param, resultInfo.getMessage());
@@ -495,10 +651,10 @@ public class YbController {
     @PostMapping("/merchandise")
     public R<?> merchandise(Long id, String ListType) {
         Medical3505Param medical3505Param =
-                ybDao.getMedical3505Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
+            ybDao.getMedical3505Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
         Result result = ybHttpUtils.merchandise(medical3505Param);
         Medical3505Result medical3505Result =
-                JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
+            JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
         if ("1".equals(medical3505Result.getRetRslt())) {
             ybDao.saveInventorySaleRecord(medical3505Param, medical3505Result.getMsgRslt());
             return R.ok();
@@ -516,10 +672,10 @@ public class YbController {
     @PostMapping("/cancel-merchandise")
     public R<?> cancelMerchandise(Long id, String ListType) {
         Medical3506Param medical3506Param =
-                ybDao.getMedical3506Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
+            ybDao.getMedical3506Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
         Result result = ybHttpUtils.cancelMerchandise(medical3506Param);
         Medical3505Result medical3505Result =
-                JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
+            JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
         if ("1".equals(medical3505Result.getRetRslt())) {
             ybDao.saveInventorySaleReturnRecord(medical3506Param, medical3505Result.getMsgRslt());
             return R.ok();
@@ -545,11 +701,30 @@ public class YbController {
         return R.fail();
     }
 
+    /**
+     * 【3206A】清算机构查询
+     *
+     * @return 结果
+     */
+    @GetMapping("/select-clroptins")
+    public R<?> getClrOptins(String pageNum, String pageSize, String fixmedinsCode) {
+        Clearing3206AParam clearing3206AParam = new Clearing3206AParam();
+        clearing3206AParam.setPageNum(Integer.parseInt(pageNum)).setPageSize(Integer.parseInt(pageSize))
+            .setFixmedinsCode(fixmedinsCode);
+        Result resultBody = ybHttpUtils.getClrOptins(clearing3206AParam);
+        if (resultBody.getCode().equals(CommonConstant.SC_OK_200)) {
+            // ybDao.saveInventoryDelRecord(medical3507Param);
+            // resultBody.
+            return R.ok();
+        }
+        return R.fail(resultBody);
+    }
+
     /**
      * 【1312】-医保目录信息查询
      *
      * @param hilistCode 医保目录编码
-     * @param dateStr    更新时间
+     * @param dateStr 更新时间
      * @return 结果
      */
     @PostMapping("/query-yb-catalogue")
@@ -557,7 +732,7 @@ public class YbController {
         Catalogue1312QueryParam catalogue1312QueryParam = new Catalogue1312QueryParam();
         catalogue1312QueryParam.setHilistCode(hilistCode);
         catalogue1312QueryParam.setInsuplcAdmdvs(
-                SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.INSUPLC_ADMDVS));
+            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.INSUPLC_ADMDVS));
         // 直接解析（默认 ISO 格式）
         LocalDate localDate = LocalDate.parse(dateStr);
         // 转换为 Date
@@ -570,4 +745,41 @@ public class YbController {
         return R.ok(outputList);
     }
 
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param encounterId 就诊ID
+     * @return 结果
+     */
+    @GetMapping("/pre-mid-analysis")
+    public R<?> yb3101PreMidAnalysis(@RequestParam("encounterId") Long encounterId,
+        @RequestParam("trigScen") String trigScen) {
+        return ybService.yb3101PreMidAnalysis(encounterId, trigScen);
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param warnRsltId 违规标识
+     * @param dspoWay 处理方式
+     * @param dspoWayRea 处理原因
+     * @return 结果
+     */
+    @GetMapping("/pre-mid-feedback")
+    public R<?> yb3103PreMidFeedback(@RequestParam("warnRsltId") String warnRsltId,
+        @RequestParam("dspoWay") String dspoWay,
+        @RequestParam(value = "dspoWayRea", required = false) String dspoWayRea) {
+        return ybService.yb3103PreMidFeedback(warnRsltId, dspoWay, dspoWayRea);
+    }
+
+    /**
+     * 【4101A】医疗保障基金结算清单信息上传（新）
+     *
+     * @param paymentId 付款ID
+     * @return 结果
+     */
+    @GetMapping("/upload-fund-settle")
+    public R<?> yb4101aUploadFundSettle(@RequestParam("paymentId") Long paymentId) {
+        return ybService.yb4101aUploadFundSettle(paymentId);
+    }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
similarity index 68%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
index 31d849ea..57dcec66 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
@@ -3,21 +3,18 @@
  */
 package com.openhis.web.ybmanage.controller;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.core.domain.R;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
 import com.openhis.web.ybmanage.service.IYbEleBaseService;
 import com.openhis.web.ybmanage.service.IYbEleHttpService;
 import com.openhis.ybelep.domain.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 医保电子处方业务接口
@@ -110,18 +107,26 @@ public class YbElepController {
     @GetMapping("/pre-verification")
     public R<?> preVerification(String prescriptionNo, String ecToken, String authNo, Integer tenantId) {
         PreCheckPrescription pcp = ybEleBaseService.makePreCheckPrescription(prescriptionNo, tenantId);
-        ElepVeriPrescriptionOutput pcpResult = ybEleHttpService.preCheck(pcp);
+        //查类型和审核医生名称
+        Map<String,String> map = ybEleBaseService.getMedTypeAndDoctorName(prescriptionNo, tenantId);
+
+        R<?> result = ybEleHttpService.preCheck(pcp,map.get("medType"),map.get("doctorName"));
         // 入参和出参 保存
         if (pcp != null) {
             pcp.getMdtrtinfo().setPrescriptionNo(prescriptionNo);
             ybEleBaseService.savePreCheckPrescription(pcp);
         }
-        if (pcpResult != null) {
-            pcpResult.setPrescriptionNo(prescriptionNo);
-            ybEleBaseService.saveEleVeriPrescriptionOutput(pcpResult);
+        //成功时保存出参
+        if (result.getCode() == 200) {
+            ElepVeriPrescriptionOutput pcpResult = null;
+            if (ElepVeriPrescriptionOutput.class.isAssignableFrom(result.getData().getClass())) {
+                pcpResult = (ElepVeriPrescriptionOutput) result.getData();
+                pcpResult.setPrescriptionNo(prescriptionNo);
+                ybEleBaseService.saveEleVeriPrescriptionOutput(pcpResult);
+                return R.ok(pcpResult);
+            }
         }
-
-        return R.ok(pcpResult);
+        return R.fail(result.getMsg());
     }
 
     /**
@@ -139,19 +144,24 @@ public class YbElepController {
 
         ElepSignatureInput eleSignature =
                 ybEleBaseService.makeEleSignature(hiRxno, practitionerId, checkDate, tenantId);
-        ElepSignatureOutput esResult = ybEleHttpService.eleSign(eleSignature);
+        R<?> result  = ybEleHttpService.eleSign(eleSignature);
 
         // 入参和出参都保存
         if (eleSignature != null) {
             eleSignature.setHiRxno(hiRxno);
             ybEleBaseService.saveEleSignature(eleSignature);
         }
-        // 入参和出参都保存
-        if (esResult != null) {
-            esResult.setHiRxno(hiRxno);
-            ybEleBaseService.saveEleSignatureOutput(esResult);
+        //成功时保存出参
+        if (result.getCode() == 200) {
+            ElepSignatureOutput esResult = null;
+            if (ElepSignatureOutput.class.isAssignableFrom(result.getData().getClass())) {
+                esResult = (ElepSignatureOutput) result.getData();
+                esResult.setHiRxno(hiRxno);
+                ybEleBaseService.saveEleSignatureOutput(esResult);
+                return R.ok(esResult);
+            }
         }
-        return R.ok(esResult);
+        return R.fail(result.getMsg());
     }
 
     /**
@@ -168,17 +178,22 @@ public class YbElepController {
                                       @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date checkDate, Integer tenantId) {
          ElepUploadInput eleUploadInput =
                 ybEleBaseService.makeEleUploadInput(hiRxno, practitionerId, checkDate, tenantId);
-        ElepUploadOutput euResult = ybEleHttpService.uploadElePre(eleUploadInput);
+        R<?> result =  ybEleHttpService.uploadElePre(eleUploadInput);
 
         // 入参和出参都保存
         if (eleUploadInput != null) {
             ybEleBaseService.saveEleUploadInput(eleUploadInput);
         }
-        // 入参和出参都保存
-        if (euResult != null) {
-            ybEleBaseService.saveEleUploadOutput(euResult);
+        //成功时保存出参
+        if (result.getCode() == 200) {
+            ElepUploadOutput euResult = null;
+            if (ElepUploadOutput.class.isAssignableFrom(result.getData().getClass())) {
+                euResult = (ElepUploadOutput) result.getData();
+                ybEleBaseService.saveEleUploadOutput(euResult);
+                return R.ok(euResult);
+            }
         }
-        return R.ok(euResult);
+        return R.fail(result.getMsg());
     }
 
     /**
@@ -197,15 +212,20 @@ public class YbElepController {
 
         ElepRevokeInput eleRevokeInput =
                 ybEleBaseService.makeEleRevokeInput(hiRxno, practitionerId, description, revokeDate, tenantId);  // 入参和出参都保存
-        ElepRevokeOutput ereResult = ybEleHttpService.revokePre(eleRevokeInput);
+        R<?> result =  ybEleHttpService.revokePre(eleRevokeInput);
         if (eleRevokeInput != null) {
             ybEleBaseService.saveEleRevokeInput(eleRevokeInput);
         }
-        // 入参和出参都保存
-        if (ereResult != null) {
-            ybEleBaseService.saveEleRevokeOutput(ereResult);
+        //成功时保存出参
+        if (result.getCode() == 200) {
+            ElepRevokeOutput ereResult = null;
+            if (ElepRevokeOutput.class.isAssignableFrom(result.getData().getClass())) {
+                ereResult = (ElepRevokeOutput) result.getData();
+                ybEleBaseService.saveEleRevokeOutput(ereResult);
+                return R.ok(ereResult);
+            }
         }
-        return R.ok(ereResult);
+        return R.fail(result.getMsg());
     }
 
     /**
@@ -218,16 +238,21 @@ public class YbElepController {
     public R<?> queryPrescription(String hiRxno) {
 
         ElepQuerPrescriptionInput eleQueryPreResultInput = ybEleBaseService.makeEleQueryPrescriptionInput(hiRxno);
-        QueryPrescription emrResult = ybEleHttpService.queryPre(eleQueryPreResultInput);
+        R<?> result = ybEleHttpService.queryPre(eleQueryPreResultInput);
         // 入参和出参都保存
         if (eleQueryPreResultInput != null) {
             ybEleBaseService.saveEleQueryPrescriptionInput(eleQueryPreResultInput);
         }
-        // 入参和出参都保存
-        if (emrResult != null) {
-            ybEleBaseService.saveEleMedResultOut(emrResult);
+        //成功时保存出参
+        if (result.getCode() == 200) {
+            QueryPrescription emrResult = null;
+            if (QueryPrescription.class.isAssignableFrom(result.getData().getClass())) {
+                emrResult = (QueryPrescription) result.getData();
+                ybEleBaseService.saveEleMedResultOut(emrResult);
+                return R.ok(emrResult);
+            }
         }
-        return R.ok(emrResult);
+        return R.fail(result.getMsg());
     }
 
     /**
@@ -240,13 +265,19 @@ public class YbElepController {
     public R<?> queryMedPrescription(String hiRxno) {
 
         ElepMedresultInput eleMedInput = ybEleBaseService.makeEleMedResultInput(hiRxno);  // 入参和出参都保存
-        MedicationResultInquiry medResult = ybEleHttpService.queryMedPre(eleMedInput);
+        R<?> result = ybEleHttpService.queryMedPre(eleMedInput);
         if (eleMedInput != null) {
             ybEleBaseService.saveEleMedResultInput(eleMedInput);
-        }       // 入参和出参都保存
-        if (medResult != null) {
-            ybEleBaseService.saveMedicationResultInquiry(medResult);
         }
-        return R.ok(medResult);
+        //成功时保存出参
+        if (result.getCode() == 200) {
+            MedicationResultInquiry medResult = null;
+            if (MedicationResultInquiry.class.isAssignableFrom(result.getData().getClass())) {
+                medResult = (MedicationResultInquiry) result.getData();
+                ybEleBaseService.saveMedicationResultInquiry(medResult);
+                return R.ok(medResult);
+            }
+        }
+        return R.fail(result.getMsg());
     }
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParma.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
similarity index 92%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParma.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
index a0f1ece0..115460aa 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParma.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  * @date 2025-04-17
  */
 @Data
-public class Clearing3205AWebParma {
+public class Clearing3205AWebParam {
     // 清算机构
     @NotNull
     private String clrOptins;
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
new file mode 100644
index 00000000..9164fe51
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
@@ -0,0 +1,10 @@
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Financial3202WebParam {
+    List<String> settlementIdList;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
new file mode 100644
index 00000000..25f9c0c3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
@@ -0,0 +1,33 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FinancialHand3203AWebParam {
+
+    @NotEmpty
+    private String clrType;//险种类型
+    @NotNull
+    private BigDecimal medfeeSumamt;//医疗费总额
+    @NotNull
+    private BigDecimal medSumfee;//医保认可费用总额（0.00）
+    @NotNull
+    private BigDecimal fundAppySum;//基金支付金额
+    @NotNull
+    private BigDecimal cashPayamt;//现金金额
+    @NotNull
+    private BigDecimal acctPay;//账户金额
+    @NotNull
+    private String begndate;//开始时间
+    @NotNull
+    private String enddate;//结束时间
+    @NotEmpty
+    private String clrOptins; // 必须是准确的6位编码
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
new file mode 100644
index 00000000..a65ec867
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
@@ -0,0 +1,196 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+//@TableName("yb_inpatient_fee_detail") // 替换为实际表名
+public class Yb2301FeeDetailParam {
+
+
+        /**
+         * 费用明细流水号
+         * 单次就诊内唯一
+         */
+        @JsonProperty("feedetl_sn")
+        private String feedetlSn;
+
+        /**
+         * 原费用流水号
+         * 退单时传入被退单的费用明细流水号
+         */
+        @JsonProperty("init_feedetl_sn")
+        private String initFeedetlSn;
+
+        /**
+         * 就诊ID
+         */
+        @JsonProperty("mdtrt_id")
+        private String mdtrtId;
+
+        /**
+         * 医嘱号
+         */
+        @JsonProperty("drord_no")
+        private String drordNo;
+
+        /**
+         * 人员编号
+         */
+        @JsonProperty("psn_no")
+        private String psnNo;
+
+        /**
+         * 医疗类别
+         */
+        @JsonProperty("med_type")
+        private String medType;
+
+        /**
+         * 费用发生时间
+         * 格式：yyyy-MM-dd HH:mm:ss
+         */
+        @JsonProperty("fee_ocur_time")
+        private Date feeOcurTime;
+
+        /**
+         * 医保目录编码
+         */
+        @JsonProperty("med_list_codg")
+        private String medListCodg;
+
+        /**
+         * 医药机构目录编码
+         */
+        @JsonProperty("medins_list_codg")
+        private String medinsListCodg;
+
+        /**
+         * 明细项目费用总额
+         */
+        @JsonProperty("det_item_fee_sumamt")
+        private BigDecimal detItemFeeSumamt;
+
+        /**
+         * 数量
+         * 退单时数量填写负数
+         */
+        @JsonProperty("cnt")
+        private BigDecimal cnt;
+
+        /**
+         * 单价
+         */
+        @JsonProperty("pric")
+        private BigDecimal pric;
+
+        /**
+         * 开单科室编码
+         */
+        @JsonProperty("bilg_dept_codg")
+        private String bilgDeptCodg;
+
+        /**
+         * 开单科室名称
+         */
+        @JsonProperty("bilg_dept_name")
+        private String bilgDeptName;
+
+        /**
+         * 开单医生编码
+         */
+        @JsonProperty("bilg_dr_codg")
+        private String bilgDrCodg;
+
+        /**
+         * 开单医师姓名
+         */
+        @JsonProperty("bilg_dr_name")
+        private String bilgDrName;
+
+        /**
+         * 受单科室编码
+         */
+        @JsonProperty("acord_dept_codg")
+        private String acordDeptCodg;
+
+        /**
+         * 受单科室名称
+         */
+        @JsonProperty("acord_dept_name")
+        private String acordDeptName;
+
+        /**
+         * 受单医生编码
+         */
+        @JsonProperty("orders_dr_code")
+        private String ordersDrCode;
+
+        /**
+         * 受单医生姓名
+         */
+        @JsonProperty("orders_dr_name")
+        private String ordersDrName;
+
+        /**
+         * 医院审批标志
+         */
+        @JsonProperty("hosp_appr_flag")
+        private String hospApprFlag;
+
+        /**
+         * 中药使用方式
+         */
+        @JsonProperty("tcmdrug_used_way")
+        private String tcmdrugUsedWay;
+
+        /**
+         * 外检标志
+         */
+        @JsonProperty("etip_flag")
+        private String etipFlag;
+
+        /**
+         * 外检医院编码
+         */
+        @JsonProperty("etip_hosp_code")
+        private String etipHospCode;
+
+        /**
+         * 出院带药标志
+         */
+        @JsonProperty("dscg_tkdrug_flag")
+        private String dscgTkdrugFlag;
+
+        /**
+         * 生育费用标志
+         */
+        @JsonProperty("matn_fee_flag")
+        private String matnFeeFlag;
+
+        /**
+         * 备注
+         */
+        @JsonProperty("memo")
+        private String memo;
+
+        /**
+         * 组套编号
+         */
+        @JsonProperty("comb_no")
+        private String combNo;
+
+        /**
+         * 字段扩展
+         * 格式：JSON
+         */
+        @JsonProperty("exp_content")
+        private String expContent;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
new file mode 100644
index 00000000..12e3d594
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
@@ -0,0 +1,124 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class Yb2301InpatientOutput {
+
+    /**
+     * 费用明细流水号
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 明细项目费用总额
+     */
+    @JsonProperty("det_item_fee_sumamt")
+    private BigDecimal detItemFeeSumamt;
+
+    /**
+     * 数量
+     */
+    @JsonProperty("cnt")
+    private BigDecimal cnt;
+
+    /**
+     * 单价
+     */
+    @JsonProperty("pric")
+    private BigDecimal pric;
+
+    /**
+     * 定价上限金额
+     */
+    @JsonProperty("pric_uplmt_amt")
+    private BigDecimal pricUplmtAmt;
+
+    /**
+     * 自付比例
+     */
+    @JsonProperty("selfpay_prop")
+    private BigDecimal selfpayProp;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_amt")
+    private BigDecimal overlmtAmt;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 收费项目等级
+     */
+    @JsonProperty("chrgitm_lv")
+    private String chrgitmLv;
+
+    /**
+     * 医疗收费项目类别
+     */
+    @JsonProperty("med_chrgitm_type")
+    private String medChrgitmType;
+
+    /**
+     * 基本药物标志
+     */
+    @JsonProperty("bas_medn_flag")
+    private String basMednFlag;
+
+    /**
+     * 医保谈判药品标志
+     */
+    @JsonProperty("hi_nego_drug_flag")
+    private String hiNegoDrugFlag;
+
+    /**
+     * 儿童用药标志
+     */
+    @JsonProperty("chld_medc_flag")
+    private String chldMedcFlag;
+
+    /**
+     * 目录特项标志
+     */
+    @JsonProperty("list_sp_item_flag")
+    private String listSpItemFlag;
+
+    /**
+     * 限制使用标志
+     */
+    @JsonProperty("lmt_used_flag")
+    private String lmtUsedFlag;
+
+    /**
+     * 直报标志
+     */
+    @JsonProperty("drt_reim_flag")
+    private String drtReimFlag;
+
+    /**
+     * 备注
+     */
+    @JsonProperty("memo")
+    private String memo;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
new file mode 100644
index 00000000..65db6495
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
@@ -0,0 +1,31 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Yb2302InpatientParam {
+    /**
+     * 费用明细流水号
+     * 单次就诊内唯一
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 人员编号
+     * 退单时传入被退单的费用明细流水号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
new file mode 100644
index 00000000..5b62a1af
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
@@ -0,0 +1,258 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2303InpatientOutput {
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     * 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
new file mode 100644
index 00000000..34cc3969
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
@@ -0,0 +1,119 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2303InpatientPram {
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号
+     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 出院时间
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("dscgTime")
+    private Date dscgTime;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
new file mode 100644
index 00000000..e9f25d1b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
@@ -0,0 +1,31 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2304InpatientExpContentParam {
+    /**
+     * 实际就医区划
+     */
+    @JsonProperty("med_admdvs")
+    private BigDecimal medAdmdvs;
+
+    /**
+     * 外报就医医院编号
+     */
+    @JsonProperty("med_hosp_no")
+    private BigDecimal medHospNo;
+
+    /**
+     * 外报就医医院名称
+     */
+    @JsonProperty("med_hosp_name")
+    private BigDecimal medHospName;
+
+    /**
+     * 外报类型
+     */
+    @JsonProperty("out_submit_type")
+    private String outSubmitType;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
new file mode 100644
index 00000000..7a3c0706
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
@@ -0,0 +1,279 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2304InpatientOutput {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_id")
+    private String setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 医院负担金额（原始）
+     */
+    @JsonProperty("hosp_part_amt_old")
+    private BigDecimal hospPartAmtOld;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 字段扩展
+     * 1.5.4新增
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     * 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 医院负担金额
+     * 1.5.4新增
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
new file mode 100644
index 00000000..2476e190
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
@@ -0,0 +1,111 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2304InpatientParam {
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号
+     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
new file mode 100644
index 00000000..918888c4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
@@ -0,0 +1,221 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2305InpatientOutput {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_id")
+    private String setlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 人员参保关系ID
+     */
+    @JsonProperty("psn_insu_rlts_id")
+    private String psnInsuRltsId;
+
+    /**
+     * 参保机构行政区划
+     */
+    @JsonProperty("insu_admdvs")
+    private String insuAdmdvs;
+
+    /**
+     * 开始日期
+     */
+    @JsonProperty("begndate")
+    private Date begndate;
+
+    /**
+     * 结算日期
+     */
+    @JsonProperty("enddate")
+    private Date enddate;
+
+    /**
+     * 就诊凭证编号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 结算类别
+     */
+    @JsonProperty("setl_type")
+    private String setlType;
+
+    /**
+     * 本次起付线
+     */
+    @JsonProperty("crt_dedc")
+    private BigDecimal crtDedc;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
new file mode 100644
index 00000000..99bc5924
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
@@ -0,0 +1,31 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2305InpatientParam {
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private BigDecimal mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_Id")
+    private BigDecimal setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private BigDecimal psnNo;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
new file mode 100644
index 00000000..e7050d0b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
@@ -0,0 +1,72 @@
+package com.openhis.web.ybmanage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.openhis.yb.dto.*;
+
+/**
+ * 医保Mapper
+ *
+ * @author GuoRui
+ */
+@Repository
+public interface YbMapper {
+
+    /**
+     * 【3101】查询就诊患者信息
+     * 
+     * @param encounterId 就诊ID
+     * @param encounterFlag 是否为就诊登记使用
+     * @param participantType 参与者类型
+     * @param deleteFlag 删除状态
+     * @return 就诊患者信息
+     */
+    Yb3101AdapterEncounterPatientInfo yb3101SelectEncounterPatientInfo(@Param("encounterId") Long encounterId,
+        @Param("encounterFlag") Integer encounterFlag, @Param("participantType") String participantType,
+        @Param("deleteFlag") String deleteFlag);
+
+    /**
+     * 【3101】查询就诊诊断信息
+     *
+     * @param encounterId 就诊ID
+     * @param deleteFlag 删除状态
+     * @return 就诊诊断信息
+     */
+    List<Yb3101AdapterEncounterDiagnoseInfo> yb3101SelectEncounterDiagnoseInfo(@Param("encounterId") Long encounterId,
+        @Param("deleteFlag") String deleteFlag);
+
+    /**
+     * 【3101】查询处方（医嘱）信息
+     *
+     * @param encounterId 就诊ID
+     * @param deleteFlag 删除状态
+     * @param ybMedChrgItmTypeWest 医疗收费项目类别-西药费
+     * @param ybMedChrgItmTypeChineseSlices 医疗收费项目类别-中药饮片费
+     * @param ybMedChrgItmTypeChinese 医疗收费项目类别-中成药费
+     * @return 处方（医嘱）信息
+     */
+    List<Yb3101AdapterOrderInfo> yb3101SelectOrderInfo(@Param("encounterId") Long encounterId,
+        @Param("deleteFlag") String deleteFlag, @Param("ybMedChrgItmTypeWest") String ybMedChrgItmTypeWest,
+        @Param("ybMedChrgItmTypeChineseSlices") String ybMedChrgItmTypeChineseSlices,
+        @Param("ybMedChrgItmTypeChinese") String ybMedChrgItmTypeChinese);
+
+    /**
+     * 【4101A】查询结算清单信息
+     * 
+     * @param paymentId 付款ID
+     * @return 结算清单信息
+     */
+    List<Yb4101AAdapterSettleInfo> yb4101aSelectSettleInfo(@Param("paymentId") Long paymentId);
+
+    /**
+     * 【4101A】查询门诊慢特病诊断信息
+     *
+     * @param paymentId 付款ID
+     * @return 门诊慢特病诊断信息
+     */
+    List<Yb4101AInputOpspdiseinfo> yb4101aSelectOpspdiseinfo(@Param("paymentId") Long paymentId);
+
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
similarity index 98%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
index f95fb881..b96e2bad 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
@@ -4,6 +4,7 @@
 package com.openhis.web.ybmanage.service;
 
 import java.util.Date;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
@@ -222,4 +223,5 @@ public interface IYbEleBaseService {
      */
     void saveMedicationResultInquiry(MedicationResultInquiry medResInquiry);
 
+    Map<String,String> getMedTypeAndDoctorName(String prescriptionNo, Integer tenantId);
 }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
similarity index 80%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
index 1ed24141..9d81a156 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.ybmanage.service;
 
+import com.core.common.core.domain.R;
 import com.openhis.ybelep.domain.*;
 
 /**
@@ -18,7 +19,7 @@ public interface IYbEleHttpService {
      * @param pcp 医保电子处方注册预核验入参实体
      * @return 医保电子处方注册预核验响应出参实体
      */
-    ElepVeriPrescriptionOutput preCheck(PreCheckPrescription pcp);
+    R<?> preCheck(PreCheckPrescription pcp, String medType , String dutyDoctorName);
 
     /**
      * 采用HTTP协议中的 POST 方法，发送电子处方医保电子签名请求，并处理响应结果
@@ -26,7 +27,7 @@ public interface IYbEleHttpService {
      * @param eleSign 电子处方医保电子签名入参实体
      * @return 电子处方医保电子签名响应出参实体
      */
-    ElepSignatureOutput eleSign(ElepSignatureInput eleSign);
+    R<?> eleSign(ElepSignatureInput eleSign);
 
     /**
      * 采用HTTP协议中的 POST 方法，发送电子处方上传请求，并处理响应结果
@@ -34,7 +35,7 @@ public interface IYbEleHttpService {
      * @param eleUploadInput 电子处方上传入参实体
      * @return 电子处方上传响应出参实体
      */
-    ElepUploadOutput uploadElePre(ElepUploadInput eleUploadInput);
+    R<?> uploadElePre(ElepUploadInput eleUploadInput);
 
     /**
      * 采用HTTP协议中的 POST 方法，发送电子处方撤销请求，并处理响应结果
@@ -42,7 +43,7 @@ public interface IYbEleHttpService {
      * @param eleRevokeInput 电子处方撤销入参实体
      * @return 电子处方撤销响应出参实体
      */
-    ElepRevokeOutput revokePre(ElepRevokeInput eleRevokeInput);
+    R<?> revokePre(ElepRevokeInput eleRevokeInput);
 
     /**
      * 采用HTTP协议中的 POST 方法，电子处方信息查询请求，并处理响应结果
@@ -50,7 +51,7 @@ public interface IYbEleHttpService {
      * @param eleQueryPreInput 电子处方信息查询入参实体
      * @return 电子处方信息查询出参实体
      */
-    QueryPrescription queryPre(ElepQuerPrescriptionInput eleQueryPreInput);
+    R<?> queryPre(ElepQuerPrescriptionInput eleQueryPreInput);
 
     /**
      * 采用HTTP协议中的 POST 方法，电子处方取药结果查询请求，并处理响应结果
@@ -58,6 +59,6 @@ public interface IYbEleHttpService {
      * @param eleMedInput 电子处方取药结果查询入参实体
      * @return 电子处方取药结果查询出参实体
      */
-    MedicationResultInquiry queryMedPre(ElepMedresultInput eleMedInput);
+    R<?> queryMedPre(ElepMedresultInput eleMedInput);
 
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
new file mode 100644
index 00000000..f5fc7ab7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
@@ -0,0 +1,38 @@
+package com.openhis.web.ybmanage.service;
+
+import com.core.common.core.domain.R;
+
+/**
+ * 医保Service
+ *
+ * @author GuoRui
+ */
+public interface IYbService {
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     * 
+     * @param encounterId 就诊ID
+     * @param trigScen 触发场景
+     * @return 结果
+     */
+    R<?> yb3101PreMidAnalysis(Long encounterId, String trigScen);
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param warnRsltId 违规标识
+     * @param dspoWay 处理方式
+     * @param dspoWayRea 处理原因
+     * @return 结果
+     */
+    R<?> yb3103PreMidFeedback(String warnRsltId, String dspoWay, String dspoWayRea);
+
+    /**
+     * 【4101A】医疗保障基金结算清单信息上传（新）
+     *
+     * @param paymentId 付款ID
+     * @return 结果
+     */
+    R<?> yb4101aUploadFundSettle(Long paymentId);
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
similarity index 77%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
index e4f66e07..5ad26d5e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
@@ -3,7 +3,10 @@
  */
 package com.openhis.web.ybmanage.service.impl;
 
+import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.yb.dto.BaseInfo;
 import com.openhis.yb.dto.BaseParam;
 import com.openhis.yb.util.YbParamBuilderUtil;
 import org.apache.http.client.config.RequestConfig;
@@ -47,10 +50,11 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @return 医保电子处方注册预核验响应出参实体
      */
     @Override
-    public ElepVeriPrescriptionOutput preCheck(PreCheckPrescription pcp) {
+    public R<?> preCheck(PreCheckPrescription pcp, String medType , String dutyDoctorName) {
         ElepVeriPrescriptionOutput pcpResult = new ElepVeriPrescriptionOutput();
+        BaseInfo baseInfo = ybParamBuilderUtil.getBaseInfo(medType, dutyDoctorName);
         // 发送请求
-        String s = httpPost(ybServiceConfig.getEleUrl() + "/preCheckPrescription", pcp);
+        String s = httpPost( SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/preCheckPrescription", pcp,baseInfo);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -62,9 +66,10 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         if (result != null && result.isSuccess()) {
             pcpResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepVeriPrescriptionOutput.class);;
             pcpResult.setPrescriptionNo(pcp.getHospRxno());
+            return  R.ok(pcpResult);
+        }else{
+            return  R.fail(result.getMessage());
         }
-
-        return pcpResult;
     }
 
     /**
@@ -73,11 +78,11 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @param eleSign 电子处方医保电子签名入参实体
      * @return 电子处方医保电子签名响应出参实体
      */
-    public ElepSignatureOutput eleSign(ElepSignatureInput eleSign) {
+    public R<?> eleSign(ElepSignatureInput eleSign) {
 
         ElepSignatureOutput esResult = new ElepSignatureOutput();
         // 发送请求
-        String s = httpPost(ybServiceConfig.getEleUrl() + "/signature", eleSign);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/signature", eleSign,ybParamBuilderUtil.getBaseInfo("",""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -88,9 +93,10 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         }
         if (result != null && result.isSuccess()) {
             esResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepSignatureOutput.class);
+            return  R.ok(esResult);
+        }else{
+            return  R.fail(result.getMessage());
         }
-
-        return esResult;
     }
 
     /**
@@ -100,11 +106,11 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @return 电子处方上传响应出参实体
      */
     @Override
-    public ElepUploadOutput uploadElePre(ElepUploadInput eleUploadInput) {
+    public R<?> uploadElePre(ElepUploadInput eleUploadInput) {
 
         ElepUploadOutput euResult = new ElepUploadOutput();
         // 发送请求
-        String s = httpPost(ybServiceConfig.getEleUrl() + "/upload", eleUploadInput);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/upload", eleUploadInput,ybParamBuilderUtil.getBaseInfo("",""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -115,9 +121,10 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         }
         if (result != null && result.isSuccess()) {
             euResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepUploadOutput.class);
+            return  R.ok(euResult);
+        }else{
+            return  R.fail(result.getMessage());
         }
-
-        return euResult;
     }
 
     /**
@@ -127,11 +134,11 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @return 电子处方撤销响应出参实体
      */
     @Override
-    public ElepRevokeOutput revokePre(ElepRevokeInput eleRevokeInput) {
+    public R<?> revokePre(ElepRevokeInput eleRevokeInput) {
 
         ElepRevokeOutput ereResult = new ElepRevokeOutput();
         // 发送请求
-        String s = httpPost(ybServiceConfig.getEleUrl() + "/revoke", eleRevokeInput);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/revoke", eleRevokeInput,ybParamBuilderUtil.getBaseInfo("",""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -142,9 +149,10 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         }
         if (result != null && result.isSuccess()) {
             ereResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepRevokeOutput.class);
+            return  R.ok(ereResult);
+        }else{
+            return  R.fail(result.getMessage());
         }
-
-        return ereResult;
     }
 
     /**
@@ -154,7 +162,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @return 电子处方信息查询出参实体
      */
     @Override
-    public QueryPrescription queryPre(ElepQuerPrescriptionInput eleQueryPreInput) {
+    public R<?> queryPre(ElepQuerPrescriptionInput eleQueryPreInput) {
         //拼参数
 //        BaseParam baseParam = new BaseParam();
 //        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(eleQueryPreInput);
@@ -162,7 +170,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         QueryPrescription emrResult = new QueryPrescription();
         // 发送请求
         String s =
-                httpPost(ybServiceConfig.getEleUrl() + "/querPrescription", eleQueryPreInput);
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/querPrescription", eleQueryPreInput,ybParamBuilderUtil.getBaseInfo("",""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -173,9 +181,10 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         }
         if (result != null && result.isSuccess()) {
             emrResult = JSON.parseObject(JSON.toJSONString(result.getResult()), QueryPrescription.class);
+            return  R.ok(emrResult);
+        }else{
+            return  R.fail(result.getMessage());
         }
-
-        return emrResult;
     }
 
     /**
@@ -184,12 +193,12 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @param eleMedInput 电子处方取药结果查询入参实体
      * @return 电子处方取药结果查询出参实体
      */
-    public MedicationResultInquiry queryMedPre(ElepMedresultInput eleMedInput){
+    public R<?> queryMedPre(ElepMedresultInput eleMedInput){
 
         MedicationResultInquiry medResult = new MedicationResultInquiry();
         // 发送请求
         String s =
-                httpPost(ybServiceConfig.getEleUrl() + "/medresult", eleMedInput);
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/medresult", eleMedInput,ybParamBuilderUtil.getBaseInfo("",""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -200,9 +209,10 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         }
         if (result != null && result.isSuccess()) {
             medResult = JSON.parseObject(JSON.toJSONString(result.getResult()), MedicationResultInquiry.class);
+            return  R.ok(medResult);
+        }else{
+            return  R.fail(result.getMessage());
         }
-
-        return medResult;
     }
     /**
      * 发送http请求（2025/05/02经测试，若以自带的工具类发送请求失败，故使用原peis系统中成功调用的写法重新封装）
@@ -210,11 +220,11 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
      * @param o 参数
      * @return
      */
-    private String httpPost(String url,Object o){
+    private String httpPost(String url, Object o, BaseInfo baseInfo){
         String resultString = "";
 //        //拼参数
         BaseParam baseParam = new BaseParam();
-        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(o);
+        baseParam.setBaseInfo(baseInfo).setData(o);
         //创建Http请求
         RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000).setConnectionRequestTimeout(30000)
                 .setSocketTimeout(30000).build();
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
similarity index 77%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
index e04a0819..68ea55c4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
@@ -21,16 +21,20 @@ import com.openhis.administration.service.IPatientService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.constant.YbCommonConstants;
 import com.openhis.common.enums.PrescriptionType;
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.service.IContractService;
 import com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
 import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
 import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
 import com.openhis.web.ybmanage.mapper.YbElepMapper;
 import com.openhis.workflow.domain.ElepMedicationRequest;
 import com.openhis.workflow.service.IElepMedicationRequestService;
+import com.openhis.yb.service.IPerinfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +62,12 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
     @Autowired
     IRegService iRegService;
     @Autowired
+    IPerinfoService perinfoService;
+    @Autowired
+    IContractService contractService;
+    @Autowired
+    IPractitionerService iPractitionerService;
+    @Autowired
     YbEleParamBuilderUtil ybEleUtil;
     @Autowired
     IElepVeriPrescriptionInfoService eleVeriPrescriptionInfoService;
@@ -175,9 +185,10 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
         // 获取当前时间
         Date now = DateUtils.getNowDate();
         // 获取医保处方号
-        ElepVeriPrescriptionOutput prescriptionOutput =
-                elePresOutputService.getOne(new LambdaQueryWrapper<ElepVeriPrescriptionOutput>()
-                        .eq(ElepVeriPrescriptionOutput::getPrescriptionNo, prescriptionNo));
+        List<ElepVeriPrescriptionOutput> prescriptionOutput =
+                elePresOutputService.list(new LambdaQueryWrapper<ElepVeriPrescriptionOutput>()
+                        .eq(ElepVeriPrescriptionOutput::getPrescriptionNo, prescriptionNo)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (prescriptionOutput == null) {
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
         }
@@ -191,9 +202,9 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
         // 更改处方信息
         for (ElepMedicationRequest item : elepMedicationRequest) {
             // 医保处方编号
-            item.setHiRxno(prescriptionOutput.getHiRxno());
+            item.setHiRxno(prescriptionOutput.get(0).getHiRxno());
             // 电子处方追溯码
-            item.setRxTraceCode(prescriptionOutput.getRxTraceCode());
+            item.setRxTraceCode(prescriptionOutput.get(0).getRxTraceCode());
             // 处方状态
             item.setStatusEnum(RequestStatus.COMPLETED.getValue());
             // 审核药师
@@ -266,7 +277,7 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
         // 更改处方信息
         for (ElepMedicationRequest item : elepMedicationRequest) {
             // 处方状态
-            item.setStatusEnum(RequestStatus.CANCELLED.getValue());
+            item.setStatusEnum(RequestStatus.STOPPED.getValue());
             // 撤销药师
             item.setQuashDrId(user.getId());
             // 撤销时间
@@ -378,12 +389,13 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
     @Override
     public ElepSignatureInput makeEleSignature(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId) {
 
-        ElepVeriPrescriptionOutput pcpResult = elePresOutputService.getOne(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno));
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (pcpResult == null) {
             return null;
         }
-        return ybEleUtil.getEleSignatureInput(pcpResult, practitionerId, checkDate, tenantId);
+        return ybEleUtil.getEleSignatureInput(pcpResult.get(0), practitionerId, checkDate, tenantId);
     }
 
     /**
@@ -420,16 +432,18 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
     @Override
     public ElepUploadInput makeEleUploadInput(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId) {
 
-        ElepVeriPrescriptionOutput pcpResult = elePresOutputService.getOne(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno));
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
-        ElepSignatureOutput esResult = eleSignOutService
-                .getOne(new LambdaQueryWrapper<ElepSignatureOutput>().eq(ElepSignatureOutput::getHiRxno, hiRxno));
+        List<ElepSignatureOutput> esResult = eleSignOutService
+                .list(new LambdaQueryWrapper<ElepSignatureOutput>().eq(ElepSignatureOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepSignatureOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (pcpResult == null || esResult == null) {
             return null;
         }
-        return ybEleUtil.getEleUploadInput(pcpResult, esResult, practitionerId, checkDate, tenantId);
+        return ybEleUtil.getEleUploadInput(pcpResult.get(0), esResult.get(0), practitionerId, checkDate, tenantId);
     }
 
     /**
@@ -468,19 +482,21 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
     public ElepRevokeInput makeEleRevokeInput(String hiRxno, Long practitionerId, String description, Date revokeDate,
                                               Integer tenantId) {
 
-        ElepVeriPrescriptionOutput pcpResult = elePresOutputService.getOne(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno));
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (pcpResult == null) {
             return null;
         }
-        ElepUploadOutput euResult = eleUploadOutputService
-                .getOne(new LambdaQueryWrapper<ElepUploadOutput>().eq(ElepUploadOutput::getHiRxno, pcpResult.getHiRxno()));
+        List<ElepUploadOutput> euResult = eleUploadOutputService
+                .list(new LambdaQueryWrapper<ElepUploadOutput>().eq(ElepUploadOutput::getHiRxno, pcpResult.get(0).getHiRxno())
+                        .orderByDesc(ElepUploadOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (euResult == null) {
             return null;
         }
 
-        return ybEleUtil.getElepRevokeInput(pcpResult, euResult, practitionerId, description, revokeDate, tenantId);
+        return ybEleUtil.getElepRevokeInput(pcpResult.get(0), euResult.get(0), practitionerId, description, revokeDate, tenantId);
     }
 
     /**
@@ -515,13 +531,14 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
     @Override
     public ElepQuerPrescriptionInput makeEleQueryPrescriptionInput(String hiRxno) {
 
-        ElepVeriPrescriptionOutput pcpResult = elePresOutputService.getOne(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno));
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (pcpResult == null) {
             return null;
         }
-        return ybEleUtil.getEleQueryPrescriptionInput(pcpResult);
+        return ybEleUtil.getEleQueryPrescriptionInput(pcpResult.get(0));
     }
 
     /**
@@ -567,14 +584,15 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
     @Override
     public ElepMedresultInput makeEleMedResultInput(String hiRxno) {
 
-        ElepVeriPrescriptionOutput pcpResult = elePresOutputService.getOne(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno));
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
-        if (pcpResult == null ) {
+        if (pcpResult == null) {
             return null;
         }
 
-        return ybEleUtil.getEleMedResultInput(pcpResult);
+        return ybEleUtil.getEleMedResultInput(pcpResult.get(0));
     }
 
     /**
@@ -604,4 +622,80 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService {
         eleMedDetailService.saveBatch(medResInquiry.getSeltdelts());
     }
 
+    @Override
+    public Map<String, String> getMedTypeAndDoctorName(String prescriptionNo, Integer tenantId) {
+
+        HashMap<String, String> map = new HashMap<>();
+        // 获取药品请求信息(处方表)
+        List<ElepMedicationRequest> medicationRequestList = elepMedicationRequestService.list(
+                new LambdaQueryWrapper<ElepMedicationRequest>().eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)
+                        .eq(ElepMedicationRequest::getTenantId, tenantId));
+        if (medicationRequestList == null) {
+            return null;
+        }
+        ElepMedicationRequest medicationRequest = medicationRequestList.get(0);
+
+        // 就诊信息
+        Encounter encounter = encounterService.getById(medicationRequest.getEncounterId());
+        //患者信息
+        Patient patient = patientService.getById(encounter.getPatientId());
+        // 获取医保挂号信息     todo  clinicReg可能改成一对多
+        ClinicReg clinicReg = iRegService.getByBusNo(encounter.getBusNo());
+        if (clinicReg == null) {
+            return null;
+        }
+
+        String medicalContractName = "";
+        String insuplcAdmdvs = clinicReg.getInsuplcAdmdvs();
+        if (insuplcAdmdvs.equals("229900") ) {
+            medicalContractName = "省";
+        } else if (insuplcAdmdvs.startsWith("2201")) {
+            medicalContractName = "市";
+        } else {
+            medicalContractName = "省异地";
+        }
+//        List<Contract> contractListByYb = contractService.getContractListByYb();
+//        for (Contract contract : contractListByYb) {
+//            if(insuplcAdmdvs.equals(contract.getAdmVs())){
+//                medicalContractName = contract.getContractName();
+//            }
+//        }
+
+        String insutype = clinicReg.getInsutype();
+
+        String medicalCareType = "";
+        switch (insutype) {
+            case "310":
+            case "320":
+            case "330":
+            case "370":
+                medicalCareType = "职工医保";
+                break;
+            case "340":
+            case "360":
+                medicalCareType = "全公费";
+                break;
+            case "390":
+            case "392":
+            case "391":
+            case "380":
+                medicalCareType = "居民医保";
+                break;
+            case "350":
+            case "410":
+            case "399":
+                medicalCareType = "其他";
+                break;
+            default:
+                medicalCareType = "全自费";
+                break;
+        }
+
+        Practitioner practitioner = iPractitionerService.getById(SecurityUtils.getLoginUser().getPractitionerId());
+
+        map.put("doctorName", practitioner.getName());
+        map.put("medType", medicalContractName + medicalCareType);
+
+        return map;
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
new file mode 100644
index 00000000..20e20120
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
@@ -0,0 +1,407 @@
+package com.openhis.web.ybmanage.service.impl;
+
+import java.math.BigDecimal;
+import java.time.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.core.common.enums.DeleteFlag;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.StringUtils;
+import com.core.web.util.TenantOptionUtil;
+import com.openhis.common.enums.ParticipantType;
+import com.openhis.common.enums.TherapyTimeType;
+import com.openhis.common.enums.Whether;
+import com.openhis.common.enums.ybenums.*;
+import com.openhis.web.ybmanage.mapper.YbMapper;
+import com.openhis.web.ybmanage.service.IYbService;
+import com.openhis.yb.dto.*;
+import com.openhis.yb.service.YbHttpUtils;
+
+/**
+ * 医保ServiceImpl
+ *
+ * @author GuoRui
+ */
+@Service
+public class YbServiceImpl implements IYbService {
+
+    @Autowired
+    private YbMapper ybMapper;
+    @Autowired
+    private YbHttpUtils ybHttpUtils;
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param encounterId 就诊ID
+     * @param trigScen 触发场景
+     * @return 结果
+     */
+    @Override
+    public R<?> yb3101PreMidAnalysis(Long encounterId, String trigScen) {
+        // 验证触发场景
+        if (YbTrigScen.getByValue(trigScen) == null) {
+            throw new ServiceException("请指定触发场景");
+        }
+
+        // 查询就诊患者信息
+        Yb3101AdapterEncounterPatientInfo encounterPatientInfo = ybMapper.yb3101SelectEncounterPatientInfo(encounterId,
+            Whether.YES.getValue(), ParticipantType.REGISTRATION_DOCTOR.getCode(), DeleteFlag.NOT_DELETED.getCode());
+        if (encounterPatientInfo == null) {
+            throw new ServiceException("患者信息不存在");
+        }
+
+        // 查询就诊诊断信息
+        List<Yb3101AdapterEncounterDiagnoseInfo> encounterDiagnoseInfoList =
+            ybMapper.yb3101SelectEncounterDiagnoseInfo(encounterId, DeleteFlag.NOT_DELETED.getCode());
+        if (encounterDiagnoseInfoList.isEmpty()) {
+            throw new ServiceException("诊断信息不存在");
+        }
+
+        // 查询处方（医嘱）信息
+        List<Yb3101AdapterOrderInfo> orderInfoList = ybMapper.yb3101SelectOrderInfo(encounterId,
+            DeleteFlag.NOT_DELETED.getCode(), YbMedChrgItmType.WEST_MEDICINE.getValue(),
+            YbMedChrgItmType.CHINESE_MEDICINE_SLICES_FEE.getValue(), YbMedChrgItmType.CHINESE_MEDICINE_FEE.getValue());
+        if (encounterDiagnoseInfoList.isEmpty()) {
+            throw new ServiceException("处方信息不存在");
+        }
+
+        // 作成诊断信息集合
+        List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos =
+            encounterDiagnoseInfoList.stream().map(this::createYb3101FsiDiagnoseDto).collect(Collectors.toList());
+
+        // 作成处方(医嘱)信息集合
+        List<Yb3101InputFsiOrderDto> fsiOrderDtos =
+            orderInfoList.stream().map(this::createYb3101InputFsiOrderDto).collect(Collectors.toList());
+
+        // 作成就诊信息
+        Yb3101InputFsiEncounterDto fsiEncounterDto =
+            createYb3101InputFsiEncounterDto(encounterPatientInfo, fsiDiagnoseDtos, fsiOrderDtos);
+
+        // 作成参保人信息
+        Yb3101InputPatientDto patientDto = createYb3101InputPatientDto(encounterPatientInfo, fsiEncounterDto);
+
+        // 作成规则分析信息
+        Yb3101InputData data = createYb3101InputData(patientDto, trigScen);
+
+        // 向医保服务发起HTTP请求，获取返回结果
+        Yb3101OutputResult result = ybHttpUtils.yb3101PreMidAnalysis(data);
+
+        // TODO:后续处理需等待门诊住院开发完全后
+
+        return R.ok();
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param warnRsltId 违规标识
+     * @param dspoWay 处理方式
+     * @param dspoWayRea 处理原因
+     * @return 结果
+     */
+    @Override
+    public R<?> yb3103PreMidFeedback(String warnRsltId, String dspoWay, String dspoWayRea) {
+        // 验证处理方式
+        if (YbDspoWay.getByValue(dspoWay) == null) {
+            throw new ServiceException("请指定处理方式");
+        }
+
+        // 继续执行医嘱时，处理原因必填
+        if (YbDspoWay.CONTINUE.getValue().equals(dspoWay) && StringUtils.isEmpty(dspoWayRea)) {
+            throw new ServiceException("请填写处理原因");
+        }
+
+        // 作成处理数据
+        Yb3103InputWarn warn =
+            new Yb3103InputWarn().setWarnRsltId(warnRsltId).setDspoWay(dspoWay).setDspoWayRea(dspoWayRea);
+
+        // 作成输入
+        Yb3103InputData data = new Yb3103InputData().setWarnType(YbWarnType.PRE.getValue()).setWarns(List.of(warn));
+
+        // 向医保服务发起HTTP请求
+        ybHttpUtils.yb3103PreMidFeedback(data);
+
+        return R.ok();
+    }
+
+    /**
+     * 【4101A】医疗保障基金结算清单信息上传（新）
+     *
+     * @param paymentId 付款ID
+     * @return 结果
+     */
+    @Override
+    public R<?> yb4101aUploadFundSettle(Long paymentId) {
+        // 查询结算清单信息
+        List<Yb4101AAdapterSettleInfo> settleInfoList = ybMapper.yb4101aSelectSettleInfo(paymentId);
+
+        return R.ok();
+    }
+
+    /**
+     * 【3101】创建诊断信息
+     * 
+     * @param encounterDiagnoseInfo 就诊诊断信息
+     * @return 诊断信息
+     */
+    private Yb3101InputFsiDiagnoseDto
+        createYb3101FsiDiagnoseDto(Yb3101AdapterEncounterDiagnoseInfo encounterDiagnoseInfo) {
+        // 根据住院患者疾病诊断类型代码，判断出入诊断类别，非入院诊断，视为出院诊断
+        String inoutDiseType;
+        if (YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getCode().equals(encounterDiagnoseInfo.getIptDiseTypeCode())) {
+            inoutDiseType = YbInOutDiagType.YB_IN_DIAG_TYPE.getValue();
+        } else {
+            inoutDiseType = YbInOutDiagType.YB_OUT_DIAG_TYPE.getValue();
+        }
+        // 返回诊断信息
+        return new Yb3101InputFsiDiagnoseDto()
+            // 诊断标识：诊断记录唯一标识
+            .setDiseId(encounterDiagnoseInfo.getDiseId())
+            // 出入诊断类别：参考字典表
+            .setInoutDiseType(inoutDiseType)
+            // 主诊断标志：参考字典表
+            .setMaindiseFlag(encounterDiagnoseInfo.getMaindiseFlag())
+            // 诊断排序号：例如：1,2,3…
+            .setDiasSrtNo(encounterDiagnoseInfo.getDiasSrtNo())
+            // 诊断(疾病)编码
+            .setDiseCodg(encounterDiagnoseInfo.getDiseCodg())
+            // 诊断(疾病)名称
+            .setDiseName(encounterDiagnoseInfo.getDiseName())
+            // 诊断日期：格式：yyyy-MM-dd HH:mm:ss
+            .setDiseDate(encounterDiagnoseInfo.getDiseDate());
+    }
+
+    /**
+     * 【3101】创建处方（医嘱）信息
+     *
+     * @param orderInfo 处方（医嘱）信息
+     * @return 处方（医嘱）信息
+     */
+    private Yb3101InputFsiOrderDto createYb3101InputFsiOrderDto(Yb3101AdapterOrderInfo orderInfo) {
+        // 根据治疗类型，判断是否为长期医嘱
+        String longDrordFlag;
+        if (TherapyTimeType.LONG_TERM.getValue().equals(orderInfo.getTherapyEnum())) {
+            longDrordFlag = Whether.YES.getCode();
+        } else {
+            longDrordFlag = Whether.NO.getCode();
+        }
+        // 根据医保类别，判断目录类别
+        String hilistType = null;
+        if (YbMedChrgItmType.WEST_MEDICINE.getValue().equals(orderInfo.getYbType())
+            || YbMedChrgItmType.CHINESE_MEDICINE_FEE.getValue().equals(orderInfo.getYbType())) {
+            hilistType = YbListType.WESTERN_AND_CHINESE_PATENT_MEDICINE.getValue();
+        } else if (YbMedChrgItmType.CHINESE_MEDICINE_SLICES_FEE.getValue().equals(orderInfo.getYbType())) {
+            hilistType = YbListType.IMPORTANT_HERBAL_SLICES.getValue();
+        }
+        return new Yb3101InputFsiOrderDto()
+            // 处方(医嘱)标识：处方(医嘱)记录唯一ID
+            .setRxId(orderInfo.getRxId())
+            // 处方号
+            .setRxno(orderInfo.getRxno())
+            // 组编号
+            .setGrpno(orderInfo.getGrpno())
+            // 是否为长期医嘱：[1=是,0=否]
+            .setLongDrordFlag(longDrordFlag)
+            // 目录类别：参考字典表
+            .setHilistType(hilistType)
+            // 收费类别：参考字典表
+            .setChrgType(orderInfo.getYbType())
+            // 医嘱行为：参考字典表
+            .setDrordBhvr(YbDrordBhvr.OTHER.getValue())
+            // 医保目录代码：国家统一标准编码
+            .setHilistCode(orderInfo.getHilistCode())
+            // 医保目录名称：国家统一标准名称
+            .setHilistName(orderInfo.getHilistName())
+            // 医保目录(药品)剂型：国家统一标准药品剂型
+            .setHilistDosform(orderInfo.getHilistDosform())
+            // 医保目录等级
+            .setHilistLv(orderInfo.getHilistLv())
+            // 医保目录价格，暂时取本系统单价
+            .setHilistPric(orderInfo.getPric())
+            // 医院目录代码
+            .setHosplistCode(orderInfo.getHilistCode())
+            // 医院目录名称
+            .setHosplistName(orderInfo.getHilistName())
+            // 医院目录(药品)剂型
+            .setHosplistDosform(orderInfo.getHilistDosform())
+            // 数量
+            .setCnt(BigDecimal.valueOf(orderInfo.getCnt()))
+            // 单价
+            .setPric(orderInfo.getPric())
+            // 总费用
+            .setSumamt(orderInfo.getSumamt())
+            // 自费金额
+            .setOwnpayAmt(BigDecimal.ZERO) // TODO:从哪取啊，住院有（但表还没建），门诊没有
+            // 自付金额
+            .setSelfpayAmt(BigDecimal.ZERO) // TODO:从哪取啊，住院有（但表还没建），门诊没有
+            // 规格：例如：0.25g×12片/盒
+            .setSpec(orderInfo.getSpec())
+            // 数量单位：例如：盒
+            .setSpecUnt(orderInfo.getSpecUnt())
+            // 医嘱开始日期：格式：yyyy-MM-dd HH:mm:ss
+            .setDrordBegnDate(orderInfo.getDrordBegnDate())
+            // 下达医嘱的科室标识
+            .setDrordDeptCodg(orderInfo.getDrordDeptCodg())
+            // 下达医嘱科室名称
+            .setDrordDeptName(orderInfo.getDrordDeptName())
+            // 开处方(医嘱)医生标识
+            .setDrordDrCodg(orderInfo.getDrordDrCodg())
+            // 开处方(医嘱)医生姓名
+            .setDrordDrName(orderInfo.getDrordDrName())
+            // 开处方(医嘱)医职称：参考字典表
+            .setDrordDrProfttl(orderInfo.getDrordDrProfttl())
+            // 是否当前处方(医嘱)：本次处方(医嘱)标记[1=是,0=否]
+            .setCurrDrordFlag(Whether.YES.getCode());
+    }
+
+    /**
+     * 【3101】创建就诊信息
+     * 
+     * @param encounterPatientInfo 就诊患者信息
+     * @param fsiDiagnoseDtos 诊断信息集合
+     * @param fsiOrderDtos 处方(医嘱)信息集合
+     * @return 就诊信息
+     */
+    private Yb3101InputFsiEncounterDto createYb3101InputFsiEncounterDto(
+        Yb3101AdapterEncounterPatientInfo encounterPatientInfo, List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos,
+        List<Yb3101InputFsiOrderDto> fsiOrderDtos) {
+        // 判断出院时间，如果为空，默认当天下午四点
+        if (encounterPatientInfo.getDscgDate() == null) {
+            encounterPatientInfo.setDscgDate(getFourPmDate(encounterPatientInfo.getAdmDate()));
+        }
+        // 提取主诊断
+        Yb3101InputFsiDiagnoseDto mainDiagnose =
+            fsiDiagnoseDtos.stream().filter(e -> Whether.YES.getCode().equals(e.getMaindiseFlag())).findFirst()
+                .orElse(new Yb3101InputFsiDiagnoseDto());
+        // 计算总费用
+        BigDecimal medfeeSumamt =
+            fsiOrderDtos.stream().map(Yb3101InputFsiOrderDto::getSumamt).reduce(BigDecimal.ZERO, BigDecimal::add);
+        // 作成就诊信息
+        return new Yb3101InputFsiEncounterDto()
+            // 就诊标识：就诊记录唯一ID
+            .setMdtrtId(encounterPatientInfo.getMdtrtId())
+            // 医疗服务机构标识：定点医疗机构ID
+            .setMedinsId(encounterPatientInfo.getMedinsId())
+            // 医疗机构名称
+            .setMedinsName(encounterPatientInfo.getMedinsName())
+            // 医疗机构行政区划编码
+            .setMedinsAdmdvs(encounterPatientInfo.getMedinsAdmdvs())
+            // 医疗服务机构类型：参考字典表
+            .setMedinsType(YbMedinsType.FIXMEDINS_TYPE1.getValue())
+            // 医疗机构等级：参考字典表
+            .setMedinsLv(TenantOptionUtil.getOptionContent(TenantOptionDict.MEDINS_LV))
+            // 入院日期
+            .setAdmDate(encounterPatientInfo.getAdmDate())
+            // 出院日期
+            .setDscgDate(encounterPatientInfo.getDscgDate())
+            // 主诊断编码：例如：I63.9
+            .setDscgMainDiseCodg(mainDiagnose.getDiseCodg())
+            // 主诊断名称：例如：脑梗塞
+            .setDscgMainDiseName(mainDiagnose.getDiseName())
+            // 诊断信息集合
+            .setFsiDiagnoseDtos(fsiDiagnoseDtos)
+            // 医师标识：医生唯一ID
+            .setDrCodg(encounterPatientInfo.getDrCodg())
+            // 入院科室标识：科室唯一ID
+            .setAdmDeptCodg(encounterPatientInfo.getAdmDeptCodg())
+            // 入院科室名称
+            .setAdmDeptName(encounterPatientInfo.getAdmDeptName())
+            // 出院科室标识：科室唯一ID
+            .setDscgDeptCodg(encounterPatientInfo.getDscgDeptCodg())
+            // 出院科室名称
+            .setDscgDeptName(encounterPatientInfo.getDscgDeptName())
+            // 就诊类型：参考字典表
+            .setMedMdtrtType(Optional.ofNullable(YbMedType.getByValue(encounterPatientInfo.getMedType()))
+                .orElse(YbMedType.GENERAL_OUTPATIENT).getYbMedMdtrtType().getValue())
+            // 医疗类别：参考字典表
+            .setMedType(encounterPatientInfo.getMedType())
+            // 处方(医嘱)信息集合
+            .setFsiOrderDtos(fsiOrderDtos)
+            // 生育状态：参考字典表
+            .setMatnStas(YbMatnStas.UNKNOWN.getValue())
+            // 总费用
+            .setMedfeeSumamt(medfeeSumamt)
+            // 自费金额
+            .setOwnpayAmt(encounterPatientInfo.getOwnpayAmt())
+            // 自付金额
+            .setSelfpayAmt(encounterPatientInfo.getSelfpayAmt())
+            // 结算总次数
+            .setSetlTotlnum(encounterPatientInfo.getSetlTotlnum())
+            // 险种：参考字典表
+            .setInsutype(encounterPatientInfo.getInsutype())
+            // 报销标志：参考字典表
+            .setReimFlag(YbPayLoc.PAY_LOC1.getValue())
+            // 异地结算标志：参考字典表
+            .setOutSetlFlag(Whether.NO.getCode());
+    }
+
+    /**
+     * 【3101】创建参保人信息
+     * 
+     * @param encounterPatientInfo 就诊患者信息
+     * @param fsiEncounterDto 就诊信息
+     * @return 参保人信息
+     */
+    private Yb3101InputPatientDto createYb3101InputPatientDto(Yb3101AdapterEncounterPatientInfo encounterPatientInfo,
+        Yb3101InputFsiEncounterDto fsiEncounterDto) {
+        // 作成参保人信息
+        return new Yb3101InputPatientDto()
+            // 参保人标识：参保人唯一ID
+            .setPatnId(encounterPatientInfo.getPatnId())
+            // 姓名
+            .setPatnName(encounterPatientInfo.getPatnName())
+            // 性别：参考字典表
+            .setGend(encounterPatientInfo.getGend())
+            // 出生日期：格式：yyyy-MM-dd
+            .setBrdy(encounterPatientInfo.getBrdy())
+            // 统筹区编码：参保人所属统筹区
+            .setPoolarea(encounterPatientInfo.getPoolarea())
+            // 当前就诊标识：本次就诊记录唯一ID
+            .setCurrMdtrtId(encounterPatientInfo.getMdtrtId())
+            // 就诊信息集合
+            .setFsiEncounterDtos(List.of(fsiEncounterDto));
+    }
+
+    /**
+     * 创建规则分析信息
+     * 
+     * @param patientDto 参保人信息
+     * @param trigScen 触发场景
+     * @return 规则分析信息
+     */
+    private Yb3101InputData createYb3101InputData(Yb3101InputPatientDto patientDto, String trigScen) {
+        // 作成规则分析信息
+        return new Yb3101InputData()
+            // 系统编码：调用方系统简码标识
+            .setSyscode("sys01")
+            // 参保人信息
+            .setPatientDtos(List.of(patientDto))
+            // 触发场景：此值与ruleIds指定其一即可,请优先指定此值
+            .setTrigScen(trigScen);
+
+    }
+
+    /**
+     * 获取指定日期当天的下午四点（16:00）的日期
+     * 
+     * @param inputDate 指定日期
+     * @return 当天的下午四点（16:00）的日期
+     */
+    private Date getFourPmDate(Date inputDate) {
+        ZonedDateTime inputZdt = inputDate.toInstant().atZone(ZoneId.systemDefault());
+        LocalDate datePart = inputZdt.toLocalDate();
+        LocalTime fourPm = LocalTime.of(16, 0);
+        LocalDateTime fourPmLocalDateTime = LocalDateTime.of(datePart, fourPm);
+        ZonedDateTime fourPmZdt = fourPmLocalDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(fourPmZdt.toInstant());
+    }
+}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
similarity index 87%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
index a52c30ae..0cf769e4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
@@ -14,8 +14,10 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import com.core.common.enums.DeleteFlag;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.YbCommonConstants;
 import com.openhis.workflow.domain.ElepMedicationRequest;
 import com.openhis.workflow.service.IElepMedicationRequestService;
 import com.openhis.ybcatalog.domain.CatalogDrugInfo;
@@ -139,7 +141,9 @@ public class YbEleParamBuilderUtil {
         Long countWesternOrChinese = elepMedicationRequestService
                 .selectWesternOrChineseCount(medicationRequest.getPrescriptionNo(), westernOrChineseList, tenantId);
         // 西药、中成药时为药品的类目数量
-        elepVeriPrescriptionInfo.setRxDrugCnt(countWesternOrChinese.toString());
+        elepVeriPrescriptionInfo.setRxDrugCnt(countWesternOrChinese.toString())
+                .setRxUsedWayCodg(medicationRequest.getMedRoute())
+                .setRxUsedWayName(YbDrugMedWay.getByValue(medicationRequest.getMedRoute()).getDescription());
 
         return elepVeriPrescriptionInfo;
     }
@@ -174,20 +178,20 @@ public class YbEleParamBuilderUtil {
 
             ElepVeriPrescriptionDetail eleObj = new ElepVeriPrescriptionDetail();
             eleObj.setMedListCodg(mObj.getMedicalCatalogCode())
-                    .setDrugGenname(mObj.getDrugGenericName()).setDrugDosform(mObj.getDrugForm())
+                    .setDrugGenname(mObj.getRegisteredName()).setDrugDosform(mObj.getDrugForm())
                     .setDrugSpec(mObj.getDrugSpecification()).setMedcBegntime(materialObj.getEffectiveDoseStart())
                     .setMedcEndtime(materialObj.getEffectiveDoseEnd())
                     .setMedcDays(materialObj.getDispensePerDuration().toString())
-                    .setDrugDosunt(mObj.getMinPricingUnit()).setDrugCnt(materialObj.getQuantity().toString())
+                    .setDrugDosunt(materialObj.getUnitCode()).setDrugCnt(materialObj.getQuantity().toString())
                     // todo 医院审批标志，配合目录的限制使用标志使用（目前吉林省不启用）,暂时先写死
                     .setHospApprFlag("0")
                     // 院内内部处方号
                     .setPrescriptionNo(prescriptionNo)
-                    .setRxItemTypeCode(materialObj.getRxTypeCode().toString())
-                    .setRxItemTypeName(PrescriptionType.getByValue(materialObj.getRxTypeCode()).getInfo())
+                    .setRxItemTypeCode(materialObj.getRxItemTypeCode().toString())
+                    .setRxItemTypeName(YbRxItemTypeCode.getByValue(materialObj.getRxItemTypeCode().toString()).getDescription())
                     .setMedcWayCodg(materialObj.getMedRoute())
-                    .setMedcWayDscr(mObj.getDosage())
-                    .setSinDoscnt(materialObj.getMedDosage().toString()).setSinDosunt(materialObj.getMedDosageUnitCode())
+                    .setMedcWayDscr(YbDrugMedWay.getByValue(materialObj.getMedRoute()).getDescription())
+                    .setSinDoscnt(materialObj.getMedDosage().stripTrailingZeros().toPlainString()).setSinDosunt(materialObj.getMedDosageUnitCode())
                     .setUsedFrquCodg(materialObj.getMedFrequency())
                     .setUsedFrquName(YbUsedFrqu.getByValue(materialObj.getMedFrequency()).getDescription());
 
@@ -214,7 +218,8 @@ public class YbEleParamBuilderUtil {
         EncounterDiagnosis encDiagObjs =
                 encounterDiagnosisService.getOne(new LambdaQueryWrapper<EncounterDiagnosis>()
                         .eq(EncounterDiagnosis::getEncounterId, medicationRequest.getEncounterId())
-                        .eq(EncounterDiagnosis::getTenantId, tenantId).eq(EncounterDiagnosis::getTenantId, tenantId).eq(EncounterDiagnosis::getMaindiseFlag, Whether.YES.getValue()));
+                        .eq(EncounterDiagnosis::getTenantId, tenantId).eq(EncounterDiagnosis::getConditionId,medicationRequest.getConditionId())
+                        .eq(EncounterDiagnosis::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
         // 就诊管理
         Encounter encounter = encounterService.getOne(new LambdaQueryWrapper<Encounter>()
                 .eq(Encounter::getId, medicationRequest.getEncounterId()));
@@ -300,9 +305,9 @@ public class YbEleParamBuilderUtil {
             eleInfo.setSpDiseFlag(Whether.NO.getCode());
         }
         // 主诊断标记
-        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
+//        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
             eleInfo.setMaindiagCode(cdObj.getYbNo()).setMaindiagName(cdObj.getName());
-        }
+//        }
 
         // 2-输入-诊断信息
         ElepVeriDiagnosisInfo eleVerDisInfo = new ElepVeriDiagnosisInfo();
@@ -314,11 +319,11 @@ public class YbEleParamBuilderUtil {
                 // 院内内部处方号
                 .setPrescriptionNo(medicationRequest.getPrescriptionNo());
         // 主诊断标记
-        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
-            eleVerDisInfo.setMaindiagFlag(Whether.YES.getValue().toString());
-        } else {
-            eleVerDisInfo.setMaindiagFlag(Whether.NO.getValue().toString());
-        }
+//        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
+        eleVerDisInfo.setMaindiagFlag(Whether.YES.getValue().toString());
+//        } else {
+//            eleVerDisInfo.setMaindiagFlag(Whether.NO.getValue().toString());
+//        }
 
         preCheckPrescription.setMdtrtinfo(eleInfo).setDiseinfo(eleVerDisInfo);
 
@@ -354,8 +359,9 @@ public class YbEleParamBuilderUtil {
                 .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
 
         // 电子处方上传预核验-输入-输入-就诊信息
-        ElepVeriVisitInfo eleVerVisInfo = eleVerVisInfoService.getOne(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo()));
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
             return null;
@@ -367,21 +373,21 @@ public class YbEleParamBuilderUtil {
         // 2 hiRxno 医保处方编号 字符型 30 Y
         cpdata.put("hiRxno", pcpResult.getHiRxno());
         // 3 mdtrtId 医保就诊 ID 字符型 30 Y
-        cpdata.put("mdtrtId", eleVerVisInfo.getMdtrtId());
+        cpdata.put("mdtrtId", eleVerVisInfo.get(0).getMdtrtId());
         // 4 patnName 患者姓名 字符型 40 Y
-        cpdata.put("patnName", eleVerVisInfo.getPatnName());
+        cpdata.put("patnName", eleVerVisInfo.get(0).getPatnName());
         // 5 psnCertType 人员证件类型 字符型 6 Y Y //todo 默认身份证:01
         cpdata.put("psnCertType", YbIdDocumentType.RESIDENT_ID_CARD.getValue());
         // 6 certno 证件号码 字符型 50 Y
-        cpdata.put("certno", eleVerVisInfo.getCertno());
+        cpdata.put("certno", eleVerVisInfo.get(0).getCertno());
         // 7 fixmedinsName 定点医疗机构名称 字符型 200 Y
         cpdata.put("fixmedinsName", fixmedinsName);
         // 8 fixmedinsCode 定点医疗机构编号 字符型 20 Y
         cpdata.put("fixmedinsCode", fixmedinsCode);
         // 9 drCode 开方医保医师代码 字符型 20 Y
-        cpdata.put("drCode", eleVerVisInfo.getDrCode());
+        cpdata.put("drCode", eleVerVisInfo.get(0).getDrCode());
         // 10 prscDrName 开方医师姓名 字符型 50 Y
-        cpdata.put("prscDrName", eleVerVisInfo.getPrscDrName());
+        cpdata.put("prscDrName", eleVerVisInfo.get(0).getPrscDrName());
         // 11 pharDeptName 审方药师科室名称 字符型 50 Y
         cpdata.put("pharDeptName", orgDor.getName());
         // 12 pharDeptCode 审方药师科室编号 字符型 30 Y
@@ -464,8 +470,9 @@ public class YbEleParamBuilderUtil {
                 .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
 
         // 电子处方上传预核验-输入-输入-就诊信息
-        ElepVeriVisitInfo eleVerVisInfo = eleVerVisInfoService.getOne(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo()));
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
             return null;
@@ -473,11 +480,11 @@ public class YbEleParamBuilderUtil {
 
         ElepUploadInput eleUploadInput = new ElepUploadInput();
         eleUploadInput.setRxTraceCode(pcpResult.getRxTraceCode()).setHiRxno(pcpResult.getHiRxno())
-                .setMdtrtId(eleVerVisInfo.getMdtrtId()).setPatnName(eleVerVisInfo.getPatnName())
+                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPatnName(eleVerVisInfo.get(0).getPatnName())
                 // todo 默认身份类型是身份证：01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.getCertno()).setPatnName(eleVerVisInfo.getPatnName())
-                .setFixmedinsCode(eleVerVisInfo.getFixmedinsCode()).setFixmedinsName(eleVerVisInfo.getFixmedinsName())
-                .setDrCode(eleVerVisInfo.getDrCode()).setPrscDrName(eleVerVisInfo.getPrscDrName())
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno()).setPatnName(eleVerVisInfo.get(0).getPatnName())
+                .setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode()).setFixmedinsName(eleVerVisInfo.get(0).getFixmedinsName())
+                .setDrCode(eleVerVisInfo.get(0).getDrCode()).setPrscDrName(eleVerVisInfo.get(0).getPrscDrName())
                 .setPharDeptCode(orgDor.getYbNo()).setPharDeptName(orgDor.getName()).setPharCode(practitioner.getYbNo())
                 .setPharName(practitioner.getName()).setPharChkTime(targetDateStr).setRxFile(esResult.getRxFile())
                 .setSignDigest(esResult.getSignDigest()).setPharProfttlCodg(practitioner.getDrProfttlCode()).setPharProfttlName(YbPharmacistTitle.getByValue(practitioner.getDrProfttlCode()).getDescription());
@@ -508,15 +515,16 @@ public class YbEleParamBuilderUtil {
                 .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
 
         // 电子处方上传预核验-输入-输入-就诊信息
-        ElepVeriVisitInfo eleVerVisInfo = eleVerVisInfoService.getOne(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo()));
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
             return null;
         }
 
         ElepRevokeInput eleRevokeInput = new ElepRevokeInput();
-        eleRevokeInput.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.getFixmedinsCode())
+        eleRevokeInput.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode())
                 .setDrCode(practitioner.getYbNo()).setUndoDrName(practitioner.getName())
                 // todo 默认身份类型是身份证：01
                 .setUndoDrCertno(practitioner.getPharPracCertNo())
@@ -534,18 +542,19 @@ public class YbEleParamBuilderUtil {
     public ElepQuerPrescriptionInput getEleQueryPrescriptionInput(ElepVeriPrescriptionOutput pcpResult) {
 
         // 电子处方上传预核验-输入-输入-就诊信息
-        ElepVeriVisitInfo eleVerVisInfo = eleVerVisInfoService.getOne(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo()));
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (eleVerVisInfo == null) {
             return null;
         }
 
         ElepQuerPrescriptionInput eleQueryPreObj = new ElepQuerPrescriptionInput();
-        eleQueryPreObj.setFixmedinsCode(eleVerVisInfo.getFixmedinsCode()).setHiRxno(pcpResult.getHiRxno())
-                .setMdtrtId(eleVerVisInfo.getMdtrtId()).setPsnName(eleVerVisInfo.getPatnName())
+        eleQueryPreObj.setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode()).setHiRxno(pcpResult.getHiRxno())
+                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPsnName(eleVerVisInfo.get(0).getPatnName())
                 // todo 默认身份类型是身份证：01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.getCertno());
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno());
 
         return eleQueryPreObj;
     }
@@ -559,18 +568,19 @@ public class YbEleParamBuilderUtil {
     public ElepMedresultInput getEleMedResultInput(ElepVeriPrescriptionOutput pcpResult) {
 
         // 电子处方上传预核验-输入-输入-就诊信息
-        ElepVeriVisitInfo eleVerVisInfo = eleVerVisInfoService.getOne(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo()));
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
 
         if (eleVerVisInfo == null) {
             return null;
         }
 
         ElepMedresultInput eleQueryPreObj = new ElepMedresultInput();
-        eleQueryPreObj.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.getFixmedinsCode())
-                .setMdtrtId(eleVerVisInfo.getMdtrtId()).setPsnName(eleVerVisInfo.getPatnName())
+        eleQueryPreObj.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode())
+                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPsnName(eleVerVisInfo.get(0).getPatnName())
                 // todo 默认身份类型是身份证：01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.getCertno());
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno());
 
         return eleQueryPreObj;
     }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
similarity index 100%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
diff --git a/openhis-server/openhis-application/src/main/resources/META-INF/spring-devtools.properties b/openhis-server-new/openhis-application/src/main/resources/META-INF/spring-devtools.properties
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/META-INF/spring-devtools.properties
rename to openhis-server-new/openhis-application/src/main/resources/META-INF/spring-devtools.properties
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-cd.yml b/openhis-server-new/openhis-application/src/main/resources/application-cd.yml
new file mode 100644
index 00000000..83bb7009
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/application-cd.yml
@@ -0,0 +1,86 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: org.postgresql.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:postgresql://192.168.10.240:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgres
+        password: root
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 # FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: openhis
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 192.168.10.240
+    port: 6379
+    # 数据库索引
+    database: 1
+    # 密码
+    password: redis
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+    # 文言
+    messages:
+      basename: i18n/general_message/messages
+      encoding: utf-8
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/application-cloud.yml b/openhis-server-new/openhis-application/src/main/resources/application-cloud.yml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/application-cloud.yml
rename to openhis-server-new/openhis-application/src/main/resources/application-cloud.yml
diff --git a/openhis-server/openhis-application/src/main/resources/application-local.yml b/openhis-server-new/openhis-application/src/main/resources/application-local.yml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/application-local.yml
rename to openhis-server-new/openhis-application/src/main/resources/application-local.yml
diff --git a/openhis-server/openhis-application/src/main/resources/application-nd.yml b/openhis-server-new/openhis-application/src/main/resources/application-nd.yml
similarity index 94%
rename from openhis-server/openhis-application/src/main/resources/application-nd.yml
rename to openhis-server-new/openhis-application/src/main/resources/application-nd.yml
index d4075f29..19375d6c 100644
--- a/openhis-server/openhis-application/src/main/resources/application-nd.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-nd.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.1.123:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.1.123:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgres
         password: root
       # 从库数据源
diff --git a/openhis-server/openhis-application/src/main/resources/application-prod.yml b/openhis-server-new/openhis-application/src/main/resources/application-prod.yml
similarity index 95%
rename from openhis-server/openhis-application/src/main/resources/application-prod.yml
rename to openhis-server-new/openhis-application/src/main/resources/application-prod.yml
index a402d23a..7f33d601 100644
--- a/openhis-server/openhis-application/src/main/resources/application-prod.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-prod.yml
@@ -7,7 +7,6 @@ spring:
       # 主库数据源
       master:
         url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-#        url: jdbc:postgresql://localhost:8020/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgres
         password: root
       # 从库数据源
diff --git a/openhis-server/openhis-application/src/main/resources/application-test.yml b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
similarity index 85%
rename from openhis-server/openhis-application/src/main/resources/application-test.yml
rename to openhis-server-new/openhis-application/src/main/resources/application-test.yml
index d4075f29..d4370287 100644
--- a/openhis-server/openhis-application/src/main/resources/application-test.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
@@ -5,8 +5,13 @@ spring:
     driverClassName: org.postgresql.Driver
     druid:
       # 主库数据源
+      #      master:
+      #        url: jdbc:postgresql://192.168.1.123:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+      #        username: postgres
+      #        password: root
+
       master:
-        url: jdbc:postgresql://192.168.1.123:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.30.199:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgres
         password: root
       # 从库数据源
@@ -62,7 +67,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.123
+    #    host: 192.168.1.123
+    host: 192.168.30.199
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/openhis-server/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml
similarity index 95%
rename from openhis-server/openhis-application/src/main/resources/application.yml
rename to openhis-server-new/openhis-application/src/main/resources/application.yml
index 43244630..24bca422 100644
--- a/openhis-server/openhis-application/src/main/resources/application.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application.yml
@@ -54,7 +54,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod # (天翼云)cloud （本地测试）test （本地）local （生产）prod (农大) nd
+    active: local # (天翼云)cloud （本地测试）test （本地）local （生产）prod (农大) nd (长大) cd
   # 文件上传
   servlet:
     multipart:
@@ -115,7 +115,7 @@ xss:
 # flowable相关表
 flowable:
   # true 会对数据库中所有表进行更新操作。如果表不存在，则自动创建(建议开发时使用)
-  database-schema-update: true
+  database-schema-update: false
   # 关闭定时任务JOB
   async-executor-activate: false
 
diff --git a/openhis-server/openhis-application/src/main/resources/banner.txt b/openhis-server-new/openhis-application/src/main/resources/banner.txt
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/banner.txt
rename to openhis-server-new/openhis-application/src/main/resources/banner.txt
diff --git a/openhis-server/openhis-application/src/main/resources/config/flow.el.xml b/openhis-server-new/openhis-application/src/main/resources/config/flow.el.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/config/flow.el.xml
rename to openhis-server-new/openhis-application/src/main/resources/config/flow.el.xml
diff --git a/openhis-server/openhis-application/src/main/resources/http.yml b/openhis-server-new/openhis-application/src/main/resources/http.yml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/http.yml
rename to openhis-server-new/openhis-application/src/main/resources/http.yml
diff --git a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties b/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
similarity index 94%
rename from openhis-server/openhis-application/src/main/resources/i18n/messages.properties
rename to openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
index 0a0511ee..09a1d5b4 100644
--- a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties
+++ b/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
@@ -48,4 +48,6 @@ apl.payment.M00003=请选择支付方式
 apl.payment.M00004=查询成功
 apl.payment.M00005=操作失败,请联系管理员
 apl.payment.M00006=成功收费
-apl.payment.M00007=未查询到收费项目
\ No newline at end of file
+apl.payment.M00007=未查询到收费项目
+apl.payment.M00008=未查询到{0}账户信息
+apl.payment.M00009=未查询到收费项目，不需要转换账户
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/logback.xml b/openhis-server-new/openhis-application/src/main/resources/logback.xml
similarity index 85%
rename from openhis-server/openhis-application/src/main/resources/logback.xml
rename to openhis-server-new/openhis-application/src/main/resources/logback.xml
index f6d9285e..68f71354 100644
--- a/openhis-server/openhis-application/src/main/resources/logback.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/logback.xml
@@ -106,6 +106,23 @@
         <appender-ref ref="PAYMENT_LOGS" />
     </logger>
 
+    <!-- 新增专用日志Appender -->
+    <appender name="E_INVOICE_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/E_invoice.log</file> <!-- 日志文件名 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天一个文件，保留60天 -->
+            <fileNamePattern>${log.path}/E_invoice.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern> <!-- 使用统一日志格式 -->
+        </encoder>
+    </appender>
+    <!-- 在原有logger配置下方添加 -->
+    <logger name="com.openhis.web.paymentmanage.appservice.impl.EleInvoiceServiceImpl" level="info" additivity="false">
+        <appender-ref ref="E_INVOICE_LOGS" />
+    </logger>
+
     <!-- 系统模块日志级别控制  -->
     <logger name="com.core" level="info"/>
     <!-- Spring日志级别控制  -->
@@ -135,4 +152,9 @@
     <logger name="PAYMENT_LOGS" level="info">
         <appender-ref ref="PAYMENT_LOGS"/>
     </logger>
+
+    <logger name="E_INVOICE_LOGS" level="info">
+        <appender-ref ref="E_INVOICE_LOGS"/>
+    </logger>
+
 </configuration> 
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
similarity index 54%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
index 5a37202b..4ffcc1aa 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
@@ -104,6 +104,7 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
           AND T1.item_table = #{medicationTableName}
           AND T1.delete_flag = '0'
@@ -162,8 +163,136 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
           AND T1.item_table = #{deviceTableName}
           AND T1.delete_flag = '0'
     </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+        SELECT T1.id,                                       --ID
+               T1.bus_no    AS supply_bus_no,               --单据号
+               T1.item_id,                                  --物品编码
+               T1.purpose_type_enum,                        --目的类型
+               T1.purpose_location_id,                      --目的仓库
+               T5."name"    AS purpose_location_name,       --目的仓库名称
+               T6."name"    AS purpose_location_store_name, --目的仓位
+               T1.occurrence_time,                          --报损时间
+               #{medicine}  AS item_type,                   --药品类型
+               T1.remake,                                   --备注
+               T2.bus_no    AS item_bus_no,                 --项目编码
+               T2."name"    AS item_name,                   --名称
+               T3.total_volume,                             --规格
+               T1.unit_code AS measurement_unit_code,       -- 物品计量单位
+               T2.unit_code,                                -- 包装单位
+               T2.min_unit_code,                            -- 最小单位
+               T2.manufacturer_text,                        --生产厂商文本
+               T4.lot_number,                               --产品批号
+               T4.quantity  AS total_quantity,              --当前库存数量
+               T1.item_quantity,                            --数量(报损数量)
+               T11.amount AS price,                         --采购单价(大单位)
+               T1.total_price,                              --总价(报损金额)
+               T1.reason_code,                              --理由类型(报损原因)
+               T1.reason,                                   --理由(报损详细)
+               T1.start_time,                               -- 开始时间
+               T1.end_time,                                 -- 结束时间
+               T1.supplier_id,                              -- 供应商id
+               T9."name"    AS supplier_name,               -- 供应商名称
+               T2.part_percent                              --拆零比
+        FROM wor_supply_request T1
+                 LEFT JOIN med_medication_definition T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication T3
+                           ON T3.medication_def_id = T2.id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN wor_inventory_item T4
+                           ON T1.item_id = T4.item_id
+                               AND T1.purpose_location_id = T4.location_id
+                               AND T1.lot_number = T4.lot_number
+                               AND T4.delete_flag = '0'
+                 LEFT JOIN adm_location T5
+                           ON T1.purpose_location_id = T5.id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_store_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN adm_supplier T9
+                           ON T9.id = T1.supplier_id
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T4.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum = #{typeEnum}
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.item_table = #{medicationTableName}
+          AND T1.delete_flag = '0'
+        UNION
+        SELECT T1.id,                                       --ID
+               T1.bus_no    AS supply_bus_no,               --单据号
+               T1.item_id,                                  --物品编码
+               T1.purpose_type_enum,                        --目的类型
+               T1.purpose_location_id,                      --目的仓库
+               T5."name"    AS purpose_location_name,       --目的仓库名称
+               T6."name"    AS purpose_location_store_name, --目的仓位
+               T1.occurrence_time,                          --报损时间
+               #{device}    AS item_type,                   --器材类型
+               T1.remake,                                   --备注
+               T7.bus_no    AS item_bus_no,                 --项目编码
+               T7."name"    AS item_name,                   --名称
+               T7."size"    AS total_volume,                --器材规格
+               T1.unit_code AS measurement_unit_code,       -- 物品计量单位
+               T7.unit_code,                                -- 包装单位
+               T7.min_unit_code,                            -- 最小单位
+               T7.manufacturer_text,                        --生产厂商文本
+               T4.lot_number,                               --产品批号
+               T4.quantity  AS total_quantity,              --当前库存数量
+               T1.item_quantity,                            --数量(报损数量)
+               T11.amount AS price,                         --采购单价(大单位)
+               T1.total_price,                              --总价(报损金额)
+               T1.reason_code,                              --理由类型(报损原因)
+               T1.reason,                                   --理由(报损详细)
+               T1.start_time,                               -- 开始时间
+               T1.end_time,                                 -- 结束时间
+               T1.supplier_id,                              -- 供应商id
+               T9."name"    AS supplier_name,               -- 供应商名称
+               T7.part_percent                              --拆零比
+        FROM wor_supply_request T1
+                 LEFT JOIN adm_device_definition T7
+                           ON T1.item_id = T7.id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN wor_inventory_item T4
+                           ON T1.item_id = T4.item_id
+                               AND T1.purpose_location_id = T4.location_id
+                               AND T1.lot_number = T4.lot_number
+                               AND T4.delete_flag = '0'
+                 LEFT JOIN adm_location T5
+                           ON T1.purpose_location_id = T5.id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_store_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN adm_supplier T9
+                           ON T9.id = T1.supplier_id
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T4.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum = #{typeEnum}
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.item_table = #{deviceTableName}
+          AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
new file mode 100644
index 00000000..a23c4b9b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inventorymanage.mapper.ProductDetailsMapper">
+
+    <select id="selectProductDetailsPage"
+            resultType="com.openhis.web.inventorymanage.dto.ProductDetailsPageDto">
+        WITH latest_records AS (
+            SELECT
+                item_table,
+                item_id,
+                location_id,
+                lot_number,
+                trace_no,
+                MAX(create_time) AS latest_time
+            FROM
+                adm_trace_no_manage
+            WHERE delete_flag = '0'
+            GROUP BY
+                item_table,
+                item_id,
+                location_id,
+                lot_number,
+                trace_no
+        )
+        SELECT T6.id,                    --库存项目管理ID（停供用）
+               T6.bus_no,                --药品编码
+               T6.medicine_name,         --药品名称
+               T6.py_str,                --药品拼音
+               T6.total_volume,          --规格
+               T6.chrgitm_lv,            --医保等级
+               T6.manufacturer_text,     --厂家
+               T6.lot_number,            --批次号
+               T6.category_code,         --药品类型
+               T6.item_type,             --药品类型区分
+               T6.part_percent,          --拆零比
+               T6.unit_code,             --采购单位
+               T6.quantity,              --库存（小单位）
+               T6.min_unit_code,         --库存单位
+               T6.price,                 --采购单价
+               T6.production_date,       --生产日期
+               T6.expiration_date,       --失效日期
+               T6.remaining_days,        --剩余天数
+               T6.trace_no,              --追溯码
+               T6.status_enum,           --药品状态（药品停用）
+               T6.location_id,
+               T6.location_name,         --仓库
+               T6.location_store_id,
+               T6.location_store_name,   --货位
+               T6.form_enum,             --仓库类型
+               T6.supplier_id,           --供应商
+               T6.supply_name,           --供应商名称
+               T6.inventory_status_enum, --停供状态
+               T6.dose_form_code,        --剂型
+               T6.approval_number,       --批准文号/国药准字
+               T6.retail_price,          --零售价
+               T6.tenant_id,
+               T6.in_count,
+               T6.out_count,
+               T6.item_table,
+               T6.item_id
+        FROM (
+                 SELECT T1.id,                    --库存项目管理ID（停供用）
+                        T2.bus_no,                --药品编码
+                        T2."name" AS medicine_name, --药品名称
+                        T2.py_str,                --药品拼音
+                        T3.total_volume,          --规格
+                        T2.chrgitm_lv,            --医保等级
+                        T2.manufacturer_text,     --厂家
+                        T1.lot_number,            --批次号
+                        T2.category_code,         --药品类型
+                        '0' AS item_type,         --药品类型区分
+                        T2.part_percent,          --拆零比
+                        T2.unit_code,             --采购单位
+                        T1.quantity,              --库存（小单位）
+                        T2.min_unit_code,         --库存单位
+                        T1.price,                 --采购单价
+                        T1.production_date,       --生产日期
+                        T1.expiration_date,       --失效日期
+                        (T1.expiration_date::date - CURRENT_DATE) AS remaining_days, --剩余天数
+                        T1.trace_no,              --追溯码
+                        T3.status_enum,           --药品状态（药品停用）
+                        T1.location_id,
+                        T5."name" AS location_name, --仓库
+                        T1.location_store_id,
+                        T4."name" AS location_store_name, --货位
+                        T5.form_enum,             --仓库类型
+                        T1.supplier_id,           --供应商
+                        T8.name AS supply_name,   --供应商名称
+                        T1.inventory_status_enum, --停供状态
+                        T3.dose_form_code,        --剂型
+                        T2.approval_number,       --批准文号/国药准字
+                        T10.amount AS retail_price, --零售价
+                        T1.tenant_id,             --修复：添加逗号
+                        COALESCE(in_counts.in_count, 0) AS in_count,
+                        COALESCE(out_counts.out_count, 0) AS out_count,
+                        T1.item_table,
+                        T1.item_id
+                 FROM wor_inventory_item T1
+                          INNER JOIN med_medication_definition T2
+                                     ON T1.item_id = T2.id
+                                         AND T2.delete_flag = '0'
+                          LEFT JOIN med_medication T3
+                                    ON T2.id = T3.medication_def_id
+                                        AND T3.delete_flag = '0'
+                          LEFT JOIN adm_location T4
+                                    ON T1.location_store_id = T4.id
+                                        AND T4.delete_flag = '0'
+                          LEFT JOIN adm_location T5
+                                    ON T1.location_id = T5.id
+                                        AND T5.delete_flag = '0'
+                          LEFT JOIN adm_supplier T8
+                                    ON T1.supplier_id = T8.id
+                                        AND T8.delete_flag = '0'
+                          LEFT JOIN adm_charge_item_definition T9
+                                    ON T9.instance_table = 'med_medication_definition'
+                                        AND T9.instance_id = T2.id
+                                        AND T9.delete_flag = '0'
+                          LEFT JOIN LATERAL (
+                     SELECT amount
+                     FROM adm_charge_item_def_detail
+                     WHERE definition_id = T9.id
+                       AND condition_value = T1.lot_number
+                       AND condition_code = '1'--1:批号进价
+                       AND delete_flag = '0'
+                     ORDER BY create_time DESC
+                         LIMIT 1
+             ) T10 ON TRUE
+    LEFT JOIN (
+        SELECT ls.item_table,
+               ls.item_id,
+               ls.location_id,
+               ls.lot_number,
+               SUM(CASE WHEN T10.status_enum = '1' THEN 1 ELSE 0 END) AS in_count
+        FROM latest_records ls
+        LEFT JOIN adm_trace_no_manage T10
+            ON T10.item_table = ls.item_table
+            AND T10.item_id = ls.item_id
+            AND T10.location_id = ls.location_id
+            AND T10.lot_number = ls.lot_number
+            AND T10.trace_no = ls.trace_no
+            AND T10.create_time = ls.latest_time
+        GROUP BY ls.item_table, ls.item_id, ls.location_id, ls.lot_number
+    ) in_counts
+        ON T1.item_table = in_counts.item_table
+            AND T1.item_id = in_counts.item_id
+            AND T1.location_id = in_counts.location_id
+            AND T1.lot_number = in_counts.lot_number
+            LEFT JOIN (
+            SELECT ls.item_table,
+            ls.item_id,
+            ls.location_id,
+            ls.lot_number,
+            SUM(CASE WHEN T10.status_enum = '2' THEN 1 ELSE 0 END) AS out_count
+            FROM latest_records ls
+            LEFT JOIN adm_trace_no_manage T10
+            ON T10.item_table = ls.item_table
+            AND T10.item_id = ls.item_id
+            AND T10.location_id = ls.location_id
+            AND T10.lot_number = ls.lot_number
+            AND T10.trace_no = ls.trace_no
+            AND T10.create_time = ls.latest_time
+            GROUP BY ls.item_table, ls.item_id, ls.location_id, ls.lot_number
+            ) out_counts
+            ON T1.item_table = out_counts.item_table
+            AND T1.item_id = out_counts.item_id
+            AND T1.location_id = out_counts.location_id
+            AND T1.lot_number = out_counts.lot_number
+        WHERE T1.delete_flag = '0'
+            ) AS T6
+            ${ew.customSqlSegment}
+
+        UNION ALL
+
+        SELECT T7.id,                    --库存项目管理ID（停供用）
+               T7.bus_no,                --药品编码
+               T7.medicine_name,         --药品名称
+               T7.py_str,                --药品拼音
+               T7.total_volume,          --规格
+               T7.chrgitm_lv,            --医保等级
+               T7.manufacturer_text,     --厂家
+               T7.lot_number,            --批次号
+               T7.category_code,         --药品类型
+               T7.item_type,             --药品类型区分
+               T7.part_percent,          --拆零比
+               T7.unit_code,             --采购单位
+               T7.quantity,              --库存（小单位）
+               T7.min_unit_code,         --库存单位
+               T7.price,                 --采购单价
+               T7.production_date,       --生产日期
+               T7.expiration_date,       --失效日期
+               T7.remaining_days,        --剩余天数
+               T7.trace_no,              --追溯码
+               T7.status_enum,           --药品状态（药品停用）
+               T7.location_id,
+               T7.location_name,         --仓库
+               T7.location_store_id,
+               T7.location_store_name,   --货位
+               T7.form_enum,             --仓库类型
+               T7.supplier_id,           --供应商
+               T7.supply_name,           --供应商名称
+               T7.inventory_status_enum, --停供状态
+               T7.dose_form_code,        --剂型
+               T7.approval_number,       --批准文号/国药准字
+               T7.retail_price,          --零售价
+               T7.tenant_id,
+               T7.in_count,
+               T7.out_count,
+               T7.item_table,
+               T7.item_id
+        FROM (
+                 SELECT T1.id,                    --库存项目管理ID（停供用）
+                        T2.bus_no,                --药品编码
+                        T2."name" AS medicine_name, --药品名称
+                        T2.py_str,                --药品拼音
+                        T2.size AS total_volume,  --规格
+                        T2.chrgitm_lv,            --医保等级
+                        T2.manufacturer_text,     --厂家
+                        T1.lot_number,            --批次号
+                        T2.category_code,         --药品类型
+                        '9' AS item_type,         --药品类型区分
+                        T2.part_percent,          --拆零比
+                        T2.unit_code,             --采购单位
+                        T1.quantity,              --库存（小单位）
+                        T2.min_unit_code,         --库存单位
+                        T1.price,                 --采购单价
+                        T1.production_date,       --生产日期
+                        T1.expiration_date,       --失效日期
+                        (T1.expiration_date::date - CURRENT_DATE) AS remaining_days, --剩余天数
+                        T1.trace_no,              --追溯码
+                        T2.status_enum,           --药品状态（药品停用）
+                        T1.location_id,
+                        T5."name" AS location_name, --仓库
+                        T1.location_store_id,
+                        T4."name" AS location_store_name, --货位
+                        T5.form_enum,             --仓库类型
+                        T1.supplier_id,           --供应商
+                        T8.name AS supply_name,   --供应商名称
+                        T1.inventory_status_enum, --停供状态
+                        '0' AS dose_form_code,    --剂型
+                        T2.approval_number,       --批准文号/国药准字
+                        T10.amount AS retail_price, --零售价
+                        T1.tenant_id,             --修复：添加逗号
+                        COALESCE(in_counts.in_count, 0) AS in_count,
+                        COALESCE(out_counts.out_count, 0) AS out_count,
+                        T1.item_table,
+                        T1.item_id
+                 FROM wor_inventory_item T1
+                          INNER JOIN adm_device_definition T2
+                                     ON T1.item_id = T2.id
+                                         AND T2.delete_flag = '0'
+                          LEFT JOIN adm_location T4
+                                    ON T1.location_store_id = T4.id
+                                        AND T4.delete_flag = '0'
+                          LEFT JOIN adm_location T5
+                                    ON T1.location_id = T5.id
+                                        AND T5.delete_flag = '0'
+                          LEFT JOIN adm_supplier T8
+                                    ON T1.supplier_id = T8.id
+                                        AND T8.delete_flag = '0'
+                          LEFT JOIN adm_charge_item_definition T9
+                                    ON T9.instance_table = 'adm_device_definition'
+                                        AND T9.instance_id = T2.id
+                                        AND T9.delete_flag = '0'
+                          LEFT JOIN LATERAL (
+                     SELECT amount
+                     FROM adm_charge_item_def_detail
+                     WHERE definition_id = T9.id
+                       AND condition_value = T1.lot_number
+                       AND condition_code = '1'--1:批号进价
+                       AND delete_flag = '0'
+                     ORDER BY create_time DESC
+                         LIMIT 1
+             ) T10 ON TRUE
+    LEFT JOIN (
+        SELECT ls.item_table,
+               ls.item_id,
+               ls.location_id,
+               ls.lot_number,
+               SUM(CASE WHEN T10.status_enum = '1' THEN 1 ELSE 0 END) AS in_count
+        FROM latest_records ls
+        LEFT JOIN adm_trace_no_manage T10
+            ON T10.item_table = ls.item_table
+            AND T10.item_id = ls.item_id
+            AND T10.location_id = ls.location_id
+            AND T10.lot_number = ls.lot_number
+            AND T10.trace_no = ls.trace_no
+            AND T10.create_time = ls.latest_time
+        GROUP BY ls.item_table, ls.item_id, ls.location_id, ls.lot_number
+    ) in_counts
+        ON T1.item_table = in_counts.item_table
+            AND T1.item_id = in_counts.item_id
+            AND T1.location_id = in_counts.location_id
+            AND T1.lot_number = in_counts.lot_number
+            LEFT JOIN (
+            SELECT ls.item_table,
+            ls.item_id,
+            ls.location_id,
+            ls.lot_number,
+            SUM(CASE WHEN T10.status_enum = '2' THEN 1 ELSE 0 END) AS out_count
+            FROM latest_records ls
+            LEFT JOIN adm_trace_no_manage T10
+            ON T10.item_table = ls.item_table
+            AND T10.item_id = ls.item_id
+            AND T10.location_id = ls.location_id
+            AND T10.lot_number = ls.lot_number
+            AND T10.trace_no = ls.trace_no
+            AND T10.create_time = ls.latest_time
+            GROUP BY ls.item_table, ls.item_id, ls.location_id, ls.lot_number
+            ) out_counts
+            ON T1.item_table = out_counts.item_table
+            AND T1.item_id = out_counts.item_id
+            AND T1.location_id = out_counts.location_id
+            AND T1.lot_number = out_counts.lot_number
+        WHERE T1.delete_flag = '0'
+            ) AS T7
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectProductDetailsPageTotal"
+            resultType="com.openhis.web.inventorymanage.dto.ProductDetailsTotalDto">
+        SELECT
+            ROUND( SUM ( sale_price ), 2 ) AS total_sale_price,--总零售价
+            ROUND( SUM ( purchase_price ), 2 ) AS total_purchase_price --总进价
+        FROM
+            (
+                <if test="itemType == 99 or itemType == 9">
+                SELECT
+                    ROUND(SUM (ROUND( T4.amount, 2 ) * ( ROUND( T1.quantity, 2 ) / ROUND( T2.part_percent, 2 ) ) ),2 ) AS sale_price,
+                    ROUND(SUM (ROUND( T1.price, 2 ) * ( ROUND( T1.quantity, 2 ) / ROUND( T2.part_percent, 2 ) ) ),2 ) AS purchase_price
+                FROM
+                    wor_inventory_item T1
+                        INNER JOIN adm_device_definition T2 ON T1.item_id = T2.ID
+                        AND T2.delete_flag = '0'
+                        LEFT JOIN adm_charge_item_definition T3 ON T3.instance_table = 'adm_device_definition'
+                        AND T3.instance_id = T1.item_id
+                        AND T3.delete_flag = '0'
+                        LEFT JOIN LATERAL ( SELECT amount FROM adm_charge_item_def_detail WHERE definition_id = T3.ID AND condition_value = T1.lot_number AND condition_code = '1' AND delete_flag = '0' ORDER BY create_time DESC LIMIT 1 ) T4 ON TRUE
+		                LEFT JOIN adm_supplier T5 ON T1.supplier_id = T5.ID
+                            AND T5.delete_flag = '0'
+                    <if test="sqlWhere != '' and sqlWhere != null">
+                        <where>
+                            ${sqlWhere}
+                        </where>
+                    </if>
+                </if>
+                <if test="itemType == 99 ">
+                UNION ALL
+                </if>
+                <if test="itemType == 99 or itemType == 0">
+                SELECT
+                    ROUND(SUM (ROUND( T4.amount, 2 ) * ( ROUND( T1.quantity, 2 ) / ROUND( T2.part_percent, 2 ) ) ),2 ) AS sale_price,
+                    ROUND(SUM (ROUND( T1.price, 2 ) * ( ROUND( T1.quantity, 2 ) / ROUND( T2.part_percent, 2 ) ) ),2 ) AS purchase_price
+                FROM
+                    wor_inventory_item T1
+                        INNER JOIN med_medication_definition T2 ON T1.item_id = T2.ID
+                        AND T2.delete_flag = '0'
+                        LEFT JOIN adm_charge_item_definition T3 ON T3.instance_table = 'med_medication_definition'
+                        AND T3.instance_id = T1.item_id
+                        AND T3.delete_flag = '0'
+                        LEFT JOIN LATERAL ( SELECT amount FROM adm_charge_item_def_detail WHERE definition_id = T3.ID AND condition_value = T1.lot_number  AND condition_code = '1' AND delete_flag = '0' ORDER BY create_time DESC LIMIT 1 ) T4 ON TRUE
+                        LEFT JOIN adm_supplier T5 ON T1.supplier_id = T5.ID
+                        AND T5.delete_flag = '0'
+                    <if test="sqlWhere != '' and sqlWhere != null">
+                        <where>
+                        ${sqlWhere}
+                        </where>
+                    </if>
+                </if>
+            )
+    </select>
+    <select id="selectExpirationWarning"
+            resultType="com.openhis.web.inventorymanage.dto.ProductDetailsPageDto">
+        select T6.category_code,         --药品类型
+               T6.item_type,             --药品类型区分
+               T6.bus_no,                --药品编码
+               T6.medicine_name,         --药品名称
+               T6.py_str,                --药品拼音
+               T6.total_volume,          --规格
+               T6.manufacturer_text,     --厂家
+               T6.lot_number,            --批次号
+               T6.production_date,       --生产日期
+               T6.expiration_date,       --失效日期
+               T6.remaining_days,        --剩余天数
+               T6.remaining_month,       --剩余月数
+               T6.quantity,              --库存（小单位）
+               T6.specification_quantity,--规格库存(小单位)
+               T6.item_min_quantity,     --最小库存警戒数量
+               T6.item_max_quantity,     --最大库存警戒数量
+               T6.min_unit_code,         --库存单位
+               T6.status_enum,           --药品状态（药品停用）
+               T6.inventory_status_enum, --停供状态
+               T6.tenant_id
+        from (select T2.category_code,                                             --药品类型
+                     '0'                                       as item_type,       --药品类型区分
+                     T2.bus_no,                                                    --药品编码
+                     T2."name"                                 as medicine_name,   --药品名称
+                     T2.py_str,                                                    --药品拼音
+                     T3.total_volume,                                              --规格
+                     T2.manufacturer_text,                                         --厂家
+                     T1.lot_number,                                                --批次号
+                     T1.production_date,                                           --生产日期
+                     T1.expiration_date,                                           --失效日期
+                     (T1.expiration_date::date - CURRENT_DATE) as remaining_days,  --剩余天数
+                     ((EXTRACT(YEAR FROM T1.expiration_date) - EXTRACT(YEAR FROM CURRENT_DATE)) * 12
+                         + (EXTRACT(MONTH FROM T1.expiration_date) -
+                            EXTRACT(MONTH FROM CURRENT_DATE))) as remaining_month, --剩余月数
+                     T1.quantity,                                                  --库存（小单位）
+                     COALESCE(CAST(T8.specification_quantity AS DECIMAL(18, 6)), 0.00)         AS specification_quantity,--规格库存(小单位)
+                     T2.item_min_quantity * T2.part_percent AS item_min_quantity,                                         --最小库存警戒数量
+                     T2.item_max_quantity * T2.part_percent AS item_max_quantity,                                         --最大库存警戒数量
+                     T2.min_unit_code,                                             --库存单位
+                     T3.status_enum,                                               --药品状态（药品停用）
+                     T1.inventory_status_enum,                                     --停供状态
+                     T1.tenant_id
+              from wor_inventory_item T1
+                       inner join med_medication_definition T2
+                                  on T1.item_id = T2.id
+                                      and T2.delete_flag = '0'
+                       left join med_medication T3
+                                 on T2.id = T3.medication_def_id
+                                     and T3.delete_flag = '0'
+                       left join adm_location T4
+                                 on T1.location_store_id = T4.id
+                                     and T4.delete_flag = '0'
+                       left join adm_location T5
+                                 on T1.location_id = T5.id
+                                     and T5.delete_flag = '0'
+                        LEFT JOIN (SELECT i1.item_table,
+                                          i1.item_id,
+                                          COALESCE(CAST(SUM(i1.quantity) AS DECIMAL(18, 6)), 0.00) AS specification_quantity
+                                   FROM wor_inventory_item i1
+                                       LEFT JOIN med_medication_definition i2 ON i1.item_id = i2.ID
+                                          AND i2.delete_flag = '0'
+                                   WHERE i1.item_table = 'med_medication_definition'
+                                     AND i1.delete_flag = '0'
+                                   GROUP BY i1.item_table,
+                                            i1.item_id) T8
+                                   ON T8.item_table = 'med_medication_definition'
+                                      AND T8.item_id = T2.ID
+              where T1.delete_flag = '0'
+                <if test="flg != null">
+                  and (T8.specification_quantity  <![CDATA[ <= ]]> T2.item_min_quantity * T2.part_percent
+                  or T8.specification_quantity  <![CDATA[ >= ]]> T2.item_max_quantity * T2.part_percent)
+                </if>
+              order by T2.bus_no ASC, --药品编码
+                       T2."name" ASC --药品名称
+             ) as T6
+            ${ew.customSqlSegment}
+        union all
+        select T7.category_code,         --药品类型
+               T7.item_type,             --药品类型区分
+               T7.bus_no,                --药品编码
+               T7.medicine_name,         --药品名称
+               T7.py_str,                --药品拼音
+               T7.total_volume,          --规格
+               T7.manufacturer_text,     --厂家
+               T7.lot_number,            --批次号
+               T7.production_date,       --生产日期
+               T7.expiration_date,       --失效日期
+               T7.remaining_days,        --剩余天数
+               T7.remaining_month,       --剩余月数
+               T7.quantity,              --库存（小单位）
+               T7.specification_quantity,--规格库存(小单位)
+               T7.item_min_quantity,     --最小库存警戒数量
+               T7.item_max_quantity,     --最大库存警戒数量
+               T7.min_unit_code,         --库存单位
+               T7.status_enum,           --药品状态（药品停用）
+               T7.inventory_status_enum, --停供状态
+               T7.tenant_id
+        from (select T2.category_code,                                             --药品类型
+                     '9'                                       as item_type,       --药品类型区分
+                     T2.bus_no,                                                    --药品编码
+                     T2."name"                                 as medicine_name,   --药品名称
+                     T2.py_str,                                                    --药品拼音
+                     T2.size                                   as total_volume,    --规格
+                     T2.manufacturer_text,                                         --厂家
+                     T1.lot_number,                                                --批次号
+                     T1.production_date,                                           --生产日期
+                     T1.expiration_date,                                           --失效日期
+                     (T1.expiration_date::date - CURRENT_DATE) as remaining_days,  --剩余天数
+                     ((EXTRACT(YEAR FROM T1.expiration_date) - EXTRACT(YEAR FROM CURRENT_DATE)) * 12
+                         + (EXTRACT(MONTH FROM T1.expiration_date) -
+                            EXTRACT(MONTH FROM CURRENT_DATE))) as remaining_month, --剩余月数
+                     T1.quantity,                                                  --库存（小单位）
+                     COALESCE(CAST(T8.specification_quantity AS DECIMAL(18, 6)), 0.00)         AS specification_quantity,--规格库存(小单位)
+                     T2.item_min_quantity * T2.part_percent AS item_min_quantity,                                         --最小库存警戒数量
+                     T2.item_max_quantity * T2.part_percent AS item_max_quantity,                                         --最大库存警戒数量
+                     T2.min_unit_code,                                             --库存单位
+                     T2.status_enum,                                               --药品状态（药品停用）
+                     T1.inventory_status_enum,                                     --停供状态
+                     T1.tenant_id
+              from wor_inventory_item T1
+                       inner join adm_device_definition T2
+                                  on T1.item_id = T2.id
+                                      and T2.delete_flag = '0'
+                       left join adm_location T4
+                                 on T1.location_store_id = T4.id
+                                     and T4.delete_flag = '0'
+                       left join adm_location T5
+                                 on T1.location_id = T5.id
+                                     and T5.delete_flag = '0'
+                       LEFT JOIN (SELECT i1.item_table,
+                                         i1.item_id,
+                                         COALESCE(CAST(SUM(i1.quantity) AS DECIMAL(18, 6)), 0.00) AS specification_quantity
+                                  FROM wor_inventory_item i1
+                                           LEFT JOIN adm_device_definition i2 ON i1.item_id = i2.ID
+                                      AND i2.delete_flag = '0'
+                                  WHERE i1.item_table = 'adm_device_definition'
+                                    AND i1.delete_flag = '0'
+                                  GROUP BY i1.item_table,
+                                           i1.item_id) T8
+                                 ON T8.item_table = 'adm_device_definition'
+                                     AND T8.item_id = T2.ID
+              where T1.delete_flag = '0'
+              <if test="flg != null">
+                  and (T8.specification_quantity  <![CDATA[ <= ]]> T2.item_min_quantity * T2.part_percent
+                  or T8.specification_quantity  <![CDATA[ >= ]]> T2.item_max_quantity * T2.part_percent)
+              </if>
+              order by T2.bus_no ASC, --药品编码
+                       T2."name" ASC --药品名称
+             ) as T7
+            ${ew.customSqlSegment}
+    </select>
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
similarity index 54%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
index 1449ccb9..9a00915e 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
@@ -73,7 +73,7 @@
                T2.min_unit_code,                      --最小单位(小单位)
                T2.manufacturer_text,                  --生产厂商文本
                T4.lot_number,                         --产品批号
-               T4.quantity  AS total_quantity,        --当前库存数量(常规单位)(小单位)
+               T1.total_quantity,        --实盘数量(常规单位)(小单位)
                T11.amount AS price,                  --采购单价(大单位)
                T1.item_quantity,                      --数量(盈亏数量)(小单位)
                T1.total_price,                        --总价(盈亏金额)
@@ -108,6 +108,7 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
           AND T1.delete_flag = '0'
           AND T1.item_table = #{medicationTableName}
@@ -131,7 +132,7 @@
                T5.min_unit_code AS min_unit_code,
                T5.manufacturer_text,
                T4.lot_number,
-               T4.quantity      AS total_quantity,
+               T1.total_quantity,
                T11.amount AS price,                  --采购单价(大单位)
                T1.item_quantity,
                T1.total_price,
@@ -163,6 +164,7 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
           AND T1.delete_flag = '0'
           AND T1.item_table = #{deviceTableName}
@@ -236,6 +238,7 @@
                                  ON T11.definition_id = T10.id
                                      AND T11.delete_flag = '0'
                                      AND T11.condition_value = T1.lot_number
+                                     AND T11.condition_code = '1'--1:批号进价
               WHERE T1.delete_flag = '0'
                 AND T1.inventory_status_enum = #{inventoryStatusEnum}
                 AND T1.location_id = #{sourceLocationId}
@@ -281,6 +284,7 @@
                                  ON T11.definition_id = T10.id
                                      AND T11.delete_flag = '0'
                                      AND T11.condition_value = T1.lot_number
+                                     AND T11.condition_code = '1'--1:批号进价
               WHERE T1.delete_flag = '0'
                 AND T1.inventory_status_enum = #{inventoryStatusEnum}
                 AND T1.location_id = #{sourceLocationId}
@@ -288,4 +292,231 @@
             ) AS T6
             ${ew.customSqlSegment}
     </select>
+    <select id="selectAutoStocktakingBatch"
+            resultType="com.openhis.web.inventorymanage.dto.ProductStocktakingDto">
+        SELECT T1.id,
+               T1.item_table,                                         --项目
+               T2.id                        AS item_id,               --项目id
+               T1.unit_code                 AS unit_code,--物品计量单位
+               0                            AS item_quantity,--盈亏数量
+               T1.quantity                  AS total_quantity,--合计数量
+               T11.amount / T2.part_percent AS price,--单价
+               0                            AS total_price,            --  盈亏金额
+               T5.form_enum                 AS purpose_type_enum,--目的仓库类型
+               T1.location_id               AS purpose_location_id,--目的仓库
+               T1.location_store_id         AS purpose_location_store_id,--目的仓位
+               T1.supplier_id,--供应商
+               T1.production_date           AS start_time,--开始时间
+               T1.expiration_date           AS end_time,--结束时间
+               T1.lot_number--产品批号
+        FROM wor_inventory_item T1
+                 LEFT JOIN med_medication_definition T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication T3
+                           ON T2.id = T3.medication_def_id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_location AS T5
+                           ON T5.id = T1.location_id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_supplier T7
+                           ON T7.id = T1.supplier_id
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T1.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T1.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.delete_flag = '0'
+          AND T1.inventory_status_enum = #{inventoryStatusEnum}
+          AND T1.item_table = #{medicationTableName}
+        UNION
+        SELECT T1.id,
+               T1.item_table,                                         --项目
+               T4.id                        AS item_id,               --项目id
+               T1.unit_code                 AS unit_code,--物品计量单位
+               0                            AS item_quantity,--盈亏数量
+               T1.quantity                  AS total_quantity,--合计数量
+               T11.amount / T4.part_percent AS price,--单价
+               0                            AS total_price,            --  盈亏金额
+               T5.form_enum                 AS purpose_type_enum,--目的仓库类型
+               T1.location_id               AS purpose_location_id,--目的仓库
+               T1.location_store_id         AS purpose_location_store_id,--目的仓位
+               T1.supplier_id,--供应商
+               T1.production_date           AS start_time,--开始时间
+               T1.expiration_date           AS end_time,--结束时间
+               T1.lot_number--产品批号
+        FROM wor_inventory_item T1
+                 LEFT JOIN adm_device_definition T4
+                           ON T1.item_id = T4.id
+                               AND T4.delete_flag = '0'
+                 LEFT JOIN adm_location T5
+                           ON T5.id = T1.location_id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_supplier T7
+                           ON T7.id = T1.supplier_id
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T1.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T1.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.delete_flag = '0'
+          AND T1.inventory_status_enum = #{inventoryStatusEnum}
+          AND T1.item_table = #{deviceTableName}
+    </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+        SELECT T1.id,                                 --ID
+               T1.bus_no,                             --单据号
+               T1.trace_no,                           --追溯码
+               T1.item_id,                            --物品编码
+               T1.purpose_type_enum,                  --目的类型
+               T1.purpose_location_id,                --目的仓库
+               T7."name"     AS purpose_location_name,       -- 目的仓库
+               T1.purpose_location_store_id,          --目的仓位
+               T1.occurrence_time,                    --期望时间(盘点日期)
+               #{medicine}  AS item_type,             --药品类型
+               T1.remake,                             --备注
+               T2.bus_no    AS item_bus_no,           --项目编码
+               T2."name"    AS item_name,             --名称
+               T3.total_volume,                       --规格
+               T1.unit_code AS measurement_unit_code,       -- 物品计量单位
+               T2.unit_code,                          --包装单位(大单位)
+               T2.min_unit_code,                      --最小单位(小单位)
+               T2.manufacturer_text,                  --生产厂商文本
+               T4.lot_number,                         --产品批号
+               T1.total_quantity,        --实盘数量(常规单位)(小单位)
+               T11.amount AS price,                  --采购单价(大单位)
+               T1.item_quantity,                      --数量(盈亏数量)(小单位)
+               T1.total_price,                        --总价(盈亏金额)
+               T1.reason_code,                        --理由类型(盈亏原因)
+               T1.reason,                             --理由(盈亏详细)
+               T2.yb_no,                              --医保编码
+               T1.start_time,                         -- 开始时间
+               T1.end_time,                           -- 结束时间
+               T1.supplier_id,         -- 供应商id
+               T8."name"            AS supplier_name,               -- 供应商名称
+               T2.part_percent                        --拆零比
+        FROM
+        <if test="endTime == null">
+             wor_aut_supply_request AS T1
+        </if>
+        <if test="endTime != null">
+             wor_supply_request AS T1
+        </if>
+                 LEFT JOIN med_medication_definition AS T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication AS T3
+                           ON T2.id = T3.medication_def_id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN wor_inventory_item AS T4
+                           ON T1.item_id = T4.item_id
+                               AND T1.purpose_location_id = T4.location_id
+                               AND T1.lot_number = T4.lot_number
+                               AND T4.delete_flag = '0'
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_id = T7.id
+                 LEFT JOIN adm_supplier T8
+                           ON T8.id = T1.supplier_id
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T4.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+         AND T1.type_enum IN
+         <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+             #{item}
+         </foreach>
+          <if test="endTime == null">
+              AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{startTime}
+          </if>
+          <if test="endTime != null">
+              AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          </if>
+          AND T1.item_table = #{medicationTableName}
+          AND T1.delete_flag = '0'
+        UNION
+        SELECT T1.id,
+               T1.bus_no,
+               T1.trace_no,
+               T1.item_id,
+               T1.purpose_type_enum,
+               T1.purpose_location_id,
+               T7."name"     AS purpose_location_name,
+               T1.purpose_location_store_id,
+               T1.occurrence_time,
+               #{device}        AS item_type,
+               T1.remake,
+               T5.bus_no        AS item_bus_no,
+               T5."name"        AS item_name,
+               T5."size"        AS total_volume,
+               T1.unit_code AS measurement_unit_code,       -- 物品计量单位
+               T5.unit_code,
+               T5.min_unit_code AS min_unit_code,
+               T5.manufacturer_text,
+               T4.lot_number,
+               T1.total_quantity,
+               T11.amount AS price,                  --采购单价(大单位)
+               T1.item_quantity,
+               T1.total_price,
+               T1.reason_code,
+               T1.reason,
+               T5.yb_no,
+               T1.start_time,                                                    -- 开始时间
+               T1.end_time,                                                      -- 结束时间
+               T1.supplier_id,         -- 供应商id
+               T8."name"            AS supplier_name,               -- 供应商名称
+               T5.part_percent
+        FROM
+        <if test="endTime == null">
+             wor_aut_supply_request AS T1
+        </if>
+        <if test="endTime != null">
+             wor_supply_request AS T1
+        </if>
+                 LEFT JOIN adm_device_definition AS T5
+                           ON T1.item_id = T5.id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN wor_inventory_item AS T4
+                           ON T1.item_id = T4.item_id
+                               AND T1.purpose_location_id = T4.location_id
+                               AND T1.lot_number = T4.lot_number
+                               AND T4.delete_flag = '0'
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_id = T7.id
+                 LEFT JOIN adm_supplier T8
+                           ON T8.id = T1.supplier_id
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T4.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T4.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum IN
+          <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          <if test="endTime == null">
+              AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{startTime}
+          </if>
+          <if test="endTime != null">
+              AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          </if>
+          AND T1.item_table = #{deviceTableName}
+          AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
similarity index 35%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
index c58171f2..527346fc 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
@@ -4,20 +4,20 @@
 
     <select id="selectProductTransferPage"
             resultType="com.openhis.web.inventorymanage.dto.ProductTransferPageDto">
-        SELECT T2.supply_bus_no, -- 商品调拨单据号
-               T2.item_table,              -- 项目(药品类型)
-               T2.status_enum,             -- 单据状态
-               T2.type_enum,               -- 单据类型
+        SELECT T2.supply_bus_no,         -- 商品调拨单据号
+               T2.item_table,            -- 项目(药品类型)
+               T2.status_enum,           -- 单据状态
+               T2.type_enum,             -- 单据类型
                T2.source_location_id,
-               T2.source_location_name,    -- 源仓库名称
+               T2.source_location_name,  -- 源仓库名称
                T2.purpose_location_id,
-               T2.purpose_location_name,   -- 目的仓库名称
-               T2.approver_id,             -- 审批人ID
-               T2.approval_time,           -- 审批时间
-               T2.applicant_id,            -- 申请人ID
-               T2.create_time,             -- 制单时间
-               T2.tenant_id                -- 租户ID
-        FROM (SELECT T1.bus_no AS supply_bus_no,
+               T2.purpose_location_name, -- 目的仓库名称
+               T2.approver_id,           -- 审批人ID
+               T2.approval_time,         -- 审批时间
+               T2.applicant_id,          -- 申请人ID
+               T2.create_time,           -- 制单时间
+               T2.tenant_id              -- 租户ID
+        FROM (SELECT T1.bus_no           AS supply_bus_no,
                      T1.status_enum,
                      T1.type_enum,
                      T1.approver_id,
@@ -26,10 +26,10 @@
                      MIN(T1.create_time) AS create_time,
                      T1.item_table,
                      T1.source_location_id,
-                     T2."name" AS source_location_name,  -- 源仓库
+                     T2."name"           AS source_location_name,  -- 源仓库
                      T1.purpose_location_id,
-                     T3."name" AS purpose_location_name, -- 目的仓库
-                     T1.tenant_id                        -- 租户ID
+                     T3."name"           AS purpose_location_name, -- 目的仓库
+                     T1.tenant_id                                  -- 租户ID
               FROM wor_supply_request AS T1
                        LEFT JOIN adm_location T2
                                  ON T1.source_location_id = T2.id
@@ -74,7 +74,7 @@
                A.part_percent,           -- 拆零比
                A.item_id,                -- 项目id
                A.supplier_id,            -- 供应商id
-               A.supplier_name,            -- 供应商名称
+               A.supplier_name,          -- 供应商名称
                A.packaging_levels        -- 追溯码包装层级
         FROM (SELECT T1.tenant_id,
                      #{medicine}          AS medication_type,
@@ -95,15 +95,15 @@
                         AND T7.delete_flag = '0'
                      )                    AS total_purpose_quantity,
                      T1.quantity          AS item_quantity,
-                     T8.amount AS price,
+                     T8.amount            AS price,
                      T1.lot_number,
                      T1.production_date   AS start_time,
                      T1.expiration_date   AS end_time,
                      T1.trace_no,
                      T2.part_percent,
                      T1.item_id,
-                     T1.supplier_id,         -- 供应商id
-                     T4."name"            AS supplier_name,               -- 供应商名称
+                     T1.supplier_id,                        -- 供应商id
+                     T4."name"            AS supplier_name, -- 供应商名称
                      T1.packaging_levels
               FROM wor_inventory_item T1
                        LEFT JOIN med_medication_definition T2
@@ -121,6 +121,7 @@
                                  ON T8.definition_id = T7.id
                                      AND T8.delete_flag = '0'
                                      AND T8.condition_value = T1.lot_number
+                                     AND T8.condition_code = '1'--1:批号进价
               WHERE T1.delete_flag = '0'
                 AND T1.inventory_status_enum = #{inventoryStatusEnum}
                 AND T1.location_id = #{sourceLocationId}
@@ -145,15 +146,15 @@
                         AND T8.delete_flag = '0'
                      )                    AS total_purpose_quantity,
                      T1.quantity          AS item_quantity,
-                     T8.amount AS price,
+                     T8.amount            AS price,
                      T1.lot_number,
                      T1.production_date   AS start_time,
                      T1.expiration_date   AS end_time,
                      T1.trace_no,
                      T5.part_percent,
                      T1.item_id,
-                     T1.supplier_id,         -- 供应商id
-                     T4."name"            AS supplier_name,               -- 供应商名称
+                     T1.supplier_id,                        -- 供应商id
+                     T4."name"            AS supplier_name, -- 供应商名称
                      T1.packaging_levels
               FROM wor_inventory_item T1
                        LEFT JOIN adm_device_definition T5
@@ -168,6 +169,7 @@
                                  ON T8.definition_id = T7.id
                                      AND T8.delete_flag = '0'
                                      AND T8.condition_value = T1.lot_number
+                                     AND T8.condition_code = '1'--1:批号进价
               WHERE T1.delete_flag = '0'
                 AND T1.inventory_status_enum = #{inventoryStatusEnum}
                 AND T1.location_id = #{sourceLocationId}
@@ -176,56 +178,40 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ProductTransferDetailDto">
-        SELECT T1.id,
-               T1.bus_no,                                           -- 商品调拨单据号
-               T1.apply_time,                                       -- 申请时间
-               T1.source_type_enum,                                 -- 源仓库类型
-               T1.source_location_id,                               -- 源仓库ID
-               T5."name"            AS source_location_name,        -- 源仓库
-               T1.source_location_store_id,                         -- 源仓位ID
-               T6."name"            AS source_location_store_name,  -- 源仓位
-               T1.purpose_type_enum,                                -- 目的仓库类型
-               T1.purpose_location_id,                              -- 目的仓库ID
-               T7."name"            AS purpose_location_name,       -- 目的仓库
-               T1.purpose_location_store_id,                        -- 目的货位ID
-               T8."name"            AS purpose_location_store_name, -- 目的货位
-               #{medicine}          AS item_type,                   -- 项目类型
-               T2.name,                                             -- 药品名称
-               T3.total_volume,                                     -- 规格
-               T2.manufacturer_text AS manufacturer,                -- 生产厂商
-               T4."name"            AS supplier_name,               -- 供应商名称
-               T1.unit_code         AS measurement_unit_code,       -- 物品计量单位
-               T2.unit_code,                                        -- 包装单位
-               T2.min_unit_code,                                    -- 最小单位
-               T1.item_quantity,                                    -- 调拨数量
-               T11.amount AS price,                                 -- 采购单价
-               T1.total_price,                                      -- 总价
-               T1.lot_number,                                       -- 产品批号
-               T1.start_time,                                       -- 开始时间
-               T1.end_time,                                         -- 结束时间
-               T1.trace_no,                                         -- 追溯码
-               T9.packaging_levels,
-               T1.item_id,                                          -- 项目id
-               T2.part_percent,                                     -- 拆零比
-               T1.remake,                                           -- 备注
-               (SELECT T9.quantity
-                FROM wor_inventory_item T9
-                WHERE T9.item_id = T1.item_id
-                  AND T9.location_id = T1.source_location_id
-                  AND T9.lot_number = T1.lot_number
-                  AND T1.bus_no = #{busNo}
-                  AND T1.delete_flag = '0'
-                  AND T9.delete_flag = '0'
-               )                    AS total_source_quantity,       -- 库存数量(源库存)
-               (SELECT T9.quantity
-                FROM wor_inventory_item T9
-                WHERE T9.item_id = T1.item_id
-                  AND T9.location_id = T1.purpose_location_id
-                  AND T9.lot_number = T1.lot_number
-                  AND T1.bus_no = #{busNo}
-                  AND T1.delete_flag = '0'
-                  AND T9.delete_flag = '0'
-               )                    AS total_purpose_quantity       -- 库存数量(目的库存)
+        SELECT DISTINCT T1.id,
+                        T1.bus_no,                                           -- 商品调拨单据号
+                        T1.apply_time,                                       -- 申请时间
+                        T1.source_type_enum,                                 -- 源仓库类型
+                        T1.source_location_id,                               -- 源仓库ID
+                        T5."name"            AS source_location_name,        -- 源仓库
+                        T1.source_location_store_id,                         -- 源仓位ID
+                        T6."name"            AS source_location_store_name,  -- 源仓位
+                        T1.purpose_type_enum,                                -- 目的仓库类型
+                        T1.purpose_location_id,                              -- 目的仓库ID
+                        T7."name"            AS purpose_location_name,       -- 目的仓库
+                        T1.purpose_location_store_id,                        -- 目的货位ID
+                        T8."name"            AS purpose_location_store_name, -- 目的货位
+                        #{medicine}          AS item_type,                   -- 项目类型
+                        T2.name,                                             -- 药品名称
+                        T3.total_volume,                                     -- 规格
+                        T2.manufacturer_text AS manufacturer,                -- 生产厂商
+                        T4."name"            AS supplier_name,               -- 供应商名称
+                        T1.unit_code         AS measurement_unit_code,       -- 物品计量单位
+                        T2.unit_code,                                        -- 包装单位
+                        T2.min_unit_code,                                    -- 最小单位
+                        T1.item_quantity,                                    -- 调拨数量
+                        T11.amount           AS price,                       -- 采购单价
+                        T1.total_price,                                      -- 总价
+                        T1.lot_number,                                       -- 产品批号
+                        T1.start_time,                                       -- 开始时间
+                        T1.end_time,                                         -- 结束时间
+                        T1.trace_no,                                         -- 追溯码
+                        T9.packaging_levels,
+                        T1.item_id,                                          -- 项目id
+                        T2.part_percent,                                     -- 拆零比
+                        T1.remake,                                           -- 备注
+                        T9.quantity          AS total_source_quantity,       -- 库存数量(源库存)
+                        T12.quantity         AS total_purpose_quantity       -- 库存数量(目的库存)
         FROM wor_supply_request T1
                  LEFT JOIN med_medication_definition T2
                            ON T1.item_id = T2.id
@@ -253,60 +239,50 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T9.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+                 LEFT JOIN wor_inventory_item T12
+                           ON T1.item_id = T12.item_id
+                               AND T1.purpose_location_id = T12.location_id
+                               AND T12.lot_number = T1.lot_number
+                               AND T12.delete_flag = '0'
         WHERE T1.bus_no = #{busNo}
           AND T1.item_table = #{medicationTableName}
           AND T1.delete_flag = '0'
         UNION
-        SELECT T1.id,
-               T1.bus_no,                                                        -- 商品调拨单据号
-               T1.apply_time,                                                    -- 申请时间
-               T1.source_type_enum,                                              -- 源仓库类型
-               T1.source_location_id,                                            -- 源仓库ID
-               T5."name"            AS source_location_name_location_name,       -- 源仓库
-               T1.source_location_store_id,                                      -- 源仓位ID
-               T6."name"            AS source_location_name_location_store_name, -- 源仓位
-               T1.purpose_type_enum,                                             -- 目的仓库类型
-               T1.purpose_location_id,                                           -- 目的仓库ID
-               T7."name"            AS purpose_location_name,                    -- 目的仓库
-               T1.purpose_location_store_id,                                     -- 目的货位ID
-               T8."name"            AS purpose_location_store_name,              -- 目的货位
-               #{device}            AS item_type,                                -- 项目类型
-               T2.name,                                                          -- 药品名称
-               T2."size"            AS total_volume,                             -- 规格
-               T2.manufacturer_text AS manufacturer,                             -- 生产厂商
-               T4."name"            AS supplier_name,                            -- 供应商名称
-               T1.unit_code         AS measurement_unit_code,                    -- 物品计量单位
-               T2.unit_code,                                                     -- 包装单位
-               T2.min_unit_code,                                                 -- 最小单位
-               T1.item_quantity,                                                 -- 调拨数量
-               T11.amount AS price,                                              -- 采购单价
-               T1.total_price,                                                   -- 总价
-               T1.lot_number,                                                    -- 产品批号
-               T1.start_time,                                                    -- 开始时间
-               T1.end_time,                                                      -- 结束时间
-               T1.trace_no,                                                      -- 追溯码
-               T9.packaging_levels,
-               T1.item_id,                                                       -- 项目id
-               T2.part_percent,                                                  -- 拆零比
-               T1.remake,                                                        -- 备注
-               (SELECT T9.quantity
-                FROM wor_inventory_item T9
-                WHERE T9.item_id = T1.item_id
-                  AND T9.location_id = T1.source_location_id
-                  AND T9.lot_number = T1.lot_number
-                  AND T1.bus_no = #{busNo}
-                  AND T1.delete_flag = '0'
-                  AND T9.delete_flag = '0'
-               )                    AS total_source_quantity,                    -- 总库存数量(源库存)
-               (SELECT T9.quantity
-                FROM wor_inventory_item T9
-                WHERE T9.item_id = T1.item_id
-                  AND T9.location_id = T1.purpose_location_id
-                  AND T9.lot_number = T1.lot_number
-                  AND T1.bus_no = #{busNo}
-                  AND T1.delete_flag = '0'
-                  AND T9.delete_flag = '0'
-               )                    AS total_purpose_quantity                    -- 总库存数量(目的库存)
+        SELECT DISTINCT T1.id,
+                        T1.bus_no,                                                        -- 商品调拨单据号
+                        T1.apply_time,                                                    -- 申请时间
+                        T1.source_type_enum,                                              -- 源仓库类型
+                        T1.source_location_id,                                            -- 源仓库ID
+                        T5."name"            AS source_location_name_location_name,       -- 源仓库
+                        T1.source_location_store_id,                                      -- 源仓位ID
+                        T6."name"            AS source_location_name_location_store_name, -- 源仓位
+                        T1.purpose_type_enum,                                             -- 目的仓库类型
+                        T1.purpose_location_id,                                           -- 目的仓库ID
+                        T7."name"            AS purpose_location_name,                    -- 目的仓库
+                        T1.purpose_location_store_id,                                     -- 目的货位ID
+                        T8."name"            AS purpose_location_store_name,              -- 目的货位
+                        #{device}            AS item_type,                                -- 项目类型
+                        T2.name,                                                          -- 药品名称
+                        T2."size"            AS total_volume,                             -- 规格
+                        T2.manufacturer_text AS manufacturer,                             -- 生产厂商
+                        T4."name"            AS supplier_name,                            -- 供应商名称
+                        T1.unit_code         AS measurement_unit_code,                    -- 物品计量单位
+                        T2.unit_code,                                                     -- 包装单位
+                        T2.min_unit_code,                                                 -- 最小单位
+                        T1.item_quantity,                                                 -- 调拨数量
+                        T11.amount           AS price,                                    -- 采购单价
+                        T1.total_price,                                                   -- 总价
+                        T1.lot_number,                                                    -- 产品批号
+                        T1.start_time,                                                    -- 开始时间
+                        T1.end_time,                                                      -- 结束时间
+                        T1.trace_no,                                                      -- 追溯码
+                        T9.packaging_levels,
+                        T1.item_id,                                                       -- 项目id
+                        T2.part_percent,                                                  -- 拆零比
+                        T1.remake,                                                        -- 备注
+                        T9.quantity          AS total_source_quantity,                    -- 总库存数量(源库存)
+                        T12.quantity         AS total_purpose_quantity                    -- 总库存数量(目的库存)
         FROM wor_supply_request T1
                  LEFT JOIN adm_device_definition T2
                            ON T1.item_id = T2.id
@@ -332,8 +308,177 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T9.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+                 LEFT JOIN wor_inventory_item T12
+                           ON T1.item_id = T12.item_id
+                               AND T1.purpose_location_id = T12.location_id
+                               AND T12.lot_number = T1.lot_number
+                               AND T12.delete_flag = '0'
         WHERE T1.bus_no = #{busNo}
           AND T1.item_table = #{deviceTableName}
           AND T1.delete_flag = '0'
     </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+        SELECT DISTINCT T1.id,
+                        T1.bus_no,                                           -- 商品调拨单据号
+                        T1.occurrence_time,                                       -- 制单时间
+                        T1.source_type_enum,                                 -- 源仓库类型
+                        T1.source_location_id,                               -- 源仓库ID
+                        T5."name"            AS source_location_name,        -- 源仓库
+                        T1.source_location_store_id,                         -- 源仓位ID
+                        T6."name"            AS source_location_store_name,  -- 源仓位
+                        T1.purpose_type_enum,                                -- 目的仓库类型
+                        T1.purpose_location_id,                              -- 目的仓库ID
+                        T7."name"            AS purpose_location_name,       -- 目的仓库
+                        T1.purpose_location_store_id,                        -- 目的货位ID
+                        T8."name"            AS purpose_location_store_name, -- 目的货位
+                        #{medicine}          AS item_type,                   -- 项目类型
+                        T2.name,                                             -- 药品名称
+                        T3.total_volume,                                     -- 规格
+                        T2.manufacturer_text AS manufacturer,                -- 生产厂商
+                        T4."name"            AS supplier_name,               -- 供应商名称
+                        T1.unit_code         AS measurement_unit_code,       -- 物品计量单位
+                        T2.unit_code,                                        -- 包装单位
+                        T2.min_unit_code,                                    -- 最小单位
+                        T1.item_quantity,                                    -- 调拨数量
+                        T11.amount           AS price,                       -- 采购单价
+                        T1.total_price,                                      -- 总价
+                        T1.lot_number,                                       -- 产品批号
+                        T1.start_time,                                       -- 开始时间
+                        T1.end_time,                                         -- 结束时间
+                        T1.trace_no,                                         -- 追溯码
+                        T9.packaging_levels,
+                        T1.item_id,                                          -- 项目id
+                        T2.part_percent,                                     -- 拆零比
+                        T1.remake,                                           -- 备注
+                        T9.quantity          AS total_source_quantity,       -- 库存数量(源库存)
+                        T12.quantity         AS total_purpose_quantity       -- 库存数量(目的库存)
+        FROM wor_supply_request T1
+                 LEFT JOIN med_medication_definition T2
+                           ON T1.item_id = T2.id
+                 LEFT JOIN med_medication T3
+                           ON T3.medication_def_id = T2.id
+                 LEFT JOIN adm_supplier T4
+                           ON T4.id = T1.supplier_id
+                 LEFT JOIN adm_location T5
+                           ON T1.source_location_id = T5.id
+                 LEFT JOIN adm_location T6
+                           ON T1.source_location_store_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_id = T7.id
+                 LEFT JOIN adm_location T8
+                           ON T1.purpose_location_store_id = T8.id
+                 LEFT JOIN wor_inventory_item T9
+                           ON T1.item_id = T9.item_id
+                               AND T1.source_location_id = T9.location_id
+                               AND T9.lot_number = T1.lot_number
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T9.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T9.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+                 LEFT JOIN wor_inventory_item T12
+                           ON T1.item_id = T12.item_id
+                               AND T1.purpose_location_id = T12.location_id
+                               AND T12.lot_number = T1.lot_number
+                               AND T12.delete_flag = '0'
+        WHERE <if test="inOutFlg == 1">
+                T1.purpose_location_id = #{locationId}
+              </if>
+              <if test="inOutFlg == 2">
+                T1.source_location_id = #{locationId}
+              </if>
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum IN
+          <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.item_table = #{medicationTableName}
+          AND T1.delete_flag = '0'
+        UNION
+        SELECT DISTINCT T1.id,
+                        T1.bus_no,                                                        -- 商品调拨单据号
+                        T1.occurrence_time,                                       -- 制单时间
+                        T1.source_type_enum,                                              -- 源仓库类型
+                        T1.source_location_id,                                            -- 源仓库ID
+                        T5."name"            AS source_location_name_location_name,       -- 源仓库
+                        T1.source_location_store_id,                                      -- 源仓位ID
+                        T6."name"            AS source_location_name_location_store_name, -- 源仓位
+                        T1.purpose_type_enum,                                             -- 目的仓库类型
+                        T1.purpose_location_id,                                           -- 目的仓库ID
+                        T7."name"            AS purpose_location_name,                    -- 目的仓库
+                        T1.purpose_location_store_id,                                     -- 目的货位ID
+                        T8."name"            AS purpose_location_store_name,              -- 目的货位
+                        #{device}            AS item_type,                                -- 项目类型
+                        T2.name,                                                          -- 药品名称
+                        T2."size"            AS total_volume,                             -- 规格
+                        T2.manufacturer_text AS manufacturer,                             -- 生产厂商
+                        T4."name"            AS supplier_name,                            -- 供应商名称
+                        T1.unit_code         AS measurement_unit_code,                    -- 物品计量单位
+                        T2.unit_code,                                                     -- 包装单位
+                        T2.min_unit_code,                                                 -- 最小单位
+                        T1.item_quantity,                                                 -- 调拨数量
+                        T11.amount           AS price,                                    -- 采购单价
+                        T1.total_price,                                                   -- 总价
+                        T1.lot_number,                                                    -- 产品批号
+                        T1.start_time,                                                    -- 开始时间
+                        T1.end_time,                                                      -- 结束时间
+                        T1.trace_no,                                                      -- 追溯码
+                        T9.packaging_levels,
+                        T1.item_id,                                                       -- 项目id
+                        T2.part_percent,                                                  -- 拆零比
+                        T1.remake,                                                        -- 备注
+                        T9.quantity          AS total_source_quantity,                    -- 总库存数量(源库存)
+                        T12.quantity         AS total_purpose_quantity                    -- 总库存数量(目的库存)
+        FROM wor_supply_request T1
+                 LEFT JOIN adm_device_definition T2
+                           ON T1.item_id = T2.id
+                 LEFT JOIN adm_supplier T4
+                           ON T4.id = T1.supplier_id
+                 LEFT JOIN adm_location T5
+                           ON T1.source_location_id = T5.id
+                 LEFT JOIN adm_location T6
+                           ON T1.source_location_store_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_id = T7.id
+                 LEFT JOIN adm_location T8
+                           ON T1.purpose_location_store_id = T8.id
+                 LEFT JOIN wor_inventory_item T9
+                           ON T1.item_id = T9.item_id
+                               AND T1.source_location_id = T9.location_id
+                               AND T9.lot_number = T1.lot_number
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T9.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T9.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+                 LEFT JOIN wor_inventory_item T12
+                           ON T1.item_id = T12.item_id
+                               AND T1.purpose_location_id = T12.location_id
+                               AND T12.lot_number = T1.lot_number
+                               AND T12.delete_flag = '0'
+        WHERE <if test="inOutFlg == 1">
+                  T1.purpose_location_id = #{locationId}
+              </if>
+              <if test="inOutFlg == 2">
+                  T1.source_location_id = #{locationId}
+              </if>
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum IN
+          <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.item_table = #{deviceTableName}
+          AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
similarity index 56%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
index 25552991..d0436c3e 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
@@ -146,4 +146,109 @@
         WHERE T1.bus_no = #{busNo}
             AND T1.delete_flag = '0'
     </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+        SELECT T1.id,
+               T1.bus_no,
+               T1.item_quantity,
+               T1.item_table,
+               T1.unit_code,
+               T1.remake,
+               T1.purpose_type_enum,
+               T1.occurrence_time,
+               T1.lot_number,
+               T1.trace_no,
+               T1.invoice_no,
+               T1.start_time,
+               T1.end_time,
+               T1.price,
+               T1.total_price,
+               T2."name" AS item_name,
+               T2.id AS item_id,
+               T2.part_percent,
+               T2.manufacturer_text AS supplier_name,
+               T3.total_volume,
+               T5."name" AS practitioner_name,
+               T6."name" AS purpose_location_name,
+               T6."id" AS purpose_location_id,
+               T7."name" AS purpose_location_store_name,
+               (SELECT SUM(T9.quantity)
+                FROM wor_inventory_item T9
+                WHERE T9.item_id = T1.item_id
+                  AND T9.location_id = T1.purpose_location_id
+               ) AS total_quantity
+        FROM wor_supply_request T1
+                 INNER JOIN med_medication_definition T2
+                            ON T1.item_id = T2.id
+                 LEFT JOIN med_medication T3
+                           ON T3.medication_def_id = T2.id
+                 LEFT JOIN adm_practitioner T5
+                           ON T1.practitioner_id = T5.id
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_store_id  = T7.id
+                 LEFT JOIN wor_inventory_item T9
+                           ON T1.item_id = T9.item_id
+                               AND T1.purpose_location_id = T9.location_id
+        WHERE  T1.purpose_location_id = #{locationId}
+           AND T1.status_enum = #{statusEnum}
+           AND T1.type_enum IN
+           <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+               #{item}
+           </foreach>
+           AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+           AND T1.item_table = #{medicationTableName}
+           AND T1.delete_flag = '0'
+        UNION
+        SELECT T1.id,
+               T1.bus_no,
+               T1.item_quantity,
+               T1.item_table,
+               T1.unit_code,
+               T1.remake,
+               T1.purpose_type_enum,
+               T1.occurrence_time,
+               T1.lot_number,
+               T1.trace_no,
+               T1.invoice_no,
+               T1.start_time,
+               T1.end_time,
+               T1.price,
+               T1.total_price,
+               T8."name" AS item_name,
+               T8.id AS item_id,
+               T8.part_percent,
+               T8.manufacturer_text AS supplier_name,
+               T8."size" AS total_volume,
+               T5."name" AS practitioner_name,
+               T6."name" AS purpose_location_name,
+               T6."id" AS purpose_location_id,
+               T7."name" AS purpose_location_store_name,
+               (SELECT SUM(T9.quantity)
+                FROM wor_inventory_item T9
+                WHERE T9.item_id = T1.item_id
+                  AND T9.location_id = T1.purpose_location_id
+               ) AS total_quantity
+        FROM wor_supply_request T1
+                 INNER JOIN adm_device_definition T8
+                            ON T1.item_id = T8.id
+                 LEFT JOIN adm_practitioner T5
+                           ON T1.practitioner_id = T5.id
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_store_id  = T7.id
+                 LEFT JOIN wor_inventory_item T9
+                           ON T1.item_id = T9.item_id
+                               AND T1.purpose_location_id = T9.location_id
+        WHERE  T1.purpose_location_id = #{locationId}
+           AND T1.status_enum = #{statusEnum}
+           AND T1.type_enum IN
+           <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+               #{item}
+           </foreach>
+           AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+           AND T1.item_table = #{deviceTableName}
+           AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
similarity index 56%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
index 015faa90..aa65a9c9 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
@@ -126,6 +126,7 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T2.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
           AND T1.item_table = #{medicationTableName}
           AND T1.delete_flag = '0'
@@ -251,6 +252,7 @@
                            ON T11.definition_id = T10.id
                                AND T11.delete_flag = '0'
                                AND T11.condition_value = T2.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
           AND T1.item_table = #{deviceTableName}
           AND T1.delete_flag = '0'
@@ -280,4 +282,198 @@
                  T1.approval_time
         ORDER BY T1.bus_no DESC
     </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto">
+        SELECT T1.bus_no,
+               T1.original_bus_no,
+               T1.item_quantity  AS item_quantity,               --退库数量
+               ( SELECT COALESCE(SUM(T9.item_quantity), 0)
+                 FROM wor_supply_request AS T9
+                 WHERE T9.original_bus_no = T1.original_bus_no
+                   AND T9.item_id = T1.item_id
+                   AND T9.lot_number = T1.lot_number
+                   AND T9.delete_flag = '0'
+                   AND T9.status_enum = #{statusEnum}
+                   )
+                       AS returned_quantity,           --已退数量
+                T1.id ,                      --采购退货id
+                NULL  AS  purchase_id,                   --采购入库id
+               T2.quantity AS quantity,                    --库存数量
+              ( SELECT T9.item_quantity
+                FROM wor_supply_request AS T9
+                WHERE T1.original_bus_no = T9.bus_no
+                  AND T9.item_id = T1.item_id
+                  AND T9.lot_number = T1.lot_number
+                  AND T9.delete_flag = '0'
+                   )
+                     AS  purchase_quantity,            --采购数量
+               T11.amount AS price,                         --采购单价
+               ( SELECT T9.unit_code
+                 FROM wor_supply_request AS T9
+                 WHERE T1.original_bus_no = T9.bus_no
+                   AND T9.item_id = T1.item_id
+                   AND T9.lot_number = T1.lot_number
+                   AND T9.delete_flag = '0'
+                   )  AS  purchase_unit_code,            --采购单位
+               T1.unit_code         AS measurement_unit_code,       -- 物品计量单位
+               T4.unit_code,                                        -- 包装单位
+               T4.min_unit_code,                                    -- 最小单位
+               T5."name"   AS purpose_location_name,       --仓库
+               T6."name"   AS purpose_location_store_name, --货位
+               T4."name"   AS item_name,                   --药品
+               T1.lot_number,                              --批次号
+               T1.reason,                                  --退货原因
+               T1.remake,                                  --备注
+               T1.item_id,                                 --物品编码
+               T1.purpose_location_id,                     --目的仓库ID
+               T1.purpose_location_store_id,               --目的货位ID
+               T1.purpose_type_enum,                       -- 目的仓库类型
+               T1.supplier_id,            -- 供应商id
+               T7."name"            AS supplier_name,               -- 供应商名称
+               T8.total_volume,                                     -- 规格
+               T4.manufacturer_text AS manufacturer,                -- 生产厂商
+               #{medicine}          AS item_type,
+               T1.start_time,                                       -- 开始时间
+               T1.end_time,                                         -- 结束时间
+               T1.invoice_no,                                   -- 发票号
+               T1.trace_no,                                   -- 追溯码
+               T2.packaging_levels,             -- 追溯码包装层级
+               T1.practitioner_id ,               --经手人
+               T1.occurrence_time,--制单日期
+               T4.part_percent                              --拆零比
+        FROM wor_supply_request T1
+                 LEFT JOIN wor_inventory_item T2
+                           ON T1.item_id = T2.item_id
+                               AND T1.purpose_location_id = T2.location_id
+                               AND T1.lot_number = T2.lot_number
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN wor_supply_delivery T3
+                           ON T1.id = T3.request_id
+                               AND T3.delete_flag = '0'
+                 INNER JOIN med_medication_definition T4
+                            ON T1.item_id = T4.id
+                                AND T4.delete_flag = '0'
+                 LEFT JOIN med_medication T8
+                           ON T8.medication_def_id = T4.id
+                               AND T8.delete_flag = '0'
+                 LEFT JOIN adm_location T5
+                           ON T1.purpose_location_id = T5.id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_store_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN adm_supplier T7
+                           ON T7.id = T1.supplier_id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T2.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T2.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum IN
+          <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.item_table = #{medicationTableName}
+          AND T1.delete_flag = '0'
+        UNION
+        SELECT T1.bus_no,
+               T1.original_bus_no,
+                T1.item_quantity   AS item_quantity,               --退库数量
+               ( SELECT COALESCE(SUM(T9.item_quantity), 0)
+                  FROM wor_supply_request AS T9
+                  WHERE T9.original_bus_no = T1.original_bus_no
+                    AND T9.item_id = T1.item_id
+                    AND T9.lot_number = T1.lot_number
+                    AND T9.delete_flag = '0'
+                    AND T9.status_enum = #{statusEnum}
+                   )   AS returned_quantity,           --已退数量
+               T1.id ,                      --采购退货id
+                NULL AS  purchase_id,                   --采购入库id
+               T2.quantity AS quantity,                    --库存数量
+               ( SELECT T9.item_quantity
+                 FROM wor_supply_request AS T9
+                 WHERE T1.original_bus_no = T9.bus_no
+                   AND T9.item_id = T1.item_id
+                   AND T9.lot_number = T1.lot_number
+                   AND T9.delete_flag = '0'
+                   ) AS purchase_quantity,            --采购数量
+              T11.amount AS price,                         --采购单价
+               ( SELECT T9.unit_code
+                 FROM wor_supply_request AS T9
+                 WHERE T1.original_bus_no = T9.bus_no
+                   AND T9.item_id = T1.item_id
+                   AND T9.lot_number = T1.lot_number
+                   AND T9.delete_flag = '0'
+                 ) AS  purchase_unit_code,            --采购单位
+               T1.unit_code         AS measurement_unit_code,       -- 物品计量单位
+               T4.unit_code,                                        -- 包装单位
+               T4.min_unit_code,                                    -- 最小单位
+               T5."name"   AS purpose_location_name,       --仓库
+               T6."name"   AS purpose_location_store_name, --货位
+               T4."name"   AS item_name,                   --药品
+               T1.lot_number,                              --批次号
+               T1.reason,                                  --退货原因
+               T1.remake,                                  --备注
+               T1.item_id,                                 --物品编码
+               T1.purpose_location_id,                     --目的仓库ID
+               T1.purpose_location_store_id,               --目的货位ID
+               T1.purpose_type_enum,                       -- 目的仓库类型
+               T1.supplier_id,            -- 供应商id
+               T7."name"            AS supplier_name,           -- 供应商名称
+               T4."size"            AS total_volume,            -- 规格
+               T4.manufacturer_text AS manufacturer,            -- 生产厂商
+               #{device}            AS item_type,
+               T1.start_time,                                 -- 开始时间
+               T1.end_time,                                   -- 结束时间
+               T1.invoice_no,                                   -- 发票号
+               T1.trace_no,                                   -- 追溯码
+               T2.packaging_levels,              -- 追溯码包装层级
+               T1.practitioner_id,               --经手人
+               T1.occurrence_time,--制单日期
+               T4.part_percent                              --拆零比
+        FROM wor_supply_request T1
+                 LEFT JOIN wor_inventory_item T2
+                           ON T2.item_id = T1.item_id
+                               AND T2.location_id = T1.purpose_location_id
+                               AND T2.lot_number = T1.lot_number
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN wor_supply_delivery T3
+                           ON T1.id = T3.request_id
+                               AND T3.delete_flag = '0'
+                 INNER JOIN adm_device_definition T4
+                            ON T1.item_id = T4.id
+                                AND T4.delete_flag = '0'
+                 LEFT JOIN adm_location T5
+                           ON T1.purpose_location_id = T5.id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_store_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN adm_supplier T7
+                           ON T7.id = T1.supplier_id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T10
+                           ON T10.instance_id = T2.item_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T11
+                           ON T11.definition_id = T10.id
+                               AND T11.delete_flag = '0'
+                               AND T11.condition_value = T2.lot_number
+                               AND T11.condition_code = '1'--1:批号进价
+        WHERE  T1.purpose_location_id = #{locationId}
+           AND T1.status_enum = #{statusEnum}
+           AND T1.type_enum IN
+           <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+               #{item}
+           </foreach>
+           AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+           AND T1.item_table = #{deviceTableName}
+           AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
similarity index 95%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
index 78788d19..26e025e2 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
@@ -7,17 +7,21 @@
                T1.item_table,
                T1.item_id,
                T1.item_quantity,
+               T1.total_quantity,
                T1.unit_code AS item_unit,
                T1.price,
                T1.total_price,
                T1.approver_id,
+               T1.source_type_enum,
                T1.source_location_id,
                T1.source_location_store_id,
+               T1.purpose_type_enum,
                T1.purpose_location_id,
                T1.purpose_location_store_id,
                T1.supplier_id,
                T1.lot_number,
                T1.trace_no,
+               T1.trace_no_unit_code,
                T1.invoice_no,
                T1.bus_no,
                T1.start_time,
@@ -58,17 +62,21 @@
                T1.item_table,
                T1.item_id,
                T1.item_quantity,
+               T1.total_quantity,
                T1.unit_code AS item_unit,
                T1.price,
                T1.total_price,
                T1.approver_id,
+               T1.source_type_enum,
                T1.source_location_id,
                T1.source_location_store_id,
+               T1.purpose_type_enum,
                T1.purpose_location_id,
                T1.purpose_location_store_id,
                T1.supplier_id,
                T1.lot_number,
                T1.trace_no,
+               T1.trace_no_unit_code,
                T1.invoice_no,
                T1.bus_no,
                T1.start_time,
@@ -128,24 +136,20 @@
         SELECT T2.supply_bus_no,
                T2.status_enum,
                T2.type_enum,
-               T2.supplier_id,
                T2.approver_id,
                T2.approval_time,
                T2.applicant_id,
                T2.apply_time,
                T2.practitioner_id,
-               T2.trace_no,
                T2.tenant_id
         FROM (SELECT T1.bus_no AS supply_bus_no,
                      T1.status_enum,
                      T1.type_enum,
-                     T1.supplier_id,
                      T1.approver_id,
                      T1.approval_time,
                      T1.applicant_id,
                      T1.apply_time,
                      T1.practitioner_id,
-                     T1.trace_no,
                      T1.tenant_id
               FROM wor_supply_request AS T1
               WHERE T1.status_enum IN (#{approval},#{agree},#{reject})
@@ -153,13 +157,11 @@
               GROUP BY T1.bus_no,
                        T1.status_enum,
                        T1.type_enum,
-                       T1.supplier_id,
                        T1.approver_id,
                        T1.approval_time,
                        T1.applicant_id,
                        T1.apply_time,
                        T1.practitioner_id,
-                       T1.trace_no,
                        T1.tenant_id
               ORDER BY T1.apply_time desc
              ) AS T2
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
similarity index 52%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
index 65735c6d..6af0280d 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
@@ -117,6 +117,7 @@
                       ON T13.definition_id = T12.id
                           AND T13.delete_flag = '0'
                           AND T13.condition_value = T10.lot_number
+                          AND T13.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
             AND T1.item_table = #{medicationTableName}
             AND T1.delete_flag = '0'
@@ -184,8 +185,167 @@
                       ON T13.definition_id = T12.id
                           AND T13.delete_flag = '0'
                           AND T13.condition_value = T10.lot_number
+                          AND T13.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
             AND T1.item_table = #{deviceTableName}
             AND T1.delete_flag = '0'
     </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
+        SELECT T1.id,
+               T1.bus_no,--单据号
+               T1.item_id,
+               T1.item_quantity,--数量
+               T1.unit_code AS measurement_unit_code,    -- 物品计量单位
+               T2.unit_code,                             -- 包装单位
+               T2.min_unit_code,                         -- 最小单位
+               T1.detail_json,--请求细节
+               T1.purpose_type_enum,--目的类型
+               #{medicine}  AS item_type,--药品类型
+               T1.apply_time,--申请时间
+               T1.lot_number,--产品批号
+               T1.trace_no,--追溯码
+               T1.invoice_no,--发票号
+               T1.start_time,--开始时间
+               T1.end_time,--结束时间
+               T13.amount AS price,--单价
+               T1.total_price,--总价
+               T2."name" AS item_name,--药品类型
+               T2.part_percent,--拆零比
+               T2."yb_no",--医保编码
+               T3.total_volume,--规格
+               T4."name" AS supplier_name,--供应商名称
+               T2.manufacturer_text AS manufacturer, -- 生产厂商
+               T10.quantity AS total_quantity, -- 当前库存总数
+               T1.source_location_id,          -- 源仓库ID
+               T1.source_location_store_id,      -- 源仓位ID
+               T1.purpose_location_id,            -- 目的仓库ID
+               T1.purpose_location_store_id,      -- 目的货位ID
+               T6."name"   AS source_location_name,        -- 源仓库
+               T7."name"   AS source_location_store_name,  -- 源仓位
+               T8."name"   AS purpose_location_name,       -- 目的仓库
+               T9."name"   AS purpose_location_store_name, -- 目的货位
+               T1.practitioner_id,       -- 经办人
+               T1.remake,                -- 备注
+               T1.occurrence_time,
+               T11."name"   AS practitioner_name -- 经办人名称
+        FROM wor_supply_request T1
+                 LEFT JOIN med_medication_definition T2
+                           ON T1.item_id = T2.id
+                 LEFT JOIN med_medication T3
+                           ON T3.medication_def_id = T2.id
+                 LEFT JOIN adm_supplier T4
+                           ON T4.id = T1.supplier_id
+                 LEFT JOIN adm_location T6
+                           ON T1.source_location_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.source_location_store_id  = T7.id
+                 LEFT JOIN adm_organization T8
+                           ON T1.purpose_location_id = T8.id
+                 LEFT JOIN adm_organization T9
+                           ON T1.purpose_location_store_id  = T9.id
+                 LEFT JOIN wor_inventory_item T10
+                           ON T1.item_id = T10.item_id
+                               AND T1.source_location_id = T10.location_id
+                               AND T10.lot_number = T1.lot_number
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_practitioner T11
+                           ON T1.practitioner_id  = T11.id
+                 LEFT JOIN adm_charge_item_definition AS T12
+                           ON T12.instance_id = T10.item_id
+                               AND T12.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T13
+                           ON T13.definition_id = T12.id
+                               AND T13.delete_flag = '0'
+                               AND T13.condition_value = T10.lot_number
+                               AND T13.condition_code = '1'--1:批号进价
+        WHERE T1.source_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum IN
+          <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          <if test="endTime == null">
+              AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{startTime}
+          </if>
+          <if test="endTime != null">
+              AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          </if>
+          AND T1.item_table = #{medicationTableName}
+          AND T1.delete_flag = '0'
+        UNION
+        SELECT T1.id,
+               T1.bus_no,
+               T1.item_id,
+               T1.item_quantity,
+               T1.unit_code AS measurement_unit_code,    -- 物品计量单位
+               T2.unit_code,                             -- 包装单位
+               T2.min_unit_code,                         -- 最小单位
+               T1.detail_json,
+               T1.purpose_type_enum,
+               #{device}  AS item_type,   --耗材类型
+               T1.apply_time,
+               T1.lot_number,
+               T1.trace_no,
+               T1.invoice_no,
+               T1.start_time,
+               T1.end_time,
+               T13.amount AS price,--单价
+               T1.total_price,
+               T2."name" AS item_name,
+               T2.part_percent,
+               T2."size" AS total_volume,
+               T2."yb_no",
+               T4."name" AS supplier_name,
+               T2.manufacturer_text AS manufacturer, -- 生产厂商
+               T10.quantity AS total_quantity, -- 当前库存总数
+               T1.source_location_id,          -- 源仓库ID
+               T1.source_location_store_id,      -- 源仓位ID
+               T1.purpose_location_id,            -- 目的仓库ID
+               T1.purpose_location_store_id,      -- 目的货位ID
+               T6."name"   AS source_location_name,        -- 源仓库
+               T7."name"   AS source_location_store_name,  -- 源仓位
+               T8."name"   AS purpose_location_name,       -- 目的仓库
+               T9."name"   AS purpose_location_store_name, -- 目的货位
+               T1.practitioner_id,       -- 经办人
+               T1.remake,                -- 备注
+               T1.occurrence_time,
+               T11."name"   AS practitioner_name -- 经办人名称
+        FROM wor_supply_request T1
+                 LEFT JOIN adm_device_definition T2
+                           ON T1.item_id = T2.id
+                 LEFT JOIN adm_supplier T4
+                           ON T4.id = T1.supplier_id
+                 LEFT JOIN adm_location T6
+                           ON T1.source_location_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.source_location_store_id  = T7.id
+                 LEFT JOIN adm_organization T8
+                           ON T1.purpose_location_id = T8.id
+                 LEFT JOIN adm_organization T9
+                           ON T1.purpose_location_store_id  = T9.id
+                 LEFT JOIN wor_inventory_item T10
+                           ON T1.item_id = T10.item_id
+                               AND T1.source_location_id = T10.location_id
+                               AND T10.lot_number = T1.lot_number
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_practitioner T11
+                           ON T1.practitioner_id  = T11.id
+                 LEFT JOIN adm_charge_item_definition AS T12
+                           ON T12.instance_id = T10.item_id
+                               AND T12.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T13
+                           ON T13.definition_id = T12.id
+                               AND T13.delete_flag = '0'
+                               AND T13.condition_value = T10.lot_number
+                               AND T13.condition_code = '1'--1:批号进价
+        WHERE  T1.source_location_id = #{locationId}
+           AND T1.status_enum = #{statusEnum}
+           AND T1.type_enum IN
+           <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+               #{item}
+           </foreach>
+           AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+           AND T1.item_table = #{deviceTableName}
+           AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
similarity index 53%
rename from openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
index 3a0e5fc6..a5b022c9 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
@@ -117,6 +117,7 @@
                       ON T13.definition_id = T12.id
                           AND T13.delete_flag = '0'
                           AND T13.condition_value = T10.lot_number
+                          AND T13.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
             AND T1.item_table = #{medicationTableName}
             AND T1.delete_flag = '0'
@@ -184,8 +185,162 @@
                       ON T13.definition_id = T12.id
                           AND T13.delete_flag = '0'
                           AND T13.condition_value = T10.lot_number
+                          AND T13.condition_code = '1'--1:批号进价
         WHERE T1.bus_no = #{busNo}
             AND T1.item_table = #{deviceTableName}
             AND T1.delete_flag = '0'
     </select>
+    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
+        SELECT T1.id,
+               T1.bus_no,--单据号
+               T1.item_id,
+               T1.item_quantity,--数量
+               T1.unit_code AS measurement_unit_code,    -- 物品计量单位
+               T2.unit_code,                             -- 包装单位
+               T2.min_unit_code,                         -- 最小单位
+               T1.detail_json,--请求细节
+               T1.source_type_enum,--源仓库类型
+               #{medicine}  AS item_type,--药品类型
+               T1.apply_time,--申请时间
+               T1.lot_number,--产品批号
+               T1.trace_no,--追溯码
+               T1.invoice_no,--发票号
+               T1.start_time,--开始时间
+               T1.end_time,--结束时间
+               T13.amount AS price,--单价
+               T1.total_price,--总价
+               T2."name" AS item_name,--药品名称
+               T2.part_percent,--拆零比
+               T2."yb_no",--医保编码
+               T3.total_volume,--药品规格
+               T4."name" AS supplier_name,--供应商名称
+               T2.manufacturer_text AS manufacturer, -- 生产厂商
+               T1.practitioner_id,       -- 经办人
+               T5."name" AS practitioner_name,--经办人名称
+               T10.quantity AS total_quantity,  -- 当前库存总数
+               T1.source_location_id,          -- 源仓库ID
+               T1.source_location_store_id,      -- 源仓位ID
+               T1.purpose_location_id,            -- 目的仓库ID
+               T1.purpose_location_store_id,      -- 目的货位ID
+               T6."name"   AS purpose_location_name,        -- 目的仓库
+               T7."name"   AS purpose_location_store_name,  -- 目的仓位
+               T8."name"   AS source_location_name,       -- 源仓库
+               T9."name"   AS source_location_store_name, -- 源仓位
+               T1.occurrence_time,
+               T1.remake                -- 备注
+        FROM wor_supply_request T1
+                 LEFT JOIN med_medication_definition T2
+                           ON T1.item_id = T2.id
+                 LEFT JOIN med_medication T3
+                           ON T3.medication_def_id = T2.id
+                 LEFT JOIN adm_supplier T4
+                           ON T4.id = T1.supplier_id
+                 LEFT JOIN adm_practitioner T5
+                           ON T1.practitioner_id = T5.id
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_store_id  = T7.id
+                 LEFT JOIN adm_organization T8
+                           ON T1.source_location_id = T8.id
+                 LEFT JOIN adm_organization T9
+                           ON T1.source_location_store_id  = T9.id
+                 LEFT JOIN wor_inventory_item T10
+                           ON T1.item_id = T10.item_id
+                               AND T1.purpose_location_id = T10.location_id
+                               AND T10.lot_number = T1.lot_number
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T12
+                           ON T12.instance_id = T10.item_id
+                               AND T12.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T13
+                           ON T13.definition_id = T12.id
+                               AND T13.delete_flag = '0'
+                               AND T13.condition_value = T10.lot_number
+                               AND T13.condition_code = '1'--1:批号进价
+        WHERE  T1.purpose_location_id = #{locationId}
+           AND T1.status_enum = #{statusEnum}
+           AND T1.type_enum IN
+           <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+               #{item}
+           </foreach>
+           AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+           AND T1.item_table = #{medicationTableName}
+           AND T1.delete_flag = '0'
+        UNION
+        SELECT T1.id,
+               T1.bus_no,
+               T1.item_id,
+               T1.item_quantity,
+               T1.unit_code AS measurement_unit_code,    -- 物品计量单位
+               T2.unit_code,                             -- 包装单位
+               T2.min_unit_code,                         -- 最小单位
+               T1.detail_json,
+               T1.source_type_enum,
+               #{device}  AS item_type,      --耗材类型
+               T1.apply_time,
+               T1.lot_number,
+               T1.trace_no,
+               T1.invoice_no,
+               T1.start_time,
+               T1.end_time,
+               T13.amount AS price,--单价
+               T1.total_price,
+               T2."name" AS item_name,--器材名称
+               T2.part_percent,--拆零比
+               T2."yb_no",--医保编码
+               T2."size" AS total_volume,--包装规格
+               T4."name" AS supplier_name,
+               T2.manufacturer_text AS manufacturer, -- 生产厂商
+               T1.practitioner_id,       -- 经办人
+               T5."name" AS practitioner_name,
+               T10.quantity AS total_quantity, -- 当前库存总数
+               T1.source_location_id,          -- 源仓库ID
+               T1.source_location_store_id,      -- 源仓位ID
+               T1.purpose_location_id,            -- 目的仓库ID
+               T1.purpose_location_store_id,      -- 目的货位ID
+               T6."name"   AS source_location_name,        -- 源仓库
+               T7."name"   AS source_location_store_name,  -- 源仓位
+               T8."name"   AS purpose_location_name,       -- 目的仓库
+               T9."name"   AS purpose_location_store_name, -- 目的货位
+              T1.occurrence_time,
+               T1.remake                -- 备注
+        FROM wor_supply_request T1
+                 LEFT JOIN adm_device_definition T2
+                           ON T1.item_id = T2.id
+                 LEFT JOIN adm_supplier T4
+                           ON T4.id = T1.supplier_id
+                 LEFT JOIN adm_practitioner T5
+                           ON T1.practitioner_id = T5.id
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_id = T6.id
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_store_id  = T7.id
+                 LEFT JOIN adm_organization T8
+                           ON T1.source_location_id = T8.id
+                 LEFT JOIN adm_organization T9
+                           ON T1.source_location_store_id  = T9.id
+                 LEFT JOIN wor_inventory_item T10
+                           ON T1.item_id = T10.item_id
+                               AND T1.purpose_location_id = T10.location_id
+                               AND T10.lot_number = T1.lot_number
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_definition AS T12
+                           ON T12.instance_id = T10.item_id
+                               AND T12.delete_flag = '0'
+                 LEFT JOIN adm_charge_item_def_detail AS T13
+                           ON T13.definition_id = T12.id
+                               AND T13.delete_flag = '0'
+                               AND T13.condition_value = T10.lot_number
+                               AND T13.condition_code = '1'--1:批号进价
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.status_enum = #{statusEnum}
+          AND T1.type_enum IN
+          <foreach collection="typeEnum" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.item_table = #{deviceTableName}
+          AND T1.delete_flag = '0'
+    </select>
 </mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
new file mode 100644
index 00000000..3951122d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inventorymanage.mapper.TraceNoAppMapper">
+    <select id="selectDetailsPage" resultType="com.openhis.web.inventorymanage.dto.TraceNoDetailsPageDto">
+        SELECT T4.id,--ID
+               T4.name,--药品名
+               T4.location_id,--药房药库
+               T4.location_name,
+               T4.lot_number,--产品批号
+               T4.trace_no,--追溯码
+               T4.status_enum,--追溯码状态
+               T4.unit_code,--追溯码单位
+               T4.operation_type,--操作类型
+               T4.item_type,--项目类型
+               T4.create_time, --进出时间
+               T4.tenant_id,
+               T4.item_table,
+               T4.item_id
+        FROM (SELECT T1.id,--ID
+                     T2.name,--药品名
+                     T1.location_id,--药房药库
+                     T3.name AS location_name,
+                     T1.lot_number,--产品批号
+                     T1.trace_no,--追溯码
+                     T1.status_enum,--追溯码状态
+                     T1.unit_code,--追溯码单位
+                     T1.operation_type,--操作类型
+                     1       AS item_type,--项目类型
+                     T1.create_time, --进出时间
+                     T1.tenant_id,
+                     T1.item_table,
+                     T1.item_id
+              FROM adm_trace_no_manage AS T1
+                       LEFT JOIN med_medication_definition AS T2
+                                 ON T1.item_id = T2.id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_location AS T3
+                                 ON T1.location_id = T3.id
+                                     AND T3.delete_flag = '0'
+              WHERE T1.item_table = 'med_medication_definition'
+                AND T1.delete_flag = '0'
+              UNION
+              SELECT T1.id,--ID
+                     T2.name,--药品名
+                     T1.location_id,--药房药库
+                     T3.name AS location_name,
+                     T1.lot_number,--产品批号
+                     T1.trace_no,--追溯码
+                     T1.status_enum,--追溯码状态
+                     T1.unit_code,--追溯码单位
+                     T1.operation_type,--操作类型
+                     2       AS item_type,--项目类型
+                     T1.create_time, --进出时间
+                     T1.tenant_id,
+                     T1.item_table,
+                     T1.item_id
+              FROM adm_trace_no_manage AS T1
+                       LEFT JOIN adm_device_definition AS T2
+                                 ON T1.item_id = T2.id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_location AS T3
+                                 ON T1.location_id = T3.id
+                                     AND T3.delete_flag = '0'
+              WHERE T1.item_table = 'adm_device_definition'
+                AND T1.delete_flag = '0') AS T4
+            ${ew.customSqlSegment}
+    </select>
+</mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
new file mode 100644
index 00000000..fc30f093
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper">
+    <select id="getMedicationInfo"
+            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto">
+        SELECT T6.id,--物品id
+               T6.bus_no,--   药品编号
+               T6.name,-- 物品名称
+               T6.py_str,-- 拼音码
+               T6.total_volume,--规格
+               T6.unit_code,-- 包装单位
+               T6.min_unit_code,--最小单位
+               T6.part_percent,--拆零比
+               T6.price,--进货单价
+               T6.retailPrice,--零售价
+               T6.manufacturer_text,-- 厂家/产地
+               T6.approval_number,--批准文号
+               T6.item_min_quantity, --库存最小警戒线
+               T6.specification_inventory,--规格库存
+               T6.batch_inventory,--批次库存
+               T6.lot_number,
+               T6.production_date,--生产日期
+               T6.expiration_date,--失效日期
+               <if test="locationId != null">
+                   T6.location_id,
+               </if>
+               T6.supplier_id,
+               T6.tenant_id
+        FROM (SELECT T1.id,--物品id
+                     T1.bus_no,--   药品编号
+                     T1.name,-- 物品名称
+                     T1.py_str,-- 拼音码
+                     T2.total_volume,--规格
+                     T1.unit_code,-- 包装单位
+                     T1.min_unit_code,--最小单位
+                     T1.part_percent,--拆零比
+                     CASE
+                         WHEN T9.lot_number IS NULL THEN
+                             CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T4.amount * T1.part_percent
+                                 ELSE  T4.amount  END
+                         ELSE CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T10.amount * T1.part_percent
+                                 ELSE  T10.amount  END
+                         END                                                        AS price,--进货单价(大单位)
+                     CASE
+                         WHEN T9.lot_number IS NULL THEN
+                             CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T5.amount * T1.part_percent
+                                 ELSE  T5.amount  END
+                         ELSE CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T11.amount * T1.part_percent
+                                 ELSE  T11.amount  END
+                         END                                                             AS retailPrice,--零售价(大单位)
+                     T1.manufacturer_text,-- 厂家/产地
+                     T1.approval_number,--批准文号
+                     T1.item_min_quantity * T1.part_percent                              AS item_min_quantity, --库存最小警戒线(小单位)
+                     COALESCE(CAST(T8.specification_inventory AS DECIMAL(18, 6)), 0.00) AS specification_inventory,--规格库存(小单位)
+                     COALESCE(CAST(T9.batch_inventory AS DECIMAL(18, 6)), 0.00)         AS batch_inventory,--批次库存(小单位)
+                     T9.lot_number,
+                     T7.production_date,--生产日期
+                     T7.expiration_date,--失效日期
+                     <if test="locationId != null">
+                         T7.location_id,
+                     </if>
+                     T7.supplier_id,
+                     T1.tenant_id
+              FROM med_medication_definition AS T1
+                       LEFT JOIN med_medication AS T2
+                                 ON T1.id = T2.medication_def_id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition T3
+                                 ON T3.instance_id = T1.id
+                                     AND T3.instance_table = 'med_medication_definition'
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T4
+                                 ON T4.definition_id = T3.id
+                                     AND T4.condition_code = '2'--2:采购价
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T5
+                                 ON T5.definition_id = T3.id
+                                     AND T5.condition_code = '3'--2:单位
+                                     AND T5.delete_flag = '0'
+                       LEFT JOIN wor_inventory_item T7
+                                 ON T7.item_table = 'med_medication_definition'
+                                     AND T7.item_id = T1.id
+                                     AND T7.delete_flag = '0'
+                       LEFT JOIN (SELECT i1.item_table,
+                                         i1.item_id,
+                                         <if test="locationId != null">
+                                             i1.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i1.quantity) AS DECIMAL(18, 6)), 0.00) AS specification_inventory
+                                  FROM wor_inventory_item i1
+                                           LEFT JOIN med_medication_definition i2 ON i1.item_id = i2.ID
+                                      AND i2.delete_flag = '0'
+                                  WHERE i1.item_table = 'med_medication_definition'
+                                    AND i1.delete_flag = '0'
+                                  GROUP BY i1.item_table,
+                                           i1.item_id
+                                           <if test="locationId != null">
+                                               ,i1.location_id
+                                           </if>) T8
+                                 ON T8.item_table = 'med_medication_definition'
+                                     AND T8.item_id = T1.ID
+                                     <if test="locationId != null">
+                                         AND T8.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN (SELECT i3.item_table,
+                                         i3.item_id,
+                                         i3.lot_number,
+                                         <if test="locationId != null">
+                                             i3.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i3.quantity) AS DECIMAL(18, 6)), 0.00) AS batch_inventory
+                                  FROM wor_inventory_item i3
+                                           LEFT JOIN med_medication_definition i4 ON i3.item_id = i4.ID
+                                      AND i4.delete_flag = '0'
+                                  WHERE i3.item_table = 'med_medication_definition'
+                                    AND i3.delete_flag = '0'
+                                  GROUP BY i3.item_table,
+                                           i3.item_id,
+                                           i3.lot_number
+                                           <if test="locationId != null">
+                                               ,i3.location_id
+                                           </if>) T9
+                                 ON T9.item_table = 'med_medication_definition'
+                                     AND T9.item_id = T1.ID
+                                     AND T9.lot_number = T7.lot_number
+                                     <if test="locationId != null">
+                                         AND T9.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN adm_charge_item_def_detail T10
+                                 ON T10.definition_id = T3.id
+                                     AND T10.condition_code = '1'--1:批号进价
+                                     AND T10.condition_value = T9.lot_number
+                                     AND T10.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T11
+                                 ON T11.definition_id = T3.id
+                                     AND T11.condition_code = '5'--1:批号售价
+                                     AND T11.condition_value = T9.lot_number
+                                     AND T11.delete_flag = '0'
+              WHERE T1.delete_flag = '0'
+                 <if test="locationId != null">
+                    AND T7.location_id = #{locationId}
+                 </if>
+<!--                 <if test="supplierId != null">-->
+<!--                     AND  T7.supplier_id = #{supplierId}-->
+<!--                 </if>-->
+              GROUP BY T1.id,
+                       T2.total_volume,
+                       T4.condition_value,
+                       T5.condition_value,
+                       T4.amount,
+                       T5.amount,
+                       T10.amount,
+                       T11.amount,
+                       T8.specification_inventory,
+                       T9.batch_inventory,
+                       T9.lot_number,
+                       <if test="locationId != null">
+                          T7.location_id,
+                       </if>
+                       T7.supplier_id,
+                       T7.production_date,
+                       T7.expiration_date
+              <if test="supplierId != null">
+                  HAVING
+                  T8.specification_inventory   <![CDATA[ <= ]]>  (T1.item_min_quantity * T1.part_percent)
+              </if>
+              ORDER BY T1.bus_no) AS T6
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getPage"
+            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto">
+        SELECT T4.tenant_id,
+               T4.supply_bus_no, --单据号
+               T4.type_enum,     --类型
+               T4.status_enum,   --状态
+               T4.supplier_id,   --供应商
+               T4.location_type_enum,  --仓库类型
+               T4.location_id,   --仓库
+               T4.applicant_id,  --开单人
+               T4.applicant_name,  --开单人
+               T4.approver_id,   --审批人
+               T4.apply_time,    -- 制单时间
+               T4.approval_time  --审批时间
+        FROM (SELECT T1.tenant_id,
+                     T1.bus_no              AS supply_bus_no,
+                     T1.type_enum,
+                     T1.status_enum,
+                     T1.supplier_id,
+                     <if test="locationFlg != null">
+                        T1.source_type_enum AS location_type_enum,
+                        T1.source_location_id AS location_id,
+                    </if>
+                    <if test="locationFlg == null">
+                        T1.purpose_type_enum AS location_type_enum,
+                        T1.purpose_location_id AS location_id,
+                    </if>
+                     T1.applicant_id,
+                     T2.name  AS applicant_name,
+                     T1.approver_id,
+                     T1.apply_time,
+                     T1.approval_time
+              FROM wor_supply_request AS T1
+                       LEFT JOIN adm_practitioner AS T2
+                                 ON T2.id = T1.applicant_id
+                                     AND T2.delete_flag = '0'
+              WHERE  T1.delete_flag = '0'
+                     <if test="originalBusNoFlg != null">
+                         and original_bus_no = ''
+                     </if>
+              GROUP BY T1.tenant_id,
+                       T1.bus_no,
+                       T1.type_enum,
+                       T1.status_enum,
+                       T1.supplier_id,
+                       <if test="locationFlg != null">
+                           T1.source_type_enum,
+                           T1.source_location_id,
+                       </if>
+                       <if test="locationFlg == null">
+                           T1.purpose_type_enum,
+                           T1.purpose_location_id,
+                       </if>
+                       T1.applicant_id,
+                       T2.name,
+                       T1.approver_id,
+                       T1.apply_time,
+                       T1.approval_time
+             ) AS T4
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getDetailPage"
+            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
+        SELECT T1.id,                             --ID
+               T1.bus_no,                         --单据号
+               T2.bus_no        AS item_bus_no,   --药品编码
+               T1.item_id,                        --药品id
+               T2.name          AS item_name,     --名称
+               T3.total_volume,                   --规格
+               T1.unit_code,                      --选择单位
+               T2.unit_code     AS max_unit_code, --常规单位
+               T2.min_unit_code AS min_unit_code, --最小单位
+               T2.part_percent,                   --拆零比
+               T1.item_quantity,                  --数量
+               T1.total_quantity,                 --合计数量
+               T1.price,                          --采购单价
+               T1.total_price,                    --采购总价
+               T1.retail_price,                   --零售价
+               T1.total_retail_price,             --零价金额
+               T2.manufacturer_text,              --生产厂商文本
+               T2.approval_number,                --批准文号
+               T1.remake,                         --备注
+               T1.reason,                         --摘要（理由）
+               T1.reason_code,                    --理由类型
+               T1.batch_inventory,                --批次库存
+               T1.specification_inventory,        --规格库存
+               T1.applicant_id,--申请人
+               T1.apply_time,--申请时间
+               T1.approver_id,--审批人
+               T1.approval_time,--审批时间
+               T1.supplier_id,--供应商
+               T4.phone,--供应商联系人
+               T1.status_enum,
+               T1.type_enum,
+               T1.category_enum,--单据类型
+               T1.source_type_enum,             --源仓库类型
+               T1.source_location_id,             --源仓库
+               T1.purpose_type_enum,             --目的仓库类型
+               T1.purpose_location_id,             --目的仓库
+               T1.practitioner_id,--仓库员
+               T1.invoice_no,--发票号
+               T1.lot_number,--产品批号
+               T1.start_time,--开始时间
+               T1.end_time,--结束时间
+               T1.packaging_condition_enum,--包装情况
+               T1.acceptance_result_enum,--验收结果
+               T1.trace_no,--追溯码
+               T1.trace_no_unit_code,--追溯码包装
+               T1.occurrence_time,--禁用日期
+               T1.tenant_id
+        FROM wor_supply_request AS T1
+                 LEFT JOIN med_medication_definition AS T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication AS T3
+                           ON T2.id = T3.medication_def_id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_supplier AS T4
+                           ON T4.id = T1.supplier_id
+                               AND T4.delete_flag = '0'
+        WHERE T1.bus_no = #{busNo}
+          AND T1.delete_flag = '0'
+        GROUP BY T1.id,
+                 T2.bus_no,
+                 T2.name,
+                 T2.unit_code,
+                 T2.min_unit_code,
+                 T3.total_volume,
+                 T2.part_percent,
+                 T2.manufacturer_text,
+                 T2.approval_number,
+                 T4.phone
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
new file mode 100644
index 00000000..6b41b8f9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper">
+    <select id="getInfo"
+            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
+     SELECT  string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,--药品发放id
+             T1.status_enum,--发放状态
+             CASE T3.category_enum
+               WHEN 1 THEN 20
+               WHEN 2 THEN 19 END AS category_enum, --分类
+             T3.medication_id AS item_id,--物品编码
+             T3.unit_code,--物品计量单位
+             T3.quantity AS item_quantity,--数量
+             T3.lot_number,  --产品批号
+             T3.perform_location AS source_location_id,   --源仓库
+             T4.organization_id AS purpose_location_id,--目的仓库
+             T1.practitioner_id AS  approver_id,--审批人
+             T1.dispense_time AS approval_time, --审批时间
+             T1.patient_id AS applicant_id,--申请人
+             T3.req_authored_time AS apply_time  --申请时间
+     FROM med_medication_dispense AS T1
+             INNER JOIN med_medication_request AS T3
+               ON T1.med_req_id = T3.id
+               AND T3.delete_flag = '0'
+             LEFT JOIN med_medication_definition AS T2
+               ON T3.medication_id = T2.id
+               AND T2.delete_flag = '0'
+             LEFT JOIN adm_encounter AS T4
+               ON T3.encounter_id = T4.id
+               AND T4.delete_flag = '0'
+     WHERE T1.id IN
+        <foreach collection="dispenseIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+       AND T1.status_enum = #{dispenseStatus}
+       AND T1.delete_flag = '0'
+     GROUP BY T1.status_enum,
+              T3.category_enum,
+              T3.medication_id,
+              T3.unit_code,
+              T3.quantity,
+              T3.lot_number,
+              T3.perform_location,
+              T4.organization_id,
+              T1.practitioner_id,
+              T1.dispense_time,
+              T1.patient_id,
+              T3.req_authored_time
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
new file mode 100644
index 00000000..d4c61a3a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryProfitLossOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
new file mode 100644
index 00000000..cd557c19
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryRequisitionOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
new file mode 100644
index 00000000..d61a75ea
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryReturnToWarehouseOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
new file mode 100644
index 00000000..b6ae2eae
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStockInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
new file mode 100644
index 00000000..35cc02c1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStocktakingOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
new file mode 100644
index 00000000..314aca69
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
new file mode 100644
index 00000000..40b23892
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferOutOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
new file mode 100644
index 00000000..b5d702c1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper">
+    <select id="getMedicationInfo"
+            resultType="com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto">
+        SELECT T6.id,--物品id
+               T6.bus_no,--   药品编号
+               T6.name,-- 物品名称
+               T6.py_str,-- 拼音码
+               T6.total_volume,--规格
+               T6.unit_code,-- 包装单位
+               T6.min_unit_code,--最小单位
+               T6.part_percent,--拆零比
+               T6.price,--进货单价
+               T6.retailPrice,--零售价
+               T6.manufacturer_text,-- 厂家/产地
+               T6.approval_number,--批准文号
+               T6.item_min_quantity, --库存最小警戒线
+               T6.specification_inventory,--规格库存
+               <if test="locationId != null">
+                   T6.location_id,
+               </if>
+               <if test="supplierId == null">
+                   T6.batch_inventory,--批次库存
+                   T6.lot_number,
+                   T6.production_date,--生产日期
+                   T6.expiration_date,--失效日期
+               </if>
+               T6.supplier_id,
+               T6.tenant_id
+        FROM (SELECT T1.id,--物品id
+                     T1.bus_no,--   药品编号
+                     T1.name,-- 物品名称
+                     T1.py_str,-- 拼音码
+                     T2.total_volume,--规格
+                     T1.unit_code,-- 包装单位
+                     T1.min_unit_code,--最小单位
+                     T1.part_percent,--拆零比
+                     CASE
+                         WHEN T7.supplier_id IS NULL THEN
+                             CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T4.amount * T1.part_percent
+                                 ELSE  T4.amount  END
+                         ELSE CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T10.amount * T1.part_percent
+                                 ELSE  T10.amount  END
+                         END                                                        AS price,--进货单价(大单位)
+                     CASE
+                         WHEN T7.supplier_id IS NULL THEN
+                             CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T5.amount * T1.part_percent
+                                 ELSE  T5.amount  END
+                         ELSE CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T11.amount * T1.part_percent
+                                 ELSE  T11.amount  END
+                         END                                                             AS retailPrice,--零售价(大单位)
+                     T1.manufacturer_text,-- 厂家/产地
+                     T1.approval_number,--批准文号
+                     T1.item_min_quantity * T1.part_percent                              AS item_min_quantity, --库存最小警戒线(小单位)
+                     COALESCE(CAST(T8.specification_inventory AS DECIMAL(18, 6)), 0.00) AS specification_inventory,--规格库存(小单位)
+                     <if test="supplierId == null">
+                         COALESCE(CAST(T9.batch_inventory AS DECIMAL(18, 6)), 0.00)         AS batch_inventory,--批次库存(小单位)
+                         T7.lot_number,
+                         T7.production_date,--生产日期
+                         T7.expiration_date,--失效日期
+                     </if>
+                     <if test="locationId != null">
+                         T7.location_id,
+                     </if>
+                     T7.supplier_id,
+                     T1.tenant_id
+              FROM med_medication_definition AS T1
+                       LEFT JOIN med_medication AS T2
+                                 ON T1.id = T2.medication_def_id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition T3
+                                 ON T3.instance_id = T1.id
+                                     AND T3.instance_table = 'med_medication_definition'
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T4
+                                 ON T4.definition_id = T3.id
+                                     AND T4.condition_code = '2'--2:采购价
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T5
+                                 ON T5.definition_id = T3.id
+                                     AND T5.condition_code = '3'--2:单位
+                                     AND T5.delete_flag = '0'
+                       LEFT JOIN wor_inventory_item T7
+                                 ON T7.item_table = 'med_medication_definition'
+                                     AND T7.item_id = T1.id
+                                     AND T7.delete_flag = '0'
+                       LEFT JOIN (SELECT i1.item_table,
+                                         i1.item_id,
+                                         <if test="locationId != null">
+                                             i1.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i1.quantity) AS DECIMAL(18, 6)), 0.00) AS specification_inventory
+                                  FROM wor_inventory_item i1
+                                           LEFT JOIN med_medication_definition i2 ON i1.item_id = i2.ID
+                                      AND i2.delete_flag = '0'
+                                  WHERE i1.item_table = 'med_medication_definition'
+                                    AND i1.delete_flag = '0'
+                                  GROUP BY i1.item_table,
+                                           i1.item_id
+                                           <if test="locationId != null">
+                                               ,i1.location_id
+                                           </if>) T8
+                                 ON T8.item_table = 'med_medication_definition'
+                                     AND T8.item_id = T1.ID
+                                     <if test="locationId != null">
+                                         AND T8.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN (SELECT i3.item_table,
+                                         i3.item_id,
+                                         i3.lot_number,
+                                         <if test="locationId != null">
+                                             i3.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i3.quantity) AS DECIMAL(18, 6)), 0.00) AS batch_inventory
+                                  FROM wor_inventory_item i3
+                                           LEFT JOIN med_medication_definition i4 ON i3.item_id = i4.ID
+                                      AND i4.delete_flag = '0'
+                                  WHERE i3.item_table = 'med_medication_definition'
+                                    AND i3.delete_flag = '0'
+                                  GROUP BY i3.item_table,
+                                           i3.item_id,
+                                           i3.lot_number
+                                           <if test="locationId != null">
+                                               ,i3.location_id
+                                           </if>) T9
+                                 ON T9.item_table = 'med_medication_definition'
+                                     AND T9.item_id = T1.ID
+                                     AND T9.lot_number = T7.lot_number
+                                     <if test="locationId != null">
+                                         AND T9.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN adm_charge_item_def_detail T10
+                                 ON T10.definition_id = T3.id
+                                     AND T10.condition_code = '1'--1:批号进价
+                                     AND T10.condition_value = T9.lot_number
+                                     AND T10.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T11
+                                 ON T11.definition_id = T3.id
+                                     AND T11.condition_code = '5'--1:批号售价
+                                     AND T11.condition_value = T9.lot_number
+                                     AND T11.delete_flag = '0'
+              WHERE T1.delete_flag = '0'
+                 <if test="locationId != null">
+                    AND T7.location_id = #{locationId}
+                 </if>
+              GROUP BY T1.id,
+                       T2.total_volume,
+                       T4.condition_value,
+                       T5.condition_value,
+                       T4.amount,
+                       T5.amount,
+                       T10.amount,
+                       T11.amount,
+                       T8.specification_inventory,
+                       <if test="locationId != null">
+                          T7.location_id,
+                       </if>
+                       <if test="supplierId == null">
+                           T7.lot_number,
+                           T9.batch_inventory,
+                           T7.production_date,
+                           T7.expiration_date,
+                       </if>
+                       T7.supplier_id
+              <if test="supplierId != null">
+                  HAVING
+                  T8.specification_inventory   <![CDATA[ <= ]]>  (T1.item_min_quantity * T1.part_percent)
+              </if>
+              ORDER BY T1.bus_no) AS T6
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getPage"
+            resultType="com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto">
+        SELECT T4.tenant_id,
+               T4.supply_bus_no, --单据号
+               T4.type_enum,     --类型
+               T4.status_enum,   --状态
+               T4.supplier_id,   --供应商
+               T4.location_type_enum,  --仓库类型
+               T4.location_id,   --仓库
+               T4.applicant_id,  --开单人
+               T4.applicant_name,  --开单人
+               T4.approver_id,   --审批人
+               T4.apply_time,    -- 制单时间
+               T4.approval_time  --审批时间
+        FROM (SELECT T1.tenant_id,
+                     T1.bus_no              AS supply_bus_no,
+                     T1.type_enum,
+                     T1.status_enum,
+                     T1.supplier_id,
+                     <if test="locationFlg != null">
+                         T1.source_type_enum AS location_type_enum,
+                         T1.source_location_id AS location_id,
+                     </if>
+                     <if test="locationFlg == null">
+                         T1.purpose_type_enum AS location_type_enum,
+                         T1.purpose_location_id AS location_id,
+                     </if>
+                     T1.applicant_id,
+                     T2.name  AS applicant_name,
+                     T1.approver_id,
+                     T1.apply_time,
+                     T1.approval_time
+              FROM wor_supply_request AS T1
+                    LEFT JOIN adm_practitioner AS T2
+                          ON T2.id = T1.applicant_id
+                            AND T2.delete_flag = '0'
+              WHERE  T1.delete_flag = '0'
+              <if test="originalBusNoFlg != null">
+                  and original_bus_no = ''
+              </if>
+              GROUP BY T1.tenant_id,
+                       T1.bus_no,
+                       T1.type_enum,
+                       T1.status_enum,
+                       T1.supplier_id,
+                       T1.source_type_enum,
+                       T1.source_location_id,
+                       <if test="locationFlg != null">
+                           T1.source_type_enum,
+                           T1.source_location_id,
+                       </if>
+                       <if test="locationFlg == null">
+                           T1.purpose_type_enum,
+                           T1.purpose_location_id,
+                       </if>
+                       T1.applicant_id,
+                       T2.name,
+                       T1.approver_id,
+                       T1.apply_time,
+                       T1.approval_time
+             ) AS T4
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getDetailPage"
+            resultType="com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto">
+        SELECT T1.id,                             --ID
+               T1.bus_no,                         --单据号
+               T2.bus_no        AS item_bus_no,   --药品编码
+               T1.item_id,                        --药品id
+               T2.name          AS item_name,     --名称
+               T3.total_volume,                   --规格
+               T1.unit_code,                      --选择单位
+               T2.unit_code     AS max_unit_code, --常规单位
+               T2.min_unit_code AS min_unit_code, --最小单位
+               T2.part_percent,                   --拆零比
+               T1.item_quantity,                  --数量
+               T1.total_quantity,                 --合计数量
+               T1.price,                          --采购单价
+               T1.total_price,                    --采购总价
+               T1.retail_price,                   --零售价
+               T1.total_retail_price,             --零价金额
+               T2.manufacturer_text,              --生产厂商文本
+               T2.approval_number,                --批准文号
+               T1.remake,                         --备注
+               T1.reason,                         --摘要（理由）
+               T1.reason_code,                    --理由类型
+               T1.batch_inventory,                --批次库存
+               T1.specification_inventory,        --规格库存
+               T1.applicant_id,--申请人
+               T1.apply_time,--申请时间
+               T1.approver_id,--审批人
+               T1.approval_time,--审批时间
+               T1.supplier_id,--供应商
+               T4.phone,--供应商联系人
+               T1.status_enum,
+               T1.type_enum,
+               T1.category_enum,--单据类型
+               T1.source_type_enum,             --源仓库类型
+               T1.source_location_id,             --源仓库
+               T1.purpose_type_enum,             --目的仓库类型
+               T1.purpose_location_id,             --目的仓库
+               T1.practitioner_id,--仓库员
+               T1.invoice_no,--发票号
+               T1.lot_number,--产品批号
+               T1.start_time,--开始时间
+               T1.end_time,--结束时间
+               T1.packaging_condition_enum,--包装情况
+               T1.acceptance_result_enum,--验收结果
+               T1.trace_no,--追溯码
+               T1.trace_no_unit_code,--追溯码包装
+               T1.occurrence_time,--禁用日期
+               T1.tenant_id
+        FROM wor_supply_request AS T1
+                 LEFT JOIN med_medication_definition AS T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication AS T3
+                           ON T2.id = T3.medication_def_id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_supplier AS T4
+                           ON T4.id = T1.supplier_id
+                               AND T4.delete_flag = '0'
+        WHERE T1.bus_no = #{busNo}
+          AND T1.delete_flag = '0'
+        GROUP BY T1.id,
+                 T2.bus_no,
+                 T2.name,
+                 T2.unit_code,
+                 T2.min_unit_code,
+                 T3.total_volume,
+                 T2.part_percent,
+                 T2.manufacturer_text,
+                 T2.approval_number,
+                 T4.phone
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
new file mode 100644
index 00000000..0a821304
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseDocumentManagementMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
new file mode 100644
index 00000000..44a7c9cb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseProfitLossOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
new file mode 100644
index 00000000..dedae60c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehousePurchaseOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
new file mode 100644
index 00000000..12a089b2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
new file mode 100644
index 00000000..70483531
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnToWarehouseOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
new file mode 100644
index 00000000..ee474a75
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
new file mode 100644
index 00000000..439a417c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockOutOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
new file mode 100644
index 00000000..e47cbac6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStocktakingOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
new file mode 100644
index 00000000..1217860a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper">
+
+    <select id="getHealthcareServicePage" resultType="com.openhis.web.basicservice.dto.HealthcareServiceDto">
+        SELECT T3.id,
+               T3.tenant_id,
+               T3.active_flag,
+               T3.offered_org_id,
+               T3.category_code,
+               T3.type_code,
+               T3.specialty_code,
+               T3.location_id,
+               T3.NAME,
+               T3.COMMENT,
+               T3.extra_details,
+               T3.contact,
+               T3.appointment_required_flag,
+               T3.definition_id,
+               T3.charge_name,
+               T3.price,
+               T3.activity_price
+        FROM (
+                 SELECT T1.ID,
+                        T1.tenant_id,
+                        T1.active_flag,
+                        T1.offered_org_id,
+                        T1.category_code,
+                        T1.type_code,
+                        T1.specialty_code,
+                        T1.location_id,
+                        T1.NAME,
+                        T1.COMMENT,
+                        T1.extra_details,
+                        T1.contact,
+                        T1.appointment_required_flag,
+                        T2.ID                               AS definition_id,
+                        T2.charge_name,
+                        T2.price,
+                        COALESCE(activity_sum.price_sum, 0) AS activity_price
+                 FROM adm_healthcare_service AS T1
+                          LEFT JOIN adm_charge_item_definition AS T2 ON T2.instance_id = T1.ID
+                     AND T2.instance_table = #{tableName}
+                          LEFT JOIN (
+                     SELECT tad.item_no,
+                            SUM(acid.price) AS price_sum
+                     FROM tmp_activity_device AS tad
+                              JOIN adm_charge_item_definition AS acid ON acid.instance_id = tad.dev_act_id
+                         AND acid.delete_flag = '0'
+                     WHERE tad.delete_flag = '0'
+                       AND tad.dev_act_table = #{activityTableName}
+                     GROUP BY tad.item_no
+                 ) AS activity_sum ON activity_sum.item_no = CAST(T1.ID AS TEXT)
+                 WHERE T1.delete_flag = '0'
+                   AND T1.active_flag = 1
+                 ORDER BY T1.create_time DESC
+             ) AS T3
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
new file mode 100644
index 00000000..905c9621
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.chargemanage.mapper.InpatientChargeAppMapper">
+
+    <select id="selectEncounterPatientPage"
+            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPageDto">
+        SELECT T4.encounter_id,
+               T4.encounter_bus_no,
+               T4.patient_id,
+               T4.reception_time,
+               T4.patient_name,
+               T4.patient_bus_no,
+               T4.gender_enum,
+               T4.birth_date,
+               T4.id_card,
+               T4.start_time,
+               T4.patient_py_str,
+               T4.patient_wb_str,
+               T4.status_enum
+        FROM (
+                 SELECT T1.id     AS encounter_id,
+                        T1.bus_no AS encounter_bus_no,
+                        T1.patient_id,
+                        T1.reception_time,
+                        T1.delete_flag,
+                        T1.tenant_id,
+                        T2."name" AS patient_name,
+                        T2.bus_no AS patient_bus_no,
+                        T2.gender_enum,
+                        T2.birth_date,
+                        T1.start_time,
+                        T2.id_card,
+                        T2.py_str AS patient_py_str,
+                        T2.wb_str AS patient_wb_str,
+                        T3.status_enum
+                 FROM adm_encounter AS T1
+                          LEFT JOIN adm_patient AS T2
+                                    ON T1.patient_id = T2.id
+                          INNER JOIN adm_charge_item AS T3
+                                     ON T3.encounter_id = T1.id
+                                         AND T3.delete_flag = '0'
+                 WHERE T1.delete_flag = '0'
+                   AND T1.class_enum = #{classEnum}
+                 GROUP BY T1.id,
+                          T1.bus_no,
+                          T1.patient_id,
+                          T1.reception_time,
+                          T1.delete_flag,
+                          T1.tenant_id,
+                          T2."name",
+                          T2.bus_no,
+                          T2.gender_enum,
+                          T2.birth_date,
+                          T2.id_card,
+                          T2.py_str,
+                          T2.wb_str,
+                          T3.status_enum
+                 ORDER BY T1.bus_no DESC
+             ) AS T4
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectEncounterPatientPrescription"
+            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto">
+        SELECT T1.encounter_id,
+               T1.id,
+               T1.patient_id,
+               T1.context_enum,
+               T1.status_enum,
+               T1.requesting_org_id,
+               T1.quantity_value,
+               T1.quantity_unit,
+               T1.unit_price,
+               T1.total_price,
+               T1.prescription_no,
+               T1.bus_no,
+               T1.entered_date,
+               T1.account_id,
+               T1.service_table,
+               T5.enterer_id,
+               T5.bill_date,
+               T6.contract_no,
+               T7.med_type_code,
+               T8.contract_name,
+               CASE
+                   WHEN T1.context_enum = #{activity} THEN T2."name"
+                   WHEN T1.context_enum = #{medication} THEN T3."name"
+                   WHEN T1.context_enum = #{device} THEN T4."name"
+                   END AS item_name,
+               CASE
+                   WHEN T1.context_enum = #{activity} THEN T2.yb_no
+                   WHEN T1.context_enum = #{medication} THEN T3.yb_no
+                   WHEN T1.context_enum = #{device} THEN T4.yb_no
+                   END AS yb_no,
+               CASE
+                   WHEN T1.context_enum = #{activity} THEN T2.id
+                   WHEN T1.context_enum = #{medication} THEN T3.id
+                   WHEN T1.context_enum = #{device} THEN T4.id
+                   END AS item_id
+        FROM adm_charge_item AS T1
+                 LEFT JOIN wor_activity_definition AS T2
+                           ON T1.context_enum = #{activity}
+                               AND T1.product_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication_definition AS T3
+                           ON T1.context_enum = #{medication}
+                               AND T1.product_id = T3.id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_device_definition AS T4
+                           ON T1.context_enum = #{device}
+                               AND T1.product_id = T4.id
+                               AND T4.delete_flag = '0'
+                 LEFT JOIN fin_payment_reconciliation AS T5
+                           ON T1.id::TEXT = ANY(string_to_array(T5.charge_item_ids, ','))
+                    AND T5.delete_flag = '0'
+                    AND T5.status_enum = 1
+            LEFT JOIN adm_account AS T6
+        ON T1.account_id = T6.id
+            AND T6.delete_flag = '0'
+            LEFT JOIN adm_encounter_diagnosis AS T7
+            ON T1.encounter_id = T7.encounter_id
+            AND T1.condition_id = T7.condition_id
+            AND T7.delete_flag = '0'
+            LEFT JOIN fin_contract AS T8
+            ON T6.contract_no = T8.bus_no
+            AND T8.delete_flag = '0'
+        WHERE T1.encounter_id = #{encounterId}
+          AND T1.status_enum IN (#{planned}
+            , #{billable}
+            , #{billed}
+            , #{refunding}
+            , #{refunded}
+            , #{partRefund})
+          AND T1.context_enum != #{register}
+          AND T1.entered_date &gt;= #{startTime}
+          AND T1.entered_date &lt;= #{endTime}
+          AND T1.delete_flag = '0'
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
similarity index 99%
rename from openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
index 3e732243..01bdff58 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
@@ -73,6 +73,7 @@
                T1.bus_no,
                T1.entered_date,
                T1.account_id,
+               T1.service_table,
                T5.enterer_id,
                T5.bill_date,
                T6.contract_no,
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
similarity index 46%
rename from openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
index 9410db7c..65cef45b 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
@@ -25,14 +25,17 @@
         <result property="quantityUnit" column="quantity_unit"/>
         <result property="unitPrice" column="unit_price"/>
         <result property="totalPrice" column="total_price"/>
+        <result property="requestId" column="request_id"/>
+        <result property="dispenseId" column="dispense_id"/>
+        <result property="serviceTable" column="service_table"/>
 
         <!--支付明细-->
         <collection property="paymentDetailList"
-                    ofType="com.openhis.web.paymentmanage.dto.PaymentDetailDto">
+                    ofType="com.openhis.yb.dto.PaymentDetailDto">
             <!--唯一值，避免相同数据合并-->
             <id column="payment_detail_id"/>
             <result property="payEnum" column="pay_enum"/>
-<!--            <result property="payLevelEnum" column="pay_level_enum"/>-->
+            <!--            <result property="payLevelEnum" column="pay_level_enum"/>-->
             <result property="amount" column="amount"/>
             <result property="returnAmount" column="return_amount"/>
             <result property="chargeAmount" column="charge_amount"/>
@@ -53,50 +56,50 @@
                T2.prescription_no,
                T2.account_id
         FROM fin_payment_reconciliation AS T1
-            LEFT JOIN adm_charge_item AS T2
-                -- 因为T2.id是long型，T1.charge_item_ids是例如 [1,2] 的string类型，所以需要先转类型再匹配
-                ON T2.id::TEXT = ANY(string_to_array(T1.charge_item_ids, ','))
+                 LEFT JOIN adm_charge_item AS T2
+            -- 因为T2.id是long型，T1.charge_item_ids是例如 [1,2] 的string类型，所以需要先转类型再匹配
+                           ON T2.id::TEXT = ANY(string_to_array(T1.charge_item_ids, ','))
                     AND T2.delete_flag = '0'
         WHERE T1.encounter_id =#{encounterId}
-            AND T1.status_enum IN (#{success})
-            AND T1.delete_flag = '0'
+          AND T1.status_enum IN (#{success})
+          AND T1.delete_flag = '0'
     </select>
     <select id="selectRefundItem" resultType="com.openhis.web.chargemanage.dto.RefundItemDto">
         SELECT T1.id AS charge_item_id,
-               T1.service_table,
-               T1.service_id,
-               T2.bus_no,
-               T2.prescription_no,
-               T2.quantity,
-               T2.medication_id AS item_id,
-               T2.unit_code,
-               T1.unit_price,
-               T1.total_price,
-               T3.status_enum AS dispense_status,
-               T3.not_performed_reason_enum AS not_performed_reason,
-               0 AS service_status,
-               T3.id AS dispense_id,
-               T2.id AS request_id,
-               T7.name AS item_name,
-               T10.id AS payment_id,
-               T1.status_enum AS refund_status
+        T1.service_table,
+        T1.service_id,
+        T2.bus_no,
+        T2.prescription_no,
+        T2.quantity,
+        T2.medication_id AS item_id,
+        T2.unit_code,
+        T1.unit_price,
+        T1.total_price,
+        T3.status_enum AS dispense_status,
+        T3.not_performed_reason_enum AS not_performed_reason,
+        0 AS service_status,
+        T3.id AS dispense_id,
+        T2.id AS request_id,
+        T7.name AS item_name,
+        T10.id AS payment_id,
+        T1.status_enum AS refund_status
         FROM adm_charge_item AS T1
-            LEFT JOIN med_medication_request AS T2
-                ON T2.id = T1.service_id
-                    AND T2.delete_flag = '0'
-            LEFT JOIN med_medication_dispense AS T3
-                ON T3.med_req_id = T2.id
-                    AND T3.delete_flag = '0'
-            LEFT JOIN med_medication_definition AS T7
-                ON T1.product_id = T7.id
-                    AND T7.delete_flag = '0'
+        LEFT JOIN med_medication_request AS T2
+        ON T2.id = T1.service_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN med_medication_dispense AS T3
+        ON T3.med_req_id = T2.id
+        AND T3.delete_flag = '0'
+        LEFT JOIN med_medication_definition AS T7
+        ON T1.product_id = T7.id
+        AND T7.delete_flag = '0'
         LEFT JOIN fin_payment_reconciliation AS T10
-            ON T1.id::TEXT = ANY(string_to_array(T10.charge_item_ids, ','))
-                AND T10.delete_flag = '0'
-                AND T10.status_enum = 1
+        ON T1.id::TEXT = ANY(string_to_array(T10.charge_item_ids, ','))
+        AND T10.delete_flag = '0'
+        AND T10.status_enum = 1
         WHERE T1.service_table = #{medMedicationRequest}
-            AND T1.delete_flag = '0'
-            AND T2.refund_medicine_id IS NULL
+        AND T1.delete_flag = '0'
+        AND T2.refund_medicine_id IS NULL
         <if test="chargeItemIdList != null and !chargeItemIdList.isEmpty()">
             AND T1.id IN
             <foreach collection="chargeItemIdList" item="chargeItemId" separator="," open="(" close=")">
@@ -105,40 +108,40 @@
         </if>
         UNION
         SELECT T1.id AS charge_item_id,
-               T1.service_table,
-               T1.service_id,
-               T4.bus_no,
-               T4.prescription_no,
-               T4.quantity,
-               T4.device_def_id AS item_id,
-               T4.unit_code,
-               T1.unit_price,
-               T1.total_price,
-               T5.status_enum AS dispense_status,
-               T5.not_performed_reason_enum AS not_performed_reason,
-               0 AS service_status,
-               T5.id AS dispense_id,
-               T4.id AS request_id,
-               T8.name AS item_name,
-               T10.id AS payment_id,
-               T1.status_enum AS refund_status
+        T1.service_table,
+        T1.service_id,
+        T4.bus_no,
+        T4.prescription_no,
+        T4.quantity,
+        T4.device_def_id AS item_id,
+        T4.unit_code,
+        T1.unit_price,
+        T1.total_price,
+        T5.status_enum AS dispense_status,
+        T5.not_performed_reason_enum AS not_performed_reason,
+        0 AS service_status,
+        T5.id AS dispense_id,
+        T4.id AS request_id,
+        T8.name AS item_name,
+        T10.id AS payment_id,
+        T1.status_enum AS refund_status
         FROM adm_charge_item AS T1
-            LEFT JOIN wor_device_request AS T4
-                ON T4.id = T1.service_id
-                    AND T4.delete_flag = '0'
-            LEFT JOIN wor_device_dispense AS T5
-                ON T5.device_req_id = T4.id
-                    AND T5.delete_flag = '0'
-            LEFT JOIN adm_device_definition AS T8
-                ON T1.product_id = T8.id
-                    AND T8.delete_flag = '0'
-            LEFT JOIN fin_payment_reconciliation AS T10
-                ON T1.id::TEXT = ANY(string_to_array(T10.charge_item_ids, ','))
-                    AND T10.delete_flag = '0'
-                    AND T10.status_enum = 1
+        LEFT JOIN wor_device_request AS T4
+        ON T4.id = T1.service_id
+        AND T4.delete_flag = '0'
+        LEFT JOIN wor_device_dispense AS T5
+        ON T5.device_req_id = T4.id
+        AND T5.delete_flag = '0'
+        LEFT JOIN adm_device_definition AS T8
+        ON T1.product_id = T8.id
+        AND T8.delete_flag = '0'
+        LEFT JOIN fin_payment_reconciliation AS T10
+        ON T1.id::TEXT = ANY(string_to_array(T10.charge_item_ids, ','))
+        AND T10.delete_flag = '0'
+        AND T10.status_enum = 1
         WHERE T1.service_table = #{worDeviceRequest}
-            AND T4.refund_device_id IS NULL
-            AND T1.delete_flag = '0'
+        AND T4.refund_device_id IS NULL
+        AND T1.delete_flag = '0'
         <if test="chargeItemIdList != null and !chargeItemIdList.isEmpty()">
             AND T1.id IN
             <foreach collection="chargeItemIdList" item="chargeItemId" separator="," open="(" close=")">
@@ -147,36 +150,36 @@
         </if>
         UNION
         SELECT T1.id AS charge_item_id,
-               T1.service_table,
-               T1.service_id,
-               T6.bus_no,
-               T6.prescription_no,
-               T6.quantity,
-               T6.activity_id AS item_id,
-               T6.unit_code,
-               T1.unit_price,
-               T1.total_price,
-               0 AS dispense_status,
-               null AS not_performed_reason,
-               T6.status_enum AS service_status,
-               null AS dispense_id,
-               T6.id AS request_id,
-               T9.name AS item_name,
-               T10.id AS payment_id,
-               T1.status_enum AS refund_status
+        T1.service_table,
+        T1.service_id,
+        T6.bus_no,
+        T6.prescription_no,
+        T6.quantity,
+        T6.activity_id AS item_id,
+        T6.unit_code,
+        T1.unit_price,
+        T1.total_price,
+        0 AS dispense_status,
+        null AS not_performed_reason,
+        T6.status_enum AS service_status,
+        null AS dispense_id,
+        T6.id AS request_id,
+        T9.name AS item_name,
+        T10.id AS payment_id,
+        T1.status_enum AS refund_status
         FROM adm_charge_item AS T1
-            LEFT JOIN wor_service_request AS T6
-                ON T6.id = T1.service_id
-                    AND T6.delete_flag = '0'
-            LEFT JOIN wor_activity_definition AS T9
-                ON T1.product_id = T9.id
-                    AND T9.delete_flag = '0'
-            LEFT JOIN fin_payment_reconciliation AS T10
-                ON T1.id::TEXT = ANY(string_to_array(T10.charge_item_ids, ','))
-                    AND T10.delete_flag = '0'
-                    AND T10.status_enum = 1
+        LEFT JOIN wor_service_request AS T6
+        ON T6.id = T1.service_id
+        AND T6.delete_flag = '0'
+        LEFT JOIN wor_activity_definition AS T9
+        ON T1.product_id = T9.id
+        AND T9.delete_flag = '0'
+        LEFT JOIN fin_payment_reconciliation AS T10
+        ON T1.id::TEXT = ANY(string_to_array(T10.charge_item_ids, ','))
+        AND T10.delete_flag = '0'
+        AND T10.status_enum = 1
         WHERE T1.service_table = #{worServiceRequest}
-            AND T1.delete_flag = '0'
+        AND T1.delete_flag = '0'
         <if test="chargeItemIdList != null and !chargeItemIdList.isEmpty()">
             AND T1.id IN
             <foreach collection="chargeItemIdList" item="chargeItemId" separator="," open="(" close=")">
@@ -204,48 +207,49 @@
                T8.insurance_amount,
                T8.self_amount
         FROM (
-                 SELECT T1.id AS encounter_id,
-                        T1.bus_no AS encounter_bus_no,
+                 SELECT T1.id                   AS encounter_id,
+                        T1.bus_no               AS encounter_bus_no,
                         T1.start_time,
                         T1.delete_flag,
                         T1.tenant_id,
                         T3.status_enum,
-                        T2."name" AS patient_name,
-                        T2.bus_no AS patient_bus_no,
+                        T2."name"               AS patient_name,
+                        T2.bus_no               AS patient_bus_no,
                         T2.gender_enum,
                         T2.birth_date,
                         T2.id_card,
-                        T2.py_str AS patient_py_str,
-                        T2.wb_str AS patient_wb_str,
+                        T2.py_str               AS patient_py_str,
+                        T2.wb_str               AS patient_wb_str,
                         T4.type_code,
                         T5.category_enum,
                         SUM(T6.tendered_amount) AS total_amount,
-                        MAX(T6.bill_date) AS max_bill_date,
-                        CASE WHEN T7.account_code = #{insurance} THEN SUM(T7.amount) ELSE 0 END AS insurance_amount,
+                        MAX(T6.bill_date)       AS max_bill_date,
+                        CASE WHEN T7.account_code = #{insurance} THEN SUM(T7.amount) ELSE 0 END  AS insurance_amount,
                         CASE WHEN T7.account_code != #{insurance} THEN SUM(T7.amount) ELSE 0 END AS self_amount
                  FROM adm_encounter AS T1
-                      LEFT JOIN adm_patient AS T2
-                        ON T1.patient_id = T2.id
-                            AND T2.delete_flag = '0'
-                      LEFT JOIN adm_charge_item AS T3
-                        ON T3.encounter_id = T1.id
-                            AND T3.delete_flag = '0'
-                      LEFT JOIN adm_account AS T4
-                        ON T4.id = T3.account_id
-                            AND T4.delete_flag = '0'
-                      LEFT JOIN fin_contract AS T5
-                        ON T5.bus_no = T4.contract_no
-                            AND T5.delete_flag = '0'
-                      LEFT JOIN fin_payment_reconciliation AS T6
-                        ON T6.encounter_id = T1.id
-                            AND T6.status_enum = 1
-                            AND T6.delete_flag = '0'
-                      LEFT JOIN fin_payment_rec_detail AS T7
-                        ON T7.reconciliation_id = T6.id
-                            AND T7.delete_flag = '0'
-                 WHERE T3.status_enum IN (#{billed},#{refunding},#{refunded},#{partRefund})
-                    AND T3.refund_id IS NULL
-                    AND T1.delete_flag = '0'
+                          LEFT JOIN adm_patient AS T2
+                                    ON T1.patient_id = T2.id
+                                        AND T2.delete_flag = '0'
+                          LEFT JOIN adm_charge_item AS T3
+                                    ON T3.encounter_id = T1.id
+                                        AND T3.delete_flag = '0'
+                          LEFT JOIN adm_account AS T4
+                                    ON T4.id = T3.account_id
+                                        AND T4.delete_flag = '0'
+                          LEFT JOIN fin_contract AS T5
+                                    ON T5.bus_no = T4.contract_no
+                                        AND T5.delete_flag = '0'
+                          LEFT JOIN fin_payment_reconciliation AS T6
+                                    ON T6.encounter_id = T1.id
+                                        AND T6.status_enum = 1
+                                        AND T6.delete_flag = '0'
+                          LEFT JOIN fin_payment_rec_detail AS T7
+                                    ON T7.reconciliation_id = T6.id
+                                        AND T7.delete_flag = '0'
+                 WHERE T3.status_enum IN (#{billed}, #{refunding}, #{refunded}, #{partRefund})
+                   AND T3.refund_id IS NULL
+                   AND T1.class_enum = #{amb}
+                   AND T1.delete_flag = '0'
                  GROUP BY T1.id,
                           T1.bus_no,
                           T1.start_time,
@@ -264,184 +268,208 @@
                           T7.account_code
              ) AS T8
             ${ew.customSqlSegment}
-            ORDER BY T8.max_bill_date DESC
+        ORDER BY T8.max_bill_date DESC
     </select>
     <select id="selectEncounterPatientRefund" resultMap="encounterPatientRefundMap">
-        SELECT aci.encounter_id ,
-               aci.bus_no ,
+        SELECT aci.encounter_id,
+               aci.bus_no,
                aci.status_enum AS charge_status,
-               aci.quantity_unit ,
-               aci.quantity_value ,
-               aci.unit_price ,
-               aci.total_price ,
-               mmr.prescription_no ,
+               aci.quantity_unit,
+               aci.quantity_value,
+               aci.unit_price,
+               aci.total_price,
+               aci.service_table,
+               mmr.prescription_no,
+               mmr.id          AS request_id,
                dis.status_enum AS dispense_status,
-               0 AS service_status,
-               dis.dispense_quantity ,
-               mmd."name" AS item_name,
-               fpr.id AS payment_id,
+               0               AS service_status,
+               dis.dispense_quantity,
+               dis.id          AS dispense_id,
+               mmd."name"      AS item_name,
+               fpr.id          AS payment_id,
                fpr.enterer_id,
                fpr.patient_id,
                fpr.status_enum AS payment_status,
                fpr.contract_no,
                fpr.bill_date,
                fpr.charge_item_ids,
-               fprd.id AS payment_detail_id,
+               fprd.id         AS payment_detail_id,
                fprd.target_enum,
                fprd.account_id,
                fprd.account_code,
                fprd.pay_enum,
                fprd.pay_level_enum,
-               fprd.amount ,
+               fprd.amount,
                fprd.return_amount,
                fprd.charge_amount,
-               ao."name" AS org_name,
-               ap."name" AS enterer_name
+               ao."name"       AS org_name,
+               ap."name"       AS enterer_name
         FROM adm_charge_item aci
-            LEFT JOIN med_medication_request mmr
-                ON aci.service_id = mmr.refund_medicine_id
-                    AND mmr.refund_medicine_id IS NOT NULL
-                    AND mmr.delete_flag = '0'
-            LEFT JOIN med_medication_dispense dis
-                ON mmr.id = dis.med_req_id
-                    AND dis.delete_flag = '0'
-            INNER JOIN med_medication_definition mmd
-                ON aci.product_id = mmd.id
-                    AND mmd.delete_flag = '0'
-            LEFT JOIN fin_payment_reconciliation fpr
-                ON aci.id::TEXT = ANY(string_to_array(fpr.charge_item_ids, ','))
+                 LEFT JOIN med_medication_request mmr
+                           ON aci.service_id = mmr.refund_medicine_id
+                               AND mmr.refund_medicine_id IS NOT NULL
+                               AND mmr.delete_flag = '0'
+                 LEFT JOIN med_medication_dispense dis
+                           ON mmr.id = dis.med_req_id
+                               AND dis.delete_flag = '0'
+                 INNER JOIN med_medication_definition mmd
+                            ON aci.product_id = mmd.id
+                                AND mmd.delete_flag = '0'
+                 LEFT JOIN fin_payment_reconciliation fpr
+                           ON aci.id::TEXT = ANY(string_to_array(fpr.charge_item_ids, ','))
                     AND fpr.status_enum = 1
                     AND fpr.delete_flag = '0'
             LEFT JOIN fin_payment_rec_detail fprd
-                ON fpr.id = fprd.reconciliation_id
-                    AND fprd.delete_flag = '0'
+        ON fpr.id = fprd.reconciliation_id
+            AND fprd.delete_flag = '0'
             LEFT JOIN adm_organization ao
-                ON ao.id = aci.org_id
-                    AND ao.delete_flag = '0'
+            ON ao.id = aci.org_id
+            AND ao.delete_flag = '0'
             LEFT JOIN adm_practitioner ap
-                ON ap.id = fpr.enterer_id
-                    AND ap.delete_flag = '0'
+            ON ap.id = fpr.enterer_id
+            AND ap.delete_flag = '0'
         WHERE aci.encounter_id = #{encounterId}
-          AND aci.status_enum IN (#{partRefund},#{refunded},#{refunding})
+          AND aci.status_enum IN (#{partRefund}
+            , #{refunded}
+            , #{refunding})
           AND aci.service_table = #{medMedicationRequest}
           AND aci.refund_id IS NULL
           AND aci.delete_flag = '0'
+          AND TO_CHAR(fpr.bill_date
+            , 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{billDateSTime}
+          AND #{billDateETime}
         UNION
-        SELECT aci.encounter_id ,
-               aci.bus_no ,
+        SELECT aci.encounter_id,
+               aci.bus_no,
                aci.status_enum AS charge_status,
-               aci.quantity_unit ,
-               aci.quantity_value ,
-               aci.unit_price ,
-               aci.total_price ,
-               wdr.prescription_no ,
+               aci.quantity_unit,
+               aci.quantity_value,
+               aci.unit_price,
+               aci.total_price,
+               aci.service_table,
+               wdr.prescription_no,
+               wdr.id          AS request_id,
                wdd.status_enum AS dispense_status,
-               0 AS service_status,
-               wdd.dispense_quantity ,
-               dev."name" AS item_name,
-               fpr.id AS payment_id,
+               0               AS service_status,
+               wdd.dispense_quantity,
+               wdd.id          AS dispense_id,
+               dev."name"      AS item_name,
+               fpr.id          AS payment_id,
                fpr.enterer_id,
                fpr.patient_id,
                fpr.status_enum AS payment_status,
                fpr.contract_no,
                fpr.bill_date,
                fpr.charge_item_ids,
-               fprd.id AS payment_detail_id,
+               fprd.id         AS payment_detail_id,
                fprd.target_enum,
                fprd.account_id,
                fprd.account_code,
                fprd.pay_enum,
                fprd.pay_level_enum,
-               fprd.amount ,
+               fprd.amount,
                fprd.return_amount,
                fprd.charge_amount,
-               ao."name" AS org_name,
-               ap."name" AS enterer_name
+               ao."name"       AS org_name,
+               ap."name"       AS enterer_name
         FROM adm_charge_item aci
-            LEFT JOIN wor_device_request wdr
-                ON aci.service_id = wdr.refund_device_id
-                    AND wdr.refund_device_id IS NOT NULL
-                    AND wdr.delete_flag = '0'
-            LEFT JOIN wor_device_dispense wdd
-                ON wdr.id = wdd.device_req_id
-                    AND wdd.delete_flag = '0'
-            INNER JOIN adm_device_definition dev
-                ON aci.product_id = dev.id
-                    AND dev.delete_flag = '0'
-            LEFT JOIN fin_payment_reconciliation fpr
-                ON aci.id::TEXT = ANY(string_to_array(fpr.charge_item_ids, ','))
+                 LEFT JOIN wor_device_request wdr
+                           ON aci.service_id = wdr.refund_device_id
+                               AND wdr.refund_device_id IS NOT NULL
+                               AND wdr.delete_flag = '0'
+                 LEFT JOIN wor_device_dispense wdd
+                           ON wdr.id = wdd.device_req_id
+                               AND wdd.delete_flag = '0'
+                 INNER JOIN adm_device_definition dev
+                            ON aci.product_id = dev.id
+                                AND dev.delete_flag = '0'
+                 LEFT JOIN fin_payment_reconciliation fpr
+                           ON aci.id::TEXT = ANY(string_to_array(fpr.charge_item_ids, ','))
                     AND fpr.status_enum = 1
                     AND fpr.delete_flag = '0'
             LEFT JOIN fin_payment_rec_detail fprd
-                ON fpr.id = fprd.reconciliation_id
+        ON fpr.id = fprd.reconciliation_id
             AND fprd.delete_flag = '0'
             LEFT JOIN adm_organization ao
-                ON ao.id = aci.org_id
+            ON ao.id = aci.org_id
             AND ao.delete_flag = '0'
             LEFT JOIN adm_practitioner ap
-                ON ap.id = fpr.enterer_id
+            ON ap.id = fpr.enterer_id
             AND ap.delete_flag = '0'
         WHERE aci.encounter_id = #{encounterId}
-          AND aci.status_enum IN (#{partRefund},#{refunded},#{refunding})
+          AND aci.status_enum IN (#{partRefund}
+            , #{refunded}
+            , #{refunding})
           AND aci.service_table = #{worDeviceRequest}
           AND aci.refund_id IS NULL
           AND aci.delete_flag = '0'
+          AND TO_CHAR(fpr.bill_date
+            , 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{billDateSTime}
+          AND #{billDateETime}
         UNION
-        SELECT aci.encounter_id ,
-               aci.bus_no ,
+        SELECT aci.encounter_id,
+               aci.bus_no,
                aci.status_enum AS charge_status,
-               aci.quantity_unit ,
-               aci.quantity_value ,
-               aci.unit_price ,
-               aci.total_price ,
-               wsr.prescription_no ,
-               0 AS dispense_status,
+               aci.quantity_unit,
+               aci.quantity_value,
+               aci.unit_price,
+               aci.total_price,
+               aci.service_table,
+               wsr.prescription_no,
+               wsr.id          AS request_id,
+               0               AS dispense_status,
                wsr.status_enum AS service_status,
-               0 AS dispense_quantity,
-               wad."name" AS item_name,
-               fpr.id AS payment_id,
+               0               AS dispense_quantity,
+               null            AS dispense_id,
+               wad."name"      AS item_name,
+               fpr.id          AS payment_id,
                fpr.enterer_id,
                fpr.patient_id,
                fpr.status_enum AS payment_status,
                fpr.contract_no,
                fpr.bill_date,
                fpr.charge_item_ids,
-               fprd.id AS payment_detail_id,
+               fprd.id         AS payment_detail_id,
                fprd.target_enum,
                fprd.account_id,
                fprd.account_code,
                fprd.pay_enum,
                fprd.pay_level_enum,
-               fprd.amount ,
+               fprd.amount,
                fprd.return_amount,
                fprd.charge_amount,
-               ao."name" AS org_name,
-               ap."name" AS enterer_name
+               ao."name"       AS org_name,
+               ap."name"       AS enterer_name
         FROM adm_charge_item aci
-            LEFT JOIN wor_service_request wsr
-                ON aci.service_id = wsr.id
-                    AND wsr.refund_service_id IS NOT NULL
-                    AND wsr.delete_flag = '0'
-            INNER JOIN wor_activity_definition wad
-                ON aci.product_id = wad.id
-                    AND wad.delete_flag = '0'
-            LEFT JOIN fin_payment_reconciliation fpr
-                ON aci.id::TEXT = ANY(string_to_array(fpr.charge_item_ids,','))
+                 LEFT JOIN wor_service_request wsr
+                           ON aci.service_id = wsr.id
+                               AND wsr.refund_service_id IS NOT NULL
+                               AND wsr.delete_flag = '0'
+                 INNER JOIN wor_activity_definition wad
+                            ON aci.product_id = wad.id
+                                AND wad.delete_flag = '0'
+                 LEFT JOIN fin_payment_reconciliation fpr
+                           ON aci.id::TEXT = ANY(string_to_array(fpr.charge_item_ids,','))
                     AND fpr.status_enum = 1
                     AND fpr.delete_flag = '0'
             LEFT JOIN fin_payment_rec_detail fprd
-                ON fpr.id = fprd.reconciliation_id
+        ON fpr.id = fprd.reconciliation_id
             AND fprd.delete_flag = '0'
             LEFT JOIN adm_organization ao
-                ON ao.id = aci.org_id
+            ON ao.id = aci.org_id
             AND ao.delete_flag = '0'
             LEFT JOIN adm_practitioner ap
-                ON ap.id = fpr.enterer_id
+            ON ap.id = fpr.enterer_id
             AND ap.delete_flag = '0'
         WHERE aci.encounter_id = #{encounterId}
-          AND aci.status_enum IN (#{partRefund},#{refunded},#{refunding})
+          AND aci.status_enum IN (#{partRefund}
+            , #{refunded}
+            , #{refunding})
           AND aci.service_table = #{worServiceRequest}
           AND aci.refund_id IS NULL
           AND aci.delete_flag = '0'
+          AND TO_CHAR(fpr.bill_date
+            , 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{billDateSTime}
+          AND #{billDateETime}
     </select>
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
new file mode 100644
index 00000000..7c0eea26
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.common.mapper.CommonAppMapper">
+
+    <select id="selectInventoryItemList" resultType="com.openhis.web.common.dto.InventoryItemDto">
+        SELECT ii.tenant_id,
+        ii.item_type,
+        ii.category_code,
+        ii.part_percent,
+        ii.definition_id,
+        ii.name,
+        ii.item_bus_no,
+        ii.py_str,
+        ii.wb_str,
+        ii.yb_no,
+        ii.product_name,
+        ii.unit_code,
+        ii.min_unit_code,
+        ii.manufacturer,
+        ii.volume,
+        ii.supplier,
+        ii.item_table_name,
+        ii.lot_number,
+        ii.org_location_id,
+        ii.purchase_amount
+        FROM ( SELECT T1.tenant_id,
+        #{medicine} AS item_type,
+        T1.category_code AS category_code,
+        T1.part_percent AS part_percent,
+        T1.id AS definition_id,
+        T1."name" AS "name",
+        T1.bus_no AS item_bus_no,
+        T1.py_str AS py_str,
+        T1.wb_str AS wb_str,
+        T1.yb_no AS yb_no,
+        T1.merchandise_name AS product_name,
+        T1.unit_code AS unit_code,
+        T1.min_unit_code AS min_unit_code,
+        T1.manufacturer_text AS manufacturer,
+        T2.total_volume AS volume,
+        T3."name" AS supplier,
+        <choose>
+            <when test="purchaseFlag != 1">
+                T7.item_table AS item_table_name,
+                T7.lot_number,
+                T7.location_id AS org_location_id,
+                NULL AS purchase_amount
+            </when>
+            <otherwise>
+                NULL AS item_table_name,
+                NULL AS lot_number,
+                NULL AS org_location_id,
+                T9.amount AS purchase_amount
+            </otherwise>
+        </choose>
+        FROM med_medication_definition AS T1
+        LEFT JOIN med_medication AS T2
+        ON T2.medication_def_id = T1.ID
+        AND T2.delete_flag = '0'
+        LEFT JOIN adm_supplier AS T3
+        ON T3.ID = T1.supply_id
+        AND T3.delete_flag = '0'
+        <if test="purchaseFlag != 1">
+            LEFT JOIN wor_inventory_item AS T7
+            ON T7.item_id = T1.id
+            AND T7.delete_flag = '0'
+        </if>
+        <if test="purchaseFlag != 0">
+            LEFT JOIN adm_charge_item_definition AS T8
+            ON T8.instance_id = T1.id
+            AND T8.delete_flag = '0'
+            LEFT JOIN adm_charge_item_def_detail AS T9
+            ON T9.definition_id = T8.id
+            AND T9.delete_flag = '0'
+        </if>
+        WHERE T1.delete_flag = '0'
+        AND T2.status_enum != #{retired}
+        <if test="purchaseFlag != 1">
+            AND T7.item_id IS NOT NULL -- 确保连接有效性
+            AND T7.item_table = #{medicationTableName}
+        </if>
+        <if test="purchaseFlag != 0">
+            AND T9.condition_code = #{purchase}
+        </if>
+        UNION ALL
+        SELECT T1.tenant_id,
+        #{device} AS item_type,
+        T1.category_code AS category_code,
+        T1.part_percent AS part_percent,
+        T1.id AS definition_id,
+        T1."name" AS "name",
+        T1.bus_no AS item_bus_no,
+        T1.py_str AS py_str,
+        T1.wb_str AS wb_str,
+        T1.yb_no AS yb_no,
+        '' AS product_name,
+        T1.unit_code AS unit_code,
+        T1.min_unit_code AS min_unit_code,
+        T1.manufacturer_text AS manufacturer,
+        T1."size" AS volume,
+        T2."name" AS supplier,
+        <choose>
+            <when test="purchaseFlag != 1">
+                T7.item_table AS item_table_name,
+                T7.lot_number,
+                T7.location_id AS org_location_id,
+                NULL AS purchase_amount
+            </when>
+            <otherwise>
+                NULL AS item_table_name,
+                NULL AS lot_number,
+                NULL AS org_location_id,
+                T9.amount AS purchase_amount
+            </otherwise>
+        </choose>
+        FROM adm_device_definition AS T1
+        LEFT JOIN adm_supplier AS T2
+        ON T2.ID = T1.supply_id
+        AND T2.delete_flag = '0'
+        <if test="purchaseFlag != 1">
+            LEFT JOIN wor_inventory_item AS T7
+            ON T7.item_id = T1.id
+            AND T7.delete_flag = '0'
+        </if>
+        <if test="purchaseFlag != 0">
+            LEFT JOIN adm_charge_item_definition AS T8
+            ON T8.instance_id = T1.id
+            AND T8.delete_flag = '0'
+            LEFT JOIN adm_charge_item_def_detail AS T9
+            ON T9.definition_id = T8.id
+            AND T9.delete_flag = '0'
+        </if>
+        WHERE T1.delete_flag = '0'
+        AND T1.status_enum != #{retired}
+        <if test="purchaseFlag != 1">
+            AND T7.item_id IS NOT NULL -- 确保连接有效性
+            AND T7.item_table = #{deviceTableName}
+        </if>
+        <if test="purchaseFlag != 0">
+            AND T9.condition_code = #{purchase}
+        </if>
+        ) AS ii
+        ${ew.customSqlSegment}
+    </select>
+    <select id="selectInventoryItemInfo" resultType="com.openhis.web.common.dto.LocationInventoryDto">
+        SELECT T1.item_id,
+        T1.item_table,
+        SUM(CASE WHEN T1.location_id = #{objLocationId} THEN T1.quantity ELSE 0 END) AS obj_quantity,
+        SUM(CASE WHEN T1.location_id = #{orgLocationId} THEN T1.quantity ELSE 0 END) AS org_quantity,
+        T1.unit_code,
+        T1.production_date,
+        T1.lot_number,
+        T1.expiration_date,
+        MAX(T2."name") AS location_name,
+        MAX(T3."name") AS location_store_name,
+        T5.amount AS price,
+        T1.supplier_id,
+        CASE WHEN T1.item_table = #{medicationTableName}
+        THEN ( SELECT T7.yb_no
+        FROM med_medication_definition AS T7
+        WHERE T1.item_id = T7.id
+        AND T7.delete_flag = '0')
+        WHEN T1.item_table = #{deviceTableName}
+        THEN ( SELECT T8.yb_no
+        FROM adm_device_definition AS T8
+        WHERE T1.item_id = T8.id
+        AND T8.delete_flag = '0'
+        ) ELSE null END AS yb_no, --医保编码
+        CASE WHEN T1.item_table = #{medicationTableName}
+        THEN ( SELECT T7.manufacturer_text
+        FROM med_medication_definition AS T7
+        WHERE T1.item_id = T7.id
+        AND T7.delete_flag = '0')
+        WHEN T1.item_table = #{deviceTableName}
+        THEN ( SELECT T8.manufacturer_text
+        FROM adm_device_definition AS T8
+        WHERE T1.item_id = T8.id
+        AND T8.delete_flag = '0')
+        ELSE null END AS manufacturer,--生产厂家
+        T6.name AS supplier_name
+        FROM wor_inventory_item AS T1
+        LEFT JOIN adm_location AS T2
+        ON T2.id = T1.location_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN adm_location AS T3
+        ON T3.id = T1.location_store_id
+        AND T3.delete_flag = '0'
+        LEFT JOIN adm_charge_item_definition AS T4
+        ON T4.instance_id = T1.item_id
+        AND T4.delete_flag = '0'
+        -- 使用子查询确保T5唯一记录 --
+        LEFT JOIN (
+        SELECT * FROM (
+        SELECT definition_id,
+        amount,
+        ROW_NUMBER() OVER (PARTITION BY definition_id ORDER BY id DESC ) AS rn -- 按ID取最新记录，按需调整排序
+        FROM adm_charge_item_def_detail
+        WHERE delete_flag = '0'
+        AND condition_code = '1'--1:批号进价
+        ) AS t
+        WHERE rn = 1 -- 确保每个分组只取一条记录
+        ) AS T5 ON T5.definition_id = T4.id
+        LEFT JOIN adm_supplier AS T6
+        ON T6.id = T1.supplier_id
+        AND T6.delete_flag = '0'
+        WHERE T1.item_id = #{itemId}
+        AND T1.inventory_status_enum != 3
+        AND T1.delete_flag = '0'
+        <choose>
+            <when test="lotNumber != null">
+                AND T1.lot_number = #{lotNumber}
+            </when>
+        </choose>
+        <choose>
+            <when test="objLocationId != null and objLocationId != ''">
+                AND T1.location_id IN (#{orgLocationId}, #{objLocationId})
+            </when>
+            <otherwise>
+                AND T1.location_id = #{orgLocationId}
+            </otherwise>
+        </choose>
+        GROUP BY T1.item_id,
+        T1.item_table,
+        T1.unit_code,
+        T1.production_date,
+        T1.expiration_date,
+        T1.lot_number,
+        T5.amount,
+        T1.supplier_id,
+        T6.name
+        ORDER BY T1.lot_number DESC
+    </select>
+
+    <select id="getInfoByTraceNo" resultType="com.openhis.administration.domain.TraceNoManage">
+        SELECT id,
+               item_table,
+               item_id,
+               location_type_enum,
+               location_id,
+               location_store_id,
+               lot_number,
+               trace_no,
+               status_enum,
+               unit_code,
+               operation_type,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               tenant_id,
+               delete_flag
+        FROM adm_trace_no_manage
+        WHERE trace_no like #{traceNo}
+          AND (trace_no) IN (
+            SELECT trace_no
+            FROM adm_trace_no_manage
+            WHERE trace_no like #{traceNo}
+              AND delete_flag = '0'
+            GROUP BY trace_no
+            HAVING SUM(CASE WHEN status_enum = 1 THEN 1 ELSE 0 END) > -- 进库次数
+                   SUM(CASE WHEN status_enum = 2 THEN 1 ELSE 0 END) -- 出库次数
+        )
+          AND delete_flag = '0'
+        ORDER BY create_time DESC LIMIT 1
+    </select>
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
similarity index 97%
rename from openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
index 17310bfa..c6cd4b42 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
@@ -24,6 +24,7 @@
         T3.approval_number,
         T3.yb_flag,
         T3.yb_no,
+        T3.yb_org_no,
         T3.yb_match_flag,
         T3.status_enum,
         T3.manufacturer_id,
@@ -64,6 +65,7 @@
             T1.approval_number,
             T1.yb_flag,
             T1.yb_no,
+            T1.yb_org_no,
             T1.yb_match_flag,
             T1.status_enum,
             T1.manufacturer_id,
@@ -127,6 +129,7 @@
         T1.approval_number,
         T1.yb_flag,
         T1.yb_no,
+        T1.yb_org_no,
         T1.yb_match_flag,
         T1.status_enum,
         T1.manufacturer_id,
@@ -140,6 +143,8 @@
         T1.tenant_id,
         T1.rx_flag,--处方标志
         T1.chrgitm_lv,--医保等级
+        T1.item_min_quantity,
+        T1.item_max_quantity,
         T2.type_code as item_type_code,
         T2.yb_type,
         T2.price as retail_price,--零售价,
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
similarity index 88%
rename from openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
index 10f5b072..88142847 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.datadictionary.mapper.MedicationManageSearchMapper">
-     <!-- 药品信息分页查询-->
+    <!-- 药品信息分页查询-->
     <select id="getPage" parameterType="java.util.Map"
             resultType="com.openhis.web.datadictionary.dto.MedicationManageDto">
-    SELECT
+        SELECT
         T6.id,
         T6.medication_def_id,
         T6.status_enum,
@@ -149,26 +149,27 @@
         T5.price as retail_price,--零售价
         (SELECT T7.amount
         FROM adm_charge_item_definition T5
-        LEFT JOIN  adm_charge_item_def_detail T7 ON  T7.definition_id = T5.id
-        WHERE   T7.condition_code = '2'--2:采购价
+        LEFT JOIN adm_charge_item_def_detail T7 ON T7.definition_id = T5.id
+        WHERE T7.condition_code = '2'--2:采购价
         AND T5.instance_id = T2.medication_def_id
         AND T5.instance_table = 'med_medication_definition'
         ) as purchase_price,--购入价
         (
         SELECT T7.amount
         FROM adm_charge_item_definition T5
-        LEFT JOIN  adm_charge_item_def_detail T7 ON  T7.definition_id = T5.id
-        WHERE   T7.condition_code = '4'--4:限制
+        LEFT JOIN adm_charge_item_def_detail T7 ON T7.definition_id = T5.id
+        WHERE T7.condition_code = '4'--4:限制
         AND T5.instance_id = T2.medication_def_id
         AND T5.instance_table = 'med_medication_definition'
         ) as maximum_retail_price--最高零售价
         FROM med_medication_definition T1
         LEFT JOIN med_medication T2 ON T1.id = T2.medication_def_id AND T2.delete_flag = '0'
-        LEFT JOIN adm_charge_item_definition T5 ON  T2.medication_def_id = T5.instance_id
+        LEFT JOIN adm_charge_item_definition T5 ON T2.medication_def_id = T5.instance_id
         <where>
             T1.delete_flag = '0'
             AND T5.instance_table = 'med_medication_definition'
         </where>
+        order by T2.status_enum ASC , T1.bus_no DESC
         ) AS T6
         ${ew.customSqlSegment}
     </select>
@@ -238,27 +239,29 @@
         T1.unit_conversion_ratio,--剂量单位换算比
         T1.chrgitm_lv,--医保等级
         T1.rx_flag,--处方标志
+        T1.item_min_quantity,--最小库存警戒数量(常规单位)
+        T1.item_max_quantity,--最大库存警戒数量(常规单位)
         T3.type_code,
         T3.yb_type,
         T3.price as retail_price,--零售价
-         (SELECT T4.amount
-            FROM adm_charge_item_definition T3
-            LEFT JOIN  adm_charge_item_def_detail T4 ON  T4.definition_id = T3.id
-            WHERE   T4.condition_code = '2'--2:采购价
-            AND T3.instance_id = T2.medication_def_id
-            AND T3.instance_table = 'med_medication_definition'
+        (SELECT T4.amount
+        FROM adm_charge_item_definition T3
+        LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id
+        WHERE T4.condition_code = '2'--2:采购价
+        AND T3.instance_id = T2.medication_def_id
+        AND T3.instance_table = 'med_medication_definition'
         ) as purchase_price,--购入价
         (
         SELECT T4.amount
         FROM adm_charge_item_definition T3
-        LEFT JOIN  adm_charge_item_def_detail T4 ON  T4.definition_id = T3.id
-        WHERE   T4.condition_code = '4'--4:限制
+        LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id
+        WHERE T4.condition_code = '4'--4:限制
         AND T3.instance_id = T2.medication_def_id
         AND T3.instance_table = 'med_medication_definition'
         ) as maximum_retail_price--最高零售价
         FROM med_medication_definition T1
         LEFT JOIN med_medication T2 on T1.id = T2.medication_def_id
-        LEFT JOIN adm_charge_item_definition T3 ON  T2.medication_def_id = T3.instance_id
+        LEFT JOIN adm_charge_item_definition T3 ON T2.medication_def_id = T3.instance_id
         <where>
             T1.delete_flag = '0'
             <if test="id!= null">
@@ -316,7 +319,9 @@
         T1.restricted_flag,
         T1.restricted_scope,
         T1.children_flag,
-        T1.characteristic
+        T1.characteristic,
+        T1.item_min_quantity,--最小库存警戒数量(常规单位)
+        T1.item_max_quantity--最大库存警戒数量(常规单位)
         FROM med_medication_definition T1
         LEFT JOIN med_medication T2 on T1.id = T2.medication_def_id
         <where>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
new file mode 100644
index 00000000..c6c43e63
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper">
+    <select id="getDeviceInfo"
+            resultType="com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto">
+        SELECT T6.id,--物品id
+               T6.bus_no,--   药品编号
+               T6.name,-- 物品名称
+               T6.py_str,-- 拼音码
+               T6.total_volume,--规格
+               T6.unit_code,-- 包装单位
+               T6.min_unit_code,--最小单位
+               T6.part_percent,--拆零比
+               T6.price,--进货单价
+               T6.retailPrice,--零售价
+               T6.manufacturer_text,-- 厂家/产地
+               T6.approval_number,--批准文号
+               T6.item_min_quantity, --库存最小警戒线
+               T6.specification_inventory,--规格库存
+               T6.batch_inventory,--批次库存
+               T6.lot_number,
+               T6.production_date,--生产日期
+               T6.expiration_date,--失效日期
+               <if test="locationId != null">
+                   T6.location_id,
+               </if>
+               T6.supplier_id,
+               T6.tenant_id
+        FROM (SELECT T1.id,--物品id
+                     T1.bus_no,--   药品编号
+                     T1.name,-- 物品名称
+                     T1.py_str,-- 拼音码
+                     T1.size AS total_volume,--规格
+                     T1.unit_code,-- 包装单位
+                     T1.min_unit_code,--最小单位
+                     T1.part_percent,--拆零比
+                     CASE
+                         WHEN T9.lot_number IS NULL THEN
+                             CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T4.amount * T1.part_percent
+                                 ELSE  T4.amount  END
+                         ELSE CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T10.amount * T1.part_percent
+                                 ELSE  T10.amount  END
+                         END                                                        AS price,--进货单价(大单位)
+                     CASE
+                         WHEN T9.lot_number IS NULL THEN
+                             CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T5.amount * T1.part_percent
+                                 ELSE  T5.amount  END
+                         ELSE CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T11.amount * T1.part_percent
+                                 ELSE  T11.amount  END
+                         END                                                             AS retailPrice,--零售价(大单位)
+                     T1.manufacturer_text,-- 厂家/产地
+                     T1.approval_number,--批准文号
+                     T1.item_min_quantity * T1.part_percent                              AS item_min_quantity, --库存最小警戒线(小单位)
+                     COALESCE(CAST(T8.specification_inventory AS DECIMAL(18, 6)), 0.00) AS specification_inventory,--规格库存(小单位)
+                     COALESCE(CAST(T9.batch_inventory AS DECIMAL(18, 6)), 0.00)         AS batch_inventory,--批次库存(小单位)
+                     T9.lot_number,
+                     T7.production_date,--生产日期
+                     T7.expiration_date,--失效日期
+                     <if test="locationId != null">
+                         T7.location_id,
+                     </if>
+                     T7.supplier_id,
+                     T1.tenant_id
+              FROM adm_device_definition AS T1
+                       LEFT JOIN adm_device AS T2
+                                 ON T1.id = T2.device_def_id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition T3
+                                 ON T3.instance_id = T1.id
+                                     AND T3.instance_table = 'adm_device_definition'
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T4
+                                 ON T4.definition_id = T3.id
+                                     AND T4.condition_code = '2'--2:采购价
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T5
+                                 ON T5.definition_id = T3.id
+                                     AND T5.condition_code = '3'--2:单位
+                                     AND T5.delete_flag = '0'
+                       LEFT JOIN wor_inventory_item T7
+                                 ON T7.item_table = 'adm_device_definition'
+                                     AND T7.item_id = T1.id
+                                     AND T7.delete_flag = '0'
+                       LEFT JOIN (SELECT i1.item_table,
+                                         i1.item_id,
+                                         <if test="locationId != null">
+                                             i1.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i1.quantity) AS DECIMAL(18, 6)), 0.00) AS specification_inventory
+                                  FROM wor_inventory_item i1
+                                           LEFT JOIN adm_device_definition i2 ON i1.item_id = i2.ID
+                                      AND i2.delete_flag = '0'
+                                  WHERE i1.item_table = 'adm_device_definition'
+                                    AND i1.delete_flag = '0'
+                                  GROUP BY i1.item_table,
+                                           i1.item_id
+                                           <if test="locationId != null">
+                                               ,i1.location_id
+                                           </if>) T8
+                                 ON T8.item_table = 'adm_device_definition'
+                                     AND T8.item_id = T1.ID
+                                     <if test="locationId != null">
+                                         AND T8.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN (SELECT i3.item_table,
+                                         i3.item_id,
+                                         i3.lot_number,
+                                         <if test="locationId != null">
+                                             i3.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i3.quantity) AS DECIMAL(18, 6)), 0.00) AS batch_inventory
+                                  FROM wor_inventory_item i3
+                                           LEFT JOIN adm_device_definition i4 ON i3.item_id = i4.ID
+                                      AND i4.delete_flag = '0'
+                                  WHERE i3.item_table = 'adm_device_definition'
+                                    AND i3.delete_flag = '0'
+                                  GROUP BY i3.item_table,
+                                           i3.item_id,
+                                           i3.lot_number
+                                           <if test="locationId != null">
+                                               ,i3.location_id
+                                           </if>) T9
+                                 ON T9.item_table = 'adm_device_definition'
+                                     AND T9.item_id = T1.ID
+                                     AND T9.lot_number = T7.lot_number
+                                     <if test="locationId != null">
+                                         AND T9.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN adm_charge_item_def_detail T10
+                                 ON T10.definition_id = T3.id
+                                     AND T10.condition_code = '1'--1:批号进价
+                                     AND T10.condition_value = T9.lot_number
+                                     AND T10.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T11
+                                 ON T11.definition_id = T3.id
+                                     AND T11.condition_code = '5'--1:批号售价
+                                     AND T11.condition_value = T9.lot_number
+                                     AND T11.delete_flag = '0'
+              WHERE T1.delete_flag = '0'
+                 <if test="locationId != null">
+                    AND T7.location_id = #{locationId}
+                 </if>
+              GROUP BY T1.id,
+                       T1.size,
+                       T4.condition_value,
+                       T5.condition_value,
+                       T4.amount,
+                       T5.amount,
+                       T10.amount,
+                       T11.amount,
+                       T8.specification_inventory,
+                       T9.batch_inventory,
+                       T9.lot_number,
+                       <if test="locationId != null">
+                          T7.location_id,
+                       </if>
+                       T7.supplier_id,
+                       T7.production_date,
+                       T7.expiration_date
+              <if test="supplierId != null">
+                  HAVING
+                  T8.specification_inventory   <![CDATA[ <= ]]>  (T1.item_min_quantity * T1.part_percent)
+              </if>
+              ORDER BY T1.bus_no) AS T6
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getPage"
+            resultType="com.openhis.web.departmentmanage.dto.DepartmentDto">
+        SELECT T4.tenant_id,
+               T4.supply_bus_no, --单据号
+               T4.type_enum,     --类型
+               T4.status_enum,   --状态
+               T4.supplier_id,   --供应商
+               T4.location_type_enum,  --仓库类型
+               T4.location_id,   --仓库
+               T4.applicant_id,  --开单人
+               T4.applicant_name,  --开单人
+               T4.approver_id,   --审批人
+               T4.apply_time,    -- 制单时间
+               T4.approval_time  --审批时间
+        FROM (SELECT T1.tenant_id,
+                     T1.bus_no              AS supply_bus_no,
+                     T1.type_enum,
+                     T1.status_enum,
+                     T1.supplier_id,
+                     <if test="locationFlg != null">
+                         T1.source_type_enum AS location_type_enum,
+                         T1.source_location_id AS location_id,
+                     </if>
+                     <if test="locationFlg == null">
+                         T1.purpose_type_enum AS location_type_enum,
+                         T1.purpose_location_id AS location_id,
+                     </if>
+                     T1.applicant_id,
+                     T2.name  AS applicant_name,
+                     T1.approver_id,
+                     T1.apply_time,
+                     T1.approval_time
+              FROM wor_supply_request AS T1
+                    LEFT JOIN adm_practitioner AS T2
+                          ON T2.id = T1.applicant_id
+                            AND T2.delete_flag = '0'
+              WHERE  T1.delete_flag = '0'
+              <if test="originalBusNoFlg != null">
+                  and original_bus_no = ''
+              </if>
+              GROUP BY T1.tenant_id,
+                       T1.bus_no,
+                       T1.type_enum,
+                       T1.status_enum,
+                       T1.supplier_id,
+                       <if test="locationFlg != null">
+                           T1.source_type_enum,
+                           T1.source_location_id,
+                       </if>
+                       <if test="locationFlg == null">
+                           T1.purpose_type_enum,
+                           T1.purpose_location_id,
+                       </if>
+                       T1.applicant_id,
+                       T2.name,
+                       T1.approver_id,
+                       T1.apply_time,
+                       T1.approval_time
+             ) AS T4
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getDetailPage"
+            resultType="com.openhis.web.departmentmanage.dto.DepartmentDetailDto">
+        SELECT T1.id,                             --ID
+               T1.bus_no,                         --单据号
+               T2.bus_no        AS item_bus_no,   --药品编码
+               T1.item_id,                        --药品id
+               T2.name          AS item_name,     --名称
+               T2.size AS total_volume,                   --规格
+               T1.unit_code,                      --选择单位
+               T2.unit_code     AS max_unit_code, --常规单位
+               T2.min_unit_code AS min_unit_code, --最小单位
+               T2.part_percent,                   --拆零比
+               T1.item_quantity,                  --数量
+               T1.total_quantity,                 --合计数量
+               T1.price,                          --采购单价
+               T1.total_price,                    --采购总价
+               T1.retail_price,                   --零售价
+               T1.total_retail_price,             --零价金额
+               T2.manufacturer_text,              --生产厂商文本
+               T2.approval_number,                --批准文号
+               T1.remake,                         --备注
+               T1.reason,                         --摘要（理由）
+               T1.reason_code,                    --理由类型
+               T1.batch_inventory,                --批次库存
+               T1.specification_inventory,        --规格库存
+               T1.applicant_id,--申请人
+               T1.apply_time,--申请时间
+               T1.approver_id,--审批人
+               T1.approval_time,--审批时间
+               T1.supplier_id,--供应商
+               T4.phone,--供应商联系人
+               T1.status_enum,
+               T1.type_enum,
+               T1.category_enum,--单据类型
+               T1.source_type_enum,             --源仓库类型
+               T1.source_location_id,             --源仓库
+               T1.purpose_type_enum,             --目的仓库类型
+               T1.purpose_location_id,             --目的仓库
+               T1.practitioner_id,--仓库员
+               T1.invoice_no,--发票号
+               T1.lot_number,--产品批号
+               T1.start_time,--开始时间
+               T1.end_time,--结束时间
+               T1.packaging_condition_enum,--包装情况
+               T1.acceptance_result_enum,--验收结果
+               T1.trace_no,--追溯码
+               T1.trace_no_unit_code,--追溯码包装
+               T1.occurrence_time,--禁用日期
+               T1.tenant_id
+        FROM wor_supply_request AS T1
+                 LEFT JOIN adm_device_definition AS T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN adm_device AS T3
+                           ON T2.id = T3.device_def_id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_supplier AS T4
+                           ON T4.id = T1.supplier_id
+                               AND T4.delete_flag = '0'
+        WHERE T1.bus_no = #{busNo}
+          AND T1.delete_flag = '0'
+        GROUP BY T1.id,
+                 T2.bus_no,
+                 T2.name,
+                 T2.unit_code,
+                 T2.min_unit_code,
+                 T2.size,
+                 T2.part_percent,
+                 T2.manufacturer_text,
+                 T2.approval_number,
+                 T4.phone
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
new file mode 100644
index 00000000..c8f7d6d7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper">
+    <select id="getInfo"
+            resultType="com.openhis.web.departmentmanage.dto.DepartmentDetailDto">
+        SELECT string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,--药品发放id
+               T1.status_enum,--发放状态
+               CASE T3.category_enum
+                 WHEN 1 THEN 20
+                 WHEN 2 THEN 19 END AS category_enum, --分类
+               T3.device_def_id AS item_id,--物品编码
+               T3.unit_code,--物品计量单位
+               T3.quantity AS item_quantity,--数量
+               T3.lot_number, --产品批号
+               T3.perform_location AS source_location_id, --源仓库
+               T4.organization_id AS purpose_location_id,--目的仓库
+               T1.performer_id AS approver_id,--审批人
+               T1.dispense_time AS approval_time, --审批时间
+               T1.patient_id AS applicant_id,--申请人
+               T3.req_authored_time AS apply_time --申请时间
+        FROM wor_device_dispense AS T1
+             INNER JOIN wor_device_request AS T3
+                     ON T1.device_req_id = T3.id
+                     AND T3.delete_flag = '0'
+             LEFT JOIN adm_device_definition AS T2
+                     ON T3.device_def_id = T2.id
+                     AND T2.delete_flag = '0'
+             LEFT JOIN adm_encounter AS T4
+                     ON T3.encounter_id = T4.id
+                     AND T4.delete_flag = '0'
+        WHERE T1.id IN
+           <foreach collection="dispenseIdList" item="item" separator="," open="(" close=")">
+               #{item}
+           </foreach>
+          AND T1.status_enum = #{dispenseStatus}
+          AND T1.delete_flag = '0'
+        GROUP BY T1.status_enum,
+                 T3.category_enum,
+                 T3.device_def_id,
+                 T3.unit_code,
+                 T3.quantity,
+                 T3.lot_number,
+                 T3.perform_location,
+                 T4.organization_id,
+                 T1.performer_id,
+                 T1.dispense_time,
+                 T1.patient_id,
+                 T3.req_authored_time
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
new file mode 100644
index 00000000..544ec6c2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentProfitLossOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
new file mode 100644
index 00000000..e46143b5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentRequisitionOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
new file mode 100644
index 00000000..b71940b6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentReturnToWarehouseOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
new file mode 100644
index 00000000..5ba6b5ee
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentStockInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
new file mode 100644
index 00000000..47691f49
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentStocktakingOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
new file mode 100644
index 00000000..f0e3ef45
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentTransferInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
new file mode 100644
index 00000000..859c695b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentTransferOutOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
similarity index 57%
rename from openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index c028cfe4..7e35429a 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -36,167 +36,190 @@
         abi.manufacturer,
         abi.charge_item_definition_id,
         abi.advice_table_name,
-        abi.position_id
+        abi.position_id,
+        abi.restricted_flag,
+        abi.restricted_scope
         from (
-        SELECT T1.tenant_id,
-        1 AS advice_type,
-        T1.category_code AS category_code,
-        T1.pharmacology_category_code AS pharmacology_category_code,
-        T1.part_percent AS part_percent,
-        T1.unit_conversion_ratio AS unit_conversion_ratio,
-        T1.part_attribute_enum AS part_attribute_enum,
-        T1.tho_part_attribute_enum AS tho_part_attribute_enum,
-        T1.skin_test_flag AS skin_test_flag,
-        T1.inject_flag AS inject_flag,
-        T1.ID AS advice_definition_id,
-        T1.NAME AS advice_name,
-        T1.bus_no AS advice_bus_no,
-        T1.py_str AS py_str,
-        T1.wb_str AS wb_str,
-        T1.yb_no AS yb_no,
-        T1.merchandise_name AS product_name,
-        0 AS activity_type,
-        T1.unit_code AS unit_code,
-        T1.min_unit_code AS min_unit_code,
-        T2.total_volume AS volume,
-        T2.method_code AS method_code,
-        T2.rate_code AS rate_code,
-        T2.org_id AS org_id,
-        T2.location_id AS location_id,
-        CAST(T2.dose AS TEXT) AS dose,
-        T2.dose_unit_code AS dose_unit_code,
-        T3.NAME AS supplier,
-        T1.manufacturer_text AS manufacturer,
-        T5.id AS charge_item_definition_id,
-        T5.instance_table AS advice_table_name,
-        T6.def_location_id AS position_id
-        FROM med_medication_definition AS t1
-        INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
-        AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
-        LEFT JOIN adm_supplier AS T3
-        ON T3.ID = T1.supply_id
-        AND T3.delete_flag = '0'
-        LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
-        AND T5.delete_flag = '0'
-        LEFT JOIN adm_organization_location AS T6
-        ON T6.distribution_category_code = T1.category_code
-        AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
-        (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
-        WHERE T1.delete_flag = '0'
-        AND T2.status_enum = #{statusEnum}
-        <if test="pricingFlag ==1">
-            AND 1 = 2
+        <if test="adviceTypes == null or adviceTypes.contains(1)">
+            SELECT T1.tenant_id,
+            1 AS advice_type,
+            T1.category_code AS category_code,
+            T1.pharmacology_category_code AS pharmacology_category_code,
+            T1.part_percent AS part_percent,
+            T1.unit_conversion_ratio AS unit_conversion_ratio,
+            T1.part_attribute_enum AS part_attribute_enum,
+            T1.tho_part_attribute_enum AS tho_part_attribute_enum,
+            T1.skin_test_flag AS skin_test_flag,
+            T1.inject_flag AS inject_flag,
+            T1.ID AS advice_definition_id,
+            T1.NAME AS advice_name,
+            T1.bus_no AS advice_bus_no,
+            T1.py_str AS py_str,
+            T1.wb_str AS wb_str,
+            T1.yb_no AS yb_no,
+            T1.merchandise_name AS product_name,
+            0 AS activity_type,
+            T1.unit_code AS unit_code,
+            T1.min_unit_code AS min_unit_code,
+            T2.total_volume AS volume,
+            T2.method_code AS method_code,
+            T2.rate_code AS rate_code,
+            T2.org_id AS org_id,
+            T2.location_id AS location_id,
+            CAST(T2.dose AS TEXT) AS dose,
+            T2.dose_unit_code AS dose_unit_code,
+            T3.NAME AS supplier,
+            T1.manufacturer_text AS manufacturer,
+            T5.id AS charge_item_definition_id,
+            T5.instance_table AS advice_table_name,
+            T6.def_location_id AS position_id,
+            t1.restricted_flag AS restricted_flag,
+            t1.restricted_scope AS restricted_scope
+            FROM med_medication_definition AS t1
+            INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
+            AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
+            LEFT JOIN adm_supplier AS T3
+            ON T3.ID = T1.supply_id
+            AND T3.delete_flag = '0'
+            LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
+            AND T5.delete_flag = '0'
+            LEFT JOIN adm_organization_location AS T6
+            ON T6.distribution_category_code = T1.category_code
+            AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
+            (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
+            WHERE T1.delete_flag = '0'
+            AND T2.status_enum = #{statusEnum}
+            <if test="pricingFlag ==1">
+                AND 1 = 2
+            </if>
+            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                AND T1.id IN
+                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                    #{itemId}
+                </foreach>
+            </if>
+            AND T5.instance_table = #{medicationTableName}
         </if>
-        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-            AND T1.id IN
-            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                #{itemId}
-            </foreach>
+
+        <if test="adviceTypes == null or adviceTypes.contains(1)">
+            <if test="adviceTypes == null or adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
         </if>
-        AND T5.instance_table = #{medicationTableName}
-        UNION ALL
-        SELECT T1.tenant_id,
-        2 AS advice_type,
-        T1.category_code AS category_code,
-        '' AS pharmacology_category_code,
-        T1.part_percent AS part_percent,
-        0 AS unit_conversion_ratio,
-        null AS part_attribute_enum,
-        null AS tho_part_attribute_enum,
-        null AS skin_test_flag,
-        null AS inject_flag,
-        T1.ID AS advice_definition_id,
-        T1.NAME AS advice_name,
-        T1.bus_no AS advice_bus_no,
-        T1.py_str AS py_str,
-        T1.wb_str AS wb_str,
-        T1.yb_no AS yb_no,
-        '' AS product_name,
-        0 AS activity_type,
-        T1.unit_code AS unit_code,
-        T1.min_unit_code AS min_unit_code,
-        T1.SIZE AS volume,
-        '' AS method_code,
-        '' AS rate_code,
-        T1.org_id AS org_id,
-        T1.location_id AS location_id,
-        '' AS dose,
-        '' AS dose_unit_code,
-        T2.NAME AS supplier,
-        T1.manufacturer_text AS manufacturer,
-        T4.id AS charge_item_definition_id,
-        T4.instance_table AS advice_table_name,
-        T5.def_location_id AS position_id
-        FROM adm_device_definition AS T1
-        LEFT JOIN adm_supplier AS T2
-        ON T2.ID = T1.supply_id
-        AND T2.delete_flag = '0'
-        LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
-        AND T4.delete_flag = '0'
-        LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
-        AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
-        (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
-        WHERE T1.delete_flag = '0'
-        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-            AND T1.id IN
-            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                #{itemId}
-            </foreach>
+
+        <if test="adviceTypes == null or adviceTypes.contains(2)">
+            SELECT T1.tenant_id,
+            2 AS advice_type,
+            T1.category_code AS category_code,
+            '' AS pharmacology_category_code,
+            T1.part_percent AS part_percent,
+            0 AS unit_conversion_ratio,
+            null AS part_attribute_enum,
+            null AS tho_part_attribute_enum,
+            null AS skin_test_flag,
+            null AS inject_flag,
+            T1.ID AS advice_definition_id,
+            T1.NAME AS advice_name,
+            T1.bus_no AS advice_bus_no,
+            T1.py_str AS py_str,
+            T1.wb_str AS wb_str,
+            T1.yb_no AS yb_no,
+            '' AS product_name,
+            0 AS activity_type,
+            T1.unit_code AS unit_code,
+            T1.min_unit_code AS min_unit_code,
+            T1.SIZE AS volume,
+            '' AS method_code,
+            '' AS rate_code,
+            T1.org_id AS org_id,
+            T1.location_id AS location_id,
+            '' AS dose,
+            '' AS dose_unit_code,
+            T2.NAME AS supplier,
+            T1.manufacturer_text AS manufacturer,
+            T4.id AS charge_item_definition_id,
+            T4.instance_table AS advice_table_name,
+            T5.def_location_id AS position_id,
+            0 AS restricted_flag,
+            '' AS restricted_scope
+            FROM adm_device_definition AS T1
+            LEFT JOIN adm_supplier AS T2
+            ON T2.ID = T1.supply_id
+            AND T2.delete_flag = '0'
+            LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
+            AND T4.delete_flag = '0'
+            LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
+            AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
+            (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
+            WHERE T1.delete_flag = '0'
+            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                AND T1.id IN
+                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                    #{itemId}
+                </foreach>
+            </if>
+            AND T4.instance_table = #{deviceTableName}
+            AND T1.category_code = #{singleUse}
+            AND T1.status_enum = #{statusEnum}
         </if>
-        AND T4.instance_table = #{deviceTableName}
-        AND T1.category_code = #{singleUse}
-        AND T1.status_enum = #{statusEnum}
-        UNION ALL
-        SELECT T1.tenant_id,
-        3 AS advice_type,
-        T1.category_code AS category_code,
-        '' AS pharmacology_category_code,
-        1 AS part_percent,
-        0 AS unit_conversion_ratio,
-        null AS part_attribute_enum,
-        null AS tho_part_attribute_enum,
-        null AS skin_test_flag,
-        null AS inject_flag,
-        T1.ID AS advice_definition_id,
-        T1.NAME AS advice_name,
-        T1.bus_no AS advice_bus_no,
-        T1.py_str AS py_str,
-        T1.wb_str AS wb_str,
-        T1.yb_no AS yb_no,
-        '' AS product_name,
-        T1.type_enum AS activity_type,
-        '' AS unit_code,
-        '' AS min_unit_code,
-        '' AS volume,
-        '' AS method_code,
-        '' AS rate_code,
-        T1.org_id AS org_id,
-        T1.location_id AS location_id,
-        '' AS dose,
-        '' AS dose_unit_code,
-        '' AS supplier,
-        '' AS manufacturer,
-        T2.ID AS charge_item_definition_id,
-        T2.instance_table AS advice_table_name,
-        T3.organization_id AS position_id
-        FROM wor_activity_definition AS T1
-        LEFT JOIN adm_charge_item_definition AS T2
-        ON T2.instance_id = T1.ID
-        AND T2.delete_flag = '0'
-        LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
-        AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
-        WHERE T1.delete_flag = '0'
-        <if test="pricingFlag ==1">
-            AND T1.pricing_flag = #{pricingFlag}
+
+        <if test="adviceTypes == null or adviceTypes.contains(2)">
+            <if test="adviceTypes == null or adviceTypes.contains(3)">UNION ALL</if>
         </if>
-        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-            AND T1.id IN
-            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                #{itemId}
-            </foreach>
+
+        <if test="adviceTypes == null or adviceTypes.contains(3)">
+            SELECT T1.tenant_id,
+            3 AS advice_type,
+            T1.category_code AS category_code,
+            '' AS pharmacology_category_code,
+            1 AS part_percent,
+            0 AS unit_conversion_ratio,
+            null AS part_attribute_enum,
+            null AS tho_part_attribute_enum,
+            null AS skin_test_flag,
+            null AS inject_flag,
+            T1.ID AS advice_definition_id,
+            T1.NAME AS advice_name,
+            T1.bus_no AS advice_bus_no,
+            T1.py_str AS py_str,
+            T1.wb_str AS wb_str,
+            T1.yb_no AS yb_no,
+            '' AS product_name,
+            T1.type_enum AS activity_type,
+            '' AS unit_code,
+            '' AS min_unit_code,
+            '' AS volume,
+            '' AS method_code,
+            '' AS rate_code,
+            T1.org_id AS org_id,
+            T1.location_id AS location_id,
+            '' AS dose,
+            '' AS dose_unit_code,
+            '' AS supplier,
+            '' AS manufacturer,
+            T2.ID AS charge_item_definition_id,
+            T2.instance_table AS advice_table_name,
+            T3.organization_id AS position_id,
+            0 AS restricted_flag,
+            '' AS restricted_scope
+            FROM wor_activity_definition AS T1
+            LEFT JOIN adm_charge_item_definition AS T2
+            ON T2.instance_id = T1.ID
+            AND T2.delete_flag = '0'
+            LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
+            AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
+            WHERE T1.delete_flag = '0'
+            <if test="pricingFlag ==1">
+                AND T1.pricing_flag = #{pricingFlag}
+            </if>
+            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                AND T1.id IN
+                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                    #{itemId}
+                </foreach>
+            </if>
+            AND T1.status_enum = #{statusEnum}
+            AND T2.instance_table = #{activityTableName}
         </if>
-        AND T1.status_enum = #{statusEnum}
-        AND T2.instance_table = #{activityTableName}) AS abi
+        ) AS abi
         ${ew.customSqlSegment}
     </select>
 
@@ -228,8 +251,9 @@
             </foreach>
         </if>
         AND T1.inventory_status_enum = #{status}
+        AND T1.expiration_date > NOW()
         AND T1.item_table IN ( ${SqlCondition} )
-        order by T1.create_time
+        order by T1.expiration_date
     </select>
 
     <select id="getAdviceDraftInventory" resultType="com.openhis.web.doctorstation.dto.AdviceInventoryDto">
@@ -251,7 +275,8 @@
                  LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
             AND T2.delete_flag = '0'
         WHERE T1.delete_flag = '0'
-          AND T1.status_enum = #{status}
+          AND NOW() &lt; T1.limit_time
+          AND (T1.status_enum = #{status1} OR T1.status_enum = #{status2})
         UNION ALL
         SELECT #{deviceTableName} AS item_table,
                T1.device_def_id   AS item_id,
@@ -271,7 +296,8 @@
                  LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
             AND T2.delete_flag = '0'
         WHERE T1.delete_flag = '0'
-          AND T1.status_enum = #{status}
+          AND NOW() &lt; T1.limit_time
+          AND (T1.status_enum = #{status1} OR T1.status_enum = #{status2})
     </select>
 
     <select id="getChildCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
@@ -343,7 +369,8 @@
         al.name AS position_name,
         T1.dispense_per_duration AS dispense_per_duration,
         T2.part_percent AS part_percent,
-        ccd.name AS condition_definition_name
+        ccd.name AS condition_definition_name,
+        T1.sort_number AS sort_number
         FROM med_medication_request AS T1
         LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
         AND T2.delete_flag = '0'
@@ -362,7 +389,7 @@
             AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
         </if>
         AND T1.refund_medicine_id IS NULL
-        ORDER BY T1.status_enum, T1.group_id)
+        ORDER BY T1.status_enum,T1.sort_number,T1.group_id)
         UNION ALL
         (SELECT 2 AS advice_type,
         T1.id AS request_id,
@@ -391,7 +418,8 @@
         al.name AS position_name,
         null AS dispense_per_duration,
         T2.part_percent AS part_percent,
-        '' AS condition_definition_name
+        '' AS condition_definition_name,
+        99 AS sort_number
         FROM wor_device_request AS T1
         LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
         AND T2.delete_flag = '0'
@@ -436,7 +464,8 @@
         ao.name AS position_name,
         null AS dispense_per_duration,
         1 AS part_percent,
-        '' AS condition_definition_name
+        '' AS condition_definition_name,
+        99 AS sort_number
         FROM wor_service_request AS T1
         LEFT JOIN wor_activity_definition AS T2
         ON T2.ID = T1.activity_id
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
new file mode 100644
index 00000000..1a6eb91e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper">
+
+    <select id="getTcmEncounterDiagnosis" resultType="com.openhis.web.doctorstation.dto.DiagnosisQueryDto">
+        SELECT T1.id AS encounter_diagnosis_id,
+               T1.condition_id,
+               T1.syndrome_group_no,
+               T2.definition_id,
+               T3.source_enum,
+               T3.NAME,
+               T1.maindise_flag,
+               T1.diag_srt_no,
+               T1.med_type_code,
+               T2.verification_status_enum,
+               T2.yb_no
+        FROM adm_encounter_diagnosis AS T1
+                 LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
+            AND T2.delete_flag = '0' AND T2.tcm_flag = 1
+                 LEFT JOIN cli_condition_definition AS T3 ON t3.ID = T2.definition_id
+            AND T3.delete_flag = '0'
+        WHERE T1.delete_flag = '0'
+          AND T1.tcm_flag = 1
+          AND T1.encounter_id = #{encounterId}
+        ORDER BY T1.diag_srt_no
+    </select>
+
+    <select id="getTcmRequestBaseInfo" resultType="com.openhis.web.doctorstation.dto.RequestBaseDto">
+        SELECT 1 AS advice_type,
+        T1.id AS request_id,
+        T1.id || '-1' AS unique_key,
+        T1.prescription_no AS prescription_no,
+        T1.practitioner_id AS requester_id,
+        T1.create_time AS request_time,
+        CASE WHEN T1.practitioner_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        T1.content_json AS content_json,
+        T1.skin_test_flag AS skin_test_flag,
+        T1.infusion_flag AS inject_flag,
+        T1.group_id AS group_id,
+        T2.NAME AS advice_name,
+        T3.total_volume AS volume,
+        T1.lot_number AS lot_number,
+        T1.quantity AS quantity,
+        T1.unit_code AS unit_code,
+        T1.status_enum AS status_enum,
+        T1.method_code AS method_code,
+        T1.rate_code AS rate_code,
+        T1.dose AS dose,
+        T1.dose_unit_code AS dose_unit_code,
+        T4.id AS charge_item_id,
+        T4.total_price AS total_price,
+        T4.status_enum AS charge_status,
+        al.id AS position_id,
+        al.name AS position_name,
+        T1.dispense_per_duration AS dispense_per_duration,
+        T1.chinese_herbs_dose_quantity AS chinese_herbs_dose_quantity,
+        T1.suffering_flag AS suffering_flag,
+        T2.part_percent AS part_percent,
+        ccd.name AS condition_definition_name
+        FROM med_medication_request AS T1
+        LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN med_medication AS T3 ON T3.medication_def_id = T2.ID
+        AND T3.delete_flag = '0'
+        LEFT JOIN adm_charge_item AS T4 ON T4.service_id = T1.ID AND T4.delete_flag = '0' AND
+        T4.service_table = #{MED_MEDICATION_REQUEST}
+        LEFT JOIN adm_location AS al ON al.ID = T1.perform_location AND al.delete_flag = '0'
+        LEFT JOIN cli_condition AS cc ON cc.id = T1.condition_id AND cc.delete_flag = '0'
+        LEFT JOIN cli_condition_definition AS ccd ON ccd.id = cc.definition_id
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 1
+        <if test="historyFlag == '0'.toString()">
+            AND T1.encounter_id = #{encounterId}
+        </if>
+        <if test="historyFlag == '1'.toString()">
+            AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
+        </if>
+        AND T1.refund_medicine_id IS NULL
+        ORDER BY T1.group_id,T1.prescription_no, T1.status_enum
+    </select>
+
+    <select id="getTcmRequestHistoryInfo" resultType="com.openhis.web.doctorstation.dto.RequestBaseDto">
+        SELECT 1 AS advice_type,
+        T1.id AS request_id,
+        T1.id || '-1' AS unique_key,
+        T1.prescription_no AS prescription_no,
+        T1.practitioner_id AS requester_id,
+        T1.create_time AS request_time,
+        CASE WHEN T1.practitioner_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        T1.content_json AS content_json,
+        T1.skin_test_flag AS skin_test_flag,
+        T1.infusion_flag AS inject_flag,
+        T1.group_id AS group_id,
+        T2.NAME AS advice_name,
+        T3.total_volume AS volume,
+        T1.lot_number AS lot_number,
+        T1.quantity AS quantity,
+        T1.unit_code AS unit_code,
+        T1.status_enum AS status_enum,
+        T1.method_code AS method_code,
+        T1.rate_code AS rate_code,
+        T1.dose AS dose,
+        T1.dose_unit_code AS dose_unit_code,
+        T4.id AS charge_item_id,
+        T4.total_price AS total_price,
+        T4.status_enum AS charge_status,
+        al.id AS position_id,
+        al.name AS position_name,
+        T1.dispense_per_duration AS dispense_per_duration,
+        T1.chinese_herbs_dose_quantity AS chinese_herbs_dose_quantity,
+        T1.suffering_flag AS suffering_flag,
+        T2.part_percent AS part_percent,
+        ccd.name AS condition_definition_name
+        FROM med_medication_request AS T1
+        LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN med_medication AS T3 ON T3.medication_def_id = T2.ID
+        AND T3.delete_flag = '0'
+        LEFT JOIN adm_charge_item AS T4 ON T4.service_id = T1.ID AND T4.delete_flag = '0' AND
+        T4.service_table = #{MED_MEDICATION_REQUEST}
+        LEFT JOIN adm_location AS al ON al.ID = T1.perform_location AND al.delete_flag = '0'
+        LEFT JOIN cli_condition AS cc ON cc.id = T1.condition_id AND cc.delete_flag = '0'
+        LEFT JOIN cli_condition_definition AS ccd ON ccd.id = cc.definition_id
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 1
+        <if test="historyFlag == '0'.toString()">
+            AND T1.encounter_id = #{encounterId}
+        </if>
+        <if test="historyFlag == '1'.toString()">
+            AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
+        </if>
+        AND T1.refund_medicine_id IS NULL
+        ORDER BY T1.group_id,T1.prescription_no, T1.status_enum
+    </select>
+
+    <select id="getConditionIds" resultType="long">
+        SELECT condition_id
+        FROM adm_encounter_diagnosis
+        WHERE delete_flag = '0'
+          AND syndrome_group_no = #{syndromeGroupNo}
+    </select>
+
+    <select id="getAdviceNumByConditionIds" resultType="integer">
+        SELECT
+        count(1)
+        FROM
+        med_medication_request
+        WHERE
+        delete_flag = '0'
+        <if test="conditionIds != null and !conditionIds.isEmpty()">
+            AND condition_id IN
+            <foreach collection="conditionIds" item="itemId" open="(" separator="," close=")">
+                #{itemId}
+            </foreach>
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
similarity index 68%
rename from openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
index 8fc3abcb..332a922c 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
@@ -12,33 +12,32 @@
                T5.binding_enum,
                T5.definition_name,
                T5.object_name
-        from (
-                 SELECT T1.tenant_id,
-                        T1.ID,
-                        T1.object_id,
-                        T1.definition_id,
-                        T1.binding_enum,
-                        T2.NAME AS definition_name,
-                        CASE
-                            WHEN T1.binding_enum = #{bindingType1} THEN
-                                T3.user_name
-                            WHEN T1.binding_enum = #{bindingType2} THEN
-                                T4.NAME
-                            END AS object_name
-                 FROM cli_diagnosis_belong_binding AS T1
-                          LEFT JOIN cli_condition_definition AS T2 ON T1.definition_id = T2.ID
-                     AND T2.delete_flag = '0'
-                          LEFT JOIN sys_user AS T3 ON T1.binding_enum = #{bindingType1}
-                     AND T1.object_id = T3.user_id
-                          LEFT JOIN adm_organization AS T4 ON T1.binding_enum = #{bindingType2}
-                     AND T1.object_id = T4.ID
-                 WHERE T1.delete_flag = '0'
-                 ORDER BY object_name) AS T5
+        from (SELECT T1.tenant_id,
+                     T1.ID,
+                     T1.object_id,
+                     T1.definition_id,
+                     T1.binding_enum,
+                     T2.NAME AS definition_name,
+                     CASE
+                         WHEN T1.binding_enum = #{bindingType1} THEN
+                             T3.user_name
+                         WHEN T1.binding_enum = #{bindingType2} THEN
+                             T4.NAME
+                         END AS object_name
+              FROM cli_diagnosis_belong_binding AS T1
+                       LEFT JOIN cli_condition_definition AS T2 ON T1.definition_id = T2.ID
+                  AND T2.delete_flag = '0'
+                       LEFT JOIN sys_user AS T3 ON T1.binding_enum = #{bindingType1}
+                  AND T1.object_id = T3.user_id
+                       LEFT JOIN adm_organization AS T4 ON T1.binding_enum = #{bindingType2}
+                  AND T1.object_id = T4.ID
+              WHERE T1.delete_flag = '0'
+              ORDER BY object_name) AS T5
             ${ew.customSqlSegment}
     </select>
 
     <select id="getPatientHistoryList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
-        SELECT T1.ID,
+        SELECT T1.ID AS definition_id,
                T1.source_enum,
                T1.condition_code,
                T1.NAME,
@@ -60,7 +59,7 @@
     </select>
 
     <select id="getDoctorCommonUseList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
-        SELECT T1.ID,
+        SELECT T1.ID AS definition_id,
                T1.source_enum,
                T1.condition_code,
                T1.NAME,
@@ -81,6 +80,7 @@
 
     <select id="getUserPersonalList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
         SELECT T2.ID,
+               T2.definition_id,
                T1.source_enum,
                T1.condition_code,
                T1.NAME,
@@ -99,6 +99,7 @@
 
     <select id="getOrganizationList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
         SELECT T2.ID,
+        T2.definition_id,
         T1.source_enum,
         T1.condition_code,
         T1.NAME,
@@ -127,6 +128,7 @@
                T1.maindise_flag,
                T1.diag_srt_no,
                T1.med_type_code,
+               T1.diagnosis_desc,
                T2.verification_status_enum,
                T2.yb_no
         FROM adm_encounter_diagnosis AS T1
@@ -139,4 +141,28 @@
           AND T1.encounter_id = #{encounterId}
     </select>
 
+    <select id="getAdviceNumByConditionId" resultType="Integer">
+        SELECT SUM
+                   (count_result) AS total_count
+        FROM (
+                 SELECT COUNT
+                            (1) AS count_result
+                 FROM med_medication_request
+                 WHERE delete_flag = '0'
+                   AND condition_id = #{conditionId}
+                 UNION ALL
+                 SELECT COUNT
+                            (1)
+                 FROM wor_device_request
+                 WHERE delete_flag = '0'
+                   AND condition_id = #{conditionId}
+                 UNION ALL
+                 SELECT COUNT
+                            (1)
+                 FROM wor_service_request
+                 WHERE delete_flag = '0'
+                   AND condition_id = #{conditionId}
+             ) AS counts
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
similarity index 32%
rename from openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
index d69a6d54..ca5ff392 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
@@ -3,6 +3,318 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationElepPrescriptionMapper">
+    <select id="selectCatalogDrugInfoByNo" resultType="com.openhis.ybcatalog.domain.CatalogDrugInfo">
+        SELECT T1.medical_catalog_code,
+               T1.drug_trade_name,
+               T1.generic_name_id,
+               T1.drug_generic_name,
+               T1.chemical_name,
+               T1.alias,
+               T1.english_name,
+               T1.registered_name,
+               T1.drug_supervision_code,
+               T1.drug_form,
+               T1.drug_form_name,
+               T1.drug_category,
+               T1.drug_category_name,
+               T1.drug_specification,
+               T1.drug_spec_code,
+               T1.registered_form,
+               T1.registered_spec,
+               T1.registered_spec_code,
+               T1.dosage,
+               T1.frequency,
+               T1.acid_base,
+               T1.national_drug_code,
+               T1.usage,
+               T1.tcm_flag,
+               T1.production_area_type,
+               T1.production_area_name,
+               T1.pricing_unit_type,
+               T1.otc_flag,
+               T1.otc_flag_name,
+               T1.packaging_material,
+               T1.packaging_material_name,
+               T1.packaging_spec,
+               T1.packaging_quantity,
+               T1.function_indication,
+               T1.administration_route,
+               T1.instructions,
+               T1.start_date,
+               T1.end_date,
+               T1.min_use_unit,
+               T1.min_sale_unit,
+               T1.min_measurement_unit,
+               T1.min_package_quantity,
+               T1.min_package_unit,
+               T1.min_preparation_unit,
+               T1.min_package_unit_name,
+               T1.min_preparation_unit_name,
+               T1.conversion_ratio,
+               T1.shelf_life,
+               T1.min_pricing_unit,
+               T1.wubi_code,
+               T1.pinyin_code,
+               T1.repackager,
+               T1.manufacturer_code,
+               T1.manufacturer_name,
+               T1.special_price_limit_flag,
+               T1.special_drug_flag,
+               T1.use_restriction,
+               T1.use_restriction_flag,
+               T1.registration_cert_no,
+               T1.reg_cert_start_date,
+               T1.reg_cert_end_date,
+               T1.approval_no,
+               T1.approval_start_date,
+               T1.approval_end_date,
+               T1.market_status,
+               T1.market_status_name,
+               T1.reg_document_archive,
+               T1.supp_application_archive,
+               T1.national_insurance_notes,
+               T1.essential_drug_flag_name,
+               T1.essential_drug_flag,
+               T1.vat_adjustment_flag,
+               T1.vat_adjustment_name,
+               T1.listed_drug_flag,
+               T1.negotiation_drug_flag,
+               T1.negotiation_drug_name,
+               T1.nhc_drug_code,
+               T1.remarks,
+               T1.valid_flag,
+               T1.unique_record_id,
+               T1.created_at,
+               T1.updated_at,
+               T1.version,
+               T1.version_name,
+               T1.pediatric_use,
+               T1.company_name,
+               T1.generic_evaluation_flag,
+               T1.distribution_company,
+               T1.distribution_contact,
+               T1.distribution_auth_archive,
+               T1.insurance_form,
+               T1.insurance_class,
+               T1.marketing_authorization_holder,
+               T1.release_flag,
+               T1.transmission_data_id,
+               T1.valid_from,
+               T1.valid_to
+        FROM yb_catalog_drug_info T1
+        WHERE T1.medical_catalog_code = #{medicationNo}
+          AND T1.version = #{version}
+          AND T1.valid_flag = '1'
+    </select>
+    <select id="selectCatalogDrugInfo" resultType="com.openhis.ybcatalog.domain.CatalogDrugInfo">
+        SELECT T3.medical_catalog_code,
+               T3.drug_trade_name,
+               T3.generic_name_id,
+               T3.drug_generic_name,
+               T3.chemical_name,
+               T3.alias,
+               T3.english_name,
+               T3.registered_name,
+               T3.drug_supervision_code,
+               T3.drug_form,
+               T3.drug_form_name,
+               T3.drug_category,
+               T3.drug_category_name,
+               T3.drug_specification,
+               T3.drug_spec_code,
+               T3.registered_form,
+               T3.registered_spec,
+               T3.registered_spec_code,
+               T3.dosage,
+               T3.frequency,
+               T3.acid_base,
+               T3.national_drug_code,
+               T3.usage,
+               T3.tcm_flag,
+               T3.production_area_type,
+               T3.production_area_name,
+               T3.pricing_unit_type,
+               T3.otc_flag,
+               T3.otc_flag_name,
+               T3.packaging_material,
+               T3.packaging_material_name,
+               T3.packaging_spec,
+               T3.packaging_quantity,
+               T3.function_indication,
+               T3.administration_route,
+               T3.instructions,
+               T3.start_date,
+               T3.end_date,
+               T3.min_use_unit,
+               T3.min_sale_unit,
+               T3.min_measurement_unit,
+               T3.min_package_quantity,
+               T3.min_package_unit,
+               T3.min_preparation_unit,
+               T3.min_package_unit_name,
+               T3.min_preparation_unit_name,
+               T3.conversion_ratio,
+               T3.shelf_life,
+               T3.min_pricing_unit,
+               T3.wubi_code,
+               T3.pinyin_code,
+               T3.repackager,
+               T3.manufacturer_code,
+               T3.manufacturer_name,
+               T3.special_price_limit_flag,
+               T3.special_drug_flag,
+               T3.use_restriction,
+               T3.use_restriction_flag,
+               T3.registration_cert_no,
+               T3.reg_cert_start_date,
+               T3.reg_cert_end_date,
+               T3.approval_no,
+               T3.approval_start_date,
+               T3.approval_end_date,
+               T3.market_status,
+               T3.market_status_name,
+               T3.reg_document_archive,
+               T3.supp_application_archive,
+               T3.national_insurance_notes,
+               T3.essential_drug_flag_name,
+               T3.essential_drug_flag,
+               T3.vat_adjustment_flag,
+               T3.vat_adjustment_name,
+               T3.listed_drug_flag,
+               T3.negotiation_drug_flag,
+               T3.negotiation_drug_name,
+               T3.nhc_drug_code,
+               T3.remarks,
+               T3.valid_flag,
+               T3.unique_record_id,
+               T3.created_at,
+               T3.updated_at,
+               T3.version,
+               T3.version_name,
+               T3.pediatric_use,
+               T3.company_name,
+               T3.generic_evaluation_flag,
+               T3.distribution_company,
+               T3.distribution_contact,
+               T3.distribution_auth_archive,
+               T3.insurance_form,
+               T3.insurance_class,
+               T3.marketing_authorization_holder,
+               T3.release_flag,
+               T3.transmission_data_id,
+               T3.valid_from,
+               T3.valid_to,
+               T3.tenant_id
+        FROM (SELECT T1.medical_catalog_code,
+                     T1.drug_trade_name,
+                     T1.generic_name_id,
+                     T1.drug_generic_name,
+                     T1.chemical_name,
+                     T1.alias,
+                     T1.english_name,
+                     T1.registered_name,
+                     T1.drug_supervision_code,
+                     T1.drug_form,
+                     T1.drug_form_name,
+                     T1.drug_category,
+                     T1.drug_category_name,
+                     T1.drug_specification,
+                     T1.drug_spec_code,
+                     T1.registered_form,
+                     T1.registered_spec,
+                     T1.registered_spec_code,
+                     T1.dosage,
+                     T1.frequency,
+                     T1.acid_base,
+                     T1.national_drug_code,
+                     T1.usage,
+                     T1.tcm_flag,
+                     T1.production_area_type,
+                     T1.production_area_name,
+                     T1.pricing_unit_type,
+                     T1.otc_flag,
+                     T1.otc_flag_name,
+                     T1.packaging_material,
+                     T1.packaging_material_name,
+                     T1.packaging_spec,
+                     T1.packaging_quantity,
+                     T1.function_indication,
+                     T1.administration_route,
+                     T1.instructions,
+                     T1.start_date,
+                     T1.end_date,
+                     T1.min_use_unit,
+                     T1.min_sale_unit,
+                     T1.min_measurement_unit,
+                     T1.min_package_quantity,
+                     T1.min_package_unit,
+                     T1.min_preparation_unit,
+                     T1.min_package_unit_name,
+                     T1.min_preparation_unit_name,
+                     T1.conversion_ratio,
+                     T1.shelf_life,
+                     T1.min_pricing_unit,
+                     T1.wubi_code,
+                     T1.pinyin_code,
+                     T1.repackager,
+                     T1.manufacturer_code,
+                     T1.manufacturer_name,
+                     T1.special_price_limit_flag,
+                     T1.special_drug_flag,
+                     T1.use_restriction,
+                     T1.use_restriction_flag,
+                     T1.registration_cert_no,
+                     T1.reg_cert_start_date,
+                     T1.reg_cert_end_date,
+                     T1.approval_no,
+                     T1.approval_start_date,
+                     T1.approval_end_date,
+                     T1.market_status,
+                     T1.market_status_name,
+                     T1.reg_document_archive,
+                     T1.supp_application_archive,
+                     T1.national_insurance_notes,
+                     T1.essential_drug_flag_name,
+                     T1.essential_drug_flag,
+                     T1.vat_adjustment_flag,
+                     T1.vat_adjustment_name,
+                     T1.listed_drug_flag,
+                     T1.negotiation_drug_flag,
+                     T1.negotiation_drug_name,
+                     T1.nhc_drug_code,
+                     T1.remarks,
+                     T1.valid_flag,
+                     T1.unique_record_id,
+                     T1.created_at,
+                     T1.updated_at,
+                     T1.version,
+                     T1.version_name,
+                     T1.pediatric_use,
+                     T1.company_name,
+                     T1.generic_evaluation_flag,
+                     T1.distribution_company,
+                     T1.distribution_contact,
+                     T1.distribution_auth_archive,
+                     T1.insurance_form,
+                     T1.insurance_class,
+                     T1.marketing_authorization_holder,
+                     T1.release_flag,
+                     T1.transmission_data_id,
+                     T1.valid_from,
+                     T1.valid_to,
+                     1 AS tenant_id
+              FROM yb_catalog_drug_info T1
+                       INNER JOIN (
+                  SELECT medical_catalog_code, MAX(version) AS max_version
+                  FROM yb_catalog_drug_info
+                  WHERE valid_flag = '1'
+                  GROUP BY medical_catalog_code
+              ) T2
+                                  ON T1.medical_catalog_code = T2.medical_catalog_code AND
+                                     T1.version = T2.max_version
+              WHERE T1.valid_flag = '1') AS T3
+            ${ew.customSqlSegment}
+    </select>
     <select id="selectElepPrescriptionInfo" resultType="com.openhis.web.doctorstation.dto.ElepPrescriptionInfoDto">
         SELECT tenant_id,
                prescription_no,             --处方号
@@ -84,18 +396,15 @@
                T1.effective_dose_end,                      --服药时间(结束)
                T1.dispense_interval,                       --给药间隔
                T1.dispense_per_quantity,                   --单次发药数
-               T1.dispense_per_duration                    --每次发药供应天数
+               T1.dispense_per_duration,                   --每次发药供应天数
+               T1.rx_type_code,                            --处方类别
+               T1.rx_item_type_code,                       --处方项目类别
+               T1.condition_id,                            --诊断id
+               T1.version                                  --药品版本号
         FROM elep_medication_request AS T1
-                 LEFT JOIN (SELECT medical_catalog_code,
-                                   registered_name,
-                                   drug_specification,
-                                   manufacturer_name,
-                                   MAX(version)
-                            FROM yb_catalog_drug_info
-                            GROUP BY  medical_catalog_code,
-                                      registered_name,
-                                      drug_specification,
-                                      manufacturer_name   ) AS T2 ON T1.medication_id = T2.medical_catalog_code
+                 LEFT JOIN yb_catalog_drug_info AS T2
+                           ON T1.medication_id = T2.medical_catalog_code
+                               AND T1.version = T2.version
         WHERE T1.prescription_no = #{prescriptionNo}
           AND T1.delete_flag = '0'
         GROUP BY T1.id,
@@ -114,26 +423,30 @@
                  T1.effective_dose_end,
                  T1.dispense_interval,
                  T1.dispense_per_quantity,
-                 T1.dispense_per_duration
+                 T1.dispense_per_duration,
+                 T1.rx_type_code,
+                 T1.rx_item_type_code,
+                 T1.condition_id,
+                 T1.version
     </select>
     <select id="selectSaveInfo" resultType="com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam">
-        SELECT T7.id           AS organization_id, --医院id
-               T1.bus_no       AS ipt_otp_no,      --门诊/住院病历号
+        SELECT T7.id       AS organization_id, --医院id
+               T1.bus_no   AS ipt_otp_no,      --门诊/住院病历号
                CASE
                    WHEN (T1.class_enum = '2') THEN T3.name
                    WHEN (T1.class_enum = '1') THEN T5.name
                    ELSE NULL
-                   END         AS department_ward, --科室病区
-               T6.insutype     AS insurance_enum,  --医保类型
-               T8.definition_id AS condition_Id     --诊断id
+                   END     AS department_ward, --科室病区
+               T6.insutype AS insurance_enum   --医保类型
+               --T8.id       AS condition_id     --诊断id
         FROM adm_encounter AS T1
-                 LEFT JOIN adm_encounter_diagnosis AS T2
-                           ON T2.encounter_id = T1.id
-                               AND T2.maindise_flag = '1'
-                               AND T2.delete_flag = '0'
-                 LEFT JOIN cli_condition AS T8
-                           ON T2.condition_id = T8.id
-                               AND T8.delete_flag = '0'
+                 --                  LEFT JOIN adm_encounter_diagnosis AS T2
+--                            ON T2.encounter_id = T1.id
+--                                AND T2.maindise_flag = '1'
+--                                AND T2.delete_flag = '0'
+--                  LEFT JOIN cli_condition AS T8
+--                            ON T2.condition_id = T8.id
+--                                AND T8.delete_flag = '0'
                  LEFT JOIN adm_organization AS T3
                            ON T1.organization_id = T3.id
                                AND T3.delete_flag = '0'
@@ -157,7 +470,25 @@
             T1.class_enum,
             T3.name,
             T5.name,
-            T6.insutype,
-            T8.definition_id
+            T6.insutype
+        --  T8.id
     </select>
+    <!--    <select id="selectConditionInfo" resultType="com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam">-->
+    <!--        SELECT  T3.id       AS condition_id,     &#45;&#45;诊断id-->
+    <!--                T4.name     AS condition_name     &#45;&#45;诊断名-->
+    <!--        FROM adm_encounter AS T1-->
+    <!--                 LEFT JOIN adm_encounter_diagnosis AS T2-->
+    <!--                           ON T2.encounter_id = T1.id-->
+    <!--                               AND T2.delete_flag = '0'-->
+    <!--                 LEFT JOIN cli_condition AS T3-->
+    <!--                           ON T2.condition_id = T3.id-->
+    <!--                               AND T3.delete_flag = '0'-->
+    <!--                 LEFT JOIN cli_condition_definition AS T4-->
+    <!--                           ON T3.definition_id = T4.id-->
+    <!--                               AND T3.delete_flag = '0'-->
+    <!--        WHERE T1.id = #{encounterId}-->
+    <!--          AND T1.delete_flag = '0'-->
+    <!--        GROUP BY T3.id,-->
+    <!--                 T4.name-->
+    <!--    </select>-->
 </mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
similarity index 39%
rename from openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
index e069ee08..e5d8a1c3 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
@@ -20,7 +20,9 @@
         T10.contract_name,
         T10.org_id,
         T10.register_time,
-        T10.reception_time
+        T10.reception_time,
+        T10.practitioner_user_id,
+        T10.jz_practitioner_user_id
         from
         (
         SELECT T1.tenant_id AS tenant_id,
@@ -30,6 +32,8 @@
         T3.NAME AS healthcare_name,
         T5.user_id AS practitioner_user_id,
         T5.NAME AS practitioner_name,
+        ap.user_id AS jz_practitioner_user_id,
+        ap.NAME AS jz_practitioner_name,
         T6.id AS account_id,
         T6.type_code AS type_code,
         T7.contract_name AS contract_name,
@@ -53,6 +57,11 @@
         LEFT JOIN adm_encounter_participant AS T4
         ON T1.ID = T4.encounter_id AND T4.type_code = #{participantType} AND T4.delete_flag = '0'
         LEFT JOIN adm_practitioner AS T5 ON T5.ID = T4.practitioner_id AND T5.delete_flag = '0'
+        LEFT JOIN adm_encounter_participant AS aep ON T1.ID = aep.encounter_id
+        AND aep.type_code = #{participantType2}
+        AND aep.delete_flag = '0'
+        LEFT JOIN adm_practitioner AS ap ON ap.ID = aep.practitioner_id
+        AND ap.delete_flag = '0'
         LEFT JOIN adm_account AS T6 ON T1.ID = T6.encounter_id AND T6.delete_flag = '0' and T6.encounter_flag = '1'
         LEFT JOIN fin_contract AS T7 ON T6.contract_no = T7.bus_no AND T7.delete_flag = '0'
         LEFT JOIN adm_patient AS T8 ON T1.patient_id = T8.ID AND T8.delete_flag = '0'
@@ -63,7 +72,7 @@
         <!-- 当前登录账号ID 和 当前登录账号所属的科室ID 用于控制数据权限 -->
         <if test="userId != null and currentUserOrganizationId != null">
             AND ( T5.user_id = #{userId}
-            OR (T1.organization_id = #{currentUserOrganizationId} AND T5.user_id != #{userId}) )
+            OR (T1.organization_id = #{currentUserOrganizationId}) )
         </if>
         <if test="pricingFlag ==1">
             AND T1.status_enum != #{encounterStatus}
@@ -73,4 +82,102 @@
         ${ew.customSqlSegment}
     </select>
 
+    <select id="getPrescriptionPageInfo" resultType="com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto">
+        SELECT ppi.prescription_no,
+               ppi.encounter_id,
+               ppi.patient_id,
+               ppi.patient_name,
+               ppi.birth_date,
+               ppi.gender_enum,
+               ppi.condition_definition_name,
+               ppi.request_time,
+               ppi.practitioner_id,
+               ppi.practitioner_name,
+               ppi.organization_id,
+               ppi.bus_no,
+               ppi.contract_name
+        FROM (SELECT DISTINCT
+              ON
+                  ( mmr.prescription_no ) mmr.prescription_no, mmr.encounter_id,
+                  mmr.tenant_id,
+                  mmr.patient_id,
+                  ap.NAME AS patient_name,
+                  ap.birth_date AS birth_date,
+                  ap.gender_enum AS gender_enum,
+                  ccd.NAME AS condition_definition_name,
+                  mmr.create_time AS request_time,
+                  mmr.practitioner_id,
+                  aper.NAME AS practitioner_name,
+                  ae.organization_id,
+                  ae.bus_no,
+                  fc.contract_name
+              FROM
+                  med_medication_request AS mmr
+                  LEFT JOIN adm_encounter AS ae
+              ON ae.id = mmr.encounter_id AND ae.delete_flag = '0'
+                  LEFT JOIN adm_account AS aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0' AND aa.encounter_flag = 1
+                  LEFT JOIN fin_contract AS fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
+                  LEFT JOIN adm_patient AS ap
+                  ON ap.ID = mmr.patient_id
+                  AND ap.delete_flag = '0'
+                  LEFT JOIN cli_condition AS cc ON cc.ID = mmr.condition_id
+                  AND cc.delete_flag = '0'
+                  LEFT JOIN cli_condition_definition AS ccd ON ccd.ID = cc.definition_id
+                  LEFT JOIN adm_practitioner AS aper ON aper.ID = mmr.practitioner_id
+                  AND aper.delete_flag = '0'
+              WHERE
+                  mmr.delete_flag = '0'
+                AND (mmr.prescription_no LIKE 'P%'
+                 OR mmr.prescription_no LIKE 'C%')
+                AND mmr.refund_medicine_id IS NULL
+              ORDER BY
+                  mmr.prescription_no DESC) AS ppi
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPrescriptionDetailInfo" resultType="com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto">
+        SELECT mmr.prescription_no,
+        mmr.ID AS request_id,
+        mmr.practitioner_id AS requester_id,
+        mmr.create_time AS request_time,
+        mmr.group_id AS group_id,
+        mmd.NAME AS advice_name,
+        mm.total_volume AS volume,
+        mmr.lot_number AS lot_number,
+        mmr.quantity AS quantity,
+        mmr.unit_code AS unit_code,
+        mmr.status_enum AS status_enum,
+        mmr.method_code AS method_code,
+        mmr.rate_code AS rate_code,
+        mmr.dose AS dose,
+        mmr.dose_unit_code AS dose_unit_code,
+        aci.ID AS charge_item_id,
+        aci.total_price AS total_price,
+        aci.status_enum AS charge_status,
+        al.ID AS position_id,
+        al.NAME AS position_name,
+        mmr.dispense_per_duration AS dispense_per_duration,
+        mmd.part_percent AS part_percent,
+        ccd.NAME AS condition_definition_name
+        FROM med_medication_request AS mmr
+        LEFT JOIN med_medication_definition AS mmd ON mmd.ID = mmr.medication_id
+        AND mmd.delete_flag = '0'
+        LEFT JOIN med_medication AS mm ON mm.medication_def_id = mmd.ID
+        AND mm.delete_flag = '0'
+        LEFT JOIN adm_charge_item AS aci ON aci.service_id = mmr.ID
+        AND aci.delete_flag = '0'
+        LEFT JOIN adm_location AS al ON al.ID = mmr.perform_location
+        AND al.delete_flag = '0'
+        LEFT JOIN cli_condition AS cc ON cc.ID = mmr.condition_id
+        AND cc.delete_flag = '0'
+        LEFT JOIN cli_condition_definition AS ccd ON ccd.ID = cc.definition_id
+        WHERE mmr.delete_flag = '0'
+        <if test="prescriptionNo != null">
+            AND mmr.prescription_no = #{prescriptionNo}
+        </if>
+        <if test="encounterId != null">
+            AND mmr.encounter_id = #{encounterId}
+        </if>
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
new file mode 100644
index 00000000..95eca535
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.doctorstation.mapper.ReservationRecordAppMapper">
+
+    <select id="getReservationInfo" resultType="com.openhis.web.doctorstation.dto.ReservationRecordDto">
+        SELECT ri.tenant_id,
+               ri.id,
+               ri.patient_name,
+               ri.patient_tel,
+               ri.chief_complaint,
+               ri.reservation_time,
+               ri.org_id,
+               ri.org_name,
+               ri.practitioner_id,
+               ri.practitioner_name,
+               ri.remark
+        from (SELECT crr.tenant_id,
+                     crr.id,
+                     crr.patient_name,
+                     crr.patient_tel,
+                     crr.chief_complaint,
+                     crr.reservation_time,
+                     crr.org_id,
+                     ao.NAME AS org_name,
+                     crr.practitioner_id,
+                     ap.NAME AS practitioner_name,
+                     crr.remark
+              FROM cli_reservation_record AS crr
+                       LEFT JOIN adm_organization AS ao ON ao.ID = crr.org_id
+                  AND ao.delete_flag = '0'
+                       LEFT JOIN adm_practitioner AS ap ON ap.ID = crr.practitioner_id
+                  AND ap.delete_flag = '0'
+              WHERE crr.delete_flag = '0'
+                AND (crr.org_id = #{orgId} OR crr.practitioner_id = #{practitionerId})
+              order by crr.reservation_time) AS ri
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
new file mode 100644
index 00000000..d504c505
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.document.mapper.DocDefinitionAppMapper">
+    <!-- 患者信息分页查询-->
+    <select id="getDefinationList" parameterType="java.util.Map"
+            resultType="com.openhis.web.document.dto.DocDefinitionDto">
+        SELECT
+        dd.id,
+        dd.name,
+        dd.version,
+        dd.primary_menu_enum ,
+        dd.sub_menu ,
+        dd.bus_no ,
+        dd.vue_router ,
+        dd.hospital_id ,
+        dd.is_valid ,
+        dd.display_order ,
+        dd.use_range_enum ,
+        dd.doctor_permission_enum ,
+        dd.nursing_permission_enum ,
+        dd.medical_permission_enum ,
+        dd.pharmacist_permission_enum ,
+        ARRAY_AGG(ddo.organization_id) FILTER (WHERE ddo.organization_id IS NOT NULL) AS organization_Ids
+        FROM doc_definition dd
+        LEFT JOIN doc_definition_organization ddo
+        ON dd.id = ddo.definition_id -- 使用 definition_id 关联
+        WHERE dd.delete_flag = '0'
+        and dd.hospital_id = #{hospitalId}
+        <if test="useRanges != null and !useRanges.isEmpty()">
+            AND dd.use_range_enum IN
+            <foreach collection="useRanges" item="useRange" open="(" separator="," close=")">
+                #{useRange}
+            </foreach>
+        </if>
+        <if test="organizationId != null and organizationId != 0">
+            AND ddo.organization_id = #{organizationId} OR dd.use_range_enum = 1
+        </if>
+        <if test="name != null and !name.isEmpty()">
+            AND dd.name LIKE CONCAT('%',#{name},'%')
+        </if>
+        GROUP BY
+        dd.id, dd.primary_menu_enum ,
+        dd.sub_menu
+
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
new file mode 100644
index 00000000..f7f42d06
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.document.mapper.DocRecordAppMapper">
+    <!-- 患者信息分页查询-->
+    <select id="getRecordPageList" parameterType="java.util.Map"
+            resultType="com.openhis.web.document.dto.DocRecordPatientDto">
+        SELECT t1.id,
+        t1.definition_id,
+        t1.definition_bus_no,
+        t1.content_json,
+        t1.status_enum,
+        t1.organization_id,
+        t1.encounter_id,
+        t1.patient_id,
+        t1.record_time,
+        t1.tenant_id,
+        t1.delete_flag,
+        t1.create_by,
+        t1.create_time,
+        t1.update_by,
+        t1.update_time,
+        t1.bus_no,
+        t1.patient_name,
+        t1.gender,
+        t1.age,
+        t1.id_card,
+        t1.phone,
+        t1.address,
+        t1.birth_date,
+        t1.reception_time,
+        t1.start_time,
+        t1.end_time,
+        t1.class_enum,
+        t1.primary_menu_enum,
+        t1.doc_name,
+        t1.tenant_id
+        FROM
+        (SELECT
+        p.bus_no,
+        p.name as patient_name,
+        p.gender_enum as gender,
+        null as age,
+        p.birth_date,
+        p.address,
+        p.phone,
+        p.id_card,
+        e.start_time,
+        e.end_time,
+        e.reception_time,
+        e.class_enum,
+        d.primary_menu_enum,
+        d.name as doc_name,
+        t.id,
+        t.definition_id,
+        t.definition_bus_no,
+        t.content_json,
+        t.status_enum,
+        t.organization_id,
+        t.encounter_id,
+        t.patient_id,
+        t.record_time,
+        t.tenant_id,
+        t.delete_flag,
+        t.create_by,
+        t.create_time,
+        t.update_by,
+        t.update_time,
+        t.tenant_id
+
+        FROM doc_record t
+        LEFT JOIN doc_definition d
+        on d.id=t.definition_id
+        LEFT JOIN adm_encounter e
+        on t.encounter_id =e.id
+        LEFT JOIN adm_patient p
+        on t.patient_id=p.id
+        WHERE t.delete_flag='0'
+
+        <if test="primaryMenuEnumList != null and !primaryMenuEnumList.isEmpty()">
+            AND t.primary_menu_enum IN
+            <foreach collection="primaryMenuEnumList" item="primaryMenuEnum" open="(" separator="," close=")">
+                #{primaryMenuEnum}
+            </foreach>
+        </if>
+        order by t.record_time desc
+        )t1
+        ${ew.customSqlSegment}
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
new file mode 100644
index 00000000..d5babe44
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.document.mapper.DocStatisticsDefinitionAppMapper">
+    <!-- 患者信息分页查询-->
+    <select id="getDocStatisticsDefinitionPageList" parameterType="java.util.Map"
+            resultType="com.openhis.web.document.dto.DocStatisticsDefinitionDto">
+
+    </select>
+    <select id="getOptionList" parameterType="java.util.Map"
+            resultType="com.openhis.web.document.dto.OptionDto">
+        SELECT op.id as option_id,
+        op.option,
+        op.display_order,
+        d.id,
+        d.name,
+        d.type_enum,
+        d.code,
+        d.required,
+        d.remark,
+        d.is_statistics,
+        d.unit
+        from doc_statistics_definition_option op
+        RIGHT JOIN doc_statistics_definition d
+        on op.doc_statistics_definition_id = d.id
+        WHERE
+        d.delete_flag='0'
+        <if test="id!= null">
+            and d.id = #{id}
+        </if>
+        <if test="code!= null and code.isEmpty() == false">
+            and d.code = #{code}
+        </if>
+        <if test="name!= null">
+            and d.name = #{name}
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
new file mode 100644
index 00000000..fcc0cfe3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper">
+
+    <select id="getAdvancePaymentInfo" resultType="com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto">
+        SELECT api.tenant_id,
+               api.encounter_id,
+               api.bus_no,
+               api.patient_id,
+               api.patient_name,
+               api.gender_enum,
+               api.birth_date,
+               api.ward_name,
+               api.house_name,
+               api.bed_name,
+               api.inHospital_org_name,
+               api.account_id,
+               api.total_amount,
+               api.balance_amount
+        from (SELECT ae.tenant_id,
+                     ae.ID                                 AS encounter_id,
+                     ae.bus_no                             AS bus_no,
+                     ap.id                                 AS patient_id,
+                     ap.NAME                               AS patient_name,
+                     ap.gender_enum                        AS gender_enum,
+                     ap.birth_date                         AS birth_date,
+                     alw.name                              AS ward_name,
+                     alh.name                              AS house_name,
+                     alb.name                              AS bed_name,
+                     ao.NAME                               AS inHospital_org_name,
+                     aa.id                                 AS account_id,
+                     COALESCE(payment.total_amount, 0)     AS total_amount,
+                     COALESCE(payment.total_amount, 0) - COALESCE(consumption.consumption_amount, 0) +
+                     COALESCE(return_pay.return_amount, 0) AS balance_amount
+              FROM adm_encounter AS ae
+                       LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+                  AND ap.delete_flag = '0'
+                       LEFT JOIN adm_organization AS ao ON ao.ID = ae.organization_id
+                  AND ao.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS aelw
+                                 ON aelw.encounter_id = ae.ID AND aelw.delete_flag = '0' AND
+                                    aelw.form_enum = #{wardEnum} AND
+                                    aelw.status_enum = #{encounterLocationStatus}
+                       LEFT JOIN adm_location AS alw ON alw.id = aelw.location_id AND alw.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS aelh
+                                 ON aelh.encounter_id = ae.ID AND aelh.delete_flag = '0' AND
+                                    aelh.form_enum = #{houseEnum} AND
+                                    aelh.status_enum = #{encounterLocationStatus}
+                       LEFT JOIN adm_location AS alh ON alh.id = aelh.location_id AND alh.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS aelb
+                                 ON aelb.encounter_id = ae.ID AND aelb.delete_flag = '0' AND
+                                    aelb.form_enum = #{bedEnum} AND
+                                    aelb.status_enum = #{encounterLocationStatus}
+                       LEFT JOIN adm_location AS alb ON alb.id = aelb.location_id AND alb.delete_flag = '0'
+                       LEFT JOIN adm_account AS aa
+                                 ON aa.encounter_id = ae.ID AND aa.delete_flag = '0' AND
+                                    aa.type_code = #{accountTypeCode}
+                       LEFT JOIN LATERAL (
+                  SELECT SUM
+                             (tendered_amount) AS total_amount
+                  FROM fin_payment_reconciliation AS fpr
+                  WHERE fpr.delete_flag = '0'
+                    AND fpr.kind_enum = #{kindEnum}
+                    AND fpr.encounter_id = ae.ID
+                      ) AS payment
+                                 ON TRUE
+                       LEFT JOIN LATERAL (
+                  SELECT SUM
+                             (total_price) AS consumption_amount
+                  FROM adm_charge_item AS aci
+                  WHERE aci.delete_flag = '0'
+                    AND aci.status_enum IN (#{status1}, #{status2})
+                    AND aci.encounter_id = ae.ID
+                      ) AS consumption ON TRUE
+                       LEFT JOIN LATERAL (
+                  SELECT SUM
+                             (total_price) AS return_amount
+                  FROM adm_charge_item AS aci
+                  WHERE aci.delete_flag = '0'
+                    AND aci.status_enum IN (#{status3})
+                    AND aci.encounter_id = ae.ID
+                      ) AS return_pay ON TRUE
+              WHERE ae.delete_flag = '0'
+                AND ae.class_enum = #{classEnum}) AS api
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getAdvancePaymentFlowRecordList"
+            resultType="com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto">
+        SELECT fpr.payment_no,
+               fpr.tendered_amount,
+               fpr.payment_enum,
+               fpr.create_time AS operate_time,
+               ap.NAME         AS enterer
+        FROM fin_payment_reconciliation AS fpr
+                 LEFT JOIN adm_practitioner AS ap ON ap.ID = fpr.enterer_id
+            AND ap.delete_flag = '0'
+        WHERE fpr.delete_flag = '0'
+          AND fpr.kind_enum = 0
+          AND fpr.encounter_id = #{encounterId}
+        ORDER BY fpr.create_time DESC
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
new file mode 100644
index 00000000..d05d13a2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper">
+
+    <select id="getInHospitalRegisterInfo" resultType="com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto">
+        SELECT ihri.tenant_id,
+        ihri.encounter_id,
+        ihri.amb_encounter_id,
+        ihri.patient_id,
+        ihri.request_time,
+        ihri.registrar,
+        ihri.source_name,
+        ihri.patient_name,
+        ihri.gender_enum,
+        ihri.birth_date,
+        ihri.ward_name
+        from (SELECT ae.tenant_id,
+        ae.ID AS encounter_id,
+        ae.amb_encounter_id AS amb_encounter_id,
+        ae.patient_id AS patient_id,
+        ae.create_time AS request_time,
+        aper.NAME AS registrar,
+        ao.NAME AS source_name,
+        ap.NAME AS patient_name,
+        ap.gender_enum AS gender_enum,
+        ap.birth_date AS birth_date,
+        al.NAME AS ward_name
+        FROM adm_encounter AS ae
+        LEFT JOIN adm_encounter AS ambae ON ae.amb_encounter_id = ambae.
+        ID
+        LEFT JOIN adm_organization AS ao ON ao.ID = ambae.organization_id
+        AND ao.delete_flag = '0'
+        LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+        AND ap.delete_flag = '0'
+        LEFT JOIN adm_encounter_location AS ael ON ael.encounter_id = ae.ID
+        AND ael.delete_flag = '0'
+        AND ael.form_enum = #{formEnum}
+        LEFT JOIN adm_location AS al ON al.ID = ael.location_id
+        AND al.delete_flag = '0'
+        LEFT JOIN adm_practitioner AS aper ON aper.ID = ae.registrar_id
+        AND aper.delete_flag = '0'
+        WHERE ae.delete_flag = '0'
+        AND ae.class_enum = #{encounterClass}
+        <if test="registeredFlag == '0'.toString()">
+            AND ae.status_enum = #{encounterStatus}
+        </if>
+        <if test="registeredFlag == '1'.toString()">
+            AND ae.status_enum != #{encounterStatus}
+        </if>
+        ) AS ihri
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPatientInfo" resultType="com.openhis.web.inhospitalcharge.dto.InHospitalPatientInfoDto">
+        SELECT ap.id   AS patient_id,
+               ap.bus_no,
+               ap.NAME AS patient_name,
+               ap.id_card,
+               ap.birth_date,
+               ap.gender_enum,
+               ap.nationality_code,
+               ap.country_code,
+               ap.marital_status_enum,
+               ap.prfs_enum,
+               ap.phone,
+               ap.address,
+               ap.native_place,
+               ap.work_company
+        FROM adm_patient AS ap
+        WHERE ap.delete_flag = '0'
+          AND ap.ID = #{patientId}
+    </select>
+
+    <select id="getInHospitalInfo" resultType="com.openhis.web.inhospitalcharge.dto.InHospitalInfoDto">
+        SELECT ae.ID                                  AS encounter_id,
+               ae.bus_no                              AS bus_no,
+               (SELECT COUNT(1)
+                FROM adm_encounter
+                WHERE delete_flag = '0'
+                  AND class_enum = 1
+                  AND patient_id = ae.patient_id) - 1 AS in_hospital_count,
+               ae.organization_id                     AS in_hospital_org_id,
+               ae.amb_encounter_id                    AS amb_encounter_id,
+               ae.priority_enum                       AS priority_enum,
+               ae.admit_source_code                   AS admit_source_code,
+               ae.in_way_code                         AS in_way_code,
+               ae.start_time                          AS start_time,
+               ao.NAME                                AS in_hospital_org_name,
+               al.ID                                  AS ward_location_id,
+               al.NAME                                AS ward_name,
+               al.bus_no                              AS ward_bus_no,
+               ap.ID                                  AS amb_doctor_practitioner_id,
+               ap.NAME                                AS amb_doctor_practitioner_name,
+               ccd.NAME                               AS amb_diagnosis_name,
+               COALESCE(aa.balance_amount, 0)         AS balance_amount
+        FROM adm_encounter AS ae
+                 LEFT JOIN adm_organization AS ao ON ao.ID = ae.organization_id
+            AND ao.delete_flag = '0'
+                 LEFT JOIN adm_encounter_location AS ael ON ael.encounter_id = ae.ID
+            AND ael.delete_flag = '0'
+            AND ael.form_enum = #{formEnum}
+                 LEFT JOIN adm_location AS al ON al.ID = ael.location_id
+            AND al.delete_flag = '0'
+                 LEFT JOIN adm_encounter_participant AS aep ON aep.encounter_id = ae.amb_encounter_id
+            AND aep.delete_flag = '0'
+            AND aep.type_code = #{participantType}
+                 LEFT JOIN adm_practitioner AS ap ON ap.ID = aep.practitioner_id
+            AND ap.delete_flag = '0'
+                 LEFT JOIN adm_encounter_diagnosis AS aed ON aed.encounter_id = ae.amb_encounter_id
+            AND aed.delete_flag = '0'
+            AND aed.maindise_flag = #{maindiseFlag}
+                 LEFT JOIN cli_condition AS cc ON cc.ID = aed.condition_id
+            AND cc.delete_flag = '0'
+                 LEFT JOIN cli_condition_definition AS ccd ON ccd.ID = cc.definition_id
+            AND ccd.delete_flag = '0'
+                 LEFT JOIN adm_account AS aa ON aa.encounter_id = ae.ID
+            AND aa.delete_flag = '0'
+            AND aa.type_code = #{accountType}
+        WHERE ae.ID = #{encounterId}
+    </select>
+
+    <select id="getTotalBedsNum" resultType="integer">
+        SELECT COUNT
+                   (1)
+        FROM adm_location
+        WHERE delete_flag = '0'
+          AND form_enum = #{formEnum}
+          AND status_enum != #{status}
+          AND bus_no LIKE concat('%'
+            , #{wardBusNo}
+            , '%')
+    </select>
+
+    <select id="getIdleBedsNum" resultType="integer">
+        SELECT COUNT
+                   (1)
+        FROM adm_location
+        WHERE delete_flag = '0'
+          AND form_enum = #{formEnum}
+          AND status_enum = #{status}
+          AND bus_no LIKE concat('%'
+            , #{wardBusNo}
+            , '%')
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
new file mode 100644
index 00000000..0de7769d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.ATDManageAppMapper">
+    <select id="selectAdmissionPatientPage"
+            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto">
+    SELECT ii.encounter_id,
+           ii.bus_no,
+           ii.encounter_status,
+           ii.start_time,
+           ii.end_time,
+           ii.admit_source_code,
+           ii.priority_enum,
+           ii.organization_id,
+           ii.patient_name,
+           ii.patient_py_str,
+           ii.patient_wb_str,
+           ii.gender_enum,
+           ii.birth_date,
+           ii.ward_id,
+           ii.ward_name,
+           ii.house_id,
+           ii.house_name,
+           ii.bed_id,
+           ii.bed_name,
+           ii.organization_name,
+           ii.contract_name
+    FROM (
+            WITH locations AS (
+            SELECT ael.encounter_id,
+                   al.form_enum,
+                   al.id AS location_id,
+                   al."name" AS location_name
+            FROM adm_encounter_location ael
+                LEFT JOIN adm_location al
+                    ON ael.location_id = al.id
+                        AND al.delete_flag = '0'
+            WHERE ael.status_enum = #{active}
+              AND ael.delete_flag = '0'
+    )
+           SELECT ae.tenant_id,
+                  ae.id           AS encounter_id,
+                  ae.bus_no,
+                  ae.status_enum  AS encounter_status,
+                  ae.start_time,
+                  ae.end_time,
+                  ae.admit_source_code,
+                  ae.priority_enum,
+                  ae.organization_id,
+                  ap."name"       AS patient_name,
+                  ap.py_str       AS patient_py_str,
+                  ap.wb_str       AS patient_wb_str,
+                  ap.gender_enum,
+                  ap.birth_date,
+                  alw.location_id AS ward_id,
+                  alw.location_name AS ward_name,
+                  alh.location_id AS house_id,
+                  alh.location_name AS house_name,
+                  alb.location_id AS bed_id,
+                  alb.location_name AS bed_name,
+                  ao."name"       AS organization_name,
+                  fc.contract_name
+           FROM adm_encounter ae
+                    LEFT JOIN adm_patient ap
+                        ON ae.patient_id = ap.id
+                            AND ap.delete_flag = '0'
+                    LEFT JOIN locations alw
+                        ON alw.encounter_id = ae.id
+                            AND alw.form_enum = #{ward}
+                    LEFT JOIN locations alh
+                        ON alh.encounter_id = ae.id
+                            AND alh.form_enum = #{house}
+                    LEFT JOIN locations alb
+                        ON alb.encounter_id = ae.id
+                            AND alb.form_enum = #{bed}
+                    LEFT JOIN adm_organization ao
+                        ON ao.id = ae.organization_id
+                            AND ao.delete_flag = '0'
+                    LEFT JOIN adm_account aa
+                        ON ae.id = aa.encounter_id
+                            AND aa.encounter_flag = 1
+                            AND aa.delete_flag = '0'
+                    LEFT JOIN fin_contract fc
+                        ON aa.contract_no = fc.bus_no
+                            AND fc.delete_flag = '0'
+           WHERE ae.delete_flag = '0'
+             AND ae.class_enum = #{imp}
+             AND ae.status_enum != #{toBeRegistered}
+           GROUP BY ae.id,
+                    ae.bus_no,
+                    ae.status_enum,
+                    ae.start_time,
+                    ae.end_time,
+                    ae.admit_source_code,
+                    ae.priority_enum,
+                    ae.organization_id,
+                    ap."name",
+                    ap.py_str,
+                    ap.wb_str,
+                    ap.gender_enum,
+                    ap.birth_date,
+                    alw.location_id,
+                    alw.location_name,
+                    alh.location_id,
+                    alh.location_name,
+                    alb.location_id,
+                    alb.location_name,
+                    ao."name",
+                    fc.contract_name
+           ORDER BY ae.bus_no DESC
+        ) AS ii
+    ${ew.customSqlSegment}
+    </select>
+    <select id="selectAdmissionBadPage"
+            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionBedPageDto">
+    SELECT ii.bed_id,
+           ii.bed_name,
+           ii.bed_status,
+           ii.house_id,
+           ii.house_name,
+           ii.ward_id,
+           ii.ward_name,
+           ii.encounter_id ,
+           ii.organization_id ,
+           ii.bus_no ,
+           ii.encounter_status,
+           ii.patient_name,
+           ii.patient_py_str,
+           ii.patient_wb_str,
+           ii.gender_enum ,
+           ii.birth_date ,
+           ii.total_amount,
+           ii.balance_amount
+    FROM ( SELECT bed.id AS bed_id,
+                  bed.tenant_id,
+                  bed."name" AS bed_name,
+                  bed.status_enum AS bed_status,
+                  house.id AS house_id,
+                  house."name" AS house_name,
+                  ward.id AS ward_id,
+                  ward."name" AS ward_name,
+                  ae.id AS encounter_id ,
+                  ae.organization_id ,
+                  ae.bus_no ,
+                  ae.status_enum AS encounter_status,
+                  ap."name" AS patient_name,
+                  ap.py_str AS patient_py_str,
+                  ap.wb_str AS patient_wb_str,
+                  ap.gender_enum ,
+                  ap.birth_date ,
+                  personal_account.total_amount,
+                  personal_account.balance_amount
+           FROM adm_location bed
+               LEFT JOIN adm_location house
+                   ON house.bus_no = SPLIT_PART(bed.bus_no,'.',1) || '.' || SPLIT_PART(bed.bus_no,'.',2)
+                       AND house.form_enum = #{house}
+                       AND house.delete_flag = '0'
+               LEFT JOIN adm_location ward
+                    ON ward.bus_no = SPLIT_PART(bed.bus_no,'.',1)
+                        AND ward.form_enum = #{ward}
+                        AND ward.delete_flag = '0'
+               LEFT JOIN adm_encounter_location aelb
+                    ON bed.id = aelb.location_id
+                        AND aelb.delete_flag = '0'
+                        AND aelb.status_enum = #{active}
+                        AND bed.form_enum = #{bed}
+               LEFT JOIN adm_encounter ae
+                    ON aelb.encounter_id = ae.id
+                        AND ae.delete_flag = '0'
+               LEFT JOIN adm_patient ap
+                    ON ap.id = ae.patient_id
+                        AND ap.delete_flag = '0'
+               LEFT JOIN ( SELECT aa.encounter_id,
+                                  aa.balance_amount AS total_amount,
+                                  (aa.balance_amount -
+                                   COALESCE(SUM(CASE WHEN aci.status_enum IN (#{billed}, #{billable})
+                                       THEN aci.total_price ELSE 0 END), 0) +
+                                   COALESCE(SUM(CASE WHEN aci.status_enum = #{refunded}
+                                       THEN aci.total_price ELSE 0 END), 0)) AS balance_amount
+                           FROM adm_account aa
+                                    LEFT JOIN adm_charge_item aci
+                                              ON aa.encounter_id = aci.encounter_id
+                                                  AND aa.delete_flag = '0'
+                           WHERE aa.type_code = #{personalCashAccount}
+                             AND aa.delete_flag = '0'
+                           GROUP BY aa.encounter_id,
+                                    aa.balance_amount
+           ) AS personal_account
+                         ON personal_account.encounter_id = ae.id
+           WHERE bed.form_enum = #{bed}
+             AND bed.delete_flag = '0'
+             AND bed.status_enum != #{inactive}
+           GROUP BY bed.id,
+                    bed.tenant_id,
+                    bed."name",
+                    bed.status_enum,
+                    house.id,
+                    house."name",
+                    ward.id,
+                    ward."name",
+                    ae.id,
+                    ae.organization_id ,
+                    ae.bus_no ,
+                    ae.status_enum,
+                    ap."name",
+                    ap.py_str,
+                    ap.wb_str,
+                    ap.gender_enum ,
+                    ap.birth_date,
+                    personal_account.total_amount,
+                    personal_account.balance_amount
+           ORDER BY bed.bus_no
+        ) AS ii
+    ${ew.customSqlSegment}
+    </select>
+    <select id="selectAdmissionPatientInfo"
+            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto">
+        WITH locations AS (
+            SELECT ael.encounter_id,
+                   ael.start_time,
+                   al.form_enum,
+                   al.id AS location_id,
+                   al."name" AS location_name
+            FROM adm_encounter_location ael
+                LEFT JOIN adm_location al
+                    ON ael.location_id = al.id
+                        AND al.delete_flag = '0'
+            WHERE ael.status_enum = #{active}
+              AND ael.delete_flag = '0'
+        ) , practitioners AS (
+            SELECT aep.encounter_id ,
+                   aep.type_code ,
+                   pra.id AS practitioner_id,
+                   pra."name" AS practitioner_name
+            FROM adm_encounter_participant aep
+                LEFT JOIN adm_practitioner pra
+                    ON aep.practitioner_id = pra.id
+                        AND pra.delete_flag = '0'
+            WHERE aep.status_enum = #{active}
+              AND aep.delete_flag = '0'
+        )
+        SELECT ae.id AS encounter_id,
+               ae.bus_no ,
+               ae.priority_enum ,
+               ae.organization_id ,
+               ae.start_time AS in_hos_time,
+               bed.start_time,
+               bed.location_id AS bed_id,
+               bed.location_name AS bed_name,
+               house.location_id AS house_id,
+               house.location_name AS house_name,
+               ward.location_id AS ward_id,
+               ward.location_name AS ward_name,
+               primaryNurse.practitioner_id AS primary_nurse_id,
+               primaryNurse.practitioner_name AS primary_nurse_name,
+               attendingDoctor.practitioner_id AS attending_doctor_id,
+               attendingDoctor.practitioner_name AS attending_doctor_name,
+               admittingDoctor.practitioner_id AS admitting_doctor_id,
+               admittingDoctor.practitioner_name AS admitting_doctor_name,
+               chiefDoctor.practitioner_id AS chief_doctor_id,
+               chiefDoctor.practitioner_name AS chief_doctor_name,
+               ao."name" AS organization_name ,
+               ap."name" AS patient_name,
+               ap.gender_enum ,
+               ap.birth_date ,
+               ap.phone ,
+               fc.contract_name ,
+               diagnosis.condition_names
+        FROM adm_encounter ae
+            LEFT JOIN locations AS bed
+                ON bed.encounter_id = ae.id
+                    AND bed.form_enum = #{bed}
+            LEFT JOIN locations AS house
+                ON house.encounter_id = ae.id
+                    AND house.form_enum = #{house}
+            LEFT JOIN locations AS ward
+                ON ward.encounter_id = ae.id
+                    AND ward.form_enum = #{ward}
+            LEFT JOIN practitioners AS primaryNurse
+                ON primaryNurse.encounter_id = ae.id
+                    AND primaryNurse.type_code = #{primaryNurse}
+            LEFT JOIN practitioners AS attendingDoctor
+                ON attendingDoctor.encounter_id = ae.id
+                    AND attendingDoctor.type_code = #{attendingDoctor}
+            LEFT JOIN practitioners AS admittingDoctor
+                ON admittingDoctor.encounter_id = ae.id
+                    AND admittingDoctor.type_code = #{admittingDoctor}
+            LEFT JOIN practitioners AS chiefDoctor
+                ON chiefDoctor.encounter_id = ae.id
+                    AND chiefDoctor.type_code = #{chiefDoctor}
+            LEFT JOIN adm_organization ao
+                ON ao.id = ae.organization_id
+                    AND ao.delete_flag = '0'
+            LEFT JOIN adm_patient ap
+                ON ae.patient_id = ap.id
+                    AND ap.delete_flag = '0'
+            LEFT JOIN adm_account aa
+                ON ae.id = aa.encounter_id
+                    AND aa.encounter_flag = 1
+                    AND aa.delete_flag = '0'
+            LEFT JOIN fin_contract fc
+                ON aa.contract_no = fc.bus_no
+                     AND fc.delete_flag = '0'
+            LEFT JOIN (
+                SELECT aed.encounter_id,
+                       STRING_AGG(ccd.name, ', ') AS condition_names
+                FROM adm_encounter_diagnosis aed
+                    INNER JOIN cli_condition cc
+                        ON cc.id = aed.condition_id
+                            AND cc.delete_flag = '0'
+                    INNER JOIN cli_condition_definition ccd
+                        ON ccd.id = cc.definition_id
+                            AND ccd.delete_flag = '0'
+                WHERE aed.delete_flag = '0'
+                GROUP BY aed.encounter_id
+                        ) AS diagnosis
+                ON ae.id = diagnosis.encounter_id
+        WHERE ae.id = #{encounterId}
+            AND ae.delete_flag = '0'
+        GROUP BY ae.id,
+                 ae.bus_no ,
+                 ae.priority_enum ,
+                 ae.organization_id ,
+                 ae.start_time,
+                 bed.start_time,
+                 bed.location_id,
+                 bed.location_name,
+                 house.location_id,
+                 house.location_name,
+                 ward.location_id,
+                 ward.location_name,
+                 primaryNurse.practitioner_id,
+                 primaryNurse.practitioner_name,
+                 attendingDoctor.practitioner_id,
+                 attendingDoctor.practitioner_name,
+                 admittingDoctor.practitioner_id,
+                 admittingDoctor.practitioner_name,
+                 chiefDoctor.practitioner_id,
+                 chiefDoctor.practitioner_name,
+                 ao."name",
+                 ap."name",
+                 ap.gender_enum ,
+                 ap.birth_date ,
+                 ap.phone ,
+                 fc.contract_name ,
+                 diagnosis.condition_names
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
new file mode 100644
index 00000000..0bc40b20
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper">
+
+    <select id="selectInpatientPage"
+            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto">
+        SELECT ii.encounter_id,
+               ii.bus_no,
+               ii.encounter_status,
+               ii.start_time,
+               ii.end_time,
+               ii.admit_source_code,
+               ii.priority_enum,
+               ii.organization_id,
+               ii.patient_name,
+               ii.patient_py_str,
+               ii.patient_wb_str,
+               ii.gender_enum,
+               ii.birth_date,
+               ii.ward_id,
+               ii.ward_name,
+               ii.house_id,
+               ii.house_name,
+               ii.bed_id,
+               ii.bed_name,
+               ii.organization_name
+        FROM (
+                 WITH locations AS (
+                     SELECT ael.encounter_id,
+                            al.form_enum,
+                            al.id AS location_id,
+                            al."name" AS location_name
+                     FROM adm_encounter_location ael
+                              LEFT JOIN adm_location al
+                                        ON ael.location_id = al.id
+                                            AND al.delete_flag = '0'
+                     WHERE ael.status_enum = #{active}
+                       AND ael.delete_flag = '0'
+                 )
+                 SELECT ae.tenant_id,
+                        ae.id           AS encounter_id,
+                        ae.bus_no,
+                        ae.status_enum  AS encounter_status,
+                        ae.start_time,
+                        ae.end_time,
+                        ae.admit_source_code,
+                        ae.priority_enum,
+                        ae.organization_id,
+                        ap."name"       AS patient_name,
+                        ap.py_str       AS patient_py_str,
+                        ap.wb_str       AS patient_wb_str,
+                        ap.gender_enum,
+                        ap.birth_date,
+                        alw.location_id AS ward_id,
+                        alw.location_name AS ward_name,
+                        alh.location_id AS house_id,
+                        alh.location_name AS house_name,
+                        alb.location_id AS bed_id,
+                        alb.location_name AS bed_name,
+                        ao."name"       AS organization_name
+                 FROM adm_encounter ae
+                          LEFT JOIN adm_patient ap
+                                    ON ae.patient_id = ap.id
+                                        AND ap.delete_flag = '0'
+                          LEFT JOIN locations alw
+                                    ON alw.encounter_id = ae.id
+                                        AND alw.form_enum = #{ward}
+                          LEFT JOIN locations alh
+                                    ON alh.encounter_id = ae.id
+                                        AND alh.form_enum = #{house}
+                          LEFT JOIN locations alb
+                                    ON alb.encounter_id = ae.id
+                                        AND alb.form_enum = #{bed}
+                          LEFT JOIN adm_organization ao
+                                    ON ao.id = ae.organization_id
+                                        AND ao.delete_flag = '0'
+                 WHERE ae.delete_flag = '0'
+                   AND ae.class_enum = #{imp}
+                   AND ae.status_enum != #{toBeRegistered}
+                   AND ae.status_enum != #{registered}
+                 GROUP BY ae.id,
+                     ae.bus_no,
+                     ae.status_enum,
+                     ae.start_time,
+                     ae.end_time,
+                     ae.admit_source_code,
+                     ae.priority_enum,
+                     ae.organization_id,
+                     ap."name",
+                     ap.py_str,
+                     ap.wb_str,
+                     ap.gender_enum,
+                     ap.birth_date,
+                     alw.location_id,
+                     alw.location_name,
+                     alh.location_id,
+                     alh.location_name,
+                     alb.location_id,
+                     alb.location_name,
+                     ao."name"
+                 ORDER BY ae.bus_no DESC
+             ) AS ii
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectInpatientAdvicePage"
+            resultType="com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto">
+    SELECT ii.encounter_id,
+           ii.advice_table,
+           ii.request_id,
+           ii.start_time,
+           ii.end_time,
+           ii.requester_id,
+           ii.request_time,
+           ii.skin_test_flag,
+           ii.inject_flag,
+           ii.group_id,
+           ii.advice_name,
+           ii.item_id,
+           ii.volume,
+           ii.lot_number,
+           ii.quantity,
+           ii.unit_code,
+           ii.request_status,
+           ii.method_code,
+           ii.rate_code,
+           ii.dose,
+           ii.dose_unit_code,
+           ii.position_id,
+           ii.position_name,
+           ii.dispense_per_duration,
+           ii.part_percent,
+           ii.condition_definition_name,
+           ii.therapy_enum,
+           ii.sort_number,
+           ii.execute_num,
+           ii.day_times,
+           ii.bus_no,
+           ii."patient_name" AS patient_name,
+           ii."bad_name" AS bad_name,
+           ii.gender_enum ,
+           ii.birth_date ,
+           ii.contract_name ,
+           ii.condition_names,
+           ii.admitting_doctor_name AS admitting_doctor_name,
+           ii.balance_amount AS balance_amount
+    FROM (( SELECT T1.encounter_id,
+                   T1.tenant_id,
+                   #{medMedicationRequest} AS advice_table,
+                   T1.id AS request_id,
+                   T1.effective_dose_start AS start_time,
+                   T1.effective_dose_end AS end_time,
+                   T1.practitioner_id AS requester_id,
+                   T1.create_time AS request_time,
+                   T1.skin_test_flag AS skin_test_flag,
+                   T1.infusion_flag AS inject_flag,
+                   T1.group_id AS group_id,
+                   T2."name" AS advice_name,
+                   T2.id AS item_id,
+                   T3.total_volume AS volume,
+                   T1.lot_number AS lot_number,
+                   T1.quantity AS quantity,
+                   T1.unit_code AS unit_code,
+                   T1.status_enum AS request_status,
+                   T1.method_code AS method_code,
+                   T1.rate_code AS rate_code,
+                   T1.dose AS dose,
+                   T1.dose_unit_code AS dose_unit_code,
+                   al1.id AS position_id,
+                   al1."name" AS position_name,
+                   T1.dispense_per_duration AS dispense_per_duration,
+                   T2.part_percent AS part_percent,
+                   ccd."name" AS condition_definition_name,
+                   T1.therapy_enum AS therapy_enum,
+                   T1.sort_number AS sort_number,
+                   T1.execute_num,
+                   af.day_times,
+                   ae.bus_no,
+                   ap."name" AS patient_name,
+                   al2."name" AS bad_name,
+                   ap.gender_enum ,
+                   ap.birth_date ,
+                   fc.contract_name ,
+                   diagnosis.condition_names,
+                   pra."name" AS admitting_doctor_name,
+                   personal_account.balance_amount
+            FROM med_medication_request AS T1
+                     LEFT JOIN med_medication_definition AS T2
+                               ON T2.id = T1.medication_id
+                                   AND T2.delete_flag = '0'
+                     LEFT JOIN med_medication AS T3
+                               ON T3.medication_def_id = T2.ID
+                                   AND T3.delete_flag = '0'
+                     LEFT JOIN adm_location AS al1
+                               ON al1.id = T1.perform_location
+                                   AND al1.delete_flag = '0'
+                     LEFT JOIN cli_condition AS cc
+                               ON cc.id = T1.condition_id
+                                   AND cc.delete_flag = '0'
+                     LEFT JOIN cli_condition_definition AS ccd
+                               ON ccd.id = cc.definition_id
+                                   AND ccd.delete_flag = '0'
+                     LEFT JOIN adm_frequency af
+                               ON af.rate_code = T1.rate_code
+                                   AND af.delete_flag = '0'
+                     LEFT JOIN adm_encounter ae
+                               ON ae.id = T1.encounter_id
+                                   AND ae.class_enum = #{imp}
+                                   AND ae.delete_flag = '0'
+                     LEFT JOIN adm_patient ap
+                               ON ae.patient_id = ap.id
+                                   AND ap.delete_flag = '0'
+                     LEFT JOIN adm_encounter_location ael
+                               ON ae.id = ael.encounter_id
+                                   AND ael.delete_flag = '0'
+                                   AND ael.status_enum = #{active}
+                                   AND ael.form_enum = #{bed}
+                     LEFT JOIN adm_location al2
+                               ON ael.location_id = al2.id
+                                   AND al2.delete_flag = '0'
+                     LEFT JOIN adm_account aa
+                               ON ae.id = aa.encounter_id
+                                   AND aa.encounter_flag = 1
+                                   AND aa.delete_flag = '0'
+                     LEFT JOIN fin_contract fc
+                               ON aa.contract_no = fc.bus_no
+                                   AND fc.delete_flag = '0'
+                     LEFT JOIN ( SELECT aed.encounter_id,
+                                       STRING_AGG(ccd.name, ', ') AS condition_names
+                                 FROM adm_encounter_diagnosis aed
+                                    INNER JOIN cli_condition cc
+                                        ON cc.id = aed.condition_id
+                                            AND cc.delete_flag = '0'
+                                    INNER JOIN cli_condition_definition ccd
+                                        ON ccd.id = cc.definition_id
+                                            AND ccd.delete_flag = '0'
+                                 WHERE aed.delete_flag = '0'
+                                 GROUP BY aed.encounter_id
+                            ) AS diagnosis
+                               ON ae.id = diagnosis.encounter_id
+                    LEFT JOIN adm_encounter_participant aep
+                              ON ae.id = aep.encounter_id
+                                  AND aep.delete_flag = '0'
+                                  AND aep.status_enum = #{active}
+                                  AND aep.type_code = #{admittingDoctor}
+                    LEFT JOIN adm_practitioner pra
+                              ON aep.practitioner_id = pra.id
+                                  AND pra.delete_flag = '0'
+                    LEFT JOIN ( SELECT aa.encounter_id,
+                                       (aa.balance_amount -
+                                        COALESCE(SUM(CASE WHEN aci.status_enum IN (#{billed}, #{billable})
+                                            THEN aci.total_price ELSE 0 END), 0) +
+                                        COALESCE(SUM(CASE WHEN aci.status_enum = #{refunded}
+                                            THEN aci.total_price ELSE 0 END), 0)) AS balance_amount
+                                FROM adm_account aa
+                                         LEFT JOIN adm_charge_item aci
+                                                   ON aa.encounter_id = aci.encounter_id
+                                                       AND aa.delete_flag = '0'
+                                WHERE aa.type_code = #{personalCashAccount}
+                                  AND aa.delete_flag = '0'
+                                GROUP BY aa.encounter_id,
+                                         aa.balance_amount
+                           ) AS personal_account
+                              ON personal_account.encounter_id = ae.id
+                WHERE T1.delete_flag = '0'
+                AND T1.refund_medicine_id IS NULL
+                AND CASE WHEN T1.status_enum = #{draft}
+                    THEN T1.performer_check_id IS NOT NULL
+                    ELSE 1=1 END
+            ORDER BY T1.status_enum,
+                     T1.sort_number,
+                     T1.group_id )
+          UNION
+          ( SELECT T1.encounter_id,
+                   T1.tenant_id,
+                   #{worServiceRequest} AS advice_table,
+                   T1.id AS request_id,
+                   T1.occurrence_start_time AS start_time,
+                   T1.occurrence_end_time AS end_time,
+                   T1.requester_id AS requester_id,
+                   T1.create_time AS request_time,
+                   NULL AS skin_test_flag,
+                   NULL AS inject_flag,
+                   NULL AS group_id,
+                   T2."name" AS advice_name,
+                   T2.id AS item_id,
+                   NULL AS volume,
+                   NULL AS lot_number,
+                   T1.quantity AS quantity,
+                   T1.unit_code AS unit_code,
+                   T1.status_enum AS request_status,
+                   NULL AS method_code,
+                   NULL AS rate_code,
+                   NULL AS dose,
+                   NULL AS dose_unit_code,
+                   ao1.id AS position_id,
+                   ao1."name" AS position_name,
+                   NULL AS dispense_per_duration,
+                   1 AS part_percent,
+                   ccd."name" AS condition_definition_name,
+                   T1.therapy_enum AS therapy_enum,
+                   NULL AS sort_number,
+                   T1.quantity AS execute_num,
+                   NULL AS day_times,
+                   ae.bus_no,
+                   ap."name" AS patient_name,
+                   al2."name" AS bad_name,
+                   ap.gender_enum ,
+                   ap.birth_date ,
+                   fc.contract_name ,
+                   diagnosis.condition_names,
+                   pra."name" AS admitting_doctor_name,
+                   personal_account.balance_amount
+            FROM wor_service_request AS T1
+                     LEFT JOIN wor_activity_definition AS T2
+                               ON T2.id = T1.activity_id
+                                   AND T2.delete_flag = '0'
+                     LEFT JOIN cli_condition AS cc
+                               ON cc.id = T1.condition_id
+                                   AND cc.delete_flag = '0'
+                     LEFT JOIN cli_condition_definition AS ccd
+                               ON ccd.id = cc.definition_id
+                                   AND ccd.delete_flag = '0'
+                     LEFT JOIN adm_organization AS ao1
+                               ON ao1.id = T1.org_id
+                                   AND ao1.delete_flag = '0'
+                     LEFT JOIN adm_encounter ae
+                               ON ae.id = T1.encounter_id
+                                   AND ae.class_enum = #{imp}
+                                   AND ae.delete_flag = '0'
+                     LEFT JOIN adm_patient ap
+                               ON ae.patient_id = ap.id
+                                   AND ap.delete_flag = '0'
+                     LEFT JOIN adm_encounter_location ael
+                               ON ae.id = ael.encounter_id
+                                   AND ael.delete_flag = '0'
+                                   AND ael.status_enum = #{active}
+                                   AND ael.form_enum = #{bed}
+                     LEFT JOIN adm_location al
+                               ON ael.location_id = al.id
+                                   AND al.delete_flag = '0'
+                     LEFT JOIN adm_location al2
+                               ON ael.location_id = al2.ID
+                                   AND al2.delete_flag = '0'
+                     LEFT JOIN adm_account aa ON ae.ID = aa.encounter_id
+                                   AND aa.encounter_flag = 1
+                                   AND aa.delete_flag = '0'
+                     LEFT JOIN fin_contract fc ON aa.contract_no = fc.bus_no
+                                   AND fc.delete_flag = '0'
+                     LEFT JOIN ( SELECT aed.encounter_id,
+                                        STRING_AGG(ccd.name, ', ') AS condition_names
+                                 FROM adm_encounter_diagnosis aed
+                                          INNER JOIN cli_condition cc
+                                                     ON cc.id = aed.condition_id
+                                                         AND cc.delete_flag = '0'
+                                          INNER JOIN cli_condition_definition ccd
+                                                     ON ccd.id = cc.definition_id
+                                                         AND ccd.delete_flag = '0'
+                                 WHERE aed.delete_flag = '0'
+                                 GROUP BY aed.encounter_id
+                            ) AS diagnosis
+                               ON ae.id = diagnosis.encounter_id
+                     LEFT JOIN adm_encounter_participant aep
+                               ON ae.id = aep.encounter_id
+                                   AND aep.delete_flag = '0'
+                                   AND aep.status_enum = #{active}
+                                   AND aep.type_code = #{admittingDoctor}
+                     LEFT JOIN adm_practitioner pra
+                               ON aep.practitioner_id = pra.id
+                                   AND pra.delete_flag = '0'
+                     LEFT JOIN ( SELECT aa.encounter_id,
+                                        (aa.balance_amount -
+                                      COALESCE(SUM(CASE WHEN aci.status_enum IN (#{billed}, #{billable})
+                                          THEN aci.total_price ELSE 0 END), 0) +
+                                      COALESCE(SUM(CASE WHEN aci.status_enum = #{refunded}
+                                          THEN aci.total_price ELSE 0 END), 0)) AS balance_amount
+                                  FROM adm_account aa
+                                  LEFT JOIN adm_charge_item aci
+                                        ON aa.encounter_id = aci.encounter_id
+                                            AND aa.delete_flag = '0'
+                                  WHERE aa.type_code = #{personalCashAccount}
+                                    AND aa.delete_flag = '0'
+                                  GROUP BY aa.encounter_id,
+                                           aa.balance_amount
+                        ) AS personal_account
+                                ON personal_account.encounter_id = ae.id
+            WHERE T1.delete_flag = '0'
+                AND CASE WHEN T1.status_enum = #{draft}
+                    THEN T1.performer_check_id IS NOT NULL
+                    ELSE 1=1 END
+                AND T1.refund_service_id IS NULL
+            ORDER BY T1.status_enum )
+         ) AS ii
+    ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/InpatientMedicineCollectionMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/InpatientMedicineCollectionMapper.xml
new file mode 100644
index 00000000..12e119a1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/InpatientMedicineCollectionMapper.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.InpatientMedicineCollectionMapper">
+    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.inhospitalnursestation.dto.InpatientMedicineEncounterInfoDto">
+        SELECT ii.tenant_id,
+               ii.organization_id,
+               ii.organization_name,
+               ii.encounter_id,
+               ii.bus_no,
+               ii.patient_name,
+               ii.patient_py_str,
+               ii.patient_wb_str,
+               ii.gender_enum,
+               ii.birth_date,
+               ii.inpatient_bed
+        FROM (SELECT T1.tenant_id,
+                     T1.organization_id,               --科室　
+                     T3.name AS organization_name,
+                     T1.id   AS encounter_id, --就诊id
+                     T1.bus_no,               --住院号
+                     T2.name AS patient_name, --患者姓名
+                     T2.py_str AS patient_py_str,--拼音码
+                     T2.wb_str AS patient_wb_str,--五笔码
+                     T2.gender_enum,          --性别
+                     T2.birth_date,           --生日
+                     STRING_AGG(T5.NAME, '_' ORDER BY T5.bus_no) AS inpatient_bed --床位
+              FROM  adm_encounter AS T1
+                       LEFT JOIN adm_patient AS T2
+                                 ON T1.patient_id = T2.id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_organization AS T3
+                                 ON T1.organization_id = T3.id
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS T4
+                                 ON T4.encounter_id = T1.id
+                                     AND T4.status_enum = '2'
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_location AS T5
+                                 ON T5.id = T4.location_id
+                                     AND T5.delete_flag = '0'
+              WHERE T1.class_enum = #{amb}
+                  --todo status_enum 的值
+                AND T1.status_enum = 5
+                 AND T1.delete_flag = '0'
+              GROUP BY T1.tenant_id,
+                       T1.organization_id,
+                       T3.name,
+                       T1.id,
+                       T1.bus_no,
+                       T2.name,
+                       T2.py_str,
+                       T2.wb_str,
+                       T2.gender_enum,
+                       T2.birth_date) AS ii
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectPrescriptionInfoListPage" resultType="com.openhis.web.inhospitalnursestation.dto.InpatientMedicinePrescriptionInfoDto">
+        SELECT ii.tenant_id,
+               ii.dispense_id,--药品发放id
+               ii.therapy_enum,--治疗类型
+               ii.planned_dispense_time,--预定发放时间
+               ii.encounter_id,--就诊id
+               ii.patient_name,--患者姓名
+               ii.status_enum,--发放状态
+               ii.item_table,--项目表
+               ii.item_id,--项目id
+               ii.item_name,--项目名
+               ii.quantity,--请求数量
+               ii.unit_code,--请求单位编码
+               ii.location_id,--发放地点
+               ii.location_name,
+               ii.lot_number,--批号
+               ii.total_volume--规格
+        FROM (SELECT T1.tenant_id,
+                     T1.id AS  dispense_id,--发放id
+                     T2.therapy_enum,--治疗类型
+                     T1.planned_dispense_time,--预定发放时间
+                     T1.encounter_id,--就诊id
+                     T3.name AS patient_name,--患者姓名
+                     T1.status_enum,--发放状态
+                     #{medMedicationDefinition} AS   item_table,--项目表
+                     T1.medication_id AS item_id,--项目id
+                     T4.name AS item_name,--项目名
+                     T1.quantity,--请求数量
+                     T1.unit_code,--请求单位编码
+                     T1.location_id,--发放地点
+                     T6.name AS location_name,
+                     T1.lot_number,--批号
+                     T5.total_volume--规格
+              FROM med_medication_dispense AS T1
+                   LEFT JOIN med_medication_request AS T2
+                          ON T1.med_req_id = T2.id
+                          AND T2.delete_flag = '0'
+                   LEFT JOIN adm_patient AS T3
+                          ON T1.patient_id = T3.id
+                          AND T3.delete_flag = '0'
+                   LEFT JOIN med_medication_definition AS T4
+                          ON T1.medication_id = T4.id
+                          AND T4.delete_flag = '0'
+                  LEFT JOIN med_medication AS T5
+                          ON T4.id = T5.medication_def_id
+                         AND T5.delete_flag = '0'
+                  LEFT JOIN adm_location AS T6
+                          ON T1.location_id = T6.id
+                          AND T6.delete_flag = '0'
+              WHERE T1.encounter_id IN
+              <foreach collection="encounterIdList" item="item" separator="," open="(" close=")">
+                  #{item}
+              </foreach>
+                  AND T1.status_enum = #{statusEnum}
+                  AND T1.delete_flag = '0'
+              GROUP BY T1.id,
+                       T2.therapy_enum,
+                       T3.name,
+                       T4.name,
+                       T6.name,
+                       T5.total_volume
+              UNION
+               SELECT T1.tenant_id,
+                      T1.id AS  dispense_id,--发放id
+                      null AS therapy_enum,--治疗类型
+                      T1.planned_dispense_time,--预定发放时间
+                      T1.encounter_id,--就诊id
+                      T3.name AS patient_name,--患者姓名
+                      T1.status_enum,--发放状态
+                      #{admDeviceDefinition} AS   item_table,--项目表
+                      T1.device_def_id AS item_id,--项目id
+                      T4.name AS item_name,--项目名
+                      T1.quantity,--请求数量
+                      T1.unit_code,--请求单位编码
+                      T1.location_id,--发放地点
+                      T6.name AS location_name,
+                      T1.lot_number,--批号
+                      T4.size AS total_volume--规格
+               FROM wor_device_dispense AS T1
+                      LEFT JOIN wor_device_request AS T2
+                             ON T1.device_req_id = T2.id
+                             AND T2.delete_flag = '0'
+                      LEFT JOIN adm_patient AS T3
+                             ON T1.patient_id = T3.id
+                             AND T3.delete_flag = '0'
+                      LEFT JOIN adm_device_definition AS T4
+                             ON T1.device_def_id = T4.id
+                             AND T4.delete_flag = '0'
+                      LEFT JOIN adm_device AS T5
+                             ON T4.id = T5.device_def_id
+                             AND T5.delete_flag = '0'
+                      LEFT JOIN adm_location AS T6
+                             ON T1.location_id = T6.id
+                             AND T6.delete_flag = '0'
+               WHERE T1.encounter_id IN
+               <foreach collection="encounterIdList" item="item" separator="," open="(" close=")">
+                   #{item}
+               </foreach>
+                    AND T1.status_enum = #{statusEnum}
+                    AND T1.delete_flag = '0'
+               GROUP BY T1.id,
+                        T3.name,
+                        T4.name,
+                        T6.name,
+                        T4.size
+              ) AS ii
+        ${ew.customSqlSegment}
+    </select>
+    <select id="selectPrescriptionSummaryInfoListPage" resultType="com.openhis.web.inhospitalnursestation.dto.InpatientMedicinePrescriptionInfoDto">
+        SELECT ii.tenant_id,
+               ii.dispense_ids,
+               ii.item_table,
+               ii.item_id,
+               ii.item_name,
+               ii.quantity,
+               ii.unit_code,
+               ii.lot_number,
+               ii.status_enum,
+               ii.location_id,
+               ii.location_enum
+        FROM (SELECT T1.tenant_id,
+                     string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,
+                     #{medMedicationDefinition} AS   item_table,--项目表
+                     T1.medication_id AS item_id,--项目id
+                     T4.name AS item_name,--项目名
+                     SUM(T1.quantity) AS quantity,--请求数量
+                     T1.unit_code,--请求单位编码
+                     T1.lot_number,--批号
+                     T1.status_enum,--发放状态
+                     T1.location_id,--发放地点
+                     T6.form_enum AS location_enum--地点类型
+              FROM med_medication_dispense AS T1
+                    LEFT JOIN med_medication_request AS T2
+                           ON T1.med_req_id = T2.id
+                           AND T2.delete_flag = '0'
+--                     LEFT JOIN adm_patient AS T3
+--                            ON T1.patient_id = T3.id
+--                            AND T3.delete_flag = '0'
+                    LEFT JOIN med_medication_definition AS T4
+                           ON T1.medication_id = T4.id
+                           AND T4.delete_flag = '0'
+                    LEFT JOIN med_medication AS T5
+                           ON T4.id = T5.medication_def_id
+                           AND T5.delete_flag = '0'
+                    LEFT JOIN adm_location AS T6
+                           ON T1.location_id = T6.id
+                           AND T6.delete_flag = '0'
+              WHERE  T1.id IN
+              <foreach collection="medDispenseId" item="item" separator="," open="(" close=")">
+                  #{item}
+              </foreach>
+                     AND T1.delete_flag = '0'
+              GROUP BY T1.tenant_id,
+                       T1.medication_id,
+                       T1.unit_code,
+                       T1.lot_number,
+                       T1.location_id,
+                       T4.name,
+                       T6.form_enum
+              UNION
+              SELECT T1.tenant_id,
+                     string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,
+                     #{admDeviceDefinition} AS   item_table,--项目表
+                     T1.device_def_id AS item_id,--项目id
+                     T4.name AS item_name,--项目名
+                     SUM(T1.quantity) AS quantity,--请求数量
+                     T1.unit_code,--请求单位编码
+                     T1.lot_number,--批号
+                     T1.status_enum,--发放状态
+                     T1.location_id,--发放地点
+                     T6.form_enum AS location_enum--地点类型
+              FROM wor_device_dispense AS T1
+                   LEFT JOIN wor_device_request AS T2
+                          ON T1.device_req_id = T2.id
+                          AND T2.delete_flag = '0'
+--                    LEFT JOIN adm_patient AS T3
+--                           ON T1.patient_id = T3.id
+--                           AND T3.delete_flag = '0'
+                   LEFT JOIN adm_device_definition AS T4
+                          ON T1.device_def_id = T4.id
+                          AND T4.delete_flag = '0'
+                   LEFT JOIN adm_device AS T5
+                          ON T4.id = T5.device_def_id
+                          AND T5.delete_flag = '0'
+                   LEFT JOIN adm_location AS T6
+                          ON T1.location_id = T6.id
+                          AND T6.delete_flag = '0'
+              WHERE  T1.id IN
+              <foreach collection="devDispenseId" item="item" separator="," open="(" close=")">
+                  #{item}
+              </foreach>
+              AND T1.delete_flag = '0'
+              GROUP BY T1.tenant_id,
+                       T1.device_def_id,
+                       T1.unit_code,
+                       T1.lot_number,
+                       T1.location_id,
+                       T4.name,
+                       T6.form_enum) AS ii
+        ${ew.customSqlSegment}
+    </select>
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/inpatientmanage/AdmissionMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/AdmissionMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/inpatientmanage/AdmissionMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/AdmissionMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
new file mode 100644
index 00000000..385f40fe
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inpatientmanage.mapper.NursingRecordAppMapper">
+    <!-- 患者信息分页查询-->
+    <select id="getPatientPage" parameterType="java.util.Map"
+            resultType="com.openhis.web.inpatientmanage.dto.NursingPageDto">
+        SELECT T5.tenant_id,
+               T5.patient_id,
+               T5.patient_name,
+               T5.patient_bus_no,
+               T5.birth_date,
+               T5.gender_enum,
+               T5.org_id,
+               T5.encounter_id,
+               T5.admissionDate,
+               T5.ward_location_id,
+               T5.bed_location_id
+        FROM (SELECT T1.tenant_id,
+                     T1.id              AS patient_id,       --患者ID
+                     T1.name            AS patient_name,     --患者姓名
+                     T1.bus_no          AS patient_bus_no,   --病历号
+                     T1.birth_date,                          --患者出生日期
+                     T1.gender_enum,                         --患者性别
+                     T1.organization_id AS org_id,           --科室ID
+                     T2.id              AS encounter_id,     --就诊ID
+                     T2.start_time      AS admissionDate,    --入院日期
+                     T3.location_id     AS ward_location_id, --病区
+                     T4.location_id     AS bed_location_id   --床号
+              FROM adm_patient AS T1
+                       INNER JOIN adm_encounter AS T2
+                                  ON T2.patient_id = T1.id
+                                      AND T2.class_enum = #{classEnum}
+                                      AND T2.delete_flag = '0'
+                       INNER JOIN (SELECT encounter_id,
+                                          location_id,
+                                          form_enum,
+                                          delete_flag
+                                   FROM (SELECT encounter_id,
+                                                location_id,
+                                                form_enum,
+                                                delete_flag,
+                                                ROW_NUMBER() OVER (PARTITION BY encounter_id
+                                                   ORDER BY
+                                                   CASE
+                                                       WHEN update_time IS NULL THEN create_time
+                                                       ELSE update_time
+                                                   END DESC) AS rn
+                                         FROM adm_encounter_location
+                                         WHERE form_enum = #{ward}
+                                           AND delete_flag = '0'
+                                        ) ranked
+                                   WHERE rn = 1) AS T3
+                                  ON T3.encounter_id = T2.ID
+                       INNER JOIN adm_encounter_location AS T4
+                                  ON T4.encounter_id = T2.ID
+                                      AND T4.form_enum = #{bed}
+                                      AND T4.status_enum = #{active}
+                                      AND T4.delete_flag = '0'
+              WHERE T1.delete_flag = '0'
+              ORDER BY T4.location_id ASC) AS T5
+            ${ew.customSqlSegment}
+    </select>
+
+    <!-- 患者护理记录单信息分页查询-->
+    <select id="getNursingPatientPage" parameterType="java.util.Map"
+            resultType="com.openhis.web.inpatientmanage.dto.NursingDetailDto">
+        SELECT T6.tenant_id,
+               T6.patient_id,
+               T6.patient_name,
+               T6.birth_date,
+               T6.gender_enum,
+               T6.org_id,
+               T6.encounter_id,
+               T6.admissionDate,
+               T6.ward_location_id,
+               T6.record_id,
+               T6.recorder_id,
+               T6.recording_time,
+               T6.context_json,
+               T6.bed_location_id
+        FROM (SELECT T1.tenant_id,
+                     T1.id              AS patient_id,       --患者ID
+                     T1.name            AS patient_name,     --患者姓名
+                     T1.birth_date,                          --患者出生日期
+                     T1.gender_enum,                         --患者性别
+                     T1.organization_id AS org_id,           --科室ID
+                     T2.id              AS encounter_id,     --就诊ID
+                     T2.start_time      AS admissionDate,    --入院日期
+                     T3.location_id     AS ward_location_id, --病区
+                     T5.id              AS record_id,        --记录单ID
+                     T5.record_id       AS recorder_id,      --记录人
+                     T5.record_time     AS recording_time,   --记录时间
+                     T5.context_json,                        --病历信息
+                     T4.location_id     AS bed_location_id   --床号
+              FROM adm_patient AS T1
+                       INNER JOIN adm_encounter AS T2
+                                  ON T2.patient_id = T1.id
+                                      AND T2.class_enum = #{classEnum}
+                                      AND T2.delete_flag = '0'
+                       INNER JOIN (SELECT encounter_id,
+                                          location_id,
+                                          form_enum,
+                                          delete_flag
+                                   FROM (SELECT encounter_id,
+                                                location_id,
+                                                form_enum,
+                                                delete_flag,
+                                                ROW_NUMBER() OVER (PARTITION BY encounter_id
+                                                   ORDER BY
+                                                   CASE
+                                                       WHEN update_time IS NULL THEN create_time
+                                                       ELSE update_time
+                                                   END DESC) AS rn
+                                         FROM adm_encounter_location
+                                         WHERE form_enum = #{ward}
+                                           AND delete_flag = '0'
+                                        ) ranked
+                                   WHERE rn = 1) AS T3
+                                  ON T3.encounter_id = T2.ID
+                       INNER JOIN adm_encounter_location AS T4
+                                  ON T4.encounter_id = T2.ID
+                                      AND T4.form_enum = #{bed}
+                                      AND T4.status_enum = #{active}
+                                      AND T4.delete_flag = '0'
+                       LEFT JOIN doc_emr AS T5
+                                 ON T5.patient_id = T1.id
+                                     AND T5.encounter_id = T2.ID
+                                     AND T5.class_enum = 1 --护理记录单
+                                     AND T5.delete_flag = '0'
+              WHERE T1.delete_flag = '0'
+              ORDER BY T5.record_time DESC) AS T6
+            ${ew.customSqlSegment}
+    </select>
+
+    <!-- 病历模板分页查询-->
+    <select id="getEmrTemplate" parameterType="java.util.Map"
+            resultType="com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto">
+        SELECT T2.tenant_id,
+               T2.id,
+               T2.template_name,
+               T2.template_type_code,
+               T2.use_scope_code,
+               T2.use_scope_code_text,
+               T2.user_id,
+               T2.context_json
+        FROM (SELECT T1.tenant_id,
+                     T1.id,
+                     T1.template_name,
+                     T1.template_type_code,
+                     T1.use_scope_code,
+                     CASE
+                         WHEN T1.use_scope_code = '1' THEN '个人'
+                         WHEN T1.use_scope_code = '2' THEN '科室'
+                         WHEN T1.use_scope_code = '3' THEN '全院'
+                         END AS use_scope_code_text,
+                     T1.user_id,
+                     T1.context_json
+              FROM doc_emr_template AS T1
+              WHERE T1.delete_flag = '0'
+                AND T1.template_type_code = #{nursing}
+              ORDER BY T1.create_time DESC) AS T2
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
new file mode 100644
index 00000000..fff5da8b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inpatientmanage.mapper.PatientHomeAppMapper">
+
+    <!-- 患者首页信息分页查询-->
+    <select id="getPage" parameterType="java.util.Map"
+            resultType="com.openhis.web.inpatientmanage.dto.PatientHomeDto">
+        SELECT
+            T1.id,
+            T1.active_flag,
+            T1.temp_flag,
+            T1."name" AS patientName, -- 患者姓名
+            T1.name_json,
+            T1.bus_no AS patientNo, -- 病历号
+            T1.gender_enum, -- 患者性别
+            T1.birth_date,
+            T1.deceased_date,
+            T1.marital_status_enum,
+            T1.prfs_enum,
+            T1.phone, -- 患者手机号
+            COALESCE(NULLIF(T1.address, ''), '') AS address, -- 处理空地址
+            T1.address_province,
+            T1.address_city,
+            T1.address_district,
+            T1.address_street,
+            T1.address_json,
+            T1.nationality_code,
+            T1.id_card,
+            T1.py_str,
+            T1.wb_str,
+            T1.blood_abo,
+            T1.blood_rh,
+            T1.work_company,
+            T1.native_place,
+            T1.country_code,
+            T1.link_name,
+            T1.link_relation_code,
+            T1.link_telcom,
+            T1.link_jsons,
+            T1.tenant_id,
+            T2.bus_no AS hospitalNo, -- 住院号
+            T2.id AS encounterId, -- 就诊ID
+            T2.priority_enum, -- 护理级别
+            T2.status_enum, -- 患者状态
+            T2.organization_id,-- 入院科室
+            T2.start_time AS admissionDate, -- 入院日期
+            T2.end_time AS dischargeDate, -- 出院日期
+            T2.class_enum, -- 就诊类别
+            Doctor.name AS responsibleDoctor, -- 责任医生
+            Nurse.name AS responsibleNurse, -- 责任护士
+            T6.type_code, -- 费别
+            T7.status_enum AS surgeryStatusEnum, -- 手术状态
+            T8.start_time AS surgeryStartTime,  -- 手术开始时间
+            T8.end_time AS surgeryEndTime,    -- 手术结束时间
+            T9.id AS encounterLocationId, -- 就诊位置ID
+            T9.location_id, -- 床位号
+            T10.category_code,  -- 过敏原
+            T11."name" AS caty, -- 入院科室
+            T12."name" AS mainDiagnosis -- 主要诊断
+        FROM adm_patient AS T1
+            LEFT JOIN adm_encounter T2
+                ON T1.id = T2.patient_id  -- 患者ID
+                AND T2.delete_flag = '0'
+                AND T2.class_enum = '1'   -- 仅选择住院患者
+            -- 获取责任医生
+            LEFT JOIN (
+                SELECT
+                    encounter_id,
+                    practitioner_id,
+                    "name",
+                    ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY practitioner_id) as rn
+                FROM (
+                    SELECT
+                        T3.encounter_id,
+                        T4."name",
+                        T3.practitioner_id
+                    FROM adm_encounter_participant T3
+                        LEFT JOIN adm_practitioner T4
+                            ON T3.practitioner_id = T4.id
+                            AND T4.delete_flag = '0'
+                    WHERE T3.type_code = '9' -- 责任医生类型
+                        AND T3.delete_flag = '0'
+                    ) sub
+            ) Doctor ON T2.id = Doctor.encounter_id AND Doctor.rn = 1
+            -- 获取责任护士
+            LEFT JOIN (
+                SELECT
+                    encounter_id,
+                    practitioner_id,
+                    "name",
+                    ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY practitioner_id) as rn
+                FROM (
+                    SELECT
+                        T3.encounter_id,
+                        T4."name",
+                        T3.practitioner_id
+                    FROM adm_encounter_participant T3
+                        LEFT JOIN adm_practitioner T4
+                            ON T3.practitioner_id = T4.id
+                            AND T4.delete_flag = '0'
+                    WHERE T3.type_code = '2' -- 责任护士类型
+                        AND T3.delete_flag = '0'
+                ) sub
+            ) Nurse ON T2.id = Nurse.encounter_id AND Nurse.rn = 1
+            LEFT JOIN adm_encounter_diagnosis T5
+                ON T2.id = T5.encounter_id -- 就诊ID
+                AND T5.maindise_flag = 1
+                AND T5.delete_flag = '0'
+            LEFT JOIN adm_account T6
+                ON T2.id = T6.encounter_id -- 就诊ID
+                AND T6.delete_flag = '0'
+            LEFT JOIN cli_procedure T7
+                ON T1.id = T7.patient_id -- 患者ID
+                AND T7.delete_flag = '0'
+            LEFT JOIN cli_procedure_performer T8
+                ON T7.id = T8.procedure_id -- 手术ID
+                AND T8.delete_flag = '0'
+            LEFT JOIN adm_encounter_location T9
+                ON T2.id = T9.encounter_id -- 就诊ID
+                AND T9.form_enum = 8
+                AND T9.delete_flag = '0'
+            LEFT JOIN cli_allergy_intolerance T10
+                ON T1.id = T10.patient_id -- 患者ID
+                AND T10.delete_flag = '0'
+            LEFT JOIN adm_organization T11
+                ON T2.organization_id = T11.id
+                AND T11.type_enum = 2
+                AND T11.delete_flag = '0'
+            LEFT JOIN cli_condition_definition T12
+                ON T5.condition_id = T12.id
+                AND T12.delete_flag = '0'
+            LEFT JOIN wor_service_request T13
+                ON T2.id = T13.encounter_id
+                AND T7.base_service_req_id = T13.id
+                AND T13.delete_flag = '0'
+            LEFT JOIN wor_service_request_detail T14
+                ON T13.id = T14.service_req_id
+                AND T14.type_code = '3'
+                AND T14.delete_flag = '0'
+        <where>
+            T1.delete_flag = '0'
+            -- 患者ID
+            <if test="patientId != null">
+                AND T1.id = #{patientId}
+            </if>
+
+            -- 在科
+            <if test="statusEnum == 1">
+                AND T9.status_enum = 2
+            </if>
+
+            -- 待出院
+            <if test="statusEnum == 3">
+                AND T2.status_enum = 4
+            </if>
+
+            -- 危重
+            <if test="statusEnum == 4">
+                AND T2.priority_enum = 1
+            </if>
+
+            -- 手术
+            <if test="statusEnum == 5">
+                AND T14.type_code = '3'
+            </if>
+
+            -- 欠费
+            <if test="statusEnum == 6">
+                AND T6.balance_amount &lt; 0
+            </if>
+
+            -- 已出院
+            <if test="statusEnum == 7">
+                AND T2.status_enum = 5
+            </if>
+
+            <if test="searchKey != null and searchKey != ''">
+                AND (
+                    -- 住院号
+                    T2.bus_no = #{searchKey}
+                    -- 患者姓名
+                    OR T1.name like concat('%', #{searchKey}, '%')
+                    -- 责任医生
+                    OR Doctor.name like concat('%', #{searchKey}, '%')
+                    -- 责任护士
+                    OR Nurse.name like concat('%', #{searchKey}, '%')
+                    )
+            </if>
+        </where>
+
+        ORDER BY T9.location_id ASC
+    </select>
+
+    <!-- 科室空床查询-->
+    <select id="getEmptyBedList" parameterType="java.util.List"
+            resultType="com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto">
+        SELECT id as locationId
+        FROM adm_location
+        WHERE organization_id = #{organizationId}
+          AND operational_enum = 4
+          AND form_enum = 8
+          AND delete_flag = '0'
+        ORDER BY id ASC
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
new file mode 100644
index 00000000..9aed0bb4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inpatientmanage.mapper.VitalSignsAppMapper">
+
+    <!-- 三测单患者信息查询-->
+    <select id="getVitalSignsInfo" parameterType="java.util.Map"
+            resultType="com.openhis.web.inpatientmanage.dto.VitalSignsDto">
+        SELECT  T1.id,
+                T1.patient_id,
+                T1.encounter_id,
+                T1.recording_date,
+                T1.time_point,
+                T1.vital_signs_code,
+                T1.vital_signs_values,
+                T1.units,
+                T1.baby_no,
+                T1.location_id,
+                T1.recorder,
+                T1.remake,
+                T2."name",                                -- 患者姓名
+                T3.bus_no AS hospitalNo,                  -- 住院号
+                T3.class_enum,                            -- 就诊类别
+                T3.organization_id,                       -- 科室ID
+                T3.start_time AS admissionDate,           -- 入院日期
+                T3.end_time AS dischargeDate,             -- 出院日期
+                T4.location_id AS bedLocationId,          -- 床位号
+                T5.status_enum AS surgeryStatusEnum,      -- 手术状态
+                T6.start_time AS surgeryStartTime,        -- 手术开始时间
+                T6.end_time AS surgeryEndTime             -- 手术结束时间
+        FROM doc_vital_signs T1
+        LEFT JOIN adm_patient T2
+            ON T1.patient_id = T2.id
+            AND T2.delete_flag = '0'
+        LEFT JOIN adm_encounter T3
+            ON T1.encounter_id = T3.id
+            AND T3.delete_flag = '0'
+        LEFT JOIN adm_encounter_location T4
+            ON T1.encounter_id = T4.encounter_id           -- 就诊ID
+            AND T4.form_enum = 8
+            AND T4.delete_flag = '0'
+        LEFT JOIN cli_procedure T5
+            ON T1.patient_id = T5.patient_id               -- 患者ID
+            AND T5.delete_flag = '0'
+        LEFT JOIN cli_procedure_performer T6
+            ON T5.id = T6.procedure_id                     -- 手术ID
+            AND T6.delete_flag = '0'
+        LEFT JOIN wor_service_request T7
+            ON T1.encounter_id = T7.encounter_id
+            AND T5.base_service_req_id = T7.id
+            AND T7.delete_flag = '0'
+        LEFT JOIN wor_service_request_detail T8
+            ON T7.id = T8.service_req_id
+            AND T8.type_code = '3'
+            AND T8.delete_flag = '0'
+        <where>
+            -- 患者ID
+            T1.patient_id = #{patientId}
+            AND T1.delete_flag = '0'
+
+        </where>
+        ORDER BY recording_date, time_point ASC
+    </select>
+
+    <!-- 三测单患者信息查询-->
+    <select id="searchVitalSigns" parameterType="java.util.Map"
+            resultType="com.openhis.document.domain.VitalSigns">
+        SELECT  T1.id,
+                T1.patient_id,
+                T1.encounter_id,
+                T1.recording_date,
+                T1.time_point,
+                T1.vital_signs_code,
+                T1.vital_signs_values,
+                T1.units,
+                T1.baby_no,
+                T1.location_id,
+                T1.recorder,
+                T1.remake
+        FROM doc_vital_signs T1
+        <where>
+            -- 记录日期
+            T1.recording_date &gt;= #{startTime}::date
+            AND T1.recording_date &lt;= #{endTime}::date
+            AND T1.delete_flag = '0'
+
+        </where>
+        ORDER BY T1.recording_date, T1.time_point, T1.vital_signs_code ASC
+    </select>
+
+    <!-- 三测单患者信息删除-->
+    <delete id="deleteVitalSigns">
+        DELETE FROM doc_vital_signs
+        <where>
+            -- 患者ID
+            patient_id = #{patientId}
+            -- 就诊ID
+            AND encounter_id = #{encounterId}
+            -- 记录日期
+            AND recording_date = #{recordingDate}
+            -- 记录时间
+            AND time_point = #{timePoint}
+            -- 删除状态
+            AND delete_flag = '0'
+        </where>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
new file mode 100644
index 00000000..cf7508dc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialCommonMapper">
+    <select id="getDeviceInfo"
+            resultType="com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto">
+        SELECT T6.id,--物品id
+               T6.bus_no,--   药品编号
+               T6.name,-- 物品名称
+               T6.py_str,-- 拼音码
+               T6.total_volume,--规格
+               T6.unit_code,-- 包装单位
+               T6.min_unit_code,--最小单位
+               T6.part_percent,--拆零比
+               T6.price,--进货单价
+               T6.retailPrice,--零售价
+               T6.manufacturer_text,-- 厂家/产地
+               T6.approval_number,--批准文号
+               T6.item_min_quantity, --库存最小警戒线
+               T6.specification_inventory,--规格库存
+               T6.batch_inventory,--批次库存
+               T6.lot_number,
+               T6.production_date,--生产日期
+               T6.expiration_date,--失效日期
+               <if test="locationId != null">
+                   T6.location_id,
+               </if>
+               T6.supplier_id,
+               T6.tenant_id
+        FROM (SELECT T1.id,--物品id
+                     T1.bus_no,--   药品编号
+                     T1.name,-- 物品名称
+                     T1.py_str,-- 拼音码
+                     T1.size AS total_volume,--规格
+                     T1.unit_code,-- 包装单位
+                     T1.min_unit_code,--最小单位
+                     T1.part_percent,--拆零比
+                     CASE
+                         WHEN T9.lot_number IS NULL THEN
+                             CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T4.amount * T1.part_percent
+                                 ELSE  T4.amount  END
+                         ELSE CASE T4.condition_value
+                                 WHEN T1.min_unit_code THEN T10.amount * T1.part_percent
+                                 ELSE  T10.amount  END
+                         END                                                        AS price,--进货单价(大单位)
+                     CASE
+                         WHEN T9.lot_number IS NULL THEN
+                             CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T5.amount * T1.part_percent
+                                 ELSE  T5.amount  END
+                         ELSE CASE T5.condition_value
+                                 WHEN T1.min_unit_code THEN T11.amount * T1.part_percent
+                                 ELSE  T11.amount  END
+                         END                                                             AS retailPrice,--零售价(大单位)
+                     T1.manufacturer_text,-- 厂家/产地
+                     T1.approval_number,--批准文号
+                     T1.item_min_quantity * T1.part_percent                              AS item_min_quantity, --库存最小警戒线(小单位)
+                     COALESCE(CAST(T8.specification_inventory AS DECIMAL(18, 6)), 0.00) AS specification_inventory,--规格库存(小单位)
+                     COALESCE(CAST(T9.batch_inventory AS DECIMAL(18, 6)), 0.00)         AS batch_inventory,--批次库存(小单位)
+                     T9.lot_number,
+                     T7.production_date,--生产日期
+                     T7.expiration_date,--失效日期
+                     <if test="locationId != null">
+                         T7.location_id,
+                     </if>
+                     T7.supplier_id,
+                     T1.tenant_id
+              FROM adm_device_definition AS T1
+                       LEFT JOIN adm_device AS T2
+                                 ON T1.id = T2.device_def_id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition T3
+                                 ON T3.instance_id = T1.id
+                                     AND T3.instance_table = 'adm_device_definition'
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T4
+                                 ON T4.definition_id = T3.id
+                                     AND T4.condition_code = '2'--2:采购价
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T5
+                                 ON T5.definition_id = T3.id
+                                     AND T5.condition_code = '3'--2:单位
+                                     AND T5.delete_flag = '0'
+                       LEFT JOIN wor_inventory_item T7
+                                 ON T7.item_table = 'adm_device_definition'
+                                     AND T7.item_id = T1.id
+                                     AND T7.delete_flag = '0'
+                       LEFT JOIN (SELECT i1.item_table,
+                                         i1.item_id,
+                                         <if test="locationId != null">
+                                             i1.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i1.quantity) AS DECIMAL(18, 6)), 0.00) AS specification_inventory
+                                  FROM wor_inventory_item i1
+                                           LEFT JOIN adm_device_definition i2 ON i1.item_id = i2.ID
+                                      AND i2.delete_flag = '0'
+                                  WHERE i1.item_table = 'adm_device_definition'
+                                    AND i1.delete_flag = '0'
+                                  GROUP BY i1.item_table,
+                                           i1.item_id
+                                           <if test="locationId != null">
+                                               ,i1.location_id
+                                           </if>) T8
+                                 ON T8.item_table = 'adm_device_definition'
+                                     AND T8.item_id = T1.ID
+                                     <if test="locationId != null">
+                                         AND T8.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN (SELECT i3.item_table,
+                                         i3.item_id,
+                                         i3.lot_number,
+                                         <if test="locationId != null">
+                                             i3.location_id,
+                                         </if>
+                                         COALESCE(CAST(SUM(i3.quantity) AS DECIMAL(18, 6)), 0.00) AS batch_inventory
+                                  FROM wor_inventory_item i3
+                                           LEFT JOIN adm_device_definition i4 ON i3.item_id = i4.ID
+                                      AND i4.delete_flag = '0'
+                                  WHERE i3.item_table = 'adm_device_definition'
+                                    AND i3.delete_flag = '0'
+                                  GROUP BY i3.item_table,
+                                           i3.item_id,
+                                           i3.lot_number
+                                           <if test="locationId != null">
+                                               ,i3.location_id
+                                           </if>) T9
+                                 ON T9.item_table = 'adm_device_definition'
+                                     AND T9.item_id = T1.ID
+                                     AND T9.lot_number = T7.lot_number
+                                     <if test="locationId != null">
+                                         AND T9.location_id = T7.location_id
+                                     </if>
+                       LEFT JOIN adm_charge_item_def_detail T10
+                                 ON T10.definition_id = T3.id
+                                     AND T10.condition_code = '1'--1:批号进价
+                                     AND T10.condition_value = T9.lot_number
+                                     AND T10.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail T11
+                                 ON T11.definition_id = T3.id
+                                     AND T11.condition_code = '5'--1:批号售价
+                                     AND T11.condition_value = T9.lot_number
+                                     AND T11.delete_flag = '0'
+              WHERE T1.delete_flag = '0'
+                 <if test="locationId != null">
+                    AND T7.location_id = #{locationId}
+                 </if>
+              GROUP BY T1.id,
+                       T1.size,
+                       T4.condition_value,
+                       T5.condition_value,
+                       T4.amount,
+                       T5.amount,
+                       T10.amount,
+                       T11.amount,
+                       T8.specification_inventory,
+                       T9.batch_inventory,
+                       T9.lot_number,
+                       <if test="locationId != null">
+                          T7.location_id,
+                       </if>
+                       T7.supplier_id,
+                       T7.production_date,
+                       T7.expiration_date
+              <if test="supplierId != null">
+                  HAVING
+                  T8.specification_inventory   <![CDATA[ <= ]]>  (T1.item_min_quantity * T1.part_percent)
+              </if>
+              ORDER BY T1.bus_no) AS T6
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getPage"
+            resultType="com.openhis.web.materialmanage.dto.MaterialDto">
+        SELECT T4.tenant_id,
+               T4.supply_bus_no, --单据号
+               T4.type_enum,     --类型
+               T4.status_enum,   --状态
+               T4.supplier_id,   --供应商
+               T4.location_type_enum,  --仓库类型
+               T4.location_id,   --仓库
+               T4.applicant_id,  --开单人
+               T4.applicant_name,  --开单人
+               T4.approver_id,   --审批人
+               T4.apply_time,    -- 制单时间
+               T4.approval_time  --审批时间
+        FROM (SELECT T1.tenant_id,
+                     T1.bus_no              AS supply_bus_no,
+                     T1.type_enum,
+                     T1.status_enum,
+                     T1.supplier_id,
+                     <if test="locationFlg != null">
+                         T1.source_type_enum AS location_type_enum,
+                         T1.source_location_id AS location_id,
+                     </if>
+                     <if test="locationFlg == null">
+                         T1.purpose_type_enum AS location_type_enum,
+                         T1.purpose_location_id AS location_id,
+                     </if>
+                     T1.applicant_id,
+                     T2.name  AS applicant_name,
+                     T1.approver_id,
+                     T1.apply_time,
+                     T1.approval_time
+              FROM wor_supply_request AS T1
+                    LEFT JOIN adm_practitioner AS T2
+                          ON T2.id = T1.applicant_id
+                            AND T2.delete_flag = '0'
+              WHERE  T1.delete_flag = '0'
+              <if test="originalBusNoFlg != null">
+                  and original_bus_no = ''
+              </if>
+              GROUP BY T1.tenant_id,
+                       T1.bus_no,
+                       T1.type_enum,
+                       T1.status_enum,
+                       T1.supplier_id,
+                       <if test="locationFlg != null">
+                           T1.source_type_enum,
+                           T1.source_location_id,
+                       </if>
+                       <if test="locationFlg == null">
+                           T1.purpose_type_enum,
+                           T1.purpose_location_id,
+                       </if>
+                       T1.applicant_id,
+                       T2.name,
+                       T1.approver_id,
+                       T1.apply_time,
+                       T1.approval_time
+             ) AS T4
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getDetailPage"
+            resultType="com.openhis.web.materialmanage.dto.MaterialDetailDto">
+        SELECT T1.id,                             --ID
+               T1.bus_no,                         --单据号
+               T2.bus_no        AS item_bus_no,   --药品编码
+               T1.item_id,                        --药品id
+               T2.name          AS item_name,     --名称
+               T2.size AS total_volume,                   --规格
+               T1.unit_code,                      --选择单位
+               T2.unit_code     AS max_unit_code, --常规单位
+               T2.min_unit_code AS min_unit_code, --最小单位
+               T2.part_percent,                   --拆零比
+               T1.item_quantity,                  --数量
+               T1.total_quantity,                 --合计数量
+               T1.price,                          --采购单价
+               T1.total_price,                    --采购总价
+               T1.retail_price,                   --零售价
+               T1.total_retail_price,             --零价金额
+               T2.manufacturer_text,              --生产厂商文本
+               T2.approval_number,                --批准文号
+               T1.remake,                         --备注
+               T1.reason,                         --摘要（理由）
+               T1.reason_code,                    --理由类型
+               T1.batch_inventory,                --批次库存
+               T1.specification_inventory,        --规格库存
+               T1.applicant_id,--申请人
+               T1.apply_time,--申请时间
+               T1.approver_id,--审批人
+               T1.approval_time,--审批时间
+               T1.supplier_id,--供应商
+               T4.phone,--供应商联系人
+               T1.status_enum,
+               T1.type_enum,
+               T1.category_enum,--单据类型
+               T1.source_type_enum,             --源仓库类型
+               T1.source_location_id,             --源仓库
+               T1.purpose_type_enum,             --目的仓库类型
+               T1.purpose_location_id,             --目的仓库
+               T1.practitioner_id,--仓库员
+               T1.invoice_no,--发票号
+               T1.lot_number,--产品批号
+               T1.start_time,--开始时间
+               T1.end_time,--结束时间
+               T1.packaging_condition_enum,--包装情况
+               T1.acceptance_result_enum,--验收结果
+               T1.trace_no,--追溯码
+               T1.trace_no_unit_code,--追溯码包装
+               T1.occurrence_time,--禁用日期
+               T1.tenant_id
+        FROM wor_supply_request AS T1
+                 LEFT JOIN adm_device_definition AS T2
+                           ON T1.item_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN adm_device AS T3
+                           ON T2.id = T3.device_def_id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_supplier AS T4
+                           ON T4.id = T1.supplier_id
+                               AND T4.delete_flag = '0'
+        WHERE T1.bus_no = #{busNo}
+          AND T1.delete_flag = '0'
+        GROUP BY T1.id,
+                 T2.bus_no,
+                 T2.name,
+                 T2.unit_code,
+                 T2.min_unit_code,
+                 T2.size,
+                 T2.part_percent,
+                 T2.manufacturer_text,
+                 T2.approval_number,
+                 T4.phone
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
new file mode 100644
index 00000000..27c71c1f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialProfitLossOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
new file mode 100644
index 00000000..e6468200
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialPurchaseOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
similarity index 65%
rename from openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
index 2d03789b..1370cc41 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.paymentmanage.mapper.ChargeBillMapper">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialReturnOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
new file mode 100644
index 00000000..0aae096d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialReturnToWarehouseOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
new file mode 100644
index 00000000..96c323a2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialStockInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
new file mode 100644
index 00000000..1e21e5bf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialStockOutOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
new file mode 100644
index 00000000..47311a1f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialStocktakingOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
new file mode 100644
index 00000000..a9524a4d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialTransferInOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
new file mode 100644
index 00000000..776fd61d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialTransferOutOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
similarity index 98%
rename from openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
index 53c86af4..0061ad9f 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
@@ -136,9 +136,7 @@
         LEFT JOIN wor_activity_definition ad
             ON ad.id = sr.activity_id
                 AND ad.delete_flag = '0'
-        WHERE ad.category_code = '21'
-            AND e.delete_flag = '0'
-            AND sr.based_on_table = #{medMedicationRequest}
+        WHERE e.delete_flag = '0'
             AND sr.status_enum IN (#{inProgress},#{completed},#{cancelled})
         GROUP BY sr.status_enum,
                  sr.encounter_id,
@@ -152,7 +150,7 @@
                  sr.tenant_id,
                  pt.gender_enum,
                  e.reception_time
-        ORDER BY create_time
+        ORDER BY create_time DESC
         ) AS T1
         ${ew.customSqlSegment}
     </select>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
new file mode 100644
index 00000000..a3244399
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper">
+    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto">
+        SELECT ii.encounter_id,
+               ii.reception_time,
+               ii.encounter_no,
+               ii.gender_enum,
+               ii.patient_name,
+               ii.patient_py_str,
+               ii.patient_wb_str,
+               ii.birth_date,
+               ii.status_enum
+        FROM (
+                 SELECT T1.tenant_id,
+                        T1.id AS encounter_id,
+                        T1.reception_time,
+                        T1.bus_no AS encounter_no,
+                        T2.gender_enum,
+                        T2."name" AS patient_name,
+                        T2.py_str AS patient_py_str,
+                        T2.wb_str AS patient_wb_str,
+                        T2.birth_date,
+                        T3.status_enum
+                 FROM adm_encounter AS T1
+                    INNER JOIN adm_patient AS T2
+                        ON T1.patient_id = T2.id
+                            AND T2.delete_flag = '0'
+                    INNER JOIN wor_service_request AS T3
+                        ON T1.id = T3.encounter_id
+                            AND T3.refund_service_id IS NULL
+                            AND T3.delete_flag = '0'
+                 WHERE T1.class_enum = #{amb}
+                     AND T1.delete_flag = '0'
+                 GROUP BY T1.tenant_id,
+                          T1.id,
+                          T1.reception_time,
+                          T1.bus_no,
+                          T2.gender_enum,
+                          T2.name,
+                          T2.py_str,
+                          T2.wb_str,
+                          T2.birth_date,
+                          T3.status_enum
+                 ORDER BY T1.bus_no DESC
+             ) AS ii
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectTreatmentInfoPage"
+            resultType="com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto">
+    SELECT ii.encounter_id ,
+           ii.request_id ,
+           ii.service_status,
+           ii.dispense_id,
+           ii.dispense_status,
+           ii.execute_num,
+           ii.quantity ,
+           ii.unit_code ,
+           ii.bus_no,
+           ii.charge_status,
+           ii.unit_price ,
+           ii.total_price ,
+           ii.request_table ,
+           ii.service_category ,
+           ii.device_category ,
+           ii.med_category ,
+           ii.item_name,
+           ii.py_str,
+           ii.wb_str,
+           ii.size,
+           ii.group_id ,
+           ii.sort_number
+    FROM (SELECT ae.id AS encounter_id ,
+                 ae.tenant_id,
+                 wsr.id AS request_id ,
+                 wsr.status_enum AS service_status,
+                 NULL AS dispense_id,
+                 NULL AS dispense_status,
+                 wsr.quantity AS execute_num,
+                 NULL AS quantity,
+                 wsr.unit_code ,
+                 wsr.bus_no,
+                 aci.status_enum AS charge_status,
+                 aci.unit_price ,
+                 aci.total_price ,
+                 #{worServiceRequest} AS request_table ,
+                 wad.category_code AS service_category,
+                 NULL AS device_category,
+                 NULL AS med_category,
+                 wad."name" AS item_name,
+                 wad.py_str,
+                 wad.wb_str,
+                 NULL AS "size",
+                 wsr.group_id ,
+                 NULL AS sort_number
+          FROM adm_encounter ae
+                   INNER JOIN wor_service_request wsr
+                              ON wsr.encounter_id = ae.id
+                                  AND wsr.delete_flag = '0'
+                                  AND wsr.refund_service_id IS NULL
+                   LEFT JOIN adm_charge_item aci
+                              ON aci.service_id = wsr.id
+                                  AND aci.delete_flag = '0'
+                                  AND aci.refund_id IS NULL
+                   INNER JOIN wor_activity_definition wad
+                              ON wsr.activity_id = wad.id
+                                  AND wad.delete_flag = '0'
+          WHERE wsr.status_enum = #{reqCompleted}
+              AND ae.delete_flag = '0'
+          UNION ALL
+          SELECT ae.id AS encounter_id ,
+                 ae.tenant_id,
+                 mmr.id AS request_id ,
+                 NULL AS service_status,
+                 dis.id AS dispense_id ,
+                 dis.status_enum AS dispense_status,
+                 mmr.execute_num ,
+                 mmr.quantity ,
+                 mmr.unit_code ,
+                 mmr.bus_no,
+                 aci.status_enum AS charge_status,
+                 aci.unit_price ,
+                 aci.total_price ,
+                 #{medMedicationRequest} AS request_table ,
+                 NULL AS service_category,
+                 NULL AS device_category,
+                 mmd.category_code AS med_category,
+                 mmd."name" AS item_name,
+                 mmd.py_str ,
+                 mmd.wb_str,
+                 mm.total_volume AS "size",
+                 mmr.group_id ,
+                 mmr.sort_number
+          FROM adm_encounter ae
+                   LEFT JOIN med_medication_request mmr
+                             ON ae.id = mmr.encounter_id
+                                 AND mmr.refund_medicine_id IS NULL
+                                 AND mmr.delete_flag = '0'
+                   LEFT JOIN med_medication_dispense dis
+                             ON dis.med_req_id = mmr.id
+                                 AND dis.delete_flag = '0'
+                   INNER JOIN med_medication_definition mmd
+                             ON mmr.medication_id = mmd.id
+                                 AND (mmd.skin_test_flag = 1 OR mmd.inject_flag = 1)
+                                 AND mmd.delete_flag = '0'
+                   INNER JOIN med_medication mm
+                             ON mm.medication_def_id = mmd.id
+                                 AND mm.delete_flag = '0'
+                   LEFT JOIN adm_charge_item aci
+                             ON aci.service_id = mmr.id
+                                 AND aci.delete_flag = '0'
+                                 AND aci.refund_id IS NULL
+          WHERE dis.status_enum != #{draft}
+              AND ae.delete_flag = '0'
+          UNION ALL
+          SELECT ae.id AS encounter_id ,
+                 ae.tenant_id,
+                 wdr.id AS request_id ,
+                 NULL AS service_status,
+                 wdd.id AS dispense_id ,
+                 wdd.status_enum AS dispense_status,
+                 NULL AS execute_num,
+                 wdr.quantity ,
+                 wdr.unit_code ,
+                 wdr.bus_no,
+                 aci.status_enum AS charge_status,
+                 aci.unit_price ,
+                 aci.total_price ,
+                  #{worDeviceRequest} AS request_table ,
+                 NULL AS service_category,
+                 dev.category_code AS device_category,
+                 NULL AS med_category,
+                 dev."name" AS item_name,
+                 dev.py_str ,
+                 dev.wb_str,
+                 dev.size,
+                 NULL AS group_id ,
+                 NULL AS sort_number
+          FROM adm_encounter ae
+                   INNER JOIN wor_device_request wdr
+                              ON wdr.encounter_id = ae.id
+                                  AND wdr.delete_flag = '0'
+                                  AND wdr.refund_device_id IS NULL
+                   LEFT JOIN wor_device_dispense wdd
+                              ON wdd.device_req_id = wdr.id
+                                  AND wdd.delete_flag = '0'
+                   LEFT JOIN adm_charge_item aci
+                              ON aci.service_id = wdr.id
+                                  AND aci.delete_flag = '0'
+                                  AND aci.refund_id IS NULL
+                   INNER JOIN adm_device_definition dev
+                              ON dev.id = wdr.device_def_id
+                                  AND dev.delete_flag = '0'
+          WHERE wdd.status_enum != #{draft}
+              AND ae.delete_flag = '0'
+        ) AS ii
+    ${ew.customSqlSegment}
+    ORDER BY ii.sort_number
+    </select>
+    <select id="selectPerformRecordList" resultType="com.openhis.web.common.dto.PerformRecordDto">
+        SELECT cp.id AS procedure_id,
+               cp.status_enum,
+               cp.occurrence_time,
+               cp.create_time,
+               al."name" AS location_name,
+               ao."name" AS org_name,
+               cp.request_id,
+               cp.refund_id,
+               cpp.start_time,
+               cpp.end_time,
+               ap."name" AS practitioner_name
+        FROM cli_procedure cp
+                 LEFT JOIN cli_procedure_performer cpp
+                           ON cpp.procedure_id = cp.id
+                               AND cpp.delete_flag = '0'
+                 LEFT JOIN adm_organization ao
+                           ON ao.id = cp.org_id
+                               AND ao.delete_flag = '0'
+                 LEFT JOIN adm_location al
+                           ON al.id = cp.location_id
+                               AND al.delete_flag = '0'
+                 LEFT JOIN adm_practitioner ap
+                           ON ap.id = cpp.practitioner_id
+                               AND ap.delete_flag = '0'
+        WHERE cp.delete_flag = '0'
+        <if test="reqIds!=null and !reqIds.isEmpty()">
+            AND cp.request_id IN
+            <foreach collection="reqIds" item="reqId" open="(" separator="," close=")">
+                #{reqId}
+            </foreach>
+        </if>
+    </select>
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
similarity index 96%
rename from openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
index 9bef3708..7e16754b 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
@@ -82,7 +82,7 @@
                 FROM adm_patient pt
                          LEFT JOIN adm_organization ogt ON pt.organization_id = ogt.id
                          LEFT JOIN adm_patient_identifier api ON pt.id = api.patient_id
-                ORDER BY pt.bus_no
+                ORDER BY pt.bus_no DESC
             ) AS T1
             ${ew.customSqlSegment}
     </select>
@@ -121,11 +121,11 @@
         e.tenant_id,
         pt.name,
         pt.id_card,
-        c.description,
+        ccd.name AS description,
         pt.bus_no as patient_bus_no,
         e.bus_no as encounter_bus_no,
         pt.gender_enum,
-        e.start_time as encounter_time,
+        e.reception_time as encounter_time,
         e.subject_status_enum,
         ogt.name as organization_name,
         pt.phone,
@@ -146,6 +146,7 @@
         adm_patient pt ON e.patient_id = pt.id
         LEFT JOIN adm_encounter_diagnosis ed ON e.id = ed.encounter_id
         LEFT JOIN cli_condition c ON ed.condition_id = c.id
+        LEFT JOIN cli_condition_definition ccd ON c.definition_id = ccd.id
         ) AS T1
         ${ew.customSqlSegment}
     </select>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
new file mode 100644
index 00000000..883b8d41
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.paymentmanage.mapper.ChargeBillMapper">
+
+    <select id="selectChargeItemExtendInfoList" resultType="com.openhis.web.paymentmanage.dto.ChargeItemExtendInfoDto">
+        SELECT
+        T1.total_price,
+        T1.org_id,
+        T1.yb_type
+        FROM(
+            SELECT
+                a.total_price,
+                COALESCE(b1.org_id, b2.org_id, b3.org_id, b4.offered_org_id, b5.org_id) AS org_id,
+                --COALESCE(b1.yb_class_enum, b2.yb_class_enum, b3.yb_class_enum) AS yb_class_enum,
+                b5.yb_type
+
+                -- 添加更多需要的字段
+            FROM
+                adm_charge_item a
+            LEFT JOIN
+                med_medication_request b1 ON a.service_id = b1.id AND a.service_table = 'med_medication_request'
+            LEFT JOIN
+                wor_device_request b2 ON a.service_id = b2.id AND a.service_table = 'wor_device_request'
+            LEFT JOIN
+                wor_service_request b3 ON a.service_id = b3.id AND a.service_table = 'wor_service_request'
+            LEFT JOIN
+                adm_healthcare_service b4 ON a.service_id = b4.id AND a.service_table = 'adm_healthcare_service'
+            LEFT JOIN
+                adm_charge_item_definition b5 ON a.definition_id = b5.id
+            WHERE
+                a.delete_flag = '0'
+            AND
+                a.id IN
+                <foreach collection="list" item="item" open="(" separator="," close=")">
+                #{item}
+                </foreach>
+        ) AS T1
+        <if test="orgIdList!=null and !orgIdList.isEmpty()">
+            WHERE T1.org_id IN
+            <foreach collection="orgIdList" item="orgId" open="(" separator="," close=")">
+                #{orgId}
+            </foreach>
+        </if>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
similarity index 35%
rename from openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
index b7cee16c..06a2e9fb 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
@@ -4,10 +4,12 @@
 
     <select id="getPage" resultType="com.openhis.web.paymentmanage.dto.PaymentVO">
         SELECT T1.id,
+               T1.relation_id,
                T1.status_enum,
                T1.payment_no,
                T1.payment_enum,
                T1.enterer_id,
+               T1.kind_enum,
                T1.patient_id,
                T1.outcome_enum,
                T1.tendered_amount,
@@ -24,11 +26,13 @@
                T1.bill_no as invoice_no,
                T1.encounter_bus_no
         FROM (SELECT t.id,
+                     t.relation_id,
                      t.status_enum,
                      t.payment_no,
                      t.payment_enum,
                      t.enterer_id,
-                     pra.name AS enterer_name,
+                     t.kind_enum,
+                     pra.name     AS enterer_name,
                      t.patient_id,
                      patient.name AS patient_name,
                      t.outcome_enum,
@@ -38,203 +42,203 @@
                      t.bill_date,
                      t.print_count,
                      t.encounter_id,
-                     invoice.id AS invoice_id,
+                     invoice.id   AS invoice_id,
                      invoice.bill_no,
                      t.yb_clear_flag,
                      t.yb_settle_ids,
-                     enc.bus_no AS encounter_bus_no,
+                     enc.bus_no   AS encounter_bus_no,
                      t.tenant_id
               FROM fin_payment_reconciliation t
                        LEFT JOIN adm_patient patient ON patient.id = t.patient_id
                        LEFT JOIN adm_practitioner pra ON pra.id = t.enterer_id
                        LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id
                        LEFT JOIN adm_encounter enc ON enc.id = t.enterer_id
-              WHERE 1 = 1 AND t.delete_flag = '0'
+              WHERE 1 = 1
+                AND t.delete_flag = '0'
+                AND t.kind_enum = #{kindEnum}
               ORDER BY t.create_time DESC) as T1
             ${ew.customSqlSegment}
     </select>
-    <select id="getPaymentDetailList" resultType="com.openhis.web.paymentmanage.dto.PaymentDetailDto">
-        SELECT
-            id,
-            predecessor_id,
-            target_enum,
-            account_id,
-            account_code,
-            pay_enum,
-            pay_level_enum,
-            amount,
-            return_amount,
-            charge_amount,
-            pay_trans_no,
-            pay_trans_text,
-            pay_trans_date,
-            before_balance,
-            after_balance,
-            result_enum,
-            tenant_id,
-            delete_flag,
-            create_by,
-            create_time,
-            update_by,
-            update_time
-        FROM fin_payment_rec_detail WHERE
-            predecessor_id = #{id}
+    <select id="getPaymentDetailList" resultType="com.openhis.yb.dto.PaymentDetailDto">
+        SELECT id,
+               predecessor_id,
+               target_enum,
+               account_id,
+               account_code,
+               pay_enum,
+               pay_level_enum,
+               amount,
+               return_amount,
+               charge_amount,
+               pay_trans_no,
+               pay_trans_text,
+               pay_trans_date,
+               before_balance,
+               after_balance,
+               result_enum,
+               tenant_id,
+               delete_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        FROM fin_payment_rec_detail
+        WHERE reconciliation_id = #{id}
     </select>
     <select id="getChargeItemList" resultType="com.openhis.web.paymentmanage.dto.ChargeItemDto">
-        select
-            T.id,
-            T.status_enum,
-            T.bus_no,
-            T.prescription_no,
-            T.patient_id,
-            T.context_enum,
-            T.encounter_id,
-            T.occurrence_time,
-            T.performer_id,
-            T.performing_org_id,
-            T.requesting_org_id,
-            T.cost_org_id,
-            T.quantity_value,
-            T.quantity_unit,
-            T.unit_price,
-            T.total_price,
-            T.definition_id,
-            T.def_detail_id,
-            T.base_amount,
-            T.discount_amount,
-            T.surcharge_amount,
-            T.override_reason_code,
-            T.override_reason_text,
-            T.enterer_id,
-            T.entered_date,
-            T.service_table,
-            T.service_id,
-            T.product_table,
-            T.product_id,
-            T.claim_state_enum,
-            T.print_count,
-            T.account_id,
-            T.org_id,
-            T.refund_id,
-            T.tenant_id,
-            T.delete_flag,
-            T.create_by,
-            T.create_time,
-            T.update_by,
-            T.update_time,
-            T1.type_code
-            FROM adm_charge_item AS T LEFT JOIN adm_charge_item_definition AS T1 ON T.definition_id =T1.id
-                LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
-            WHERE T2.dict_type = #{s} AND T.id IN (#{collect})
+        select T.id,
+               T.status_enum,
+               T.bus_no,
+               T.prescription_no,
+               T.patient_id,
+               T.context_enum,
+               T.encounter_id,
+               T.occurrence_time,
+               T.performer_id,
+               T.performing_org_id,
+               T.requesting_org_id,
+               T.cost_org_id,
+               T.quantity_value,
+               T.quantity_unit,
+               T.unit_price,
+               T.total_price,
+               T.definition_id,
+               T.def_detail_id,
+               T.base_amount,
+               T.discount_amount,
+               T.surcharge_amount,
+               T.override_reason_code,
+               T.override_reason_text,
+               T.enterer_id,
+               T.entered_date,
+               T.service_table,
+               T.service_id,
+               T.product_table,
+               T.product_id,
+               T.claim_state_enum,
+               T.print_count,
+               T.account_id,
+               T.org_id,
+               T.refund_id,
+               T.tenant_id,
+               T.delete_flag,
+               T.create_by,
+               T.create_time,
+               T.update_by,
+               T.update_time,
+               T1.type_code
+        FROM adm_charge_item AS T
+                 LEFT JOIN adm_charge_item_definition AS T1 ON T.definition_id = T1.id
+                 LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
+        WHERE T2.dict_type = #{s}
+          AND T.id IN (#{collect})
     </select>
     <select id="getChargeItems" resultType="com.openhis.web.paymentmanage.dto.ChargeItemDto">
-        select
-            T.id,
-            T.status_enum,
-            T.bus_no,
-            T.prescription_no,
-            T.patient_id,
-            T.context_enum,
-            T.encounter_id,
-            T.occurrence_time,
-            T.performer_id,
-            T.performing_org_id,
-            T.requesting_org_id,
-            T.cost_org_id,
-            T.quantity_value,
-            T.quantity_unit,
-            T.unit_price,
-            T.total_price,
-            T.definition_id,
-            T.def_detail_id,
-            T.base_amount,
-            T.discount_amount,
-            T.surcharge_amount,
-            T.override_reason_code,
-            T.override_reason_text,
-            T.enterer_id,
-            T.entered_date,
-            T.service_table,
-            T.service_id,
-            T.product_table,
-            T.product_id,
-            T.claim_state_enum,
-            T.print_count,
-            T.account_id,
-            T.org_id,
-            T.refund_id,
-            T.tenant_id,
-            T.delete_flag,
-            T.create_by,
-            T.create_time,
-            T.update_by,
-            T.update_time,
-            T1.type_code
+        select T.id,
+               T.status_enum,
+               T.bus_no,
+               T.prescription_no,
+               T.patient_id,
+               T.context_enum,
+               T.encounter_id,
+               T.occurrence_time,
+               T.performer_id,
+               T.performing_org_id,
+               T.requesting_org_id,
+               T.cost_org_id,
+               T.quantity_value,
+               T.quantity_unit,
+               T.unit_price,
+               T.total_price,
+               T.definition_id,
+               T.def_detail_id,
+               T.base_amount,
+               T.discount_amount,
+               T.surcharge_amount,
+               T.override_reason_code,
+               T.override_reason_text,
+               T.enterer_id,
+               T.entered_date,
+               T.service_table,
+               T.service_id,
+               T.product_table,
+               T.product_id,
+               T.claim_state_enum,
+               T.print_count,
+               T.account_id,
+               T.org_id,
+               T.refund_id,
+               T.tenant_id,
+               T.delete_flag,
+               T.create_by,
+               T.create_time,
+               T.update_by,
+               T.update_time,
+               T1.type_code
         FROM adm_charge_item AS T
-            LEFT JOIN adm_charge_item_definition AS T1 ON T.definition_id =T1.id
-            LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
+                 LEFT JOIN adm_charge_item_definition AS T1 ON T.definition_id = T1.id
+                 LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
         WHERE T.id IN (#{collect})
     </select>
     <select id="getChargeItemListByEncounterId" resultType="com.openhis.web.paymentmanage.dto.ChargeItemDto">
-        select
-            T.id,
-            T.status_enum,
-            T.bus_no,
-            T.prescription_no,
-            T.patient_id,
-            T.context_enum,
-            T.encounter_id,
-            T.occurrence_time,
-            T.performer_id,
-            T.performing_org_id,
-            T.requesting_org_id,
-            T.cost_org_id,
-            T.quantity_value,
-            T.quantity_unit,
-            T.unit_price,
-            T.total_price,
-            T.definition_id,
-            T.def_detail_id,
-            T.base_amount,
-            T.discount_amount,
-            T.surcharge_amount,
-            T.override_reason_code,
-            T.override_reason_text,
-            T.enterer_id,
-            T.entered_date,
-            T.service_table,
-            T.service_id,
-            T.product_table,
-            T.product_id,
-            T.claim_state_enum,
-            T.print_count,
-            T.account_id,
-            T.org_id,
-            T.refund_id,
-            T.tenant_id,
-            T.delete_flag,
-            T.create_by,
-            T.create_time,
-            T.update_by,
-            T.update_time,
-            T1.type_code
+        select T.id,
+               T.status_enum,
+               T.bus_no,
+               T.prescription_no,
+               T.patient_id,
+               T.context_enum,
+               T.encounter_id,
+               T.occurrence_time,
+               T.performer_id,
+               T.performing_org_id,
+               T.requesting_org_id,
+               T.cost_org_id,
+               T.quantity_value,
+               T.quantity_unit,
+               T.unit_price,
+               T.total_price,
+               T.definition_id,
+               T.def_detail_id,
+               T.base_amount,
+               T.discount_amount,
+               T.surcharge_amount,
+               T.override_reason_code,
+               T.override_reason_text,
+               T.enterer_id,
+               T.entered_date,
+               T.service_table,
+               T.service_id,
+               T.product_table,
+               T.product_id,
+               T.claim_state_enum,
+               T.print_count,
+               T.account_id,
+               T.org_id,
+               T.refund_id,
+               T.tenant_id,
+               T.delete_flag,
+               T.create_by,
+               T.create_time,
+               T.update_by,
+               T.update_time,
+               T1.type_code
         FROM adm_charge_item AS T
-                 LEFT JOIN adm_charge_item_definition AS T1 ON T.definition_id =T1.id
+                 LEFT JOIN adm_charge_item_definition AS T1 ON T.definition_id = T1.id
                  LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
         WHERE T.encounter_id = #{encounterId}
     </select>
     <select id="selectDispenseQuantity" resultType="com.openhis.web.paymentmanage.dto.DispenseQuantityDto">
         SELECT COALESCE(SUM(mmr.quantity), 0) AS minpacunt_drug_trac_cnt,
-               COALESCE(SUM(wdr.quantity), 0) AS mcs_trac_cnt
+        COALESCE(SUM(wdr.quantity), 0) AS mcs_trac_cnt
         FROM adm_charge_item aci
-            LEFT JOIN med_medication_request mmr
-                ON aci.service_id = mmr.id
-                    AND mmr.delete_flag = '0'
-            LEFT JOIN wor_device_request wdr
-                ON aci.service_id = wdr.id
-                    AND wdr.delete_flag = '0'
+        LEFT JOIN med_medication_request mmr
+        ON aci.service_id = mmr.id
+        AND mmr.delete_flag = '0'
+        LEFT JOIN wor_device_request wdr
+        ON aci.service_id = wdr.id
+        AND wdr.delete_flag = '0'
         WHERE aci.delete_flag = '0'
-            AND aci.id IN
+        AND aci.id IN
         <foreach collection="chargeItemIds" item="chargeItemId" open="(" separator="," close=")">
             #{chargeItemId}
         </foreach>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/ChineseMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ChineseMedicineDispenseMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/ChineseMedicineDispenseMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ChineseMedicineDispenseMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/IDeviceDispenseMapper.xml
similarity index 43%
rename from openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/IDeviceDispenseMapper.xml
index bdaf9c15..b38537e9 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/IDeviceDispenseMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper">
+<mapper namespace="com.openhis.web.pharmacymanage.mapper.IDeviceDispenseMapper">
     <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto">
         SELECT ii.tenant_id,
                ii.encounter_id,
@@ -36,19 +36,23 @@
                           LEFT JOIN adm_organization AS T3
                                     ON T1.organization_id = T3.id
                                         AND T3.delete_flag = '0'
-                          INNER JOIN med_medication_dispense AS T4
+                          INNER JOIN wor_device_dispense AS T4
                                      ON T4.encounter_id = T1.id
                                          AND T4.delete_flag = '0'
+                          INNER JOIN wor_device_request AS T5
+                                     ON T4.device_req_id = T5.id
+                                         AND T5.delete_flag = '0'
                  -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
                  WHERE <if test="statusEnum == null">
                             T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
                         </if>
                         <if test="statusEnum == 3">
-                            T4.status_enum IN (#{inProgress},#{preparation})
+                            T4.status_enum IN (#{inProgress},#{preparation},#{prepared})
                         </if>
                         <if test="statusEnum == 4">
-                            T4.status_enum IN (#{completed},#{prepared})
+                            T4.status_enum = #{completed}
                         </if>
+                    AND T1.class_enum = #{amb}
                  GROUP BY T1.tenant_id,
                           T1.id,
                           T1.bus_no,
@@ -71,17 +75,20 @@
           T2.name AS patient_name,
           T2.gender_enum,
           T2.birth_date,
+          T2.phone,
           T4.category_enum,
           T2.id_card,
+          T2.bus_no AS patient_bus_no,
           T5.name AS organization_name,
+          (SELECT T6.name  FROM adm_organization AS T6  WHERE  T6.id = #{hospitalId} AND T6.delete_flag = '0') AS hospital_name,
           TO_CHAR(T1.start_time,'YYYY-MM-DD') AS encounter_date
         FROM adm_encounter AS T1
         INNER JOIN adm_patient AS T2
         ON T1.patient_id = T2.id
-        LEFT JOIN med_medication_request AS T3
+        LEFT JOIN wor_device_request AS T3
         ON T1.id = T3.encounter_id
         LEFT JOIN fin_contract AS T4
-        ON T3.contract_no = T4.bus_no
+        ON T3.contract_code = T4.bus_no
         LEFT JOIN adm_organization AS T5
         ON T1.organization_id = T5.id
         WHERE
@@ -90,135 +97,128 @@
           T2.name,
           T2.gender_enum,
           T2.birth_date,
+          T2.phone,
           T4.category_enum,
           T2.id_card,
+          T2.bus_no,
           T5.name,
+          hospital_name,
           T1.start_time
     </select>
-    <select id="selectPrescriptionMedicineInfoList" resultType="com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto">
-        SELECT T8."name" AS department_name,
-               T9."name" AS doctor_name,
-               T3.category_code AS item_type,
-               T7."name" AS condition_name,
-               T2.prescription_no,
-               T2.lot_number,
-               T2.id AS request_id,
-               T3."name" AS medicine_name,
-               T3.id AS medicine_id,
-               T4.total_volume,
-               T1.unit_code,
-               T1.dose,
-               T1.status_enum,
-               T2.rate_code,
-               T1.location_id,
-               T1.method_code,
-               T2.dose_unit_code,
-               T2.max_dose,
-               T2.first_dose,
-               T2.first_duration,
-               T2.dispense_interval,
-               T2.dispense_per_quantity,
-               T2.dispense_per_duration,
-               T1.quantity,
-               T1.id AS dispense_id,
-               T5.unit_price,
-               T5.total_price,
-               T10."name" AS dispense_doctor_name,
-               T11."name" AS preparer_doctor_name,
-               T13."name" AS location_name,
-	       T2.group_id      AS group_id
-        FROM med_medication_dispense AS T1
-                 LEFT JOIN med_medication_request AS T2
-                           ON T1.med_req_id = T2.id
-                 LEFT JOIN med_medication_definition AS T3
-                           ON T1.medication_id = T3.id
-                 LEFT JOIN med_medication AS T4
-                           ON T3.id = T4.medication_def_id
-                 INNER JOIN adm_charge_item AS T5
-                            ON T1.med_req_id = T5.service_id
-                 LEFT JOIN adm_encounter AS T6
+    <select id="selectPrescriptionDeviceInfoList" resultType="com.openhis.web.pharmacymanage.dto.PrescriptionDeviceInfoDto">
+    SELECT ii.department_name,
+           ii.doctor_name,
+           ii.item_type,
+           ii.condition_name,
+           ii.prescription_no,
+           ii.lot_number,
+           ii.request_id,
+           ii.device_name,
+           ii.device_id,
+           ii.total_volume,
+           ii.unit_code,
+           ii.encounter_id,
+           ii.status_enum,
+           ii.rate_code,
+           ii.location_id,
+           ii.quantity,
+           ii.dispense_id,
+           ii.unit_price,
+           ii.total_price,
+           ii.dispense_doctor_name,
+           ii.location_name,
+           ii.encounter_bus_no,
+           ii.req_authored_time,
+           ii.no,
+           ii.charge_type,
+           ii.med_type_code,
+           ii.tenant_id
+        FROM ( SELECT T8."name" AS department_name,
+                      T9."name" AS doctor_name,
+                      T3.category_code AS item_type,
+                      T7."name" AS condition_name,
+                      T2.prescription_no,
+                      T2.lot_number,
+                      T2.id AS request_id,
+                      T3."name" AS device_name,
+                      T3.id AS device_id,
+                      T3.size AS total_volume,
+                      T1.unit_code,
+                      T1.encounter_id,
+                      T1.status_enum,
+                      T2.rate_code,
+                      T1.location_id,
+                      T1.quantity,
+                      T1.id AS dispense_id,
+                      T5.unit_price,
+                      T5.total_price,
+                      T10."name" AS dispense_doctor_name,
+                      T13."name" AS location_name,
+                      T6.bus_no AS encounter_bus_no,
+                      T2.req_authored_time,
+                      T14.no,
+                      T15.contract_name AS charge_type,
+                      T16.med_type_code,
+                      T1.tenant_id
+               FROM wor_device_dispense AS T1
+                        LEFT JOIN wor_device_request AS T2
+                           ON T1.device_req_id = T2.id
+                               AND T2.delete_flag = '0'
+                        LEFT JOIN adm_device_definition AS T3
+                           ON T1.device_def_id = T3.id
+                               AND T3.delete_flag = '0'
+                        LEFT JOIN adm_device AS T4
+                           ON T3.id = T4.device_def_id
+                               AND T4.delete_flag = '0'
+                        INNER JOIN adm_charge_item AS T5
+                           ON T1.device_req_id = T5.service_id
+                               AND T5.delete_flag = '0'
+                        LEFT JOIN adm_encounter AS T6
                            ON T1.encounter_id = T6.id
-                 LEFT JOIN cli_condition AS T12
-                           ON T2.condition_id = T12.id
-                 LEFT JOIN cli_condition_definition AS T7
+                               AND T6.delete_flag = '0'
+                        LEFT JOIN cli_condition AS T12
+                            ON T2.condition_id = T12.id
+                               AND T12.delete_flag = '0'
+                        LEFT JOIN cli_condition_definition AS T7
                            ON T12.definition_id = T7.id
-                 LEFT JOIN adm_organization AS T8
+                               AND T7.delete_flag = '0'
+                        LEFT JOIN adm_organization AS T8
                            ON T6.organization_id = T8.id
-                 LEFT JOIN adm_practitioner AS T9
-                           ON T2.practitioner_id = T9.id
-                 LEFT JOIN adm_practitioner AS T10
-                           ON T1.practitioner_id = T10.id
-                 LEFT JOIN adm_practitioner AS T11
-                           ON T1.preparer_id = T11.id
-                 LEFT JOIN adm_location AS T13
+                               AND T8.delete_flag = '0'
+                        LEFT JOIN adm_practitioner AS T9
+                           ON T2.requester_id = T9.id
+                               AND T9.delete_flag = '0'
+                        LEFT JOIN adm_practitioner AS T10
+                           ON T1.performer_id = T10.id
+                               AND T10.delete_flag = '0'
+                        LEFT JOIN adm_location AS T13
                            ON T1.location_id = T13.id
-        WHERE T1.encounter_id = #{encounterId}
-        -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
-          AND
-         <if test="dispenseStatus == null">
-             T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
-         </if>
-         <if test="dispenseStatus == 3">
-             T1.status_enum IN (#{inProgress},#{preparation})
-         </if>
-         <if test="dispenseStatus == 4">
-             T1.status_enum IN (#{completed},#{prepared})
-         </if>
-        ORDER BY prescription_no
-    </select>
-    <select id="selectDispenseInventoryInfoByPrescriptionNo" resultType="com.openhis.web.pharmacymanage.dto.DispenseInventoryDto">
-        SELECT T1.id AS dispense_id,
-               T1.unit_code AS dispense_unit_code,
-               T1.quantity AS dispense_quantity,
-               T1.status_enum AS dispense_status,
-               T1.med_req_id,
-               T1.encounter_id,
-               T1.dispense_time,
-               T1.bus_no AS dispense_no,
-               T3.Id AS inventory_id,
-               T3.unit_code AS inventory_unit_code,
-               T3.quantity AS inventory_quantity,
-               T3.lot_number,
-               T3.production_date,
-               T3.expiration_date,
-               T3.trace_no,
-               T4.part_percent,
-               T4.yb_no,
-               T4.bus_no AS medication_no,
-               T4.rx_flag,
-               T5."name" AS preparer_name,
-               T6."name" AS dispense_name,
-               T6.phar_prac_cert_no,
-               T7."name" AS practitioner_name,
-               T8.patient_id,
-               T8.bus_no AS encounter_no
-        FROM med_medication_dispense AS T1
-                 INNER JOIN med_medication_request AS T2
-                    ON T1.med_req_id = T2.id
-                        AND T2.delete_flag = '0'
-                 LEFT JOIN wor_inventory_item AS T3
-                    ON T1.medication_id = T3.item_id
-                        AND T3.item_table = #{medMedicationDefinition}
-                        AND T1.location_id = T3.location_id
-                        AND T1.lot_number = T3.lot_number
-                        AND T3.delete_flag = '0'
-                 LEFT JOIN med_medication_definition AS T4
-                    ON T1.medication_id = T4.id
-                        AND T4.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T5
-                    ON T1.preparer_id = T5.id
-                        AND T5.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T6
-                    ON T1.practitioner_id = T6.id
-                        AND T6.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T7
-                    ON T2.practitioner_id = T7.id
-                        AND T7.delete_flag = '0'
-                 LEFT JOIN adm_encounter AS T8
-                    ON T1.encounter_id = T8.id
-                        AND T8.delete_flag = '0'
-        WHERE T2.prescription_no = #{prescriptionNo}
-          AND T1.delete_flag = '0'
+                               AND T13.delete_flag = '0'
+                        LEFT JOIN adm_account AS T14
+                           ON T5.account_id = T14.id
+                               AND T14.delete_flag = '0'
+                        LEFT JOIN fin_contract AS T15
+                           ON T14.contract_no = T15.bus_no
+                               AND T15.delete_flag = '0'
+                       LEFT JOIN adm_encounter_diagnosis AS T16
+                           ON T2.encounter_id = T16.encounter_id
+                               AND T2.condition_id = T16.condition_id
+                               AND T16.delete_flag = '0'
+               WHERE T1.delete_flag = '0'
+                    -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
+                    AND
+                    <if test="dispenseStatus == null">
+                        T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
+                    </if>
+                    <if test="dispenseStatus == 3">
+                        T1.status_enum IN (#{inProgress},#{preparation},#{prepared})
+                    </if>
+                    <if test="dispenseStatus == 4">
+                        T1.status_enum = #{completed}
+                    </if>
+                ORDER BY prescription_no DESC
+        ) AS ii
+        ${ew.customSqlSegment}
     </select>
     <select id="getPreparerDoctorList" resultType="com.openhis.administration.domain.Practitioner">
         SELECT ap.id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineDispenseMapper.xml
new file mode 100644
index 00000000..88caedfb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineDispenseMapper.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacymanage.mapper.InpatientMedicineDispenseMapper">
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineSummaryDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineSummaryDispenseMapper.xml
new file mode 100644
index 00000000..74965391
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InpatientMedicineSummaryDispenseMapper.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacymanage.mapper.InpatientMedicineSummaryDispenseMapper">
+    <select id="selectMedicationSummaryInfo" resultType="com.openhis.web.pharmacymanage.dto.InpatientMedicineSummaryPrescriptionInfoDto">
+        SELECT ii.tenant_id,
+               ii.bus_no,--单据号
+               ii.request_id,--供应请求id
+               ii.delivery_id,--供应发放id
+               ii.item_table,--项目表
+               ii.item_name,--项目名
+               ii.item_id,--项目id
+               ii.total_volume,--规格
+               ii.lot_number,--批号
+               ii.quantity,--请求数
+               ii.unit_code,--单位
+               ii.max_unit_code,--常规单位
+               ii.min_unit_code,--最小单位
+               ii.source_location_id,--发放地点
+               ii.source_location_name,
+               ii.org_id,--申请科室
+               ii.org_name,
+               ii.applicant_id,--领药人
+               ii.applicant_name,
+               ii.apply_time,--申请时间
+               ii.status_enum,--状态
+               ii.patient_info --患者信息
+        FROM (SELECT T1.tenant_id,
+                     T1.bus_no,--单据号
+                     T1.id                         AS request_id,--供应请求id
+                     T2.id                         AS delivery_id,--供应发放id
+                     T1.item_table,--项目表
+                     T3.name                       AS item_name,--项目名
+                     T1.item_id,--项目id
+                     T4.total_volume,--规格
+                     T1.lot_number,--批号
+                     T1.item_quantity              AS quantity,--请求数
+                     T1.unit_code,--单位
+                     T3.unit_code                  AS max_unit_code,--常规单位
+                     T3.min_unit_code,--最小单位
+                     T1.source_location_id,--发放地点
+                     T5.name                       AS source_location_name,
+                     T1.purpose_location_id        AS org_id,--申请科室
+                     T6.name                       AS org_name,
+                     T1.applicant_id,--领药人
+                     T7.name                       AS applicant_name,
+                     T1.apply_time,--申请时间
+                     T1.status_enum,--状态
+                     STRING_AGG(CONCAT(T11.name, ' : ', T12.inpatient_bed), ',' ORDER BY T11.name,
+                                T12.inpatient_bed) AS patient_info -- 患者信息
+              FROM wor_supply_request T1
+                       LEFT JOIN wor_supply_delivery AS T2
+                                 ON T2.request_id = T1.id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN med_medication_definition AS T3
+                                 ON T1.item_id = T3.id
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN med_medication AS T4
+                                 ON T3.id = T4.medication_def_id
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_location AS T5
+                                 ON T1.source_location_id = T5.id
+                                     AND T5.delete_flag = '0'
+                       LEFT JOIN adm_organization AS T6
+                                 ON T1.purpose_location_id = T6.id
+                                     AND T6.delete_flag = '0'
+                       LEFT JOIN adm_practitioner AS T7
+                                 ON T1.applicant_id = T7.id
+                                     AND T7.delete_flag = '0'
+                       LEFT JOIN (SELECT id,
+                                         encounter_id,
+                                         patient_id
+                                  FROM (SELECT id,
+                                               encounter_id,
+                                               patient_id,
+                                               ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY id) AS rn
+                                        FROM med_medication_dispense
+                                        WHERE delete_flag = '0') t
+                                  WHERE rn = 1) AS T8
+                                 ON CONCAT(',', T2.based_on_ids, ',') LIKE CONCAT('%,', T8.id, ',%')
+                       LEFT JOIN (SELECT STRING_AGG(T10.NAME, '_' ORDER BY T10.bus_no) AS inpatient_bed, T9.encounter_id
+                                  FROM adm_encounter_location T9
+                                           LEFT JOIN adm_location AS T10
+                                                     ON T10.id = T9.location_id
+                                                         AND T10.delete_flag = '0'
+                                  WHERE T9.status_enum = '2'
+                                    AND T9.delete_flag = '0'
+                                  GROUP BY T9.encounter_id) AS T12 ON T8.encounter_id = T12.encounter_id
+                       LEFT JOIN adm_patient AS T11
+                                 ON T11.id = T8.patient_id
+                                     AND T11.delete_flag = '0'
+              WHERE T1.item_table = #{medicationDefinition}
+                AND T1.type_enum = #{typeEnum}
+                AND T1.category_enum = #{categoryEnum}
+                AND T1.delete_flag = '0'
+              GROUP BY T1.tenant_id,
+                       T1.bus_no,
+                       T1.id,
+                       T2.id,
+                       T1.item_table,
+                       T3.name,
+                       T1.item_id,
+                       T4.total_volume,
+                       T1.lot_number,
+                       T1.item_quantity,
+                       T1.unit_code,
+                       T3.unit_code,
+                       T3.min_unit_code,
+                       T1.source_location_id,
+                       T5.name,
+                       T1.purpose_location_id,
+                       T6.name,
+                       T1.applicant_id,
+                       T7.name,
+                       T1.apply_time,
+                       T1.status_enum
+              UNION
+              SELECT T1.tenant_id,
+                     T1.bus_no,--单据号
+                     T1.id                         AS request_id,--供应请求id
+                     T2.id                         AS delivery_id,--供应发放id
+                     T1.item_table,--项目表
+                     T3.name                       AS item_name,--项目名
+                     T1.item_id,--项目id
+                     T3.size                       AS total_volume,--规格
+                     T1.lot_number,--批号
+                     T1.item_quantity              AS quantity,--请求数
+                     T1.unit_code,--单位
+                     T3.unit_code                  AS max_unit_code,--常规单位
+                     T3.min_unit_code,--最小单位
+                     T1.source_location_id,--发放地点
+                     T5.name                       AS source_location_name,
+                     T1.purpose_location_id        AS org_id,--申请科室
+                     T6.name                       AS org_name,
+                     T1.applicant_id,--领药人
+                     T7.name                       AS applicant_name,
+                     T1.apply_time,--申请时间
+                     T1.status_enum,--状态
+                     STRING_AGG(CONCAT(T11.name, ' : ', T12.inpatient_bed), ',' ORDER BY T11.name,
+                                T12.inpatient_bed) AS patient_info -- 患者信息
+              FROM wor_supply_request T1
+                       LEFT JOIN wor_supply_delivery AS T2
+                                 ON T2.request_id = T1.id
+                                     AND T2.delete_flag = '0'
+                       LEFT JOIN adm_device_definition AS T3
+                                 ON T1.item_id = T3.id
+                                     AND T3.delete_flag = '0'
+                       LEFT JOIN adm_device AS T4
+                                 ON T3.id = T4.device_def_id
+                                     AND T4.delete_flag = '0'
+                       LEFT JOIN adm_location AS T5
+                                 ON T1.source_location_id = T5.id
+                                     AND T5.delete_flag = '0'
+                       LEFT JOIN adm_organization AS T6
+                                 ON T1.purpose_location_id = T6.id
+                                     AND T6.delete_flag = '0'
+                       LEFT JOIN adm_practitioner AS T7
+                                 ON T1.applicant_id = T7.id
+                                     AND T7.delete_flag = '0'
+                       LEFT JOIN (SELECT id,
+                                         encounter_id,
+                                         patient_id
+                                  FROM (SELECT id,
+                                               encounter_id,
+                                               patient_id,
+                                               ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY id) AS rn
+                                        FROM wor_device_dispense
+                                        WHERE delete_flag = '0') t
+                                  WHERE rn = 1) AS T8
+                                 ON CONCAT(',', T2.based_on_ids, ',') LIKE CONCAT('%,', T8.id, ',%')
+                       LEFT JOIN (SELECT STRING_AGG(T10.NAME, '_' ORDER BY T10.bus_no) AS inpatient_bed, T9.encounter_id
+                                  FROM adm_encounter_location T9
+                                           LEFT JOIN adm_location AS T10
+                                                     ON T10.id = T9.location_id
+                                                         AND T10.delete_flag = '0'
+                                  WHERE T9.status_enum = '2'
+                                    AND T9.delete_flag = '0'
+                                  GROUP BY T9.encounter_id) AS T12 ON T8.encounter_id = T12.encounter_id
+                       LEFT JOIN adm_patient AS T11
+                                 ON T11.id = T8.patient_id
+                                     AND T11.delete_flag = '0'
+              WHERE T1.item_table = #{deviceDefinition}
+                AND T1.type_enum = #{typeEnum}
+                AND T1.category_enum = #{categoryEnum}
+                AND T1.delete_flag = '0'
+              GROUP BY T1.tenant_id,
+                       T1.bus_no,
+                       T1.id,
+                       T2.id,
+                       T1.item_table,
+                       T3.name,
+                       T1.item_id,
+                       T3.size,
+                       T1.lot_number,
+                       T1.item_quantity,
+                       T1.unit_code,
+                       T3.unit_code,
+                       T3.min_unit_code,
+                       T1.source_location_id,
+                       T5.name,
+                       T1.purpose_location_id,
+                       T6.name,
+                       T1.applicant_id,
+                       T7.name,
+                       T1.apply_time,
+                       T1.status_enum) AS ii
+            ${ew.customSqlSegment}
+    </select>
+
+
+    <!--    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.InpatientMedicineEncounterInfoDto">-->
+    <!--        SELECT ii.tenant_id,-->
+    <!--               ii.org_id,-->
+    <!--               ii.therapy_enum,-->
+    <!--               ii.encounter_id,-->
+    <!--               ii.bus_no,-->
+    <!--               ii.patient_name,-->
+    <!--               ii.gender_enum,-->
+    <!--               ii.birth_date,-->
+    <!--               ii.inpatient_bed,-->
+    <!--               ii.effective_dose_start-->
+    <!--        FROM (SELECT T1.tenant_id,-->
+    <!--                     T1.org_id,               &#45;&#45;科室-->
+    <!--                     T1.therapy_enum,         &#45;&#45;治疗类型  1:临时医嘱,2:长期医嘱,3:备用医嘱　	　-->
+    <!--                     T3.id   AS encounter_id, &#45;&#45;就诊id-->
+    <!--                     T3.bus_no,               &#45;&#45;住院号-->
+    <!--                     T2.name AS patient_name, &#45;&#45;患者姓名-->
+    <!--                     T2.gender_enum,          &#45;&#45;性别-->
+    <!--                     T2.birth_date,           &#45;&#45;生日-->
+    <!--                     STRING_AGG(T5.NAME, '_' ORDER BY T5.bus_no) AS inpatient_bed, &#45;&#45;床位-->
+    <!--                     MIN(T1.effective_dose_start) AS effective_dose_start  &#45;&#45;请求开始时间-->
+    <!--              FROM  med_medication_request AS T1-->
+    <!--                       LEFT JOIN adm_patient AS T2-->
+    <!--                                 ON T1.patient_id = T2.id-->
+    <!--                                     AND T2.delete_flag = '0'-->
+    <!--                       INNER JOIN adm_encounter AS T3-->
+    <!--                                  ON T1.encounter_id = T3.id-->
+    <!--                                      AND T3.class_enum = #{amb}-->
+    <!--                                      AND T3.status_enum = 5-->
+    <!--                                      AND T3.delete_flag = '0'-->
+    <!--                       LEFT JOIN adm_encounter_location AS T4-->
+    <!--                                 ON T4.encounter_id = T3.id-->
+    <!--                                     AND T4.status_enum = '2'-->
+    <!--                                     AND T4.delete_flag = '0'-->
+    <!--                       LEFT JOIN adm_location AS T5-->
+    <!--                                 ON T5.id = T4.location_id-->
+    <!--                                     AND T5.delete_flag = '0'-->
+    <!--              WHERE T1.delete_flag = '0'-->
+    <!--              GROUP BY T1.tenant_id,-->
+    <!--                       T1.org_id,-->
+    <!--                       T1.therapy_enum,-->
+    <!--                       T3.id,-->
+    <!--                       T3.bus_no,-->
+    <!--                       T2.name,-->
+    <!--                       T2.gender_enum,-->
+    <!--                       T2.birth_date) AS ii-->
+    <!--            ${ew.customSqlSegment}-->
+    <!--    </select>-->
+    <!--    <select id="selectPrescriptionInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.InpatientMedicinePrescriptionInfoDto">-->
+    <!--        SELECT ii.tenant_id,-->
+    <!--               ii.request_id,&#45;&#45;药品请求id-->
+    <!--               ii.encounter_id,&#45;&#45;就诊id-->
+    <!--               ii.bus_no,  &#45;&#45;单据号-->
+    <!--               ii.status_enum, &#45;&#45;状态-->
+    <!--               ii.patient_name,&#45;&#45;患者姓名-->
+    <!--               ii.medication_name,&#45;&#45;药品名-->
+    <!--               ii.effective_dose_start,&#45;&#45;医嘱开始时间-->
+    <!--               ii.effective_dose_end,&#45;&#45;医嘱结束时间-->
+    <!--               ii.req_authored_time &#45;&#45;生成日期-->
+    <!--        FROM (SELECT T1.tenant_id,-->
+    <!--                     T1.id AS request_id,&#45;&#45;药品请求id-->
+    <!--                     T1.encounter_id,&#45;&#45;就诊id-->
+    <!--                     T1.bus_no,  &#45;&#45;单据号-->
+    <!--                     T1.status_enum, &#45;&#45;状态-->
+    <!--                     T2.name AS patient_name,&#45;&#45;患者姓名-->
+    <!--                     T3.name AS medication_name,&#45;&#45;药品名-->
+    <!--                     T1.effective_dose_start,&#45;&#45;医嘱开始时间-->
+    <!--                     T1.effective_dose_end,&#45;&#45;医嘱结束时间-->
+    <!--                     T1.req_authored_time &#45;&#45;生成日期-->
+    <!--              FROM med_medication_request AS T1-->
+    <!--                   LEFT JOIN adm_patient AS T2-->
+    <!--                          ON T1.patient_id = T2.id-->
+    <!--                          AND T2.delete_flag = '0'-->
+    <!--                   LEFT JOIN med_medication_definition AS T3-->
+    <!--                          ON T1.medication_id = T3.id-->
+    <!--                          AND T3.delete_flag = '0'-->
+    <!--              WHERE T1.encounter_id IN-->
+    <!--              <foreach collection="encounterIdList" item="item" separator="," open="(" close=")">-->
+    <!--                  #{item}-->
+    <!--              </foreach>-->
+    <!--                  AND T1.delete_flag = '0'-->
+    <!--              GROUP BY T1.id,-->
+    <!--                       T2.name,-->
+    <!--                       T3.name) AS ii-->
+    <!--        ${ew.customSqlSegment}-->
+    <!--    </select>-->
+    <!--    <select id="selectMedicationSummaryHeadInfo" resultType="com.openhis.web.pharmacymanage.dto.InpatientMedicineSummaryPrescriptionInfoDto">-->
+    <!--        SELECT T2.dispense_time,&#45;&#45;发药日期-->
+    <!--               T2.rec_practitioner_id,&#45;&#45;领药人-->
+    <!--               T3.name  AS rec_practitioner_name,-->
+    <!--               SUM(T5.total_price) AS  totalPrice,&#45;&#45;金额合计-->
+    <!--               COUNT(DISTINCT T1.medication_id) AS  medVarietyCount,&#45;&#45;药品种数-->
+    <!--               COUNT(T1.id)    AS    aggregated_order_count,&#45;&#45;汇总医嘱数-->
+    <!--               T4.name    AS department&#45;&#45;科室病区-->
+    <!--        FROM med_medication_request AS T1-->
+    <!--                 LEFT JOIN med_medication_dispense AS T2-->
+    <!--                           ON T2.med_req_id = T1.id-->
+    <!--                               AND T2.delete_flag = '0'-->
+    <!--                 LEFT JOIN adm_practitioner AS T3-->
+    <!--                           ON T2.rec_practitioner_id = T3.id-->
+    <!--                               AND T3.delete_flag = '0'-->
+    <!--                 LEFT JOIN adm_organization AS T4-->
+    <!--                           ON T3.org_id = T4.id-->
+    <!--                               AND T4.delete_flag = '0'-->
+    <!--                 LEFT JOIN adm_charge_item AS T5-->
+    <!--                           ON T1.id = T5.service_id-->
+    <!--                               AND T5.service_table = #{medicationRequest}-->
+    <!--                               AND T5.delete_flag = '0'-->
+    <!--        WHERE T1.id IN-->
+    <!--            <foreach collection="requestIdList" item="item" separator="," open="(" close=")">-->
+    <!--                #{item}-->
+    <!--            </foreach>-->
+    <!--          AND T1.delete_flag = '0'-->
+    <!--        GROUP BY  T2.dispense_time,-->
+    <!--                  T2.rec_practitioner_id,-->
+    <!--                  T3.name,-->
+    <!--                  T4.name-->
+    <!--    </select>-->
+<!--    <select id="selectMedicationSummaryInfo" resultType="com.openhis.web.pharmacymanage.dto.InpatientMedicineSummaryPrescriptionInfoDto">-->
+<!--        SELECT T2.name             AS med_name,&#45;&#45;药品名-->
+<!--               T3.total_volume,&#45;&#45;规格-->
+<!--               T5.name             AS supplier_name,&#45;&#45;供应商-->
+<!--               CASE T1.unit_code-->
+<!--               WHEN T2.min_unit_code THEN T8.amount * T2.part_percent-->
+<!--               ELSE  T8.amount  END          AS purchase_price,&#45;&#45;采购价-->
+<!--               CASE T1.unit_code-->
+<!--               WHEN T2.min_unit_code THEN T9.amount * T2.part_percent-->
+<!--               ELSE  T9.amount  END        AS unit_price,&#45;&#45;单价-->
+<!--               T1.lot_number,&#45;&#45;批号-->
+<!--               CASE T1.unit_code-->
+<!--               WHEN T2.min_unit_code THEN T4.quantity-->
+<!--               ELSE  T4.quantity/T2.part_percent  END   AS stock_quantity,&#45;&#45;库存数-->
+<!--               SUM(CASE WHEN T1.status_enum = #{active} THEN T1.quantity ELSE 0 END) AS pending_quantity,&#45;&#45;待发药数-->
+<!--               SUM(CASE WHEN T1.status_enum = #{completed} THEN T1.quantity ELSE 0 END) AS dispensed_quantity,&#45;&#45;已发药数-->
+<!--               SUM(CASE WHEN T1.status_enum = #{cancelled} THEN T1.quantity ELSE 0 END) AS returned_quantity,&#45;&#45;已退药数-->
+<!--               T1.unit_code, &#45;&#45;单位-->
+<!--               T1.status_enum,&#45;&#45;状态-->
+<!--               T1.trace_no&#45;&#45;追溯码-->
+<!--        FROM med_medication_request AS T1-->
+<!--                 LEFT JOIN med_medication_definition AS T2-->
+<!--                           ON T1.medication_id = T2.id-->
+<!--                               AND T2.delete_flag = '0'-->
+<!--                 LEFT JOIN med_medication AS T3-->
+<!--                           ON T2.id = T3.medication_def_id-->
+<!--                               AND T3.delete_flag = '0'-->
+<!--                 LEFT JOIN wor_inventory_item AS T4-->
+<!--                           ON T4.item_id = T2.id-->
+<!--                               AND T4.item_table = #{medicationDefinition}-->
+<!--                               AND T1.lot_number = T4.lot_number-->
+<!--                               AND T4.delete_flag = '0'-->
+<!--                 LEFT JOIN adm_supplier AS T5-->
+<!--                           ON T4.supplier_id = T5.id-->
+<!--                               AND T5.delete_flag = '0'-->
+<!--                 LEFT JOIN adm_charge_item AS T6-->
+<!--                           ON T6.service_id = T1.id-->
+<!--                               AND T6.service_table = #{medicationRequest}-->
+<!--                               AND T6.delete_flag = '0'-->
+<!--                LEFT JOIN adm_charge_item_definition T7-->
+<!--                           ON T7.instance_id = T2.id-->
+<!--                               AND T7.instance_table = #{medicationDefinition}-->
+<!--                               AND T7.delete_flag = '0'-->
+<!--                LEFT JOIN adm_charge_item_def_detail T8-->
+<!--                           ON T8.definition_id = T7.id-->
+<!--                              AND T8.condition_code = '1'&#45;&#45;1:批号进价-->
+<!--                              AND T8.condition_value = T1.lot_number-->
+<!--                              AND T8.delete_flag = '0'-->
+<!--                LEFT JOIN adm_charge_item_def_detail T9-->
+<!--                           ON T9.definition_id = T7.id-->
+<!--                              AND T9.condition_code = '5'&#45;&#45;1:批号售价-->
+<!--                              AND T9.condition_value = T1.lot_number-->
+<!--                              AND T9.delete_flag = '0'-->
+<!--        WHERE T1.id IN-->
+<!--               <foreach collection="requestIdList" item="item" separator="," open="(" close=")">-->
+<!--                   #{item}-->
+<!--               </foreach>-->
+<!--          AND T1.delete_flag = '0'-->
+<!--        GROUP BY T2.name,-->
+<!--                 T3.total_volume,-->
+<!--                 T5.name,-->
+<!--                 T1.unit_code,-->
+<!--                 T2.min_unit_code,-->
+<!--                 T8.amount,-->
+<!--                 T2.part_percent,-->
+<!--                 T9.amount,-->
+<!--                 T1.lot_number,-->
+<!--                 T4.quantity,-->
+<!--                 T1.status_enum,-->
+<!--                 T1.trace_no-->
+<!--    </select>-->
+
+
+
+
+
+
+<!--    <select id="selectMedicationPatientInfoList" resultType="com.openhis.web.pharmacymanage.dto.InpatientMedicineEncounterInfoDto">-->
+<!--        SELECT T3.bus_no,&#45;&#45;住院号-->
+<!--               T4.name   AS patient_name,&#45;&#45;患者姓名-->
+<!--               T2.bus_no AS med_request_bus_no,&#45;&#45;发药单号-->
+<!--               T6.name   AS occurrence_name,&#45;&#45;发药人-->
+<!--               T5.occurrence_time,&#45;&#45;发药时间-->
+<!--               T2.status_enum&#45;&#45;状态-->
+<!--        FROM wor_supply_request AS T1-->
+<!--                 INNER JOIN med_medication_request AS T2-->
+<!--                            ON T1.item_id = T2.id-->
+<!--                                AND T2.delete_flag = '0'-->
+<!--                 INNER JOIN adm_encounter AS T3-->
+<!--                            ON T2.encounter_id = T3.id-->
+<!--                                AND T3.delete_flag = '0'-->
+<!--                 LEFT JOIN adm_patient AS T4-->
+<!--                           ON T1.patient_id = T4.id-->
+<!--                               AND T4.delete_flag = '0'-->
+<!--                 LEFT JOIN wor_supply_delivery AS T5-->
+<!--                           ON T5.request_id = T1.id-->
+<!--                               AND T5.delete_flag = '0'-->
+<!--                 LEFT JOIN adm_practitioner AS T6-->
+<!--                           ON T5.practitioner_id = T6.id-->
+<!--                               AND T6.delete_flag = '0'-->
+<!--        WHERE T1.bus_no = #{busNo}-->
+<!--          AND T1.item_table = #{medicationRequest}-->
+<!--          AND T1.delete_flag = '0'-->
+<!--        GROUP BY T3.bus_no,-->
+<!--                 T4.name,-->
+<!--                 T2.bus_no,-->
+<!--                 T6.name,-->
+<!--                 T5.occurrence_time,-->
+<!--                 T2.status_enum-->
+<!--    </select>-->
+
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicineConsumablesDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalConsumablesDispenseAppMapper.xml
similarity index 98%
rename from openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicineConsumablesDispenseMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalConsumablesDispenseAppMapper.xml
index 74f012e5..a2c0566b 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicineConsumablesDispenseMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalConsumablesDispenseAppMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.MedicineConsumablesDispenseMapper">
+<mapper namespace="com.openhis.web.pharmacymanage.mapper.MedicalConsumablesDispenseAppMapper">
     <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto">
         SELECT
           tenant_id,
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
similarity index 98%
rename from openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
index d9de11df..757c64dc 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
@@ -9,6 +9,7 @@
                A.practitioner_id,
                A.practitioner_name,
                A.medication_name,
+               A.py_str,
                A.bus_no,
                A.dispense_no,
                A.yb_no,
@@ -43,6 +44,7 @@
                        AND mmr.refund_medicine_id IS not null
                  )
                  SELECT def."name"           AS medication_name,
+                        def.py_str,
                         def.bus_no,
                         def.yb_no,
                         def.manufacturer_text,
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
similarity index 96%
rename from openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
index 2c647dd5..3d261cde 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
@@ -5,6 +5,7 @@
             resultType="com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto">
         SELECT T7.medicine_no,      --药品编码
                T7.medicine_name,    --药品名称
+               T7.py_str,    --药品拼音
                T7.dispense_quantity, --待发药数量
                T7.unit_code,        --请求单位
                T7.dispense_enum,    --发药类型
@@ -17,6 +18,7 @@
         FROM (
                  SELECT T1.bus_no                          AS medicine_no,      --药品编码
                         T6."name"                          AS medicine_name,    --药品名称
+                        T6.py_str,                                              --药品拼音
                         T1.quantity   AS dispense_quantity,                     --待发药数量
                         T1.unit_code,                                           --请求单位
                         T1.dispense_enum,                                       --发药类型
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
similarity index 70%
rename from openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
index e731116b..dfb42448 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
@@ -35,6 +35,7 @@
                  LEFT JOIN adm_organization ao
                         ON ao.id = ae.organization_id
             WHERE mmr.refund_medicine_id IS NOT NULL
+                AND ae.class_enum = #{amb}
             UNION
             SELECT ae.reception_time,
                    ae.id           AS encounter_id,
@@ -56,6 +57,7 @@
                      LEFT JOIN adm_organization ao
                             ON ao.id = ae.organization_id
             WHERE wdr.refund_device_id IS NOT NULL
+              AND ae.class_enum = #{amb}
         ) AS ii
         ${ew.customSqlSegment}
         ORDER BY ii.reception_time DESC
@@ -140,8 +142,10 @@
                 T2.unit_code AS inventory_unit_code,
                 T2.quantity AS inventory_quantity,
                 T2.inventory_status_enum,
+                T2.expiration_date,
                 T3.part_percent,
-                T3."name" AS item_name
+                T3."name" AS item_name,
+                T3.id AS item_id
                 FROM med_medication_dispense AS T1
                 INNER JOIN wor_inventory_item AS T2
                 ON T1.medication_id = T2.item_id
@@ -172,18 +176,20 @@
                 T2.unit_code AS inventory_unit_code,
                 T2.quantity AS inventory_quantity,
                 T2.inventory_status_enum,
+                T2.expiration_date,
                 T5.part_percent,
-                T5."name" AS item_name
+                T5."name" AS item_name,
+                T5.id AS item_id
                 FROM wor_device_dispense AS T4
                 INNER JOIN wor_inventory_item AS T2
                 ON T4.device_def_id = T2.item_id
-                T2.delete_flag = '0'
+                AND T2.delete_flag = '0'
                 AND T2.item_table = #{admDeviceDefinition}
                 AND T4.lot_number = T2.lot_number
                 AND T4.location_id = T2.location_id
                 INNER JOIN adm_device_definition AS T5
                 ON T4.device_def_id = T5.id
-                T5.delete_flag = '0'
+                AND T5.delete_flag = '0'
                 WHERE T4.id IN
                 <foreach collection="devDispenseIdList" item="devDispenseId" open="(" separator="," close=")">
                     #{devDispenseId}
@@ -208,7 +214,8 @@
                med.id      AS item_id,
                aci.total_price,
                aci.service_table,
-               doc."name"      AS doctor_name
+               doc."name"      AS doctor_name,
+               mmd.trace_no
         FROM med_medication_request mmr
                  LEFT JOIN med_medication_dispense mmd
                            ON mmr.refund_medicine_id = mmd.med_req_id
@@ -225,15 +232,14 @@
         WHERE mmr.refund_medicine_id IS NOT NULL
           AND mmr.encounter_id = #{encounterId}
           AND aci.service_table =#{medMedicationRequest}
-          AND
           <if test="refundStatus == null">
-              mmr.status_enum IN (#{inRefund},#{completed})
+              AND mmr.status_enum IN (#{inRefund},#{completed})
           </if>
-          <if test="refundStatus == 11">
-              mmr.status_enum = #{inRefund}
+          <if test="refundStatus == 5">
+              AND mmr.status_enum = #{inRefund}
           </if>
           <if test="refundStatus == 3">
-              mmr.status_enum = #{completed}
+              AND mmr.status_enum = #{completed}
           </if>
           AND mmr.delete_flag = '0'
         UNION
@@ -250,7 +256,8 @@
                dev.id      AS item_id,
                aci.total_price,
                aci.service_table,
-               doc."name"      AS doctor_name
+               doc."name"      AS doctor_name,
+               wdd.trace_no
         FROM wor_device_request wdr
                  LEFT JOIN wor_device_dispense wdd
                            ON wdr.refund_device_id = wdd.device_req_id
@@ -267,24 +274,27 @@
         WHERE wdr.refund_device_id IS NOT NULL
           AND wdr.encounter_id =#{encounterId}
           AND aci.service_table =#{worDeviceRequest}
-          AND
           <if test="refundStatus == null">
-              wdr.status_enum IN (#{inRefund},#{completed})
+           AND wdr.status_enum IN (#{inRefund},#{completed})
           </if>
-          <if test="refundStatus == 11">
-              wdr.status_enum = #{inRefund}
+          <if test="refundStatus == 5">
+            AND wdr.status_enum = #{inRefund}
           </if>
           <if test="refundStatus == 3">
-              wdr.status_enum = #{completed}
+            AND wdr.status_enum = #{completed}
           </if>
           AND wdr.delete_flag = '0'
     </select>
     <select id="selectReturnItemDetail" resultType="com.openhis.web.pharmacymanage.dto.DispenseInventoryDto">
+        <choose>
+        <when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
+                  or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
+        <if test="medDispenseIdList != null and !medDispenseIdList.isEmpty()">
         SELECT T1.id AS dispense_id,
                T1.unit_code AS dispense_unit_code,
                T1.quantity AS dispense_quantity,
                T1.status_enum AS dispense_status,
-               T1.med_req_id,
+               T1.med_req_id AS req_id,
                T1.encounter_id,
                T1.dispense_time,
                T1.bus_no AS dispense_no,
@@ -297,43 +307,116 @@
                T3.expiration_date,
                T4.part_percent,
                T4.yb_no,
-               T4.bus_no AS medication_no,
+               T4.bus_no AS item_no,
                T4.rx_flag,
                T5."name" AS preparer_name,
                T6."name" AS dispense_name,
                T6.phar_prac_cert_no,
                T7."name" AS practitioner_name,
                T8.patient_id,
-               T8.bus_no AS encounter_no
+               T8.bus_no AS encounter_no,
+               T9.id_card,
+               T9."name" AS patient_name,
+               #{medMedicationDefinition} AS item_table
         FROM med_medication_dispense AS T1
-                 INNER JOIN med_medication_request AS T2
-                            ON T1.med_req_id = T2.id
-                                AND T2.delete_flag = '0'
-                 LEFT JOIN wor_inventory_item AS T3
-                           ON T1.medication_id = T3.item_id
-                               AND T3.item_table = #{medMedicationDefinition}
-                               AND T1.location_id = T3.location_id
-                               AND T1.lot_number = T3.lot_number
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN med_medication_definition AS T4
-                           ON T1.medication_id = T4.id
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T5
-                           ON T1.preparer_id = T5.id
-                               AND T5.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T6
-                           ON T1.practitioner_id = T6.id
-                               AND T6.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T7
-                           ON T2.practitioner_id = T7.id
-                               AND T7.delete_flag = '0'
-                 LEFT JOIN adm_encounter AS T8
-                           ON T1.encounter_id = T8.id
-                               AND T8.delete_flag = '0'
+            INNER JOIN med_medication_request AS T2
+               ON T1.med_req_id = T2.id
+                   AND T2.delete_flag = '0'
+            LEFT JOIN wor_inventory_item AS T3
+               ON T1.medication_id = T3.item_id
+                   AND T3.item_table = #{medMedicationDefinition}
+                   AND T1.location_id = T3.location_id
+                   AND T1.lot_number = T3.lot_number
+                   AND T3.delete_flag = '0'
+            LEFT JOIN med_medication_definition AS T4
+               ON T1.medication_id = T4.id
+                   AND T4.delete_flag = '0'
+            LEFT JOIN adm_practitioner AS T5
+               ON T1.preparer_id = T5.id
+                   AND T5.delete_flag = '0'
+            LEFT JOIN adm_practitioner AS T6
+               ON T1.practitioner_id = T6.id
+                   AND T6.delete_flag = '0'
+            LEFT JOIN adm_practitioner AS T7
+                ON T2.practitioner_id = T7.id
+                   AND T7.delete_flag = '0'
+            LEFT JOIN adm_encounter AS T8
+                ON T1.encounter_id = T8.id
+                    AND T8.delete_flag = '0'
+            LEFT JOIN adm_patient AS T9
+                ON T1.patient_id = T9.id
+                    AND T9.delete_flag = '0'
         WHERE T1.id IN
             <foreach collection="medDispenseIdList" item="medDispenseId" open="(" separator="," close=")">
                 #{medDispenseId}
             </foreach>
           AND T1.delete_flag = '0'
+        </if>
+        <if test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
+             and (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
+            UNION
+        </if>
+        <if test="devDispenseIdList != null and !devDispenseIdList.isEmpty()">
+        SELECT T10.id AS dispense_id,
+               T10.unit_code AS dispense_unit_code,
+               T10.quantity AS dispense_quantity,
+               T10.status_enum AS dispense_status,
+               T10.device_req_id AS req_id,
+               T10.encounter_id,
+               T10.dispense_time,
+               T10.bus_no AS dispense_no,
+               T10.trace_no,
+               T3.Id AS inventory_id,
+               T3.unit_code AS inventory_unit_code,
+               T3.quantity AS inventory_quantity,
+               T3.lot_number,
+               T3.production_date,
+               T3.expiration_date,
+               T12.part_percent,
+               T12.yb_no,
+               T12.bus_no AS item_no,
+               T12.rx_flag,
+               null AS preparer_name,
+               T6."name" AS dispense_name,
+               T6.phar_prac_cert_no,
+               T7."name" AS practitioner_name,
+               T8.patient_id,
+               T8.bus_no AS encounter_no,
+               T9.id_card,
+               T9."name" AS patient_name,
+               #{admDeviceDefinition} AS item_table
+        FROM wor_device_dispense AS T10
+            INNER JOIN wor_device_request AS T11
+                ON T10.device_req_id = T11.id
+                    AND T11.delete_flag = '0'
+            LEFT JOIN wor_inventory_item AS T3
+                ON T10.device_def_id = T3.item_id
+                    AND T3.item_table = #{admDeviceDefinition}
+                    AND T10.location_id = T3.location_id
+                    AND T10.lot_number = T3.lot_number
+                    AND T3.delete_flag = '0'
+            LEFT JOIN adm_device_definition AS T12
+                ON T10.device_def_id = T12.id
+                    AND T12.delete_flag = '0'
+            LEFT JOIN adm_practitioner AS T6
+                ON T10.performer_id = T6.id
+                    AND T6.delete_flag = '0'
+            LEFT JOIN adm_practitioner AS T7
+                ON T11.requester_id = T7.id
+                    AND T7.delete_flag = '0'
+            LEFT JOIN adm_encounter AS T8
+                ON T10.encounter_id = T8.id
+                    AND T8.delete_flag = '0'
+            LEFT JOIN adm_patient AS T9
+                ON T10.patient_id = T9.id
+                    AND T9.delete_flag = '0'
+        WHERE T10.id IN
+            <foreach collection="devDispenseIdList" item="devDispenseId" open="(" separator="," close=")">
+                #{devDispenseId}
+            </foreach>
+            AND T10.delete_flag = '0'
+        </if>
+        </when>
+    </choose>
     </select>
 </mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
new file mode 100644
index 00000000..cbe4820b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper">
+    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoPageDto">
+        SELECT ii.tenant_id,
+               ii.encounter_id,
+               ii.encounter_no,
+               ii.department_name,
+               ii.patient_name,
+               ii.patient_wb_str,
+               ii.patient_py_str,
+               ii.gender_enum,
+               ii.department_id,
+               ii.id_card,
+               ii.reception_time,
+               ii.status_enum,
+               ii.tcm_flag
+--                ii.location_id
+        FROM (
+                 SELECT T1.tenant_id,
+                        T1.id AS encounter_id,
+                        T1.bus_no AS encounter_no,
+                        T1.reception_time,
+                        T1.organization_id AS department_id,
+                        T2.gender_enum,
+                        T2.name AS patient_name,
+                        T2.wb_str AS patient_wb_str,
+                        T2.py_str AS patient_py_str,
+                        T2.id_card,
+                        T3.name AS department_name,
+                        T4.status_enum,
+                        T5.tcm_flag
+--                         T4.location_id
+                 FROM adm_encounter AS T1
+                          INNER JOIN adm_patient AS T2
+                                     ON T1.patient_id = T2.id
+                                         AND T2.delete_flag = '0'
+                          LEFT JOIN adm_organization AS T3
+                                    ON T1.organization_id = T3.id
+                                        AND T3.delete_flag = '0'
+                          INNER JOIN med_medication_dispense AS T4
+                                     ON T4.encounter_id = T1.id
+                                         AND T4.delete_flag = '0'
+                          INNER JOIN med_medication_request AS T5
+                                     ON T4.med_req_id = T5.id
+                                         AND T5.delete_flag = '0'
+                 -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
+                 WHERE <if test="statusEnum == null">
+                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
+                        </if>
+                        <if test="statusEnum == 3">
+                            T4.status_enum IN (#{inProgress},#{preparation},#{prepared})
+                        </if>
+                        <if test="statusEnum == 4">
+                            T4.status_enum = #{completed}
+                        </if>
+                    AND T1.class_enum = #{amb}
+                 GROUP BY T1.tenant_id,
+                          T1.id,
+                          T1.bus_no,
+                          T1.reception_time,
+                          T1.organization_id,
+                          T2.gender_enum,
+                          T2.name,
+                          T2.wb_str,
+                          T2.py_str,
+                          T2.id_card,
+                          T3.name,
+                          T4.status_enum,
+                          T5.tcm_flag
+--                           T4.location_id
+                 ORDER BY T1.reception_time desc
+             ) AS ii
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectPrescriptionPatientInfo" resultType="com.openhis.web.pharmacymanage.dto.PrescriptionPatientInfoDto">
+        SELECT T2.name                              AS patient_name,
+               T2.gender_enum,
+               T2.birth_date,
+               T2.phone,
+               T4.category_enum,
+               T4.contract_name,
+               T2.id_card,
+               T2.bus_no                            AS patient_bus_no,
+               T5.name                              AS organization_name,
+               (SELECT T6.name
+                FROM adm_organization AS T6
+                WHERE T6.id = #{hospitalId}
+                  AND T6.delete_flag = '0')         AS hospital_name,
+               TO_CHAR(T1.start_time, 'YYYY-MM-DD') AS encounter_date,
+               T1.id                                AS encounter_id,
+               T8.id                                AS condition_id,
+               T8.name                              AS condition_name
+        FROM adm_encounter AS T1
+                 INNER JOIN adm_patient AS T2
+                            ON T1.patient_id = T2.id
+                 LEFT JOIN med_medication_request AS T3
+                           ON T1.id = T3.encounter_id
+                 LEFT JOIN adm_charge_item AS T9
+                           ON T9.encounter_id = T1.id
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_account AS T10
+                           ON T10.id = T9.account_id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN fin_contract AS T4
+                           ON T4.bus_no = T10.contract_no
+                 LEFT JOIN adm_organization AS T5
+                           ON T1.organization_id = T5.id
+                 LEFT JOIN adm_encounter_diagnosis T6
+                           ON T1.id = T6.encounter_id
+                               AND T6.maindise_flag = '1'
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN cli_condition AS T7
+                           ON T6.condition_id = T7.id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN cli_condition_definition AS T8
+                           ON T7.definition_id = T8.id
+                               AND T8.delete_flag = '0'
+        WHERE T1.id = #{encounterId}
+        GROUP BY T2.name,
+                 T2.gender_enum,
+                 T2.birth_date,
+                 T2.phone,
+                 T4.category_enum,
+                 T4.contract_name,
+                 T2.id_card,
+                 T2.bus_no,
+                 T5.name,
+                 hospital_name,
+                 T1.start_time,
+                 T1.id,
+                 T8.id
+    </select>
+    <select id="selectPrescriptionMedicineInfoList" resultType="com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto">
+    SELECT ii.department_name,
+           ii.doctor_name,
+           ii.item_type,
+           ii.condition_name,
+           ii.prescription_no,
+           ii.lot_number,
+           ii.request_id,
+           ii.tcm_flag,
+           ii.medicine_name,
+           ii.medicine_id,
+           ii.total_volume,
+           ii.unit_code,
+           ii.encounter_id,
+           ii.dose,
+           ii.status_enum,
+           ii.rate_code,
+           ii.location_id,
+           ii.method_code,
+           ii.dose_unit_code,
+           ii.max_dose,
+           ii.first_dose,
+           ii.first_duration,
+           ii.dispense_interval,
+           ii.dispense_per_quantity,
+           ii.dispense_per_duration,
+           ii.quantity,
+           ii.dispense_id,
+           ii.unit_price,
+           ii.total_price,
+           ii.dispense_doctor_name,
+           ii.preparer_doctor_name,
+           ii.location_name,
+           ii.encounter_bus_no,
+           ii.req_authored_time,
+           ii.no,
+           ii.charge_type,
+           ii.pharmacology_category_code,
+           ii.med_type_code,
+           ii.skin_test_flag,
+           ii.group_id
+        FROM ( SELECT T8."name" AS department_name,
+                      T9."name" AS doctor_name,
+                      T3.category_code AS item_type,
+                      T7."name" AS condition_name,
+                      T2.prescription_no,
+                      T2.lot_number,
+                      T2.id AS request_id,
+                      T2.tcm_flag,
+                      T3."name" AS medicine_name,
+                      T3.id AS medicine_id,
+                      T4.total_volume,
+                      T1.unit_code,
+                      T1.encounter_id,
+                      T1.dose,
+                      T1.status_enum,
+                      T2.rate_code,
+                      T1.location_id,
+                      T1.method_code,
+                      T2.dose_unit_code,
+                      T2.max_dose,
+                      T2.first_dose,
+                      T2.first_duration,
+                      T2.dispense_interval,
+                      T2.dispense_per_quantity,
+                      T2.dispense_per_duration,
+                      T1.quantity,
+                      T1.id AS dispense_id,
+                      T5.unit_price,
+                      T5.total_price,
+                      T10."name" AS dispense_doctor_name,
+                      T11."name" AS preparer_doctor_name,
+                      T13."name" AS location_name,
+                      T6.bus_no AS encounter_bus_no,
+                      T2.req_authored_time,
+                      T14.no,
+                      T15.contract_name AS charge_type,
+                      T3.pharmacology_category_code,
+                      T16.med_type_code,
+                      T3.skin_test_flag,
+	                  T2.group_id      AS group_id,
+                      T1.tenant_id
+               FROM med_medication_dispense AS T1
+                        LEFT JOIN med_medication_request AS T2
+                           ON T1.med_req_id = T2.id
+                               AND T2.delete_flag = '0'
+                        LEFT JOIN med_medication_definition AS T3
+                           ON T1.medication_id = T3.id
+                               AND T3.delete_flag = '0'
+                        LEFT JOIN med_medication AS T4
+                           ON T3.id = T4.medication_def_id
+                               AND T4.delete_flag = '0'
+                        INNER JOIN adm_charge_item AS T5
+                           ON T1.med_req_id = T5.service_id
+                               AND T5.delete_flag = '0'
+                        LEFT JOIN adm_encounter AS T6
+                           ON T1.encounter_id = T6.id
+                               AND T6.delete_flag = '0'
+                        LEFT JOIN cli_condition AS T12
+                            ON T2.condition_id = T12.id
+                               AND T12.delete_flag = '0'
+                        LEFT JOIN cli_condition_definition AS T7
+                           ON T12.definition_id = T7.id
+                               AND T7.delete_flag = '0'
+                        LEFT JOIN adm_organization AS T8
+                           ON T6.organization_id = T8.id
+                               AND T8.delete_flag = '0'
+                        LEFT JOIN adm_practitioner AS T9
+                           ON T2.practitioner_id = T9.id
+                               AND T9.delete_flag = '0'
+                        LEFT JOIN adm_practitioner AS T10
+                           ON T1.practitioner_id = T10.id
+                               AND T10.delete_flag = '0'
+                        LEFT JOIN adm_practitioner AS T11
+                           ON T1.preparer_id = T11.id
+                               AND T11.delete_flag = '0'
+                        LEFT JOIN adm_location AS T13
+                           ON T1.location_id = T13.id
+                               AND T13.delete_flag = '0'
+                        LEFT JOIN adm_account AS T14
+                           ON T5.account_id = T14.id
+                               AND T14.delete_flag = '0'
+                        LEFT JOIN fin_contract AS T15
+                           ON T14.contract_no = T15.bus_no
+                               AND T15.delete_flag = '0'
+                       LEFT JOIN adm_encounter_diagnosis AS T16
+                           ON T2.encounter_id = T16.encounter_id
+                               AND T2.condition_id = T16.condition_id
+                               AND T16.delete_flag = '0'
+               WHERE T1.delete_flag = '0'
+                    -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
+                    AND
+                    <if test="dispenseStatus == null">
+                        T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
+                    </if>
+                    <if test="dispenseStatus == 3">
+                        T1.status_enum IN (#{inProgress},#{preparation},#{prepared})
+                    </if>
+                    <if test="dispenseStatus == 4">
+                        T1.status_enum = #{completed}
+                    </if>
+                ORDER BY prescription_no DESC
+        ) AS ii
+        ${ew.customSqlSegment}
+    </select>
+    <select id="selectDispenseInventoryInfoByPrescriptionNo" resultType="com.openhis.web.pharmacymanage.dto.DispenseInventoryDto">
+        SELECT T1.id AS dispense_id,
+               T1.unit_code AS dispense_unit_code,
+               T1.quantity AS dispense_quantity,
+               T1.status_enum AS dispense_status,
+               T1.med_req_id,
+               T1.encounter_id,
+               T1.dispense_time,
+               T1.bus_no AS dispense_no,
+               T3.Id AS inventory_id,
+               T3.unit_code AS inventory_unit_code,
+               T3.quantity AS inventory_quantity,
+               T3.lot_number,
+               T3.production_date,
+               T3.expiration_date,
+               T3.trace_no,
+               T4.part_percent,
+               T4.yb_no,
+               T4.bus_no AS medication_no,
+               T4.rx_flag,
+               T5."name" AS preparer_name,
+               T6."name" AS dispense_name,
+               T6.phar_prac_cert_no,
+               T7."name" AS practitioner_name,
+               T8.patient_id,
+               T8.bus_no AS encounter_no
+        FROM med_medication_dispense AS T1
+                 INNER JOIN med_medication_request AS T2
+                    ON T1.med_req_id = T2.id
+                        AND T2.delete_flag = '0'
+                 LEFT JOIN wor_inventory_item AS T3
+                    ON T1.medication_id = T3.item_id
+                        AND T3.item_table = #{medMedicationDefinition}
+                        AND T1.location_id = T3.location_id
+                        AND T1.lot_number = T3.lot_number
+                        AND T3.delete_flag = '0'
+                 LEFT JOIN med_medication_definition AS T4
+                    ON T1.medication_id = T4.id
+                        AND T4.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T5
+                    ON T1.preparer_id = T5.id
+                        AND T5.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T6
+                    ON T1.practitioner_id = T6.id
+                        AND T6.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T7
+                    ON T2.practitioner_id = T7.id
+                        AND T7.delete_flag = '0'
+                 LEFT JOIN adm_encounter AS T8
+                    ON T1.encounter_id = T8.id
+                        AND T8.delete_flag = '0'
+        WHERE T2.prescription_no = #{prescriptionNo}
+          AND T1.delete_flag = '0'
+    </select>
+    <select id="getPreparerDoctorList" resultType="com.openhis.administration.domain.Practitioner">
+        SELECT ap.id,
+               ap."name"
+        FROM adm_practitioner ap
+            LEFT JOIN adm_practitioner_role apr
+                ON ap.id = apr.practitioner_id
+        WHERE apr.role_code = #{pharmacist}
+        GROUP BY ap.id,
+                 ap."name"
+    </select>
+    <select id="selectMonthlySettlementPatientInfoList" resultType="com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto">
+        SELECT T8."name"         AS department_name,
+               T9."name"         AS doctor_name,
+               T3.category_code  AS item_type,
+               T7."name"         AS condition_name,
+               T2.prescription_no,
+               T2.lot_number,
+               T2.id             AS request_id,
+               T2.tcm_flag,
+               T3."name"         AS medicine_name,
+               T3.id             AS medicine_id,
+               T4.total_volume,
+               T1.unit_code,
+               T1.encounter_id,
+               T1.dose,
+               T1.status_enum,
+               T2.rate_code,
+               T1.location_id,
+               T1.method_code,
+               T2.dose_unit_code,
+               T2.max_dose,
+               T2.first_dose,
+               T2.first_duration,
+               T2.dispense_interval,
+               T2.dispense_per_quantity,
+               T2.dispense_per_duration,
+               T1.quantity,
+               T1.id             AS dispense_id,
+               T5.unit_price,
+               T5.total_price,
+               T10."name"        AS dispense_doctor_name,
+               T11."name"        AS preparer_doctor_name,
+               T13."name"        AS location_name,
+               T6.bus_no         AS encounter_bus_no,
+               T2.req_authored_time,
+               T14.no,
+               T15.contract_name AS charge_type,
+               T3.pharmacology_category_code,
+               T16.med_type_code,
+               T3.skin_test_flag,
+               T2.group_id       AS group_id,
+               #{medicine}       AS type
+        FROM med_medication_dispense AS T1
+                 LEFT JOIN med_medication_request AS T2
+                           ON T1.med_req_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN med_medication_definition AS T3
+                           ON T1.medication_id = T3.id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN med_medication AS T4
+                           ON T3.id = T4.medication_def_id
+                               AND T4.delete_flag = '0'
+                 INNER JOIN adm_charge_item AS T5
+                            ON T1.med_req_id = T5.service_id
+                                AND T5.delete_flag = '0'
+                 LEFT JOIN adm_encounter AS T6
+                           ON T1.encounter_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN cli_condition AS T12
+                           ON T2.condition_id = T12.id
+                               AND T12.delete_flag = '0'
+                 LEFT JOIN cli_condition_definition AS T7
+                           ON T12.definition_id = T7.id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN adm_organization AS T8
+                           ON T6.organization_id = T8.id
+                               AND T8.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T9
+                           ON T2.practitioner_id = T9.id
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T10
+                           ON T1.practitioner_id = T10.id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T11
+                           ON T1.preparer_id = T11.id
+                               AND T11.delete_flag = '0'
+                 LEFT JOIN adm_location AS T13
+                           ON T1.location_id = T13.id
+                               AND T13.delete_flag = '0'
+                 LEFT JOIN adm_account AS T14
+                           ON T5.account_id = T14.id
+                               AND T14.delete_flag = '0'
+                 LEFT JOIN fin_contract AS T15
+                           ON T14.contract_no = T15.bus_no
+                               AND T15.delete_flag = '0'
+                 LEFT JOIN adm_encounter_diagnosis AS T16
+                           ON T2.encounter_id = T16.encounter_id
+                               AND T2.condition_id = T16.condition_id
+                               AND T16.delete_flag = '0'
+        WHERE T1.delete_flag = '0'
+          AND T1.status_enum = #{completed}
+          AND T1.location_id = #{locationId}
+          AND TO_CHAR(T1.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+        UNION
+        SELECT T8."name"         AS department_name,
+               T9."name"         AS doctor_name,
+               T3.category_code  AS item_type,
+               T7."name"         AS condition_name,
+               T2.prescription_no,
+               T2.lot_number,
+               T2.id             AS request_id,
+               NULL              AS tcm_flag,
+               T3."name"         AS medicine_name,
+               T3.id             AS medicine_id,
+               T3.size           AS total_volume,
+               T1.unit_code,
+               T1.encounter_id,
+               NULL              AS dose,
+               T1.status_enum,
+               T2.rate_code,
+               T1.location_id,
+               NULL              AS method_code,
+               NULL              AS dose_unit_code,
+               NULL              AS max_dose,
+               NULL              AS first_dose,
+               NULL              AS first_duration,
+               NULL              AS dispense_interval,
+               NULL              AS dispense_per_quantity,
+               NULL              AS dispense_per_duration,
+               T1.quantity,
+               T1.id             AS dispense_id,
+               T5.unit_price,
+               T5.total_price,
+               T10."name"        AS dispense_doctor_name,
+               NULL              AS preparer_doctor_name,
+               T13."name"        AS location_name,
+               T6.bus_no         AS encounter_bus_no,
+               T2.req_authored_time,
+               T14.no,
+               T15.contract_name AS charge_type,
+               NULL              AS pharmacology_category_code,
+               T16.med_type_code,
+               NULL              AS skin_test_flag,
+               NULL              AS group_id,
+               #{device}         AS type
+        FROM wor_device_dispense AS T1
+                 LEFT JOIN wor_device_request AS T2
+                           ON T1.device_req_id = T2.id
+                               AND T2.delete_flag = '0'
+                 LEFT JOIN adm_device_definition AS T3
+                           ON T1.device_def_id = T3.id
+                               AND T3.delete_flag = '0'
+                 LEFT JOIN adm_device AS T4
+                           ON T3.id = T4.device_def_id
+                               AND T4.delete_flag = '0'
+                 INNER JOIN adm_charge_item AS T5
+                            ON T1.device_req_id = T5.service_id
+                                AND T5.delete_flag = '0'
+                 LEFT JOIN adm_encounter AS T6
+                           ON T1.encounter_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN cli_condition AS T12
+                           ON T2.condition_id = T12.id
+                               AND T12.delete_flag = '0'
+                 LEFT JOIN cli_condition_definition AS T7
+                           ON T12.definition_id = T7.id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN adm_organization AS T8
+                           ON T6.organization_id = T8.id
+                               AND T8.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T9
+                           ON T2.requester_id = T9.id
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_practitioner AS T10
+                           ON T1.performer_id = T10.id
+                               AND T10.delete_flag = '0'
+                 LEFT JOIN adm_location AS T13
+                           ON T1.location_id = T13.id
+                               AND T13.delete_flag = '0'
+                 LEFT JOIN adm_account AS T14
+                           ON T5.account_id = T14.id
+                               AND T14.delete_flag = '0'
+                 LEFT JOIN fin_contract AS T15
+                           ON T14.contract_no = T15.bus_no
+                               AND T15.delete_flag = '0'
+                 LEFT JOIN adm_encounter_diagnosis AS T16
+                           ON T2.encounter_id = T16.encounter_id
+                               AND T2.condition_id = T16.condition_id
+                               AND T16.delete_flag = '0'
+        WHERE T1.delete_flag = '0'
+          AND T1.status_enum = #{completed}
+          AND T1.location_id = #{locationId}
+          AND TO_CHAR(T1.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+    </select>
+</mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
new file mode 100644
index 00000000..61094e5b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.regdoctorstation.mapper.AdviceManageAppMapper">
+
+    <select id="getRegPatientMainInfo" resultType="com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto">
+        SELECT rpmi.tenant_id,
+               rpmi.encounter_id,
+               rpmi.status_enum,
+               rpmi.bus_no,
+               rpmi.in_hospital_time,
+               rpmi.in_hospital_days,
+               rpmi.out_hospital_time,
+               rpmi.patient_id,
+               rpmi.patient_name,
+               rpmi.gender_enum,
+               rpmi.birth_date,
+               rpmi.ward_name,
+               rpmi.house_name,
+               rpmi.bed_name,
+               rpmi.in_org_time,
+               rpmi.in_hospital_org_id,
+               rpmi.in_hospital_org_name,
+               rpmi.contract_no,
+               rpmi.contract_name,
+               rpmi.reg_diagnosis_name,
+               rpmi.account_id
+        from (SELECT ae.tenant_id,
+                     ae.ID                                                             AS encounter_id,
+                     ae.status_enum                                                    AS status_enum,
+                     ae.bus_no                                                         AS bus_no,
+                     ae.start_time                                                     AS in_hospital_time,
+                     (EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days,
+                     ae.end_time                                                       AS out_hospital_time,
+                     ap.ID                                                             AS patient_id,
+                     ap.NAME                                                           AS patient_name,
+                     ap.gender_enum                                                    AS gender_enum,
+                     ap.birth_date                                                     AS birth_date,
+                     alw.NAME                                                          AS ward_name,
+                     alh.NAME                                                          AS house_name,
+                     alb.NAME                                                          AS bed_name,
+                     aelb.start_time                                                   AS in_org_time,
+                     ao.id                                                             AS in_hospital_org_id,
+                     ao.NAME                                                           AS in_hospital_org_name,
+                     aa.id                                                             AS account_id,
+                     aa.contract_no                                                    AS contract_no,
+                     fc.contract_name                                                  AS contract_name,
+                     ccd.NAME                                                          AS reg_diagnosis_name
+              FROM adm_encounter AS ae
+                       LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+                  AND ap.delete_flag = '0'
+                       LEFT JOIN adm_organization AS ao ON ao.ID = ae.organization_id
+                  AND ao.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS aelw ON aelw.encounter_id = ae.ID
+                  AND aelw.delete_flag = '0'
+                  AND aelw.form_enum = #{wardEnum}
+                  AND aelw.status_enum = #{encounterLocationStatus}
+                       LEFT JOIN adm_location AS alw ON alw.ID = aelw.location_id
+                  AND alw.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS aelh ON aelh.encounter_id = ae.ID
+                  AND aelh.delete_flag = '0'
+                  AND aelh.form_enum = #{houseEnum}
+                  AND aelh.status_enum = #{encounterLocationStatus}
+                       LEFT JOIN adm_location AS alh ON alh.ID = aelh.location_id
+                  AND alh.delete_flag = '0'
+                       LEFT JOIN adm_encounter_location AS aelb ON aelb.encounter_id = ae.ID
+                  AND aelb.delete_flag = '0'
+                  AND aelb.form_enum = #{bedEnum}
+                  AND aelb.status_enum = #{encounterLocationStatus}
+                       LEFT JOIN adm_location AS alb ON alb.ID = aelb.location_id
+                  AND alb.delete_flag = '0'
+                       INNER JOIN adm_account AS aa ON aa.encounter_id = ae.ID
+                  AND aa.delete_flag = '0'
+                  AND aa.encounter_flag = 1
+                       LEFT JOIN fin_contract AS fc ON fc.bus_no = aa.contract_no
+                  AND fc.delete_flag = '0'
+                       LEFT JOIN adm_encounter_diagnosis AS aed ON aed.encounter_id = ae.ID
+                  AND aed.delete_flag = '0'
+                  AND aed.maindise_flag = #{maindiseFlag}
+                       LEFT JOIN cli_condition AS cc ON cc.ID = aed.condition_id
+                  AND cc.delete_flag = '0'
+                       LEFT JOIN cli_condition_definition AS ccd ON ccd.ID = cc.definition_id
+                  AND ccd.delete_flag = '0'
+              WHERE ae.delete_flag = '0'
+                AND ae.class_enum = #{classEnum}
+                AND ae.status_enum = #{status}
+                AND EXISTS(
+                      SELECT 1
+                      FROM adm_practitioner_role
+                      WHERE delete_flag = '0'
+                        AND practitioner_id = #{practitionerId}
+                        AND org_id = ae.organization_id
+                  )) AS rpmi
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getRegRequestBaseInfo" resultType="com.openhis.web.regdoctorstation.dto.RegRequestBaseDto">
+        (SELECT 1 AS advice_type,
+        T1.id AS request_id,
+        T1.id || '-1' AS unique_key,
+        T1.practitioner_id AS requester_id,
+        T1.create_time AS request_time,
+        CASE WHEN T1.practitioner_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        T1.content_json AS content_json,
+        T1.skin_test_flag AS skin_test_flag,
+        T1.infusion_flag AS inject_flag,
+        T1.group_id AS group_id,
+        T2.NAME AS advice_name,
+        T3.total_volume AS volume,
+        T1.lot_number AS lot_number,
+        T1.quantity AS quantity,
+        T1.unit_code AS unit_code,
+        T1.status_enum AS status_enum,
+        T1.method_code AS method_code,
+        T1.rate_code AS rate_code,
+        T1.dose AS dose,
+        T1.dose_unit_code AS dose_unit_code,
+        T4.id AS charge_item_id,
+        T4.total_price AS total_price,
+        T4.status_enum AS charge_status,
+        al.id AS position_id,
+        al.name AS position_name,
+        T1.dispense_per_duration AS dispense_per_duration,
+        T2.part_percent AS part_percent,
+        ccd.name AS condition_definition_name,
+        T1.therapy_enum AS therapyEnum,
+        T1.sort_number AS sort_number
+        FROM med_medication_request AS T1
+        LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN med_medication AS T3 ON T3.medication_def_id = T2.ID
+        AND T3.delete_flag = '0'
+        LEFT JOIN adm_charge_item AS T4 ON T4.service_id = T1.ID AND T4.delete_flag = '0' AND
+        T4.service_table = #{MED_MEDICATION_REQUEST}
+        LEFT JOIN adm_location AS al ON al.ID = T1.perform_location AND al.delete_flag = '0'
+        LEFT JOIN cli_condition AS cc ON cc.id = T1.condition_id AND cc.delete_flag = '0'
+        LEFT JOIN cli_condition_definition AS ccd ON ccd.id = cc.definition_id
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 0 AND T1.category_enum = #{categoryEnum}
+        <if test="historyFlag == '0'.toString()">
+            AND T1.encounter_id = #{encounterId}
+        </if>
+        <if test="historyFlag == '1'.toString()">
+            AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
+        </if>
+        AND T1.refund_medicine_id IS NULL
+        ORDER BY T1.status_enum,T1.sort_number,T1.group_id)
+        UNION ALL
+        (SELECT 2 AS advice_type,
+        T1.id AS request_id,
+        T1.id || '-2' AS unique_key,
+        T1.requester_id AS requester_id,
+        T1.create_time AS request_time,
+        CASE WHEN T1.requester_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        T1.content_json AS content_json,
+        null AS skin_test_flag,
+        null AS inject_flag,
+        null AS group_id,
+        T2.NAME AS advice_name,
+        T2.SIZE AS volume,
+        T1.lot_number AS lot_number,
+        T1.quantity AS quantity,
+        T1.unit_code AS unit_code,
+        T1.status_enum AS status_enum,
+        '' AS method_code,
+        T1.rate_code AS rate_code,
+        NULL AS dose,
+        '' AS dose_unit_code,
+        T3.id AS charge_item_id,
+        T3.total_price AS total_price,
+        T3.status_enum AS charge_status,
+        al.id AS position_id,
+        al.name AS position_name,
+        null AS dispense_per_duration,
+        T2.part_percent AS part_percent,
+        '' AS condition_definition_name,
+        2 AS therapyEnum,
+        99 AS sort_number
+        FROM wor_device_request AS T1
+        LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN adm_charge_item AS T3
+        ON T3.service_id = T1.ID AND T3.delete_flag = '0' AND
+        T3.service_table = #{WOR_DEVICE_REQUEST}
+        LEFT JOIN adm_location AS al ON al.ID = T1.perform_location AND al.delete_flag = '0'
+        WHERE T1.delete_flag = '0' AND T1.category_enum = #{categoryEnum}
+        <if test="historyFlag == '0'.toString()">
+            AND T1.encounter_id = #{encounterId}
+        </if>
+        <if test="historyFlag == '1'.toString()">
+            AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
+        </if>
+        AND T1.refund_device_id IS NULL
+        ORDER BY T1.status_enum)
+        UNION ALL
+        (SELECT 3 AS advice_type,
+        T1.id AS request_id,
+        T1.id || '-3' AS unique_key,
+        T1.requester_id AS requester_id,
+        T1.create_time AS request_time,
+        CASE WHEN T1.requester_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        T1.content_json AS content_json,
+        null AS skin_test_flag,
+        null AS inject_flag,
+        null AS group_id,
+        T2.NAME AS advice_name,
+        '' AS volume,
+        '' AS lot_number,
+        T1.quantity AS quantity,
+        T1.unit_code AS unit_code,
+        T1.status_enum AS status_enum,
+        '' AS method_code,
+        '' AS rate_code,
+        NULL AS dose,
+        '' AS dose_unit_code,
+        T3.id AS charge_item_id,
+        T3.total_price AS total_price,
+        T3.status_enum AS charge_status,
+        ao.id AS position_id,
+        ao.name AS position_name,
+        null AS dispense_per_duration,
+        1 AS part_percent,
+        '' AS condition_definition_name,
+        T1.therapy_enum AS therapyEnum,
+        99 AS sort_number
+        FROM wor_service_request AS T1
+        LEFT JOIN wor_activity_definition AS T2
+        ON T2.ID = T1.activity_id
+        AND T2.delete_flag = '0'
+        LEFT JOIN adm_charge_item AS T3 ON T3.service_id = T1.ID AND T3.delete_flag = '0' AND
+        T3.service_table = #{WOR_SERVICE_REQUEST}
+        LEFT JOIN adm_organization AS ao ON ao.ID = T1.org_id AND ao.delete_flag = '0'
+        WHERE T1.delete_flag = '0' AND T1.category_enum = #{categoryEnum}
+        AND T1.based_on_table is null
+        <if test="historyFlag == '0'.toString()">
+            AND T1.encounter_id = #{encounterId}
+        </if>
+        <if test="historyFlag == '1'.toString()">
+            AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
+        </if>
+        ORDER BY T1.status_enum)
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
new file mode 100644
index 00000000..fd383f15
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper">
+
+    <select id="getRequestForm" resultType="com.openhis.web.regdoctorstation.dto.RequestFormQueryDto">
+        SELECT drf.encounter_id,
+               drf.prescription_no,
+               drf.NAME,
+               drf.desc_json,
+               drf.requester_id,
+               drf.create_time,
+               ap.NAME AS patient_name
+        FROM doc_request_form AS drf
+                 LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
+            AND ae.delete_flag = '0'
+                 LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+            AND ap.delete_flag = '0'
+        WHERE drf.delete_flag = '0'
+          AND drf.encounter_id = #{encounterId}
+          AND drf.type_code = #{typeCode}
+    </select>
+
+    <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
+        SELECT wsr.quantity,
+               wsr.unit_code,
+               wad.NAME AS advice_name,
+               aci.total_price
+        FROM wor_service_request AS wsr
+                 LEFT JOIN wor_activity_definition AS wad ON wad.ID = wsr.activity_id
+            AND wad.delete_flag = '0'
+                 LEFT JOIN adm_charge_item AS aci ON aci.service_id = wsr.ID
+            AND aci.delete_flag = '0'
+        WHERE wsr.delete_flag = '0'
+          AND wsr.prescription_no = #{prescriptionNo}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
new file mode 100644
index 00000000..afc63f4a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.regdoctorstation.mapper.SpecialAdviceAppMapper">
+
+    <select id="getNursingOrdersInfos" resultType="com.openhis.web.regdoctorstation.dto.NursingOrdersDetailDto">
+        SELECT
+        wad.ID AS definition_id,
+        wad.category_code AS category_code,
+        wad.category_code AS category_enum,
+        wad.NAME AS nursing_order_name
+        FROM
+        wor_activity_definition AS wad
+        WHERE
+        wad.delete_flag = '0'
+        <if test="categoryCodeList != null and !categoryCodeList.isEmpty()">
+            AND wad.category_code IN
+            <foreach collection="categoryCodeList" item="itemId" open="(" separator="," close=")">
+                #{itemId}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getEncounterNursingOrdersInfos"
+            resultType="com.openhis.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto">
+        SELECT wsr.activity_id AS definition_id,
+        wsr.category_enum AS category_enum
+        FROM wor_service_request AS wsr
+        INNER JOIN (
+        SELECT category_enum,
+        MAX(create_time) AS max_create_time
+        FROM wor_service_request
+        WHERE delete_flag = '0'
+        AND encounter_id = #{encounterId}
+        AND (status_enum = #{draft} OR status_enum = #{active} OR status_enum = #{completed})
+        <if test="categoryEnumList != null and !categoryEnumList.isEmpty()">
+            AND category_enum IN
+            <foreach collection="categoryEnumList" item="itemId" open="(" separator="," close=")">
+                #{itemId}
+            </foreach>
+        </if>
+        GROUP BY category_enum
+        ) AS latest ON wsr.category_enum = latest.category_enum
+        AND wsr.create_time = latest.max_create_time
+        WHERE wsr.delete_flag = '0'
+        AND wsr.encounter_id = #{encounterId}
+        AND (wsr.status_enum = #{draft} OR wsr.status_enum = #{active} OR wsr.status_enum = #{completed})
+        <if test="categoryEnumList != null and !categoryEnumList.isEmpty()">
+            AND wsr.category_enum IN
+            <foreach collection="categoryEnumList" item="itemId" open="(" separator="," close=")">
+                #{itemId}
+            </foreach>
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
similarity index 99%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
index 902ba161..ab40d692 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
@@ -159,7 +159,9 @@
               WHERE T1.status_enum IN (#{success}, #{refundAll})
          </if>
                 AND T1.delete_flag = '0'
-              ORDER BY T2.bus_no) AS T8
+              ORDER BY T2.bus_no,
+                       T4.ID,
+                       T1.bill_date) AS T8
             ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
new file mode 100644
index 00000000..ccb9ec2a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollectionMapper">
+    <select id="getInfo"
+            resultType="com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto">
+        SELECT                                                                            --todo sql没写完
+         AS  A48, -- 病案号 A48 字符 50 必填
+         AS  A49, -- 住院次数 A49 数字 4 必填
+                to_char(T1.start_time::TIMESTAMPTZ,'YYYY-MM-DD HH24:MI:SS') AS B12,--入院时间
+                to_char(T1.end_time::TIMESTAMPTZ,'YYYY-MM-DD HH24:MI:SS')    AS B15,--出院时间
+         AS  A46C, -- 医疗付费方式 A46C 字符 3 必填
+               T2.name  AS A11,  --姓名
+               T2.gender_enum  AS A12C, --性别
+               T2.birth_date AS  A13,--  出生日期
+               T2.country_code AS A15C,--国籍
+               T2,marital_status_enum AS A21C,--婚姻
+               T2.prfs_enum AS A38C,--职业
+               T2.nationality_code AS A19C,--民族
+               T2.id_card AS A20,-- 证件号码
+        AS  A22, -- 出生地址 A22 字符 200 必填
+               T2.native_place AS  A23C, --籍贯省（自治区、直辖市）
+               T2.address AS A24,-- 户口地址
+        AS  A25C, -- 户口地址邮政编码 A25C 字符 6 必填
+        AS  A26, -- 现住址 A26 字符 200 必填
+       T2.phone AS  A27, -- 现住址电话 A27 字符 40 必填
+        AS  A28C, -- 现住址邮政编码 A28C 字符 6 必填
+      T2.work_company  AS  A29, -- 工作单位及地址 A29 字符 200 必填
+        AS  A30, -- 工作单位电话 A30 字符 20 必填
+        AS  A31C, -- 工作单位邮政编码 A31C 字符 6 必填
+      T2.link_name  AS  A32, -- 联系人姓名 A32 字符 40 必填
+      T2.link_relation_code  AS  A33C, -- 联系人关系 A33C 字符 1 必填
+        AS  A34, -- 联系人地址 A34 字符 200 必填
+      T2.link_telcom  AS  A35, -- 联系人电话 A35 字符 40 必填
+        AS  B38, -- 是否为日间手术 B38 字符 1 必填
+        AS  B11C, -- 入院途径 B11C 字符 1 必填
+        AS  B13C, -- 入院科别 B13C 字符 6 必填
+        AS  B14, -- 入院病房 B14 字符 30 必填
+        AS  B21C, -- 转科科别 B21C 集合 可以多选 必填
+        AS  B16C, -- 出院科别 B16C 字符 6 必填
+        AS  B17, -- 出院病房 B17 字符 30 必填
+        DATE(T1.end_time::TIMESTAMPTZ) - DATE(T1.start_time::TIMESTAMPTZ)   AS  B20, -- 实际住院（天） B20 数字 6 必填
+        AS  C01C, -- 门（急）诊诊断编码 C01C 字符 20 必填
+        AS  C02N, -- 门（急）诊诊断名称 C02N 字符 100 必填
+        AS  C03C, -- 出院主要诊断编码 C03C 字符 20 必填
+        AS  C04N, -- 出院主要诊断名称 C04N 字符 100 必填
+        AS  C05C, -- 出院主要诊断入院病情 C05C 字符 1 必填
+        AS  C09C, -- 病理诊断编码 C09C 字符 20 条件必填
+        AS  C10N, -- 病理诊断名称 C10N 字符 100 条件必填
+        AS  C11, -- 病理号 C11 字符 50 条件必填
+        AS  C12C, -- 损伤、中毒外部原因编码 C12C 字符 20 条件必填
+        AS  C13N, -- 损伤、中毒外部原因名称 C13N 字符 100 条件必填
+        AS  C24C, -- 有无药物过敏 C24C 字符 1 必填
+        AS  C25, -- 过敏药物名称 C25 字符 200 条件必填
+        AS  B22C, -- 科主任编码 B22C 字符 30 必填
+        AS  B22, -- 科主任 B22 字符 40 必填
+        AS  B23C, -- 主（副主）任医师编码 B23C 字符 30 必填
+        AS  B23, -- 主（副主）任医师 B23 字符 40 必填
+        AS  B24C, -- 主治医师编码 B24C 字符 30 必填
+        AS  B24, -- 主治医师 B24 字符 40 必填
+        AS  B25C, -- 住院医师编码 B25C 字符 30 必填
+        AS  B25, -- 住院医师 B25 字符 40 必填
+        AS  B26C, -- 责任护士编码 B26C 字符 30 必填
+        AS  B26, -- 责任护士 B26 字符 40 必填
+        AS  B29, -- 编码员 B29 字符 40 必填
+        AS  C26C, -- ABO血型 C26C 字符 1 必填
+        AS  C27C, -- Rh血型 C27C 字符 1 必填
+        AS  C14x01C, -- 主要手术操作编码 C14x01C 字符 20 必填
+        AS  C15x01N, -- 主要手术操作名称 C15x01N 字符 100 必填
+        AS  C16x01, -- 主要手术操作日期 C16x01 日期时间 必填
+        AS  C17x01, -- 主要手术操作级别 C17x01 字符 1 条件必填
+        AS  C18x01, -- 主要手术操作术者 C18x01 字符 40 条件必填
+        AS  C19x01, -- 主要手术操作Ⅰ助 C19x01 字符 40 条件必填
+        AS  C20x01, -- 主要手术操作Ⅱ助 C20x01 字符 40 条件必填
+        AS  C21x01C, -- 主要手术操作切口愈合等级 C21x01C 字符 2 条件必填
+        AS  C22x01C, -- 主要手术操作麻醉方式 C22x01C 字符 6 条件必填
+        AS  C23x01, -- 主要手术操作麻醉医师 C23x01 字符 40 条件必填
+        AS  F21, -- 输血反应 F21 数字 1 条件必填
+        AS  F22, -- 红细胞 F22 数字 (4,1) 条件必填
+        AS  F23, -- 血小板 F23 数字 (4,1) 条件必填
+        AS  F24, -- 血浆 F24 数字 (8,2) 条件必填
+        AS  F25, -- 全血 F25 数字 (8,2) 条件必填
+        AS  F26, -- 自体血回输 F26 数字 (4,1) 条件必填
+        AS  A16, -- 年龄不足1周岁的年龄（天） A16 数字 3 条件必填②
+        AS  A18x01, -- 新生儿出生体重（克） A18x01 数字 6 条件必填②
+        AS  A17, -- 新生儿入院体重（克） A17 数字 6 条件必填②
+        AS  C28, -- 颅脑损伤患者入院前昏迷时间（天） C28 数字 5 必填
+        AS  C29, -- 颅脑损伤患者入院前昏迷时间（小时） C29 数字 2 必填
+        AS  C30, -- 颅脑损伤患者入院前昏迷时间（分钟） C30 数字 2 必填
+        AS  C31, -- 颅脑损伤患者入院后昏迷时间（天） C31 数字 5 必填
+        AS  C32, -- 颅脑损伤患者入院后昏迷时间（小时） C32 数字 2 必填
+        AS  C33, -- 颅脑损伤患者入院后昏迷时间（分钟） C33 数字 2 必填
+        AS  B36C, -- 是否有出院31日内再住院计划 B36C 数字 1 必填
+        AS  B37, -- 出院31天再住院计划目的 B37 字符 100 条件必填
+        AS  B34C, -- 离院方式 B34C 字符 1 必填
+        AS  B35, -- 医嘱转院、转社区卫生服务机构/乡镇卫生院名称 B35 字符 100 条件必填
+        AS  D01, -- 住院总费用 D01 数字 (11,2) 必填
+        AS  D09, -- 住院总费用其中自付金额 D09 数字 (10,2) 必填
+        AS  D26 -- 16.血费 D26 数字 (10,2)
+
+
+
+
+
+        T3.name AS organization_name,
+        STRING_AGG(T5.NAME, '_' ORDER BY T5.bus_no) AS inpatient_bed --床位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        FROM adm_encounter T1
+          LEFT JOIN adm_patient T2
+                 ON T1.patient_id = T2.id
+                 AND T2.delete_flag = '0'
+         LEFT JOIN adm_organization AS T3
+                 ON T1.organization_id = T3.id
+                 AND T3.delete_flag = '0'
+         LEFT JOIN adm_encounter_location AS T4
+                 ON T4.encounter_id = T1.id
+                 AND T4.status_enum = '2'
+                 AND T4.delete_flag = '0'
+         LEFT JOIN adm_location AS T5
+                 ON T5.id = T4.location_id
+                 AND T5.delete_flag = '0'
+
+
+        WHERE T1.id IN
+          <foreach collection="encounterIdList" item="item" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+          AND T1.class_enum = 1
+          AND T1.delete_flag = '0'
+       GROUP BY
+
+    </select>
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
new file mode 100644
index 00000000..0a50640b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.reportmanage.mapper.MedicationDeviceReportMapper">
+
+    <select id="selectMedDdevInfo"
+            resultType="com.openhis.web.reportmanage.dto.MedUseReportInfoDto">
+               SELECT
+                   name,
+                   total_volume,
+                   lot_number,
+                   manufacturer_text,
+                   org_id,
+                   SUM(total_quantity)            AS total_quantity,
+                   MAX(unit_code)                 AS unit_code,
+                   SUM(total_money)               AS total_money,
+                   MAX(dispense_time)             AS dispense_time
+               FROM (
+                        /* ---------- 第一段查询 ---------- */
+                        SELECT
+                            name,
+                            total_volume,
+                            lot_number,
+                            manufacturer_text,
+                            total_quantity,
+                            unit_code,
+                            unit_price,
+                            total_money,
+                            org_id,
+                            dispense_time
+                        FROM (
+                                 SELECT
+                                     T3.name,
+                                     T7.total_volume,
+                                     T1.lot_number,
+                                     T3.manufacturer_text,
+                                     SUM(T1.quantity)               AS total_quantity,
+                                     MAX(T1.unit_code)              AS unit_code,
+                                     MAX(T8.unit_price)             AS unit_price,
+                                     SUM(T1.quantity) * MAX(T8.unit_price) AS total_money,
+                                     T1.org_id,
+                                     MAX(T2.dispense_time)          AS dispense_time
+                                 FROM med_medication_request T1
+                                          LEFT JOIN med_medication_dispense T2
+                                                    ON T2.med_req_id = T1.id AND T2.delete_flag = '0'
+                                          LEFT JOIN med_medication_definition T3
+                                                    ON T3.id = T1.medication_id AND T3.delete_flag = '0'
+                                          LEFT JOIN med_medication T7
+                                                    ON T3.id = T7.medication_def_id AND T7.delete_flag = '0'
+                                          LEFT JOIN adm_charge_item T8
+                                                    ON T8.service_table = #{medReqTableName} --'med_medication_request'
+                                                        AND T8.service_id = T1.id
+                                                        AND T8.delete_flag = '0'
+                                 WHERE T1.status_enum = #{completed} --'3'
+                                   AND T1.delete_flag = '0'
+                                   AND TO_CHAR(T2.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+                                 GROUP BY
+                                     T3.name,
+                                     T7.total_volume,
+                                     T1.lot_number,
+                                     T3.manufacturer_text,
+                                     T1.org_id
+
+                                 UNION ALL
+
+                                 SELECT
+                                     T6.name,
+                                     T6.size         AS total_volume,
+                                     T4.lot_number,
+                                     T6.manufacturer_text,
+                                     SUM(T4.quantity)               AS total_quantity,
+                                     MAX(T4.unit_code)              AS unit_code,
+                                     MAX(T9.unit_price)             AS unit_price,
+                                     SUM(T4.quantity) * MAX(T9.unit_price) AS total_money,
+                                     T4.org_id,
+                                     MAX(T5.dispense_time)          AS dispense_time
+                                 FROM wor_device_request T4
+                                          LEFT JOIN wor_device_dispense T5
+                                                    ON T5.device_req_id = T4.id AND T5.delete_flag = '0'
+                                          LEFT JOIN adm_device_definition T6
+                                                    ON T6.id = T5.device_def_id AND T6.delete_flag = '0'
+                                          LEFT JOIN adm_charge_item T9
+                                                    ON T9.service_table = #{devReqTableName} --'wor_device_request'
+                                                        AND T9.service_id = T4.id
+                                                        AND T9.delete_flag = '0'
+                                 WHERE T4.status_enum =  #{completed} --'3'
+                                   AND T4.delete_flag = '0'
+                                   AND TO_CHAR(T5.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+                                 GROUP BY
+                                     T6.name,
+                                     T6.size,
+                                     T4.lot_number,
+                                     T6.manufacturer_text,
+                                     T4.org_id
+                             ) AS q1
+                        WHERE total_quantity > 0
+
+                        UNION ALL
+
+                        /* ---------- 第二段查询 ---------- */
+                        SELECT
+                            name,
+                            total_volume,
+                            lot_number,
+                            manufacturer_text,
+                            total_quantity,
+                            unit_code,
+                            NULL                       AS unit_price,      -- 第二段已自带总金额，不需要单价
+                            total_money,
+                            org_id,
+                            dispense_time
+                        FROM (
+                                 SELECT
+                                     name,
+                                     total_volume,
+                                     lot_number,
+                                     manufacturer_text,
+                                     org_id,
+                                     SUM(quantity)  AS total_quantity,
+                                     MAX(unit_code) AS unit_code,
+                                     SUM(total_price) AS total_money,
+                                     MAX(dispense_time) AS dispense_time
+                                 FROM (
+                                          SELECT
+                                              T10.name,
+                                              T11.total_volume,
+                                              T9.lot_number,
+                                              T10.manufacturer_text,
+                                              CASE WHEN T9.type_enum = #{returnIssue} THEN T9.item_quantity * -1
+                                                   ELSE T9.item_quantity END AS quantity,
+                                              T9.unit_code,
+                                              CASE WHEN T9.type_enum = #{returnIssue} THEN T9.total_price * -1
+                                                   ELSE T9.total_price END AS total_price,
+                                              CASE WHEN T9.type_enum = #{returnIssue} THEN T9.source_location_id
+                                                   ELSE T9.purpose_location_id END AS org_id,
+                                              T12.occurrence_time AS dispense_time
+                                          FROM wor_supply_request T9
+                                                   LEFT JOIN med_medication_definition T10
+                                                             ON T9.item_id = T10.id AND T10.delete_flag = '0'
+                                                   LEFT JOIN med_medication T11
+                                                             ON T10.id = T11.medication_def_id AND T11.delete_flag = '0'
+                                                   LEFT JOIN wor_supply_delivery T12
+                                                             ON T12.request_id = T9.id AND T12.delete_flag = '0'
+                                          WHERE (T9.type_enum = #{returnIssue} OR T9.type_enum = #{issueInventory})
+                                            AND T9.item_table = #{medDefTableName} --'med_medication_definition'
+                                            AND T12.status_enum = #{eventStatus}--'4'
+                                            AND T9.delete_flag = '0'
+                                            AND TO_CHAR(T12.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+
+                                          UNION ALL
+
+                                          SELECT
+                                              T14.name,
+                                              T14.size AS total_volume,
+                                              T13.lot_number,
+                                              T14.manufacturer_text,
+                                              CASE WHEN T13.type_enum = #{returnIssue} THEN T13.item_quantity * -1
+                                                   ELSE T13.item_quantity END AS quantity,
+                                              T13.unit_code,
+                                              CASE WHEN T13.type_enum = #{returnIssue} THEN T13.total_price * -1
+                                                   ELSE T13.total_price END AS total_price,
+                                              CASE WHEN T13.type_enum = #{returnIssue} THEN T13.source_location_id
+                                                   ELSE T13.purpose_location_id END AS org_id,
+                                              T15.occurrence_time AS dispense_time
+                                          FROM wor_supply_request T13
+                                                   LEFT JOIN adm_device_definition T14
+                                                             ON T13.item_id = T14.id AND T14.delete_flag = '0'
+                                                   LEFT JOIN wor_supply_delivery T15
+                                                             ON T15.request_id = T13.id AND T15.delete_flag = '0'
+                                          WHERE (T13.type_enum = #{returnIssue} OR T13.type_enum = #{issueInventory})
+                                            AND T13.item_table = #{devDefTableName} --'adm_device_definition'
+                                            AND T15.status_enum =  #{eventStatus}--'4'
+                                            AND T13.delete_flag = '0'
+                                            AND TO_CHAR(T15.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+                                      ) AS q2
+                                 GROUP BY
+                                     name,
+                                     total_volume,
+                                     lot_number,
+                                     manufacturer_text,
+                                     org_id
+                             ) AS q3
+                    ) AS merged
+               WHERE org_id = #{orgId}
+               <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+
+               GROUP BY
+                   name,
+                   total_volume,
+                   lot_number,
+                   manufacturer_text,
+                   org_id
+               ORDER BY
+                   org_id,
+                   MAX(dispense_time) DESC
+    </select>
+
+
+
+    <select id="selectMedDevReport"
+            resultType="com.openhis.web.reportmanage.dto.MedDevUseReportDto">
+        SELECT org_id,
+               org_name,
+               SUM(total_money) AS total_money
+        FROM (
+                 /* ---------- 第一段：药品申领 + 耗材申领 ---------- */
+                 SELECT T1.org_id,
+                        T16.name                                 AS org_name,
+                        SUM(T1.quantity * T8_MAX.unit_price_max) AS total_money
+                 FROM med_medication_request T1
+                          LEFT JOIN med_medication_dispense T2
+                                    ON T2.med_req_id = T1.id
+                                        AND T2.delete_flag = '0'
+                                        /* 时间区间 */
+                                        AND
+                                       TO_CHAR(T2.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+                          LEFT JOIN (SELECT T8.service_id,
+                                            MAX(T8.unit_price) AS unit_price_max -- 单处方的最高单价
+                                     FROM adm_charge_item T8
+                                     WHERE T8.service_table = #{medReqTableName} --'med_medication_request'
+                                       AND T8.delete_flag = '0'
+                                     GROUP BY T8.service_id) T8_MAX ON T8_MAX.service_id = T1.ID
+                          LEFT JOIN adm_organization T16
+                                    ON T1.org_id = T16.id
+                                        AND T16.delete_flag = '0'
+                 WHERE T1.status_enum = #{completed} --'3'
+                   AND T1.delete_flag = '0'
+                     /* 确保有发放记录才纳入汇总 */
+                   AND T2.dispense_time IS NOT NULL
+                 GROUP BY T1.org_id,
+                          T16.name
+
+                 UNION ALL
+
+                 SELECT T4.org_id,
+                        T16.name                              AS org_name,
+                        SUM(T4.quantity * T9_MAX.unit_price_max) AS total_money
+                 FROM wor_device_request T4
+                          LEFT JOIN wor_device_dispense T5
+                                    ON T5.device_req_id = T4.id
+                                        AND T5.delete_flag = '0'
+                                        /* 时间区间 */
+                                        AND
+                                       TO_CHAR(T5.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+                          LEFT JOIN (SELECT T9.service_id,
+                                            MAX(T9.unit_price) AS unit_price_max -- 单处方的最高单价
+                                     FROM adm_charge_item T9
+                                     WHERE T9.service_table = #{devReqTableName} --'wor_device_request'
+                                       AND T9.delete_flag = '0'
+                                     GROUP BY T9.service_id) T9_MAX ON T9_MAX.service_id = T4.ID
+                          LEFT JOIN adm_organization T16
+                                    ON T4.org_id = T16.id
+                                        AND T16.delete_flag = '0'
+                 WHERE T4.status_enum = #{completed} --'3'
+                   AND T4.delete_flag = '0'
+                   AND T5.dispense_time IS NOT NULL
+                 GROUP BY T4.org_id,
+                          T16.name
+
+                 /* ---------- 第二段：supply_request ---------- */
+                 UNION ALL
+
+                 SELECT CASE
+                            WHEN T9.type_enum = '9' THEN T9.source_location_id
+                            ELSE T9.purpose_location_id END AS org_id,
+                        CASE
+                            WHEN T9.type_enum = '9' THEN T16.name
+                            ELSE T17.name END               AS org_name,
+                        SUM(CASE
+                                WHEN T9.type_enum = '9' THEN T9.total_price * -1
+                                ELSE T9.total_price END)    AS total_money
+                 FROM wor_supply_request T9
+                          LEFT JOIN wor_supply_delivery T12
+                                    ON T12.request_id = T9.id
+                                        AND T12.delete_flag = '0'
+                                        /* 时间区间 */
+                                        AND
+                                       TO_CHAR(T12.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{dispenseDateSTime} AND #{dispenseDateETime}
+                          LEFT JOIN adm_organization T16
+                                    ON T9.source_location_id = T16.id
+                                        AND T16.delete_flag = '0'
+                          LEFT JOIN adm_organization T17
+                                    ON T9.purpose_location_id = T17.id
+                                        AND T17.delete_flag = '0'
+                 WHERE (T9.type_enum = '9' OR T9.type_enum = '7')
+                   AND T9.item_table IN (#{medDefTableName}, #{devDefTableName})--('med_medication_definition','adm_device_definition')
+                   AND T12.status_enum = #{eventStatus}--'4'
+                   AND T9.delete_flag = '0'
+                   AND T12.occurrence_time IS NOT NULL
+                 GROUP BY CASE
+                              WHEN T9.type_enum = '9' THEN T9.source_location_id
+                              ELSE T9.purpose_location_id END,
+                          CASE
+                              WHEN T9.type_enum = '9' THEN T16.name
+                              ELSE T17.name END) AS merged
+        GROUP BY org_id,
+                 org_name
+        ORDER BY org_id
+    </select>
+
+</mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
new file mode 100644
index 00000000..36184749
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.reportmanage.mapper.MonthlySettlementReportMapper">
+
+    <!--期初金额 todo：定时任务每日凌晨批量盘库，做成盘点时间occurrence_time是 yyyy-MM-dd 00:00:00，-->
+    <select id="selectAmount" resultType="java.math.BigDecimal">
+        SELECT COALESCE(SUM(T1.price * COALESCE(T1.total_quantity, 0)), 0) AS total_amount
+        FROM wor_aut_supply_request T1
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.type_enum = '44' -- 商品批量盘点
+          AND TO_CHAR(T1.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') = #{time}
+          AND T1.delete_flag = '0'
+    </select>
+
+    <!--采购入库金额 -->
+    <select id="selectAmountNumber"
+            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+        SELECT
+            COALESCE(SUM(total_price), 0) AS total_amount,
+            COUNT(DISTINCT bus_no) AS total_number
+        FROM wor_supply_request T1
+                 INNER JOIN wor_supply_delivery T2 ON T1.id = T2.request_id AND T2.delete_flag = '0'
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.type_enum = #{typeEnum}  -- 1:采购入库
+          AND T1.status_enum = #{agree}--同意
+          AND T2.status_enum = #{completed}--已完成
+          AND TO_CHAR(T2.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.delete_flag = '0'
+    </select>
+
+    <!--调拨入库查询 -->
+    <select id="selectTransferInAmountNumber"
+            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+        SELECT
+            COALESCE(SUM(total_price), 0) AS total_amount,
+            COUNT(DISTINCT bus_no) AS total_number
+        FROM wor_supply_request T1
+                 INNER JOIN wor_supply_delivery T2 ON T1.id = T2.request_id AND T2.delete_flag = '0'
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.type_enum IN (#{productTransfer} ,#{productBatchTransfer} )
+          AND T1.status_enum = #{agree}--同意
+          AND T2.status_enum = #{completed}--已完成
+          AND TO_CHAR(T2.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.delete_flag = '0'
+    </select>
+
+    <!--调拨出库查询 -->
+    <select id="selectTransferOutAmountNumber"
+            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+        SELECT
+            COALESCE(SUM(total_price), 0) AS total_amount,
+            COUNT(DISTINCT bus_no) AS total_number
+        FROM wor_supply_request T1
+                 INNER JOIN wor_supply_delivery T2 ON T1.id = T2.request_id AND T2.delete_flag = '0'
+        WHERE T1.source_location_id = #{locationId}
+          AND T1.type_enum IN (#{productTransfer} ,#{productBatchTransfer} )
+          AND T1.status_enum = #{agree}--同意
+          AND T2.status_enum = #{completed}--已完成
+          AND TO_CHAR(T2.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.delete_flag = '0'
+    </select>
+
+    <!--盘点查询 -->
+    <select id="selectProfitLossAmountNumber"
+            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+        SELECT
+            COALESCE(SUM(total_price), 0) AS total_amount,
+            COUNT(DISTINCT bus_no) AS total_number
+        FROM wor_supply_request T1
+                 INNER JOIN wor_supply_delivery T2 ON T1.id = T2.request_id AND T2.delete_flag = '0'
+        WHERE T1.source_location_id = #{locationId}
+          AND T1.type_enum IN (#{productStocktaking} ,#{productBatchStocktaking} )
+          AND T1.status_enum = #{agree}--同意
+          AND T2.status_enum = #{completed}--已完成
+          AND TO_CHAR(T2.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.delete_flag = '0'
+    </select>
+
+    <!--报损单查询 -->
+    <select id="selectLossAmountNumber"
+            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+        SELECT
+            COALESCE(SUM(total_price), 0) AS total_amount,
+            COUNT(DISTINCT bus_no) AS total_number
+        FROM wor_supply_request T1
+                 INNER JOIN wor_supply_delivery T2 ON T1.id = T2.request_id AND T2.delete_flag = '0'
+        WHERE T1.purpose_location_id = #{locationId}
+          AND T1.type_enum = #{lossReportForm}
+          AND T1.status_enum = #{agree}--同意
+          AND T2.status_enum = #{completed}--已完成
+          AND TO_CHAR(T2.occurrence_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+          AND T1.delete_flag = '0'
+    </select>
+
+    <!--药品发放查询 -->
+    <select id="selectDrugIssue" resultType="java.math.BigDecimal">
+        SELECT  COALESCE(SUM(total_money), 0) AS total_money_sum
+        FROM (
+                 /* ---------- 查询药品 ---------- */
+                 SELECT
+                     SUM(T1.quantity) * MAX(T8.unit_price) AS total_money
+                 FROM med_medication_request T1
+                          LEFT JOIN med_medication_dispense T2
+                                    ON T2.med_req_id = T1.id AND T2.delete_flag = '0'
+                          LEFT JOIN med_medication_definition T3
+                                    ON T3.id = T1.medication_id AND T3.delete_flag = '0'
+                          LEFT JOIN med_medication T7
+                                    ON T3.id = T7.medication_def_id AND T7.delete_flag = '0'
+                          LEFT JOIN adm_charge_item T8
+                                    ON T8.service_table =  #{medReqTableName} --'med_medication_request'
+                                        AND T8.service_id = T1.id
+                                        AND T8.delete_flag = '0'
+                 WHERE T2.location_id = #{locationId}
+                   AND T1.status_enum = #{completed}--请求状态:已完成
+                   AND T1.delete_flag = '0'
+                   AND TO_CHAR(T2.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+                 GROUP BY
+                     T3.name,
+                     T7.total_volume,
+                     T1.lot_number,
+                     T1.unit_code,
+                     T3.manufacturer_text,
+                     T2.location_id
+                 UNION ALL
+                 /* ---------- 查询耗材 ---------- */
+                 SELECT
+                     SUM(T4.quantity) * MAX(T9.unit_price) AS total_money
+                 FROM wor_device_request T4
+                          LEFT JOIN wor_device_dispense T5
+                                    ON T5.device_req_id = T4.id AND T5.delete_flag = '0'
+                          LEFT JOIN adm_device_definition T6
+                                    ON T6.id = T5.device_def_id AND T6.delete_flag = '0'
+                          LEFT JOIN adm_charge_item T9
+                                    ON T9.service_table = #{devReqTableName} --'wor_device_request'
+                                        AND T9.service_id = T4.id
+                                        AND T9.delete_flag = '0'
+                 WHERE T5.location_id = #{locationId}
+                   AND T4.status_enum = #{completed}--请求状态:已完成
+                   AND T4.delete_flag = '0'
+                   AND TO_CHAR(T5.dispense_time, 'yyyy-MM-dd HH24:mi:ss') BETWEEN #{startTime} AND #{endTime}
+                 GROUP BY
+                     T6.name,
+                     T6.size,
+                     T4.lot_number,
+                     T4.unit_code,
+                     T6.manufacturer_text,
+                     T5.location_id
+             )T
+    </select>
+
+</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
similarity index 96%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
index 299615df..742ba41f 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
@@ -107,12 +107,19 @@
                ccd.name                                                 AS diag_name,        -- 临床诊断
                mmd.practitioner_id                                      AS check_phar_id,    -- 核对、发药药师
                mmd.preparer_id                                          AS dis_rev_phar_id,  -- 调配药师
-               COALESCE((SELECT SUM(aci.total_price)
+--                COALESCE((SELECT SUM(aci.total_price)
+--                          FROM adm_charge_item aci
+--                          WHERE aci.prescription_no = mmr.prescription_no
+--                            AND aci.context_enum = 1
+--                            AND aci.status_enum IN (1, 2, 5)
+--                            AND aci.encounter_id = mmr.encounter_id
+--                            AND aci.tenant_id = 1), 0)                   AS total_price,
+               COALESCE((SELECT aci.total_price
                          FROM adm_charge_item aci
-                         WHERE aci.prescription_no = mmr.prescription_no
+                         WHERE aci.service_table = 'med_medication_request'
+                           AND aci.service_id = mmr.id
                            AND aci.context_enum = 1
                            AND aci.status_enum IN (1, 2, 5)
-                           AND aci.encounter_id = mmr.encounter_id
                            AND aci.tenant_id = 1), 0)                   AS total_price,
                (SELECT CASE
                            WHEN EXISTS(
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
similarity index 80%
rename from openhis-server/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
rename to openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
index 587d831a..3eb87500 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
@@ -14,19 +14,19 @@
                prsc_time,       --处方开立日期
                hi_rxno          --医保处方编号
         FROM (SELECT T1.tenant_id,
-                     T1.prescription_no,               --处方号
-                     T1.ipt_otp_no,                    --门诊号
-                     T2.name        AS patient_name,   --姓名
-                     T2.id_card     AS certno,         --身份证号
+                     T1.prescription_no,                  --处方号
+                     T1.ipt_otp_no,                       --门诊号
+                     T2.name           AS patient_name,   --姓名
+                     T2.id_card        AS certno,         --身份证号
                      CASE
                          WHEN (T5.rx_used_stas_codg IN ('1', '2')) THEN T5.rx_used_stas_name
                          ELSE '未使用'
-                         END        AS med_status,     --取药状态
-                     T1.status_enum AS status_enum,    --状态
-                     T4.name        AS prsc_dept_name, --开单科室
-                     T3.reception_time  AS mdtrt_time,     --挂号日期
-                     T1.issue_time  AS prsc_time,      --处方开立日期
-                     T1.hi_rxno                        --医保处方编号
+                         END           AS med_status,     --取药状态
+                     T1.status_enum    AS status_enum,    --状态
+                     T4.name           AS prsc_dept_name, --开单科室
+                     T3.reception_time AS mdtrt_time,     --挂号日期
+                     T1.issue_time     AS prsc_time,      --处方开立日期
+                     T1.hi_rxno                           --医保处方编号
               FROM elep_medication_request AS T1
                        LEFT JOIN adm_patient AS T2
                                  ON T1.patient_id = T2.id
@@ -63,7 +63,7 @@
                         T1.unit_code,                                --请求单位
                         T1.status_enum       AS status_enum,         --药品请求状态
                         --处方信息
-                        T2.drug_generic_name AS medication_name,     --药品名
+                        T2.registered_name AS medication_name,     --药品名
                         T2.drug_specification,                       --药品规格
                         T1.med_dosage,                               --药品剂量
                         T1.med_dosage_unit_code,                     --药品剂量单位
@@ -90,13 +90,24 @@
                         T4.name              AS practitioner_name,   --开方医生名
                         T6.name              AS mdtrt_dept_name,     --挂号科室
                         T7.name              AS prsc_dept_name,      --开单科室
-                        T5.create_time        AS mdtrt_time,          --挂号日期
+                        T5.create_time       AS mdtrt_time,          --挂号日期
                         T1.issue_time        AS prsc_time,           --处方开立日期
                         --诊断信息
                         T8.name              AS condition_name       --诊断名
         FROM elep_medication_request AS T1
-                 LEFT JOIN yb_catalog_drug_info AS T2
-                           ON T1.medication_id = T2.medical_catalog_code
+                 LEFT JOIN (SELECT drug.medical_catalog_code,
+                                   drug.registered_name,
+                                   drug.drug_specification,
+                                   drug.version
+                            FROM yb_catalog_drug_info drug
+                                     INNER JOIN (SELECT info.medical_catalog_code, MAX(info.version) AS max_version
+                                                 FROM yb_catalog_drug_info info
+                                                 WHERE  info.valid_flag = '1'
+                                                 GROUP BY info.medical_catalog_code
+                            ) AS item ON drug.medical_catalog_code = item.medical_catalog_code AND
+                                         drug.version = item.max_version
+                            WHERE  drug.valid_flag = '1'
+        ) AS T2 ON T1.medication_id = T2.medical_catalog_code
                  LEFT JOIN adm_patient AS T3
                            ON T1.patient_id = T3.id
                                AND T3.delete_flag = '0'
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml
new file mode 100644
index 00000000..19bf0cc3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.ybmanage.mapper.YbMapper">
+
+    <select id="yb3101SelectEncounterPatientInfo"
+            resultType="com.openhis.yb.dto.Yb3101AdapterEncounterPatientInfo">
+        SELECT MAX(T5.psn_no)                               AS patnId
+             , MAX(T5.psn_name)                             AS patnName
+             , MAX(T5.gend)                                 AS gend
+             , MAX(T5.brdy)                                 AS brdy
+             , MAX(T5.insuplc_admdvs)                       AS poolarea
+             , MAX(T8.mdtrt_id)                             AS mdtrtId
+             , MAX(T4.id)                                   AS contractId
+             , MAX(T4.fixmedins_code)                       AS medinsId
+             , MAX(T4.fixmedins_name)                       AS medinsName
+             , MAX(T4.adm_vs)                               AS medinsAdmdvs
+             , MAX(COALESCE(T1.start_time, T1.create_time)) AS admDate
+             , MAX(T1.end_time)                             AS dscgDate
+             , MAX(T6.practitioner_id)                      AS drCodg
+             , MAX(COALESCE(T12.bus_no, T7.bus_no))         AS admDeptCodg
+             , MAX(COALESCE(T12.name, T7.name))             AS admDeptName
+             , MAX(T7.bus_no)                               AS dscgDeptCodg
+             , MAX(T7.name)                                 AS dscgDeptName
+             , MAX(T1.yb_class_enum)                        AS medType
+             , SUM(T9.fulamt_ownpay_amt)                    AS ownpayAmt
+             , SUM(T9.preselfpay_amt)                       AS selfpayAmt
+             , COUNT(T9.id)                                 AS setlTotlnum
+             , MAX(T5.insutype)                             AS insutype
+        FROM adm_encounter T1
+                 INNER JOIN adm_patient T2
+                            ON T2.id = T1.patient_id
+                 INNER JOIN adm_account T3
+                            ON T3.encounter_id = T1.id
+                                AND T3.encounter_flag = #{encounterFlag}
+                 INNER JOIN fin_contract T4
+                            ON T4.bus_no = T3.contract_no
+                 INNER JOIN LATERAL ( SELECT psn_no
+                                           , psn_name
+                                           , gend
+                                           , brdy
+                                           , insuplc_admdvs
+                                           , insutype
+                                      FROM yb_pub_perinfo
+                                      WHERE certno = T2.id_card
+                                      ORDER BY create_time DESC LIMIT 1) T5
+        ON T2.id_card IS NOT NULL
+            INNER JOIN adm_encounter_participant T6
+            ON T6.encounter_id = T1.id
+            AND T6.delete_flag = #{deleteFlag}
+            AND T6.type_code = #{participantType}
+            INNER JOIN adm_organization T7
+            ON T7.id = T1.organization_id
+            INNER JOIN yb_clinc_reg T8
+            ON T8.ipt_otp_no = T1.bus_no
+            INNER JOIN yb_clinc_settle T9
+            ON T9.mdtrt_id = T8.mdtrt_id
+            LEFT JOIN LATERAL ( SELECT location_id
+            FROM adm_encounter_location
+            WHERE encounter_id = T1.id
+            ORDER BY create_time LIMIT 1) T10
+            ON TRUE
+            LEFT JOIN adm_location T11
+            ON T11.id = T10.location_id
+            LEFT JOIN adm_organization T12
+            ON T12.id = T11.organization_id
+        WHERE T1.id = #{encounterId}
+    </select>
+
+    <select id="yb3101SelectEncounterDiagnoseInfo"
+            resultType="com.openhis.yb.dto.Yb3101AdapterEncounterDiagnoseInfo">
+        SELECT T1.id                 AS diseId
+             , T1.ipt_dise_type_code AS iptDiseTypeCode
+             , T1.maindise_flag      AS maindiseFlag
+             , T1.diag_srt_no        AS diasSrtNo
+             , T2.yb_no              AS diseCodg
+             , T3."name"             AS diseName
+             , T1.create_time        AS diseDate
+        FROM adm_encounter_diagnosis T1
+                 INNER JOIN cli_condition T2
+                            ON T2.id = T1.condition_id
+                 INNER JOIN cli_condition_definition T3
+                            ON T3.id = T2.definition_id
+        WHERE T1.delete_flag = #{deleteFlag}
+          AND T1.encounter_id = #{encounterId}
+    </select>
+
+    <select id="yb3101SelectOrderInfo" resultType="com.openhis.yb.dto.Yb3101AdapterOrderInfo">
+        SELECT T3.bus_no                                                  AS rxId
+             , T3.prescription_no                                         AS rxno
+             , T3.group_id                                                AS grpno
+             , T3.therapy_enum                                            AS therapyEnum
+             , T2.yb_type                                                 AS ybType
+             , COALESCE(T5.medical_catalog_code, T6.medical_catalog_code) AS hilistCode
+             , COALESCE(T5.registered_name, T6.single_drug_name)          AS hilistName
+             , COALESCE(T5.drug_form, '')                                 AS hilistDosform
+             , T4.chrgitm_lv                                              AS hilistLv
+             , T1.quantity_value                                          AS cnt
+             , T1.unit_price                                              AS pric
+             , T1.total_price                                             AS sumamt
+             , COALESCE(T5.registered_spec, '')                           AS spec
+             , COALESCE(T5.min_package_unit, '')                          AS specUnt
+             , T1.entered_date                                            AS drordBegnDate
+             , T7.bus_no                                                  AS drordDeptCodg
+             , T7."name"                                                  AS drordDeptName
+             , T8.yb_no                                                   AS drordDrCodg
+             , T8."name"                                                  AS drordDrName
+             , T8.dr_profttl_code                                         AS drordDrProfttl
+        FROM adm_charge_item T1
+                 INNER JOIN adm_charge_item_definition T2
+                            ON T2.id = T1.definition_id
+                 INNER JOIN med_medication_request T3
+                            ON T3.id = T1.service_id
+                                AND T1.service_table = 'med_medication_request'
+                 INNER JOIN med_medication_definition T4
+                            ON T4.id = T1.product_id
+                 LEFT JOIN LATERAL (SELECT medical_catalog_code
+                                         , registered_name
+                                         , drug_form
+                                         , registered_spec
+                                         , min_package_unit
+                                    FROM yb_catalog_drug_info
+                                    WHERE medical_catalog_code = T4.yb_no
+                                        AND T2.yb_type = #{ybMedChrgItmTypeWest}
+                                       OR T2.yb_type = #{ybMedChrgItmTypeChinese}
+                                    ORDER BY created_at DESC LIMIT 1) T5
+        ON true
+            LEFT JOIN LATERAL (SELECT medical_catalog_code
+            , single_drug_name
+            FROM yb_catalog_medical_herb_info
+            WHERE medical_catalog_code = T4.yb_no
+            AND T2.yb_type = #{ybMedChrgItmTypeChineseSlices}
+            ORDER BY create_time DESC LIMIT 1 ) T6 ON true
+            INNER JOIN adm_organization T7
+            ON T7.id = T1.requesting_org_id
+            INNER JOIN adm_practitioner T8
+            ON T8.id = T1.enterer_id
+        WHERE T1.delete_flag = #{deleteFlag}
+          AND T1.encounter_id = #{encounterId}
+    </select>
+
+    <select id="yb4101aSelectSettleInfo" resultType="com.openhis.yb.dto.Yb4101AAdapterSettleInfo">
+        SELECT T4.psn_no          AS psnNo
+             , T6.mdtrt_id        AS mdtrtId
+             , T2.setl_id         AS setlId
+             , T3.country_code    AS ntly
+             , T3.prfs_enum       AS prfs
+             , T7.caty            AS dscgCaty
+             , T8.bill_batch_code AS billCode
+             , T8.bill_no         AS billNo
+             , T1.payment_no      AS bizSn
+             , T2.setl_time       AS setlDate
+        FROM fin_payment_reconciliation T1
+                 INNER JOIN yb_inpatient_settle T2
+                            ON T1.yb_settle_ids LIKE CONCAT('%', T2.setl_id, '%')
+                 INNER JOIN adm_patient T3
+                            ON T3.id = T1.patient_id
+                 INNER JOIN LATERAL ( SELECT psn_no
+                                      FROM yb_pub_perinfo
+                                      WHERE certno = T3.id_card
+                                      ORDER BY create_time DESC LIMIT 1) T4
+        ON T3.id_card IS NOT NULL
+            INNER JOIN adm_encounter T5
+            ON T5.id = T1.encounter_id
+            INNER JOIN yb_clinc_reg T6
+            ON T6.ipt_otp_no = T5.bus_no
+            INNER JOIN adm_organization T7
+            ON T7.id = T5.organization_id
+            INNER JOIN adm_invoice T8
+            ON T8.reconciliation_id = T1.id
+        WHERE T1.id = #{paymentId}
+    </select>
+
+    <select id="yb4101aSelectOpspdiseinfo" resultType="com.openhis.yb.dto.Yb4101AInputOpspdiseinfo">
+        SELECT T5."name" AS diagName
+             , T5.yb_no  AS diagCode
+        FROM fin_payment_reconciliation T1
+                 INNER JOIN adm_charge_item T2
+                            ON T1.charge_item_ids LIKE CONCAT('%', T2.id, '%')
+                 INNER JOIN adm_encounter_diagnosis T3
+                            ON T3.id = T2.encounter_diagnosis_id
+                 INNER JOIN cli_condition T4
+                            ON T4.id = T3.condition_id
+                 INNER JOIN cli_condition_definition T5
+                            ON T5.id = T4.definition_id
+        WHERE T1.id = #{paymentId}
+        GROUP BY T5."name", T5.yb_no
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/openhis-application/src/main/resources/mybatis/mybatis-config.xml
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/mybatis/mybatis-config.xml
rename to openhis-server-new/openhis-application/src/main/resources/mybatis/mybatis-config.xml
diff --git a/openhis-server/openhis-application/src/main/resources/properties/yb.properties b/openhis-server-new/openhis-application/src/main/resources/properties/yb.properties
similarity index 100%
rename from openhis-server/openhis-application/src/main/resources/properties/yb.properties
rename to openhis-server-new/openhis-application/src/main/resources/properties/yb.properties
diff --git a/openhis-server/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java b/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java
similarity index 100%
rename from openhis-server/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java
rename to openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java
diff --git a/openhis-server/openhis-common/pom.xml b/openhis-server-new/openhis-common/pom.xml
similarity index 100%
rename from openhis-server/openhis-common/pom.xml
rename to openhis-server-new/openhis-common/pom.xml
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
similarity index 84%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
index fe910161..68df9bab 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
@@ -62,9 +62,14 @@ public class CommonConstants {
         String DASH = "-";
 
         /**
-         * 诊疗项目：输液
+         * 耗材万能追溯码
          */
-        String INFUSION = "%输液%";
+        String DEV_TRACE_NO = "22000000000000000000";
+
+        /**
+         * 地区码
+         */
+        String AREA_CODE = "000000";
     }
 
     /**
@@ -111,6 +116,10 @@ public class CommonConstants {
          * 药品请求
          */
         String MED_MEDICATION_REQUEST = "med_medication_request";
+        /**
+         * 药品发放
+         */
+        String MED_MEDICATION_DISPENSE = "med_medication_dispense";
 
         /**
          * 服务(项目)请求
@@ -229,12 +238,12 @@ public class CommonConstants {
         /**
          * 就诊Id
          */
-        String encounterId = "encounter_id";
+        String EncounterId = "encounter_id";
 
         /**
          * 合同编码
          */
-        String contractNo = "contract_no";
+        String ContractNo = "contract_no";
 
         /**
          * 支付流水
@@ -297,6 +306,35 @@ public class CommonConstants {
          */
         String DeleteFlag = "delete_flag";
 
+        /**
+         * 费用项id
+         */
+        String ChargeId = "charge_id";
+        /**
+         * 费用项时间
+         */
+        String ChargeTime = "charge_time";
+        /**
+         * 采购员
+         */
+        String ApplicantName = "applicant_name";
+        /**
+         * 病床
+         */
+        String InpatientBed = "inpatient_bed";
+        /**
+         * 病床
+         */
+        String PlannedDispenseTime = "planned_dispense_time";
+        /**
+         * 项目id
+         */
+        String itemId = "item_id";
+        /**
+         * 申请时间
+         */
+        String applyTime = "apply_time";
+
     }
 
     /**
@@ -339,6 +377,21 @@ public class CommonConstants {
          */
         String INTRAVENOUS_INFUSION = "静脉输液";
 
+        /**
+         * 代煎中药
+         */
+        String SUFFERING_TCM = "代煎中药";
+
+        /**
+         * 转科
+         */
+        String TRANSFER_ORGANIZATION = "转科";
+
+        /**
+         * 出院
+         */
+        String LEAVE_HOSPITAL = "出院";
+
     }
 
     /**
@@ -417,4 +470,16 @@ public class CommonConstants {
         String HOSPITAL_SEAL_PATH = "hospitalSealPath";
     }
 
+    /**
+     * 长大个性化常量
+     */
+    public interface CCU {
+
+        // 耗材发放人
+        Long DisDeviceDoctor = 1934507489239801857L;
+
+        // 耗材发放人姓名
+        String DisDeviceDoctorName = "张桂英";
+    }
+
 }
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
similarity index 93%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
index 193d7e93..d56e5d7c 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
@@ -187,8 +187,17 @@ public class PromptMsgConstant {
          * 未查询到收费项目
          */
         String M00007 = "apl.payment.M00007";
+        /**
+         * 未查询到{0}账户信息
+         */
+        String M00008 = "apl.payment.M00008";
+        /**
+         * 未查询到收费项目，不需要转换账户
+         */
+        String M00009 = "apl.payment.M00009";
 
     }
+
     /**
      * 电子发票
      */
@@ -223,6 +232,10 @@ public class PromptMsgConstant {
          * 收费成功，电子发票开具失败
          */
         String M00008 = "apl.invoice.M00008";
+        /**
+         * 退款支付id不存在
+         */
+        String M00009 = "apl.invoice.M00009";
     }
 
     /**
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java
similarity index 57%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java
index 570778bf..52748e79 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java
@@ -7,33 +7,34 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 单据类别
+ * 验收结果
  *
- * @author zwh
- * @date 2025-03-05
+ * @author yuxj
+ * @date 2025-07-29
  */
 @Getter
 @AllArgsConstructor
-public enum SupplyCategory {
+public enum AcceptanceResult implements HisEnumInterface{
+
 
     /**
-     * 库存供应
+     * 合格
      */
-    STOCK_SUPPLY(1, "库存供应"),
-
+    QUALIFIED(1, "1","合格"),
     /**
-     * 非库存供应
+     * 不合格
      */
-    NON_STOCK(2, "非库存供应");
+    UNQUALIFIED(2, "2","不合格");
 
     private Integer value;
+    private String code;
     private String info;
 
-    public static SupplyCategory getByValue(Integer value) {
+    public static AcceptanceResult getByValue(Integer value) {
         if (value == null) {
             return null;
         }
-        for (SupplyCategory val : values()) {
+        for (AcceptanceResult val : values()) {
             if (val.getValue().equals(value)) {
                 return val;
             }
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
similarity index 55%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
index a15c2311..db82a797 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
@@ -90,7 +90,7 @@ public enum AssignSeqEnum {
      * 盘点单据号
      */
     STOCKTAKING_NUM("17", "盘点单据号", "STO"),
-	
+
     /**
      * 报损单单据号
      */
@@ -135,7 +135,7 @@ public enum AssignSeqEnum {
      * 处方号-二类精神药
      */
     PRESCRIPTION_B_PSYCHOTROPIC_NO("25", "处方号", "PBN"),
-    
+
     /**
      * 住院编号
      */
@@ -178,8 +178,136 @@ public enum AssignSeqEnum {
     /**
      * 自费收费批号
      */
-    SF_CLINIC_ORDER("33", "自费订单编号", "SFORD"),;
+    SF_CLINIC_ORDER("33", "自费订单编号", "SFORD"),
+
+    /**
+     * 处方号-中草药
+     */
+    PRESCRIPTION_CHINESE_HERBAL_MEDICINE("34", "处方号-中草药", "PCM"),
 
+    /**
+     * 身体部位编码
+     */
+    BODY_STRUCTURE_NO("35", "身体部位编码", "BS"),
+
+    /**
+     * 订货单单号
+     */
+    PHARMACY_WAREHOUSE_PURCHASE("36", "药库订货单", "PWP"),
+    /**
+     * 药房请领单单号
+     */
+    PURCHASE_REQUISITION("37", "药房请领单", "PRE"),
+    /**
+     * 药房入库单单号
+     */
+    PURCHASE_STOCKIN("38", "药房入库单", "PST"),
+    /**
+     * 药房退库单单号
+     */
+    PURCHASE_RETURN("39", "药房退库单", "PET"),
+    /**
+     * 发药单单号
+     */
+    DISPENSING_ORDER("40", "发药单", "DIO"),
+    /**
+     * 药房损益单单号
+     */
+    PURCHASE_PRPFITLOSS("41", "药房损益单", "PPR"),
+    /**
+     * 药房盘点单单号
+     */
+    PURCHASE_STOCKTAKING("42", "药房盘点单", "PTO"),
+    /**
+     * 药房调入单单号
+     */
+    PURCHASE_TRANSFERIN("43", "药房调入单", "PTI"),
+    /**
+     * 药房调出单单号
+     */
+    PURCHASE_TRANSFEROUT("44", "药房调出单", "PTU"),
+
+    /**
+     * 医嘱签发编码
+     */
+    ADVICE_SIGN("45", "医嘱签发编码", "ASI"),
+
+    /**
+     * 物资订货单
+     */
+    MATERIAL_PURCHASE("46", "物资订货单", "MPU"),
+
+    /**
+     * 物资进货单
+     */
+    MATERIAL_STOCKIN("47", "物资进货单", "MSI"),
+    /**
+     * 物资退货单
+     */
+    MATERIAL_RETURN("48", "物资退货单", "MRE"),
+    /**
+     * 物资出库单
+     */
+    MATERIAL_STOCKOUT("49", "物资出库单", "MSO"),
+    /**
+     * 物资退库单
+     */
+    MATERIAL_PRODUCT_RETURN("50", "物资退库单", "MPR"),
+    /**
+     * 物资损益单
+     */
+    MATERIAL_PRPFITLOSS("51", "物资损益单", "MPP"),
+
+    /**
+     * 物资盘点单
+     */
+    MATERIAL_STOCKTAKING("52", "物资盘点单", "MST"),
+    /**
+     * 物资调入单
+     */
+    MATERIAL_TRANSFERIN("53", "物资调入单", "MTI"),
+    /**
+     * 物资调出单
+     */
+    MATERIAL_TRANSFEROUT("54", "物资调出单", "MTO"),
+
+    /**
+     * 科室请领单单号
+     */
+    DEPARTMENT_REQUISITION("55", "科室请领单", "DRE"),
+    /**
+     * 科室入库单单号
+     */
+    DEPARTMENT_STOCKIN("56", "科室入库单", "DST"),
+    /**
+     * 科室退库单单号
+     */
+    DEPARTMENT_RETURN("57", "科室退库单", "DET"),
+    /**
+     * 科室损益单单号
+     */
+    DEPARTMENT_PRPFITLOSS("58", "科室损益单", "DPR"),
+    /**
+     * 科室盘点单单号
+     */
+    DEPARTMENT_STOCKTAKING("59", "科室盘点单", "DTO"),
+    /**
+     * 科室调入单单号
+     */
+    DEPARTMENT_TRANSFERIN("60", "科室调入单", "DTI"),
+    /**
+     * 科室调出单单号
+     */
+    DEPARTMENT_TRANSFEROUT("61", "科室调出单", "DTU"),
+    /**
+     * 诊疗处方号
+     */
+    ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
+    /**
+     * b
+     * 病历文书
+     */
+    PURCHASE_DOCUMENT("63", "病历文书", "DOC");
     private final String code;
     private final String info;
     private final String prefix;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Category.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Category.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Category.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Category.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
similarity index 94%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
index e142a481..cba68c32 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
@@ -7,6 +7,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ChargeItemStatus implements HisEnumInterface {
 
+    /**
+     * 草稿
+     */
+    DRAFT(0, "draft", "草稿"),
+
     /**
      * 待收费
      */
@@ -28,7 +33,7 @@ public enum ChargeItemStatus implements HisEnumInterface {
     ABORTED(4, "aborted", "终止"),
 
     /**
-     * 已结算
+     * 已收费
      */
     BILLED(5, "billed ", "已收费"),
 
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
similarity index 83%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
index 00dbe84c..85d8baf9 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
@@ -15,7 +15,7 @@ public enum ConditionCode implements HisEnumInterface {
     /**
      * 批号
      */
-    LOT_NUMBER(1, "1", "产品批号"),
+    LOT_NUMBER_COST(1, "1", "产品批号进价"),
 
     /**
      * 采购
@@ -30,7 +30,12 @@ public enum ConditionCode implements HisEnumInterface {
     /**
      * 限制
      */
-    LIMIT(4, "4", "限制");
+    LIMIT(4, "4", "限制"),
+
+    /**
+     * 限制
+     */
+    LOT_NUMBER_PRICE(5, "5", "产品批号售价");
 
     @EnumValue
     private final Integer value;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DelFlag.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
similarity index 97%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
index ceb93563..2b2896e2 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
@@ -31,7 +31,7 @@ public enum DispenseStatus implements HisEnumInterface {
     /**
      * 已发药
      */
-    COMPLETED(4, "CO", "已发药"),
+    COMPLETED(4, "CO", "已发放"),
 
     /**
      * 暂停
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java
new file mode 100644
index 00000000..7f3fe03e
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 文书权限枚举类 一级菜单
+ *
+ * @author zxy
+ * @date 2025-02-24
+ */
+@Getter
+@AllArgsConstructor
+public enum DocPermissionEnum implements HisEnumInterface {
+
+    /**
+     * 不限制
+     */
+    NO_LIMIT(0, "NO_LIMIT", "不限制"),
+
+    /**
+     * 编辑
+     */
+    EDIT(1, "EDIT", "编辑"),
+
+    /**
+     * 查看
+     */
+    VIEW(2, "VIEW", "查看");
+
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static DocPermissionEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (DocPermissionEnum val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java
new file mode 100644
index 00000000..c4762b05
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java
@@ -0,0 +1,67 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 文档统计定义-属性类型枚举
+ * 对应属性类型：Input（输入框）、Date（日期选择器）、Checkbox（复选框）、Radio（单选框）、Select（下拉选择）、Textarea（文本域）
+ */
+@Getter
+@AllArgsConstructor
+public enum DocStatisticsDefinitionTypeEnum implements HisEnumInterface {
+    // 枚举项：value（数据库存储值）、code（业务编码）、info（前端/业务描述）
+    INPUT(1, "INPUT", "输入框（单行文本）"),
+    DATE(2, "DATE", "日期选择器"),
+    CHECKBOX(3, "CHECKBOX", "复选框"),
+    RADIO(4, "RADIO", "单选框"),
+    SELECT(5, "SELECT", "下拉选择框"),
+    TEXTAREA(6, "TEXTAREA", "文本域（多行文本）");
+
+    // 数据库存储的枚举值（与表中type_enum字段对应）
+    @EnumValue
+    private final Integer value;
+    // 业务编码（用于前后端交互、日志打印等，避免硬编码）
+    private final String code;
+    // 枚举描述（用于前端显示、接口返回说明等）
+    private final String info;
+
+    /**
+     * 根据数据库存储值（value）获取枚举实例
+     *
+     * @param value 数据库中存储的type_enum值（如1、2、3...）
+     * @return 对应的枚举实例，若未匹配则返回null
+     */
+    public static DocStatisticsDefinitionTypeEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        // 遍历所有枚举项，匹配value
+        for (DocStatisticsDefinitionTypeEnum typeEnum : values()) {
+            if (typeEnum.getValue().equals(value)) {
+                return typeEnum;
+            }
+        }
+        // 无匹配项时返回null（避免抛出异常，便于业务层处理）
+        return null;
+    }
+
+    /**
+     * 扩展：根据业务编码（code）获取枚举实例（可选，按需使用）
+     *
+     * @param code 业务编码（如"INPUT"、"SELECT"）
+     * @return 对应的枚举实例，若未匹配则返回null
+     */
+    public static DocStatisticsDefinitionTypeEnum getByCode(String code) {
+        if (code == null || code.trim().isEmpty()) {
+            return null;
+        }
+        for (DocStatisticsDefinitionTypeEnum typeEnum : values()) {
+            if (typeEnum.getCode().equals(code.trim())) {
+                return typeEnum;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java
new file mode 100644
index 00000000..d8579ba9
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java
@@ -0,0 +1,33 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 就诊类型
+ */
+@Getter
+@AllArgsConstructor
+public enum DocStatusEnum implements HisEnumInterface {
+    DRAFT(0, "DRAFT", "草稿/暂存"),
+    SAVED(1, "SAVED", "提交"),
+    ARCHIVED(2, "ARCHIVED", "归档"),
+    UPDATED(3, "UPDATED", "修改");
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static DocStatusEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (DocStatusEnum val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java
new file mode 100644
index 00000000..03cd95bd
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java
@@ -0,0 +1,39 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 就诊类型
+ */
+@Getter
+@AllArgsConstructor
+public enum DocTypeEnum implements HisEnumInterface {
+    OUT_DOC(0, "OUT_DOC", "门诊病历"),
+    IN_DOC(1, "IN_DOC", "住院病历"),
+    NURSING_DOC(2, "NURSING_DOC", "护理评估"),
+    NURSING_RECORD_DOC(3, "NURSING_RECORD_DOC", "护理记录"),
+    TEMPERATURE_DOC(4, "NURSING_RECORD_DOC", "体温单"),
+    NOTICE_DOC(5, "NOTICE_DOC", "告知书"),
+    AGREEMENT_DOC(6, "AGREEMENT_DOC", "知情同意书"),
+    IN_CASE_DOC(7, "IN_CASE_DOC", "病案首页");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static DocTypeEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (DocTypeEnum val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java
new file mode 100644
index 00000000..14bf7ddb
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java
@@ -0,0 +1,37 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 就诊类型
+ */
+@Getter
+@AllArgsConstructor
+public enum DocUseRangeEnum implements HisEnumInterface {
+    //    使用范围 0-暂不使用 1-全院使用 2-指定科室使用 3-个人使用
+    NO_IN_USE(0, "NO_IN_USE", "暂不使用"),
+
+    ALL_HOSPITAL_USE(1, "ALL_HOSPITAL_USE", "全院使用"),
+
+    DEPT_USE(2, "DEPT_USE", "指定科室使用"),
+    USE_BY_SELF(3, "USE_BY_SELF", "个人使用");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static DocUseRangeEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (DocUseRangeEnum val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java
similarity index 94%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java
index e0a6964c..f12dff75 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java
@@ -14,7 +14,7 @@ public enum EncounterLocationStatus implements HisEnumInterface {
 
     RESERVED(3, "reserved", "已保留"),
 
-    COMPLETED(4, "completed", "已用完");
+    COMPLETED(4, "completed", "已完成");
 
     @EnumValue
     private final Integer value;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
similarity index 80%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
index c160373d..80cd29c9 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
@@ -11,15 +11,15 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum EncounterStatus implements HisEnumInterface {
-    PLANNED(1, "draft", "待诊"), // 已安排
+    PLANNED(1, "draft", "待诊"),
 
-    IN_PROGRESS(2, "in-progress", "在诊"), // 进行中
+    IN_PROGRESS(2, "in-progress", "在诊"),
 
     ON_HOLD(3, "on-hold", "暂离"),
 
-    DISCHARGED(4, "on-discharged", "诊毕"), // 诊毕,出院
+    DISCHARGED(4, "on-discharged", "诊毕"),
 
-    COMPLETED(5, "completed", "完成,已结算"),
+    COMPLETED(5, "completed", "完成"),
 
     CANCELLED(6, "cancelled", "退号"),
 
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java
new file mode 100644
index 00000000..9a86f589
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java
@@ -0,0 +1,44 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 住院就诊状态
+ */
+@Getter
+@AllArgsConstructor
+public enum EncounterZyStatus implements HisEnumInterface {
+    TO_BE_REGISTERED(1, "to-be-registered", "待登记"),
+
+    REGISTERED(2, "registered", "待入科"),
+
+    AWAITING_DISCHARGE(3, "awaiting-discharge", "待出院"),
+
+    DISCHARGED_FROM_HOSPITAL(4, "discharged-from-hospital", "已出院"),
+
+    ADMITTED_TO_THE_HOSPITAL(5, "admitted-to-the-hospital", "已入院"),
+
+    PENDING_TRANSFER(6, "pending-transfer", "待转科"),
+
+    ALREADY_SETTLED(7, "already-settled", "已结算");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static EncounterZyStatus getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (EncounterZyStatus val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
similarity index 75%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
index 40cfb096..c9d224eb 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 事件状态
+ * 执行状态（事件执行用）
  *
  * @author lyx
  * @date 2025-03-05
@@ -14,14 +14,14 @@ import lombok.Getter;
 public enum EventStatus implements HisEnumInterface {
 
     /**
-     * 草稿
+     * 待执行
      */
-    PREPARATION(1, "PREP", "草稿"),
+    PREPARATION(1, "PREP", "待执行"),
 
     /**
-     * 进行中
+     * 执行中
      */
-    IN_PROGRESS(2, "IP", "进行中"),
+    IN_PROGRESS(2, "IP", "执行中"),
 
     /**
      * 未完成
@@ -39,9 +39,9 @@ public enum EventStatus implements HisEnumInterface {
     STOPPED(5, "ST", "停止"),
 
     /**
-     * 已完成
+     * 已执行
      */
-    COMPLETED(6, "CMP", "已完成"),
+    COMPLETED(6, "CMP", "已执行"),
 
     /**
      * 录入错误
@@ -51,7 +51,12 @@ public enum EventStatus implements HisEnumInterface {
     /**
      * 未知
      */
-    UNKNOWN(8, "UNK", "未知");
+    UNKNOWN(8, "UNK", "未知"),
+
+    /**
+     * 取消执行
+     */
+    CANCEL(9, "CCL", "取消执行");
 
     private Integer value;
     private String code;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java
new file mode 100644
index 00000000..2f0af6a3
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java
@@ -0,0 +1,35 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 费用类别
+ */
+@Getter
+@AllArgsConstructor
+public enum FeeTypeClass implements HisEnumInterface {
+    // 费用类别
+    ORDINARY_HOSPITALIZATION(21, "21", "普通住院"), FOREIGN_HOSPITALIZATION(25, "25", "异地住院"),
+    SINGLE_DIAGNOSIS_HOSPITALIZATION(26, "26", "单病种住院"), INJURY_HOSPITALIZATION(22, "22", "外伤住院"),
+    TRANSFER_HOSPITALIZATION(23, "23", "转外诊治住院"), EMERGENCY_TRANSFER_HOSPITALIZATION(24, "24", "急诊转住院"),
+    PALLIATIVE_CARE_HOSPITALIZATION(2114, "2114", "舒缓疗护住院"), LOW_COPAY_HOSPITALIZATION(3101, "3101", "低自付住院");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static FeeTypeClass getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (FeeTypeClass val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java
new file mode 100644
index 00000000..55b7fc4e
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 医院编码枚举
+ *
+ * @author zwh
+ * @date 2025-06-24
+ */
+@Getter
+@AllArgsConstructor
+public enum HospitalCodeEnum implements HisEnumInterface {
+
+    /**
+     * 长大
+     */
+    CCU(1, "H22010200672", "长大"),
+
+    /**
+     * 农大
+     */
+    JLAU(2, "H22017200667", "农大"),;
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static HospitalCodeEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (HospitalCodeEnum val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+
+    public static HospitalCodeEnum getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (HospitalCodeEnum val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java
new file mode 100644
index 00000000..725a6364
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java
@@ -0,0 +1,40 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 身份证件类型
+ *
+ * @author liuhr
+ * @date 2025/3/18
+ */
+
+@Getter
+@AllArgsConstructor
+public enum IdentityDocumentType implements HisEnumInterface {
+
+    RESIDENT_ID_CARD(1, "residentIdCard", "居民身份证"), HOUSEHOLD_REGISTER(2, "householdRegister", "居民户口簿"),
+    PASSPORT(3, "passport", "护照"), OFFICER_CERTIFICATE(4, "officerCertificate", "军官证"),
+    DRIVING_LICENSE(5, "drivingLicense", "驾驶证"), HONGKONG_MACAO_PASS(6, "hongkongMacaoPass", "港澳居民来往内地通行证"),
+    TAIWAN_PASS(7, "taiwanPass", "台湾居民来往内地通行证"), OTHER(99, "other", "其他身份证件");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static IdentityDocumentType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (IdentityDocumentType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
similarity index 61%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
index 8e233a0f..c89b3c71 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
@@ -9,10 +9,39 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum LocationForm implements HisEnumInterface {
 
-    SITE(1, "si", "集合点"), BUILDING(2, "bu", "建筑"), WING(3, "wi", "连廊"), WARD(4, "wa", "病区"), LEVEL(5, "lvl", "楼层"),
-    CORRIDOR(6, "co", "走廊"), ROOM(7, "ro", "诊室"), BED(8, "bd", "床"), VEHICLE(9, "ve", "运输工具"), HOUSE(10, "ho", "病房"),
-    CABINET(11, "ca", "库房"), ROAD(12, "rd", "路"), AREA(13, "area", "区域"), VIRTUAL(15, "vi", "虚拟"),
-    PHARMACY(16, "ph", "药房");
+    SITE(1, "si", "集合点"),
+
+    BUILDING(2, "bu", "建筑"),
+
+    WING(3, "wi", "连廊"),
+
+    WARD(4, "wa", "病区"),
+
+    LEVEL(5, "lvl", "楼层"),
+
+    CORRIDOR(6, "co", "走廊"),
+
+    ROOM(7, "ro", "诊室"),
+
+    BED(8, "bd", "床"),
+
+    VEHICLE(9, "ve", "运输工具"),
+
+    HOUSE(10, "ho", "病房"),
+
+    CABINET(11, "ca", "药库"),
+
+    ROAD(12, "rd", "路"),
+
+    AREA(13, "area", "区域"),
+
+    VIRTUAL(15, "vi", "虚拟"),
+
+    PHARMACY(16, "ph", "药房"),
+
+    WAREHOUSE (17, "wa", "仓库"),
+
+    DEPARTMENT (18, "de", "科室");
 
     // PHARMACY_WINDOW(17, "phw", "发药窗口"),
     // PHARMACY_TABLE(18, "dt", "摆药台"),
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
similarity index 75%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
index 10a2b558..402e7794 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
@@ -13,7 +13,17 @@ public enum LocationStatus implements HisEnumInterface {
 
     INACTIVE(2, "inactive", "停用"),
 
-    SUSPENDED(3, "suspended", "临时停用");
+    SUSPENDED(3, "suspended", "临时停用"),
+
+    ARRANGE(4, "arrange", "整理"),
+
+    OCCUPY(5, "occupy", "占用"),
+
+    IDLE(6, "idle", "空闲"),
+
+    POLLUTION(7, "pollution", "污染"),
+
+    ISOLATE(8, "isolate", "隔离");
 
     @EnumValue
     private final Integer value;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java
similarity index 38%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java
index a6cba27e..d8a5ec4f 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java
@@ -3,82 +3,81 @@
  */
 package com.openhis.common.enums;
 
+import com.core.common.utils.StringUtils;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 单据类型
+ * 护理医嘱分类
  *
  * @author zwh
- * @date 2025-03-05
+ * @date 2025-03-14
  */
 @Getter
 @AllArgsConstructor
-public enum SupplyType implements HisEnumInterface {
-
-    /**
-     * 采购入库
-     */
-    PURCHASE_INVENTORY(1, "1", "采购入库"),
-
-    /**
-     * 商品调拨
-     */
-    PRODUCT_TRANSFER(2, "2", "商品调拨"),
-
-    /**
-     * 汇总发药
-     */
-    DISPENSING_AGGREGATION(3, "3", "汇总发药"),
+public enum NursingOrdersClass implements HisEnumInterface {
 
     /**
-     * 商品盘点
+     * 护理
      */
-    PRODUCT_STOCKTAKING(4, "4", "商品盘点"),
+    NURSING(26, "26", "护理"),
 
     /**
-     * 采购退货
+     * 病情
      */
-    PRODUCT_RETURN(5, "5", "采购退货"),
+    CONDITION(38, "38", "病情"),
 
     /**
-     * 报损单
+     * 护理常规
      */
-    LOSS_REPORT_FORM(6, "6", "报损单"),
+    NURSING_ROUTINE(39, "39", "护理常规"),
 
     /**
-     * 领用出库
+     * 膳食
      */
-    ISSUE_INVENTORY(7, "7", "领用出库"),
+    DIET(27, "27", "膳食"),
 
     /**
-     * 商品批量调拨
+     * 体位
      */
-    PRODUCT_BATCH_TRANSFER(8, "8", "商品批量调拨"),
+    POSITION(40, "40", "体位"),
 
     /**
-     * 退货出库
+     * 陪护
      */
-    RETURN_ISSUE(9, "9", "退货出库"),
+    COMPANION_CARE(41, "41", "陪护"),
 
     /**
-     * 商品批量盘点
+     * 隔离等级
      */
-    PRODUCT_BATCH_STOCKTAKING(10, "10", "商品批量盘点");
+    ISOLATION_LEVEL(42, "42", "隔离等级");
 
     private Integer value;
     private String code;
     private String info;
 
-    public static SupplyType getByValue(Integer value) {
+    public static NursingOrdersClass getByValue(Integer value) {
         if (value == null) {
             return null;
         }
-        for (SupplyType val : values()) {
+        for (NursingOrdersClass val : values()) {
             if (val.getValue().equals(value)) {
                 return val;
             }
         }
         return null;
     }
+
+    public static NursingOrdersClass getByCode(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return null;
+        }
+        for (NursingOrdersClass val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
 }
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java
new file mode 100644
index 00000000..3c94fbdd
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 包装情况
+ *
+ * @author yuxj
+ * @date 2025-07-29
+ */
+@Getter
+@AllArgsConstructor
+public enum PackagingCondition implements HisEnumInterface{
+
+    /**
+     * 包装完好
+     */
+    INTACT_PACKAGING(1, "1","包装完好"),
+    /**
+     * 包装破损
+     */
+    DAMAGED_PACKAGING(2, "2","包装破损"),
+    /**
+     * 包装损坏
+     */
+    SEVERELY_DAMAGED_PACKAGING(3, "3","包装损坏");
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static PackagingCondition getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (PackagingCondition val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
similarity index 88%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
index 1b2120e5..20256823 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
@@ -13,7 +13,7 @@ import lombok.Getter;
 public enum ParticipantType implements HisEnumInterface {
     ADMITTER(1, "1", "接诊医生"),
 
-    ATTENDER(2, "2", "责任护士"),
+    PRIMARY_NURSE(2, "2", "责任护士"),
 
     CONTACT(3, "3", "联系人"),
 
@@ -27,11 +27,11 @@ public enum ParticipantType implements HisEnumInterface {
 
     EMERGENCY(8, "8", "紧急联系人"),
 
-    ATTENDING_DOCTOR(9, "9", "住院医生"),
+    ADMITTING_DOCTOR(9, "9", "住院医生"),
 
     CHIEF_DOCTOR(10, "10", "主任医生"),
 
-    PRINCIPAL_DOCTOR(11, "11", "主治医生"),
+    ATTENDING_DOCTOR(11, "11", "主治医生"),
 
     REGISTRATION_DOCTOR(12, "12", "挂号医生");
 
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java
new file mode 100644
index 00000000..c4cea69d
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * PaymentStatisticalMethod (0: MEMBER_FIRST; 1: MEMBER_SECOND;)
+ *
+ * @author SunJQ
+ * @date 2025-08-08
+ */
+@Getter
+@AllArgsConstructor
+public enum PaymentStatisticalMethod {
+
+    /**
+     * 字典fin_type_code
+     */
+    FIN_TYPE_CODE(1, "fin_type_code"),
+    /**
+     * 医保分类med_chrgitm_type
+     */
+    MED_CHRGITM_TYPE(2, "med_chrgitm_type");
+
+    private Integer value;
+    private String description;
+
+    public static PaymentStatisticalMethod getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (PaymentStatisticalMethod val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
similarity index 73%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
index 3f28615b..15fa49b6 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
@@ -3,6 +3,8 @@
  */
 package com.openhis.common.enums;
 
+import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
 import lombok.AllArgsConstructor;
@@ -16,20 +18,22 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum PaymentType {
+public enum PaymentType implements HisEnumInterface {
 
     /**
      * 付费
      */
-    PAY(0, "付费"),
+    PAY(0, "0", "付费", BigDecimal.ONE),
     /**
      * 退费
      */
-    UN_PAY(1, "退费");
+    UN_PAY(1, "0", "退费", new BigDecimal("-1"));
 
     @EnumValue
     private Integer value;
-    private String description;
+    private String code;
+    private String info;
+    private BigDecimal multiplier;
 
     public static PaymentType getByValue(Integer value) {
         if (value == null) {
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
similarity index 79%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
index 0f31343d..2e82fe19 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
@@ -12,7 +12,15 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PriorityLevel implements HisEnumInterface {
 
-    EMERGENCY(1, "EM", "紧急"), PRIORITY(2, "PR", "优先"), ORDINARY(3, "OR", "普通"), NOT_URGENT(4, "NU", "不紧急");
+    NOT_URGENT(1, "NU", "不紧急"),
+
+    ORDINARY(2, "OR", "普通"),
+
+    PRIORITY(3, "PR", "优先"),
+
+    EMERGENCY(4, "EM", "紧急"),
+
+    DANGER(5, "DA", "危");
 
     @EnumValue
     private final Integer value;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
similarity index 92%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
index a70cc5dc..59908b88 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
@@ -20,7 +20,11 @@ public enum ProcedureCategory {
     MEASUREMENT(7, "122869004", "测量The action or process of measuring something."),
     MANIPULATION(8, "46947000",
         "治疗A therapeutic procedure involving the manipulation of the spine or other parts of the body to alleviate pain or discomfort."),
-    SOCIAL_SERVICE(9, "410606002", "社会相关A procedure related to providing social services.");
+    SOCIAL_SERVICE(9, "410606002", "社会相关A procedure related to providing social services."),
+
+    OUTPATIENT_ADVICE(10, "10", "门诊医嘱"),
+
+    INPATIENT_ADVICE(11, "11", "住院医嘱");
 
     @EnumValue
     private final Integer value;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java
new file mode 100644
index 00000000..4e646b4e
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 申请单管理类型
+ *
+ * @author zwh
+ * @date 2025-03-10
+ */
+@Getter
+@AllArgsConstructor
+public enum RequestFormType implements HisEnumInterface {
+
+    /**
+     * 检查
+     */
+    CHECK(1, "1", "检查"),
+
+    /**
+     * 检验
+     */
+    INSPECTION(2, "2", "检验"),
+
+    /**
+     * 输血
+     */
+    BLOOD_TRANSFUSION(3, "3", "输血"),
+
+    /**
+     * 手术
+     */
+    SURGERY(4, "4", "手术");
+
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static RequestFormType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (RequestFormType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
similarity index 67%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
index ebf9e722..b44c52a8 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
@@ -26,9 +26,9 @@ public enum RequestStatus implements HisEnumInterface {
     ACTIVE(2, "active", "已发送"),
 
     /**
-     * 已完成
+     * 已校对
      */
-    COMPLETED(3, "completed", "已完成"),
+    COMPLETED(3, "completed", "已校对"),
 
     /**
      * 暂停
@@ -36,39 +36,24 @@ public enum RequestStatus implements HisEnumInterface {
     ON_HOLD(4, "on_hold", "暂停"),
 
     /**
-     * 取消
+     * 待退
      */
-    CANCELLED(5, "cancelled", "取消"),
+    CANCELLED(5, "cancelled", "取消/待退"),
 
     /**
-     * 停止
+     * 停嘱
      */
-    STOPPED(6, "stopped", "停止"),
+    STOPPED(6, "stopped", "停嘱"),
 
     /**
-     * 不可用
+     * 不执行
      */
-    ENDED(7, "ended", "不可用"),
-
-    /**
-     * 已汇总
-     */
-    SUMMARIZED(8, "summarized", "已汇总"),
+    ENDED(7, "ended", "不执行"),
 
     /**
      * 未知
      */
-    UNKNOWN(9, "unknown", "未知"),
-
-    /**
-     * 待执行
-     */
-    IN_PROGRESS(10, "in_progress", "待执行"),
-
-    /**
-     * 待退药
-     */
-    IN_REFUND(11, "in_refund", "待退药");
+    UNKNOWN(9, "unknown", "未知");
 
     @EnumValue
     private final Integer value;
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Severity.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Severity.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Severity.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Severity.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
new file mode 100644
index 00000000..21ed9b57
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 单据类别
+ *
+ * @author zwh
+ * @date 2025-03-05
+ */
+@Getter
+@AllArgsConstructor
+public enum SupplyCategory implements HisEnumInterface{
+
+    /**
+     * 库存供应
+     */
+    STOCK_SUPPLY(1, "1","库存供应"),
+
+    /**
+     * 非库存供应
+     */
+    NON_STOCK(2, "2","非库存供应"),
+    /**
+     * 普通
+     */
+    NORMAL(3, "3","0.普通"),
+    /**
+     * 采购计划生成
+     */
+    PURCHASE_PLAN_GENERATION(4, "4","1.采购计划生成"),
+    /**
+     * 外购药品入库
+     */
+    PURCHASED_DRUGS_WAREHOUSING(5, "5","0.外购药品入库"),
+    /**
+     * 自制药品入库
+     */
+    HOMEMADE_DRUGS_WAREHOUSING(6, "6","1.自制药品入库"),
+    /**
+     * 代销药品入库
+     */
+    CONSIGNMENT_DRUGS_WAREHOUSING(7, "7","2.代销药品入库"),
+    /**
+     * 其他药品入库
+     */
+    OTHER_DRUGS_WAREHOUSING(8, "8","3.其他药品入库"),
+    /**
+     * 赠送药品入库
+     */
+    DONATED_DRUGS_WAREHOUSING(9, "9","4.赠送药品入库"),
+    /**
+     * 申请采购
+     */
+    PURCHASE_APPLICATION(10, "10","1.申请采购"),
+    /**
+     * 院内出库
+     */
+    IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
+    /**
+     * 院外出库
+     */
+    OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
+    /**
+     * 其他出库
+     */
+    OTHER_OUTBOUND(13, "13","2.其他出库"),
+    /**
+     * 普通损益
+     */
+    GENERAL_PROFIT_AND_LOSS(14, "14","0.普通损益"),
+    /**
+     * 盘点损益
+     */
+    STOCKTAKING_PROFIT_AND_LOSS(15, "15","1.盘点损益"),
+    /**
+     * 制剂消耗
+     */
+    PREPARATION_CONSUMPTION(16, "16","2.制剂消耗"),
+    /**
+     * 常备抢救药品
+     */
+    STANDBY_RESCUE_MEDICINES(16, "16","2.常备抢救药品"),
+    /**
+     * 破损过期药品
+     */
+    DAMAGED_EXPIRED_MEDICINES(16, "16","3.破损过期药品"),
+    /**
+     * 捐赠药品
+     */
+    DONATED_MEDICINES(16, "16","4.捐赠药品"),
+    /**
+     * 普通盘点
+     */
+    GENERAL_STOCKTAKING(17, "17","0.普通盘点"),
+    /**
+     * 月度盘点
+     */
+    MONTHLY_STOCKTAKING(18, "18","1.月度盘点"),
+    /**
+     * 门诊病人发药
+     */
+    OUTPATIENT_PATIENT_DISPENSING(19, "19","0.门诊病人发药"),
+    /**
+     * 住院病人发药
+     */
+    INPATIENT_PATIENT_DISPENSING(20, "20","1.住院病人发药"),
+    /**
+     * 住院病人汇总发药
+     */
+    INPATIENT_PATIENT_SUMMARY_DISPENSING(21, "21","2.住院病人汇总发药"),
+    /**
+     * 赠送
+     */
+    PRESENT(22, "22","1.赠送"),
+    /**
+     * 视光材料
+     */
+    OPTICAL_MATERIALS(23, "23","2.视光材料");
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static SupplyCategory getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (SupplyCategory val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
similarity index 84%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
index 0047c553..3e341092 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
@@ -44,7 +44,16 @@ public enum SupplyStatus implements HisEnumInterface {
     /**
      * 待审请
      */
-    PENDING_REVIEW(10, "6", "待审请");
+    PENDING_REVIEW(10, "6", "待审请"),
+    /**
+     * 已失效
+     */
+    EXPIRED_INVALIDATED(11, "7", "已失效"),
+
+    /**
+     * 已发送
+     */
+    SEND(12, "12", "已发送");
 
     private Integer value;
     private String code;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
new file mode 100644
index 00000000..6473f639
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 单据类型
+ *
+ * @author zwh
+ * @date 2025-03-05
+ */
+@Getter
+@AllArgsConstructor
+public enum SupplyType implements HisEnumInterface {
+
+    /**
+     * 采购入库
+     */
+    PURCHASE_INVENTORY(1, "1", "采购入库"),
+
+    /**
+     * 商品调拨
+     */
+    PRODUCT_TRANSFER(2, "2", "商品调拨"),
+
+    /**
+     * 汇总发药
+     */
+    DISPENSING_AGGREGATION(3, "3", "汇总发药"),
+
+    /**
+     * 商品盘点
+     */
+    PRODUCT_STOCKTAKING(4, "4", "商品盘点"),
+
+    /**
+     * 采购退货
+     */
+    PRODUCT_RETURN(5, "5", "采购退货"),
+
+    /**
+     * 报损单
+     */
+    LOSS_REPORT_FORM(6, "6", "报损单"),
+
+    /**
+     * 领用出库
+     */
+    ISSUE_INVENTORY(7, "7", "领用出库"),
+
+    /**
+     * 商品批量调拨
+     */
+    PRODUCT_BATCH_TRANSFER(8, "8", "商品批量调拨"),
+
+    /**
+     * 领用退货
+     */
+    RETURN_ISSUE(9, "9", "领用退货"),
+
+    /**
+     * 商品批量盘点
+     */
+    PRODUCT_BATCH_STOCKTAKING(10, "10", "商品批量盘点"),
+
+    /**
+     * 发药
+     */
+    DISPENSE_MEDICATION(11, "11", "发药"),
+    /**
+     * 退药
+     */
+    RETURN_MEDICATION(12, "12", "退药") ,
+
+    /**
+     * 药库订货单
+     */
+    CABINET_PURCHASE(13, "13", "药库订货单"),
+
+    /**
+     * 药库进货单
+     */
+    CABINET_STOCKIN(14, "14", "药库进货单"),
+    /**
+     * 药库退货单
+     */
+    CABINET_RETURN(15, "15", "药库退货单"),
+    /**
+     * 药库出库单
+     */
+    CABINET_STOCKOUT(16, "16", "药库出库单"),
+    /**
+     * 药库退库单
+     */
+    CABINET_PRODUCT_RETURN(17, "17", "药库退库单"),
+    /**
+     * 药库损益单
+     */
+    CABINET_PRPFITLOSS(18, "18", "药库损益单"),
+
+    /**
+     * 药库盘点单
+     */
+    CABINET_STOCKTAKING(19, "19", "药库盘点单"),
+
+    /**
+     * 药房请领单
+     */
+    PURCHASE_REQUISITION(20, "20", "药房请领单"),
+    /**
+     * 药房入库单
+     */
+    PURCHASE_STOCKIN(21,"21", "药房入库单" ),
+    /**
+     * 药房退库单
+     */
+    PURCHASE_RETURN(22,"22", "药房退库单"),
+    /**
+     * 发药单
+     */
+    DISPENSING_ORDER(23,"23", "发药单"),
+    /**
+     * 药房损益单
+     */
+    PURCHASE_PRPFITLOSS(24,"24", "药房损益单"),
+    /**
+     * 药房盘点单
+     */
+    PURCHASE_STOCKTAKING(25,"25", "药房盘点单"),
+    /**
+     * 药房调入单
+     */
+    PURCHASE_TRANSFERIN(26,"26", "药房调入单"),
+    /**
+     * 药房调出单
+     */
+    PURCHASE_TRANSFEROUT(27,"27", "药房调出单"),
+
+    /**
+     * 物资订货单
+     */
+    MATERIAL_PURCHASE(28, "28", "物资订货单"),
+
+    /**
+     * 物资进货单
+     */
+    MATERIAL_STOCKIN(29, "29", "物资进货单"),
+    /**
+     * 物资退货单
+     */
+    MATERIAL_RETURN(30, "30", "物资退货单"),
+    /**
+     * 物资出库单
+     */
+    MATERIAL_STOCKOUT(31, "31", "物资出库单"),
+    /**
+     * 物资退库单
+     */
+    MATERIAL_PRODUCT_RETURN(32, "32", "物资退库单"),
+    /**
+     * 物资损益单
+     */
+    MATERIAL_PRPFITLOSS(33, "33", "物资损益单"),
+
+    /**
+     * 物资盘点单
+     */
+    MATERIAL_STOCKTAKING(34, "34", "物资盘点单"),
+    /**
+     * 物资调入单
+     */
+    MATERIAL_TRANSFERIN(35,"35", "物资调入单"),
+    /**
+     * 物资调出单
+     */
+    MATERIAL_TRANSFEROUT(36,"36", "物资调出单"),
+
+    /**
+     * 科室请领单
+     */
+    DEPARTMENT_REQUISITION(37, "37", "科室请领单"),
+    /**
+     * 科室入库单
+     */
+    DEPARTMENT_STOCKIN(38,"38", "科室入库单" ),
+    /**
+     * 科室退库单
+     */
+    DEPARTMENT_RETURN(39,"39", "科室退库单"),
+    /**
+     * 科室损益单
+     */
+    DEPARTMENT_PRPFITLOSS(40,"40", "科室损益单"),
+    /**
+     * 科室盘点单
+     */
+    DEPARTMENT_STOCKTAKING(41,"41", "科室盘点单"),
+    /**
+     * 科室调入单
+     */
+    DEPARTMENT_TRANSFERIN(42,"42", "科室调入单"),
+    /**
+     * 科室调出单
+     */
+    DEPARTMENT_TRANSFEROUT(43,"43", "科室调出单"),
+
+    /**
+     * 自动盘点
+     */
+    AUTO_STOCKTAKING(44, "44", "自动盘点"),
+
+    /**
+     * 库存明细
+     */
+    INVENTORY_PRODUCT(44, "44", "库存明细");
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static SupplyType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (SupplyType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java
new file mode 100644
index 00000000..aefe9c07
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java
@@ -0,0 +1,31 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TraceNoStatus implements HisEnumInterface {
+
+    IN(1, "1", "进"),
+
+    OUT(2, "2", "出"),;
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static TraceNoStatus getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (TraceNoStatus val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/VerificationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/VerificationStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/VerificationStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/VerificationStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Whether.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Whether.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java
new file mode 100644
index 00000000..707748b5
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums.ybenums;
+
+import com.core.common.utils.StringUtils;
+import com.openhis.common.enums.HisEnumInterface;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 账户类型
+ *
+ * @author zwh
+ * @date 2025-03-14
+ */
+@Getter
+@AllArgsConstructor
+public enum PriorityType implements HisEnumInterface {
+
+    /**
+     * 特级
+     */
+    SPECIAL_GRADE(1, "01", "特级"),
+
+    /**
+     * 一级
+     */
+    ONE_GRADE(2, "02", "一级"),
+
+    /**
+     * 二级
+     */
+    TWO_GRADE(3, "03", "二级"),
+
+    /**
+     * 三级
+     */
+    THREE_GRADE(4, "04", "三级");
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static PriorityType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (PriorityType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+
+    public static PriorityType getByCode(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return null;
+        }
+        for (PriorityType val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
similarity index 71%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
index 0f22fcdd..84bb09ff 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
@@ -4,6 +4,7 @@
 package com.openhis.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
+import com.openhis.common.enums.HisEnumInterface;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -15,19 +16,20 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum YbDrordType {
+public enum YbDrordType implements HisEnumInterface {
 
     // 临时医嘱
-    TEMPORARY_ORDER(1, "临时医嘱"),
+    TEMPORARY_ORDER(1, "1","临时医嘱"),
 
     // 长期医嘱
-    STANDING_ORDER(2, "长期医嘱"),
+    STANDING_ORDER(2, "2","长期医嘱"),
 
     // 备用医嘱
-    STANDBY_ORDER(3, "备用医嘱");
+    STANDBY_ORDER(3, "3","备用医嘱");
 
     private Integer value;
-    private String description;
+    private String code;
+    private String info;
 
     public static YbDrordType getByValue(String value) {
         if (StringUtil.isEmpty(value)) {
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
similarity index 88%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
index b92b15e3..48ec7714 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
@@ -23,6 +23,14 @@ public enum YbDrugMedWay {
 
     INJECTION_DRUG("4", "注射给药"),
 
+    SUBCUTANEOUS_DRUG("401", "皮下注射"),
+
+    INTRACUTANEOUS_DRUG("402", "皮内注射"),
+
+    INTRAMUSCULAR_DRUG("403", "肌肉注射"),
+
+    INGECTION_DRUG("404", "静脉注射或静脉滴注"),
+
     INHALATION_DRUG("5", "吸入给药"),
 
     TOPICAL_DRUG("6", "局部用药"),
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java
new file mode 100644
index 00000000..f7ce0902
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java
@@ -0,0 +1,40 @@
+package com.openhis.common.enums.ybenums;
+
+import com.github.pagehelper.util.StringUtil;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 处理方式
+ *
+ * @author GuoRui
+ */
+@Getter
+@AllArgsConstructor
+public enum YbDspoWay {
+
+    /**
+     * 继续执行医嘱
+     */
+    CONTINUE("1", "继续执行医嘱"),
+    /**
+     * 返回修改医嘱
+     */
+    MODIFY("2", "返回修改医嘱");
+
+    private String value;
+    private String description;
+
+    public static YbDspoWay getByValue(String value) {
+        if (StringUtil.isEmpty(value)) {
+            return null;
+        }
+        for (YbDspoWay val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java
new file mode 100644
index 00000000..973957dc
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java
@@ -0,0 +1,47 @@
+package com.openhis.common.enums.ybenums;
+
+import com.github.pagehelper.util.StringUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 医保费用结算类型
+ *
+ * @author YourName
+ * @date 2025-04-22
+ */
+@Getter
+@AllArgsConstructor
+public enum YbHiFeesetlType {
+
+    /**
+     * 非医疗保险结算
+     */
+    CHIEF_PHYSICIAN("0", "非医疗保险结算"),
+
+    /**
+     * 本地医疗保险结算
+     */
+    ATTENDING_PHYSICIAN("1", "本地医疗保险结算"),
+
+    /**
+     * 异地医疗保险结算
+     */
+    DEPUTY_CHIEF_PHYSICIAN("2", "异地医疗保险结算");
+
+
+    private String code;
+    private String description;
+
+    public static YbHiFeesetlType getByValue(String code) {
+        if (StringUtil.isEmpty(code)) {
+            return null;
+        }
+        for (YbHiFeesetlType title : values()) {
+            if (title.getCode().equals(code)) {
+                return title;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
similarity index 50%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
index 18402426..6d910486 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
@@ -19,63 +19,64 @@ import lombok.Getter;
 public enum YbIptDiseTypeCode {
 
     // 出院诊断
-    DISCHARGE_DIAGNOSIS("1", "出院诊断"),
+    DISCHARGE_DIAGNOSIS(1,"1", "出院诊断"),
 
     // 入院诊断
-    ADMISSION_DIAGNOSIS("31", "入院诊断"),
+    ADMISSION_DIAGNOSIS(31,"31", "入院诊断"),
 
     // 并发症诊断
-    COMPLICATION_DIAGNOSIS("10", "并发症诊断"),
+    COMPLICATION_DIAGNOSIS(10,"10", "并发症诊断"),
 
     // 术前诊断
-    PREOPERATIVE_DIAGNOSIS("4", "术前诊断"),
+    PREOPERATIVE_DIAGNOSIS(4,"4", "术前诊断"),
 
     // 院内感染诊断
-    NOSOCOMIAL_INFECTION_DIAGNOSIS("11", "院内感染诊断"),
+    NOSOCOMIAL_INFECTION_DIAGNOSIS(11,"11", "院内感染诊断"),
 
     // 术后诊断
-    POSTOPERATIVE_DIAGNOSIS("5", "术后诊断"),
+    POSTOPERATIVE_DIAGNOSIS(5,"5", "术后诊断"),
 
     // 主要诊断
-    PRIMARY_DIAGNOSIS("12", "主要诊断"),
+    PRIMARY_DIAGNOSIS(12,"12", "主要诊断"),
 
     // 次要诊断
-    SECONDARY_DIAGNOSIS("13", "次要诊断"),
+    SECONDARY_DIAGNOSIS(13,"13", "次要诊断"),
 
     // 中医出院诊断病名
-    TCM_DISCHARGE_DIAGNOSIS_DISEASE_NAME("14", "中医出院诊断病名"),
+    TCM_DISCHARGE_DIAGNOSIS_DISEASE_NAME(14,"14", "中医出院诊断病名"),
 
     // 超声诊断
-    ULTRASOUND_DIAGNOSIS("8", "超声诊断"),
+    ULTRASOUND_DIAGNOSIS(8,"8", "超声诊断"),
 
     // 中医出院主病
-    TCM_DISCHARGE_PRIMARY_DISEASE("141", "中医出院主病"),
+    TCM_DISCHARGE_PRIMARY_DISEASE(141,"141", "中医出院主病"),
 
     // 中医出院主证
-    TCM_DISCHARGE_PRIMARY_SYNDROME("142", "中医出院主证"),
+    TCM_DISCHARGE_PRIMARY_SYNDROME(142,"142", "中医出院主证"),
 
     // 损伤、中毒的外部原因
-    EXTERNAL_CAUSE_OF_INJURY_OR_POISONING("98", "损伤、中毒的外部原因"),
+    EXTERNAL_CAUSE_OF_INJURY_OR_POISONING(98,"98", "损伤、中毒的外部原因"),
 
     // 门诊诊断
-    OUTPATIENT_DIAGNOSIS("2", "门诊诊断"),
+    OUTPATIENT_DIAGNOSIS(2,"2", "门诊诊断"),
 
     // 其他
-    OTHER("99", "其他"),
+    OTHER(99,"99", "其他"),
 
     // 入院初步诊断
-    ADMISSION_PRELIMINARY_DIAGNOSIS("3", "入院初步诊断"),
+    ADMISSION_PRELIMINARY_DIAGNOSIS(3,"3", "入院初步诊断"),
 
     // 尸检诊断
-    AUTOPSY_DIAGNOSIS("6", "尸检诊断"),
+    AUTOPSY_DIAGNOSIS(6,"6", "尸检诊断"),
 
     // 放射诊断
-    RADIOLOGICAL_DIAGNOSIS("7", "放射诊断"),
+    RADIOLOGICAL_DIAGNOSIS(7,"7", "放射诊断"),
 
     // 病理诊断
-    PATHOLOGICAL_DIAGNOSIS("9", "病理诊断");
+    PATHOLOGICAL_DIAGNOSIS(9,"9", "病理诊断");
 
-    private String value;
+    private Integer value;
+    private String code;
     private String description;
 
     public static YbIptDiseTypeCode getByValue(String value) {
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
similarity index 86%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
index efec2b14..d8497109 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
@@ -96,4 +96,16 @@ public enum YbMedChrgItmType {
         }
         return null;
     }
+
+    public static YbMedChrgItmType getByValue(String value) {
+        if (value == null) {
+            return null;
+        }
+        for (YbMedChrgItmType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
 }
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
similarity index 41%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
index 1e2505e7..832d15c5 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
@@ -18,64 +18,65 @@ import lombok.Getter;
 public enum YbMedType {
 
     // 异地住院
-    CROSS_PROVINCIAL_HOSPITALIZATION("25", "异地住院"),
+    CROSS_PROVINCIAL_HOSPITALIZATION("25", "异地住院",YbMedMdtrtType.INPATIENT_CARE),
     // 单病种住院
-    SINGLE_DISEASE_HOSPITALIZATION("26", "单病种住院"),
+    SINGLE_DISEASE_HOSPITALIZATION("26", "单病种住院",YbMedMdtrtType.INPATIENT_CARE),
     // 自主就医
-    SELF_MEDICATION("27", "自主就医"),
+    SELF_MEDICATION("27", "自主就医",YbMedMdtrtType.OTHER),
     // 意外伤害门诊
-    ACCIDENTAL_INJURY_OUTPATIENT("81", "意外伤害门诊"),
+    ACCIDENTAL_INJURY_OUTPATIENT("81", "意外伤害门诊",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 特药
-    SPECIAL_MEDICATION("15", "特药"),
+    SPECIAL_MEDICATION("15", "特药",YbMedMdtrtType.PHARMACY_PURCHASE),
     // 日间手术
-    DAY_SURGERY("28", "日间手术"),
+    DAY_SURGERY("28", "日间手术",YbMedMdtrtType.OTHER),
     // 照护保险
-    CARE_INSURANCE("61", "照护保险"),
+    CARE_INSURANCE("61", "照护保险",YbMedMdtrtType.OTHER),
     // 普通门诊
-    GENERAL_OUTPATIENT("11", "普通门诊"),
+    GENERAL_OUTPATIENT("11", "普通门诊",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 门诊挂号
-    OUTPATIENT_REGISTRATION("12", "门诊挂号"),
+    OUTPATIENT_REGISTRATION("12", "门诊挂号",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 急诊
-    EMERGENCY("13", "急诊"),
+    EMERGENCY("13", "急诊",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 门诊慢特病
-    CHRONIC_SPECIAL_DISEASE_OUTPATIENT("14", "门诊慢特病"),
+    CHRONIC_SPECIAL_DISEASE_OUTPATIENT("14", "门诊慢特病",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 门诊特检特治（限吉林市）
-    SPECIAL_EXAMINATION_TREATMENT_OUTPATIENT_JILIN("990404", "门诊特检特治（限吉林市）"),
+    SPECIAL_EXAMINATION_TREATMENT_OUTPATIENT_JILIN("990404", "门诊特检特治（限吉林市）",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 普通住院
-    GENERAL_HOSPITALIZATION("21", "普通住院"),
+    GENERAL_HOSPITALIZATION("21", "普通住院",YbMedMdtrtType.INPATIENT_CARE),
     // 外伤住院
-    TRAUMA_HOSPITALIZATION("22", "外伤住院"),
+    TRAUMA_HOSPITALIZATION("22", "外伤住院",YbMedMdtrtType.INPATIENT_CARE),
     // 转外诊治住院
-    EXTERNAL_TREATMENT_HOSPITALIZATION("23", "转外诊治住院"),
+    EXTERNAL_TREATMENT_HOSPITALIZATION("23", "转外诊治住院",YbMedMdtrtType.INPATIENT_CARE),
     // 急诊转住院
-    EMERGENCY_TO_HOSPITALIZATION("24", "急诊转住院"),
+    EMERGENCY_TO_HOSPITALIZATION("24", "急诊转住院",YbMedMdtrtType.INPATIENT_CARE),
     // 定点药店购药
-    DESIGNATED_PHARMACY_PURCHASE("41", "定点药店购药"),
+    DESIGNATED_PHARMACY_PURCHASE("41", "定点药店购药",YbMedMdtrtType.PHARMACY_PURCHASE),
     // 生育门诊
-    MATERNITY_OUTPATIENT("51", "生育门诊"),
+    MATERNITY_OUTPATIENT("51", "生育门诊",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 生育住院
-    MATERNITY_HOSPITALIZATION("52", "生育住院"),
+    MATERNITY_HOSPITALIZATION("52", "生育住院",YbMedMdtrtType.INPATIENT_CARE),
     // 生育新生儿费用
-    NEWBORN_MATERNITY_EXPENSES("5212", "生育新生儿费用"),
+    NEWBORN_MATERNITY_EXPENSES("5212", "生育新生儿费用",YbMedMdtrtType.OTHER),
     // 中医特色门诊
-    TRADITIONAL_CHINESE_MEDICINE_OUTPATIENT("16", "中医特色门诊"),
+    TRADITIONAL_CHINESE_MEDICINE_OUTPATIENT("16", "中医特色门诊",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 起付线治疗
-    DEDUCTIBLE_TREATMENT("29", "起付线治疗"),
+    DEDUCTIBLE_TREATMENT("29", "起付线治疗",YbMedMdtrtType.OTHER),
     // 体检
-    PHYSICAL_EXAMINATION("9107", "体检"),
+    PHYSICAL_EXAMINATION("9107", "体检",YbMedMdtrtType.OTHER),
     // 低自付住院
-    LOW_COPAY_HOSPITALIZATION("3101", "低自付住院"),
+    LOW_COPAY_HOSPITALIZATION("3101", "低自付住院",YbMedMdtrtType.INPATIENT_CARE),
     // 低自付门诊
-    LOW_COPAY_OUTPATIENT("3102", "低自付门诊"),
+    LOW_COPAY_OUTPATIENT("3102", "低自付门诊",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 门诊慢病
-    CHRONIC_DISEASE_OUTPATIENT("140104", "门诊慢病"),
+    CHRONIC_DISEASE_OUTPATIENT("140104", "门诊慢病",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 门诊特病
-    SPECIAL_DISEASE_OUTPATIENT("140201", "门诊特病"),
+    SPECIAL_DISEASE_OUTPATIENT("140201", "门诊特病",YbMedMdtrtType.OUTPATIENT_CLINIC),
     // 舒缓疗护住院
-    PALLIATIVE_CARE_HOSPITALIZATION("2114", "舒缓疗护住院");
+    PALLIATIVE_CARE_HOSPITALIZATION("2114", "舒缓疗护住院",YbMedMdtrtType.INPATIENT_CARE);
 
     private String value;
     private String description;
+    private YbMedMdtrtType ybMedMdtrtType;
 
     public static YbMedType getByValue(String value) {
         if (StringUtil.isEmpty(value)) {
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java
new file mode 100644
index 00000000..e65be1e4
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java
@@ -0,0 +1,76 @@
+package com.openhis.common.enums.ybenums;
+
+import com.github.pagehelper.util.StringUtil;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 医疗机构等级
+ *
+ * @author GuoRui
+ */
+@Getter
+@AllArgsConstructor
+public enum YbMedinsLv {
+
+    /**
+     * 三级特等
+     */
+    THIRD_SPECIAL("01", "三级特等"),
+    /**
+     * 三级甲等
+     */
+    THIRD_A("02", "三级甲等"),
+    /**
+     * 三级乙等
+     */
+    THIRD_B("03", "三级乙等"),
+    /**
+     * 三级丙等
+     */
+    THIRD_C("04", "三级丙等"),
+    /**
+     * 二级甲等
+     */
+    SECOND_A("05", "二级甲等"),
+    /**
+     * 二级乙等
+     */
+    SECOND_B("06", "二级乙等"),
+    /**
+     * 二级丙等
+     */
+    SECOND_C("07", "二级丙等"),
+    /**
+     * 一级甲等
+     */
+    FIRST_A("08", "一级甲等"),
+    /**
+     * 一级乙等
+     */
+    FIRST_B("09", "一级乙等"),
+    /**
+     * 一级丙等
+     */
+    FIRST_C("10", "一级丙等"),
+    /**
+     * 无等级
+     */
+    NO_LEVEL("11", "无等级");
+
+    private String value;
+    private String description;
+
+    public static YbMedinsLv getByValue(String value) {
+        if (StringUtil.isEmpty(value)) {
+            return null;
+        }
+        for (YbMedinsLv val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
similarity index 98%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
index 323b4c43..98b7762d 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
@@ -172,6 +172,8 @@ public enum YbPayment {
     FINANCIAL_FUND(360100, 2,YB_FUND_PAY,"财政基金"),
     HOSPITAL_ADVANCE(999900,2,YB_FUND_PAY, "医院垫付"),
     SUPPLEMENTARY_INSURANCE(390300,2,YB_FUND_PAY, "城乡居民大病补充保险基金"),
+    BASIC_MEDICAL_INSURANCE_FOR_URBAN_EMPLOYEES(310201,2,YB_FUND_PAY, "城镇职工基本医疗保险个人账户基金"),
+    E_WALLET(9999981,2,YB_FUND_PAY, "电子钱包"),
     HEALTHCARE_PREPAYMENT(360300, 2,YB_FUND_PAY,"保健预支基金");
 //
 //
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java
new file mode 100644
index 00000000..b765afa8
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java
@@ -0,0 +1,72 @@
+package com.openhis.common.enums.ybenums;
+
+import com.github.pagehelper.util.StringUtil;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 触发场景
+ *
+ * @author GuoRui
+ */
+@Getter
+@AllArgsConstructor
+public enum YbTrigScen {
+
+    /**
+     * 门诊挂号
+     */
+    OUTPATIENT_REGISTRATION("1", "门诊挂号"),
+    /**
+     * 门诊收费登记
+     */
+    OUTPATIENT_CHARGE_REGISTRATION("2", "门诊收费登记"),
+    /**
+     * 住院登记
+     */
+    HOSPITALIZATION_REGISTRATION("3", "住院登记"),
+    /**
+     * 住院收费登记
+     */
+    HOSPITALIZATION_CHARGE_REGISTRATION("4", "住院收费登记"),
+    /**
+     * 住院执行医嘱
+     */
+    HOSPITALIZATION_ORDER_EXECUTION("5", "住院执行医嘱"),
+    /**
+     * 门诊结算
+     */
+    OUTPATIENT_SETTLEMENT("6", "门诊结算"),
+    /**
+     * 门诊预结算
+     */
+    OUTPATIENT_PRE_SETTLEMENT("7", "门诊预结算"),
+    /**
+     * 住院结算
+     */
+    HOSPITALIZATION_SETTLEMENT("8", "住院结算"),
+    /**
+     * 住院预结算
+     */
+    HOSPITALIZATION_PRE_SETTLEMENT("9", "住院预结算"),
+    /**
+     * 药店划卡
+     */
+    PHARMACY_CARD("10", "药店划卡");
+
+    private String value;
+    private String description;
+
+    public static YbTrigScen getByValue(String value) {
+        if (StringUtil.isEmpty(value)) {
+            return null;
+        }
+        for (YbTrigScen val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
similarity index 42%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
index d8f1926c..665cebef 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
@@ -20,45 +20,45 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum YbUsedFrqu {
 
-    DAILY_ONCE("11", "每天一次 (qd)"),
+    DAILY_ONCE("11", "每天1次 (qd)"),
 
-    DAILY_TWICE("12", "每天二次 (bid)"),
+    DAILY_TWICE("12", "每天2次 (bid)"),
 
-    DAILY_THRICE("13", "每天三次 (tid)"),
+    DAILY_THRICE("13", "每天3次 (tid)"),
 
-    DAILY_FOUR_TIMES("14", "每天四次 (qid)"),
+    DAILY_FOUR_TIMES("14", "每天4次 (qid)"),
 
-    WEEKLY_ONCE("21", "每周一次 (qw)"),
+    WEEKLY_ONCE("21", "每周1次 (qw)"),
 
-    WEEKLY_TWICE("22", "每周二次 (biw)"),
+    WEEKLY_TWICE("22", "每周2次 (biw)"),
 
-    WEEKLY_THRICE("23", "每周三次 (tiw)"),
+    WEEKLY_THRICE("23", "每周3次 (tiw)"),
 
-    EVERY_TWO_WEEKS("24", "每两周一次 (q2w)"),
+    EVERY_TWO_WEEKS("24", "每2周1次 (q2w)"),
 
-    EVERY_HOUR("31", "每小时一次 (qh)"),
+    EVERY_HOUR("31", "每小时1次 (qh)"),
 
-    EVERY_TWO_HOURS("32", "每2小时一次 (q2h)"),
+    EVERY_TWO_HOURS("32", "每2小时1次 (q2h)"),
 
-    EVERY_FOUR_HOURS("33", "每4小时一次 (q4h)"),
+    EVERY_FOUR_HOURS("33", "每4小时1次 (q4h)"),
 
-    EVERY_FIVE_HOURS("34", "每5小时一次 (q5h)"),
+    EVERY_FIVE_HOURS("34", "每5小时1次 (q5h)"),
 
-    EVERY_SIX_HOURS("35", "每6小时一次 (q6h)"),
+    EVERY_SIX_HOURS("35", "每6小时1次 (q6h)"),
 
-    EVERY_EIGHT_HOURS("36", "每8小时一次 (q8h)"),
+    EVERY_EIGHT_HOURS("36", "每8小时1次 (q8h)"),
 
-    EVERY_TWELVE_HOURS("37", "每12小时一次 (q12h)"),
+    EVERY_TWELVE_HOURS("37", "每12小时1次 (q12h)"),
 
-    EVERY_NIGHT("41", "每晚一次 (qn)"),
+    EVERY_NIGHT("41", "每晚1次 (qn)"),
 
-    EVERY_OTHER_DAY("42", "隔天一次 (qod)"),
+    EVERY_OTHER_DAY("42", "隔天1次 (qod)"),
 
-    EVERY_FIVE_DAYS("43", "五天一次 (q5d)"),
+    EVERY_FIVE_DAYS("43", "5天1次 (q5d)"),
 
-    EVERY_TEN_DAYS("44", "十天一次 (q10d)"),
+    EVERY_TEN_DAYS("44", "10天1次 (q10d)"),
 
-    EVERY_THREE_DAYS("45", "隔三日一次 (q3d)"),
+    EVERY_THREE_DAYS("45", "隔3日1次 (q3d)"),
 
     TWELVE_HOUR_MAINTAIN("51", "12小时维持"),
 
@@ -68,15 +68,15 @@ public enum YbUsedFrqu {
 
     WHEN_NEEDED("62", "必要时使用 (prn)"),
 
-    ONCE("63", "一次 (once)"),
+    ONCE("63", "1次 (once)"),
 
-    MONTHLY_ONCE("71", "每月一次 (qm)"),
+    MONTHLY_ONCE("71", "每月1次 (qm)"),
 
-    MONTHLY_TWICE("72", "每月两次 (bim)"),
+    MONTHLY_TWICE("72", "每月2次 (bim)"),
 
-    EVERY_THREE_MONTHS("73", "每三个月一次 (q3m)"),
+    EVERY_THREE_MONTHS("73", "每3个月1次 (q3m)"),
 
-    EVERY_SIX_MONTHS("74", "每六个月一次 (q6m)");
+    EVERY_SIX_MONTHS("74", "每6个月1次 (q6m)");
 
     private String value;
     private String description;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java
new file mode 100644
index 00000000..e6718269
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java
@@ -0,0 +1,40 @@
+package com.openhis.common.enums.ybenums;
+
+import com.github.pagehelper.util.StringUtil;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 反馈类型
+ *
+ * @author GuoRui
+ */
+@Getter
+@AllArgsConstructor
+public enum YbWarnType {
+
+    /**
+     * 事前
+     */
+    PRE("1", "事前"),
+    /**
+     * 事中
+     */
+    MID("2", "事中");
+
+    private String value;
+    private String description;
+
+    public static YbWarnType getByValue(String value) {
+        if (StringUtil.isEmpty(value)) {
+            return null;
+        }
+        for (YbWarnType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java
similarity index 100%
rename from openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java
rename to openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java
new file mode 100644
index 00000000..c9cc729a
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.utils;
+
+import com.openhis.common.constant.CommonConstants;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * 身份证号生成工具类
+ *
+ * @author zwh
+ * @date 2025-07-24
+ */
+public class IdCardUtil {
+
+    // 权重因子（用于计算校验码）
+    private static final int[] WEIGHT_FACTORS = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2};
+    // 校验码对应表
+    private static final char[] CHECK_CODES = {'1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'};
+
+    /**
+     * 根据年龄生成类似身份证的唯一编码 格式：6位地区码 + 8位出生日期 + 3位随机码 + 1位校验码
+     *
+     * @param age 年龄（整数）
+     * @return 18位身份证号
+     */
+    public static String generateIdByAge(int age) {
+        // 1. 生成出生日期（确保当前年龄计算准确）
+        LocalDate today = LocalDate.now();
+        // 最大出生日期（今天减去年龄年）
+        LocalDate maxBirthDate = today.minusYears(age);
+        // 最小出生日期（最大日期减1年加1天，确保年龄计算准确）
+        LocalDate minBirthDate = maxBirthDate.minusYears(1).plusDays(1);
+
+        // 生成介于最小和最大日期之间的随机日期
+        long minDay = minBirthDate.toEpochDay();
+        long maxDay = maxBirthDate.toEpochDay();
+        long randomDay = ThreadLocalRandom.current().nextLong(minDay, maxDay + 1);
+
+        String birthDateStr = LocalDate.ofEpochDay(randomDay).format(DateTimeFormatter.BASIC_ISO_DATE); // yyyyMMdd
+
+        // 2. 生成3位随机码（001-999）
+        String randomCode = String.format("%03d", ThreadLocalRandom.current().nextInt(1, 1000));
+
+        // 3. 组合前17位
+        String partialId = CommonConstants.Common.AREA_CODE + birthDateStr + randomCode;
+
+        // 4. 计算校验码
+        int sum = 0;
+        for (int i = 0; i < partialId.length(); i++) {
+            int digit = Character.getNumericValue(partialId.charAt(i));
+            sum += digit * WEIGHT_FACTORS[i];
+        }
+        char checksum = CHECK_CODES[sum % 11];
+        return partialId + checksum;
+    }
+
+    /**
+     * 从身份证号提取生日日期
+     *
+     * @param idCard 身份证号码（15位或18位）
+     * @return 格式化后的生日日期字符串，格式为"yyyy-MM-dd HH:mm:ss.SSS Z"
+     * @throws IllegalArgumentException 如果身份证号格式无效
+     */
+    public static Date extractBirthdayFromIdCard(String idCard) {
+        // 验证身份证号长度
+        if (idCard == null || (idCard.length() != 15 && idCard.length() != 18)) {
+            throw new IllegalArgumentException("身份证号码长度无效，必须是15位或18位");
+        }
+        String birthdayStr;
+        // 处理15位身份证号（7-12位是生日，年份只有后两位）
+        if (idCard.length() == 15) {
+            // 15位身份证：年份前加"19"，月份和日期直接取
+            birthdayStr = "19" + idCard.substring(6, 8) + idCard.substring(8, 12);
+        }
+        // 处理18位身份证号（7-14位是完整生日）
+        else {
+            birthdayStr = idCard.substring(6, 14);
+        }
+        // 验证生日字符串是否全为数字
+        if (!birthdayStr.matches("\\d{8}")) {
+            throw new IllegalArgumentException("身份证号码中的生日部分无效");
+        }
+        // 解析生日日期
+        SimpleDateFormat inputFormat = new SimpleDateFormat("yyyyMMdd");
+        inputFormat.setLenient(false); // 严格模式，防止无效日期如2月30日
+        try {
+            // 解析为Date对象
+            return inputFormat.parse(birthdayStr);
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("无法解析生日日期: " + e.getMessage());
+        }
+    }
+}
diff --git a/openhis-server/openhis-domain/pom.xml b/openhis-server-new/openhis-domain/pom.xml
similarity index 100%
rename from openhis-server/openhis-domain/pom.xml
rename to openhis-server-new/openhis-domain/pom.xml
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java
new file mode 100644
index 00000000..15891be3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java
@@ -0,0 +1,46 @@
+package com.openhis.administration.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 身体部位管理Entity实体
+ *
+ * @author liuhr
+ * @date 2025-07-22
+ */
+@Data
+@TableName("adm_body_structure")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class BodyStructure extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 部位名称 */
+    private String name;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
similarity index 97%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
index 31f94fbf..899bbc97 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
@@ -147,4 +147,9 @@ public class ChargeItem extends HisBaseEntity {
      */
     private Long encounterDiagnosisId;
 
+    /**
+     * 中医标识
+     */
+    private Integer tcmFlag;
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
similarity index 90%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
index 6b4f86ef..21b59a55 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
@@ -53,6 +53,12 @@ public class DeviceDefinition extends HisBaseEntity {
     /** 包装规格 */
     private String size;
 
+    /** 最小库存警戒数量(常规单位) */
+    private BigDecimal itemMinQuantity;
+
+    /** 最大库存警戒数量(常规单位) */
+    private BigDecimal itemMaxQuantity;
+
     /** 拆零比 */
     private BigDecimal partPercent;
 
@@ -83,6 +89,9 @@ public class DeviceDefinition extends HisBaseEntity {
     /** 医保编码 */
     private String ybNo;
 
+    /** 医药机构目录编码 */
+    private String ybOrgNo;
+
     /** 医保对码标记 */
     private Integer ybMatchFlag;
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
similarity index 91%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
index e4dfc8fb..a66e065e 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
@@ -130,4 +130,19 @@ public class Encounter extends HisBaseEntity {
      */
     private String inWayCode;
 
+    /**
+     * 出院方式
+     */
+    private String outWayCode;
+
+    /**
+     * 门诊就诊id
+     */
+    private Long ambEncounterId;
+
+    /**
+     * 登记员id
+     */
+    private Long registrarId;
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
similarity index 95%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
index 458cbe33..72a3a796 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
@@ -62,4 +62,9 @@ public class EncounterDiagnosis extends HisBaseEntity {
      */
     private Integer tcmFlag;
 
+    /**
+     * 诊断描述
+     */
+    private String diagnosisDesc;
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
similarity index 95%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
index d7c223fa..61d4614f 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
@@ -43,5 +43,6 @@ public class EncounterParticipant extends HisBaseEntity {
     /** 参与者ID */
     private Long practitionerId;
 
-
+    /** 状态 */
+    private Long statusEnum;
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java
new file mode 100644
index 00000000..1d6396d1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java
@@ -0,0 +1,109 @@
+package com.openhis.administration.domain
+        ;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 频次配置表，用于频次、周期和相关信息
+ * @TableName adm_frequency
+ */
+@Data
+@TableName(value ="adm_frequency")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Frequency extends HisBaseEntity {
+    /**
+     * 唯一标识符
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 频次代码，唯一标识与字典表对应
+     */
+    private String rateCode;
+
+    /**
+     * 频次名称
+     */
+    private String name;
+
+    /**
+     * 每天执行的次数
+     */
+    private Integer dayCount;
+
+    /**
+     * 每次执行之间的间隔（天数）
+     */
+    private Integer dayInterval;
+
+    /**
+     * 每天的具体执行时间点，逗号分隔
+     */
+    private String dayTimes;
+
+    /**
+     * 是否周期性每周执行，0 为否，1 为是
+     */
+    private Integer weekCycleFlag;
+
+    /**
+     * 每周执行的间隔，单位为周
+     */
+    private Integer weekInterval;
+
+    /**
+     * 每周执行的次数
+     */
+    private Integer weekTimes;
+
+    /**
+     * 是否为连续执行，0 为否，1 为是
+     */
+    private Integer continueFlag;
+
+    /**
+     * 执行总次数，记录任务累计执行次数
+     */
+    private Integer totalExecutionCount;
+
+    /**
+     * 任务执行周期长度
+     */
+    private Integer executionPeriod;
+
+    /**
+     * 任务执行周期的单位，如 day、week、month
+     */
+    private String executionPeriodUnit;
+
+    /**
+     * 第三方代码，外部系统使用
+     */
+    private String thirdCode;
+
+    /**
+     * 备注信息
+     */
+    private String memo;
+
+    /**
+     * 并发戳，用于版本控制和并发冲突检测
+     */
+    private Integer concurrencyStamp;
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
similarity index 92%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
index c79916d5..3a114ddb 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.enums.LocationMode;
 import com.openhis.common.enums.LocationOperational;
 import com.openhis.common.enums.LocationStatus;
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
similarity index 86%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
index f2d0d2ca..e14e7970 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
@@ -9,6 +9,10 @@ import com.core.common.core.domain.HisBaseEntity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.ActPriority;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.SupplyCategory;
+import com.openhis.common.enums.SupplyStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,6 +58,11 @@ public class Patient extends HisBaseEntity {
     /** 死亡时间 */
     private Date deceasedDate;
 
+    /**
+     * 死亡原因
+     */
+    private String deceasedReason;
+
     /** 婚姻状态 */
     private Integer maritalStatusEnum;
 
@@ -123,4 +132,9 @@ public class Patient extends HisBaseEntity {
     /** 机构Id */
     private Long organizationId;
 
+    public Patient() {
+        // 活动标识：启用
+        this.activeFlag = PublicationStatus.ACTIVE.getValue();
+    }
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
similarity index 97%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
index 65610249..e562f15d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
@@ -1,13 +1,12 @@
 package com.openhis.administration.domain;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -46,5 +45,4 @@ public class PatientIdentifier extends HisBaseEntity {
     /** 有效时间end */
     private Date endTime;
 
-
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
similarity index 86%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
index 1b5b6025..13b1eef4 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,6 +37,7 @@ public class PractitionerRole extends HisBaseEntity {
     private Integer activeFlag;
 
     /** 参与者Id */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long practitionerId;
 
     /** 机构 */
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java
new file mode 100644
index 00000000..cf8075f1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java
@@ -0,0 +1,61 @@
+package com.openhis.administration.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【追溯码管理】Entity实体
+ *
+ * @author system
+ * @date 2025-07-07
+ */
+@Data
+@TableName("adm_trace_no_manage")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class TraceNoManage extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 项目所属表 */
+    private String itemTable;
+
+    /** 项目id */
+    private Long itemId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+
+    /** 仓库 */
+    private Long locationId;
+
+    /** 仓位 */
+    private Long locationStoreId;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码状态 */
+    private Integer statusEnum;
+
+    /** 追溯码单位 */
+    private String unitCode;
+
+    /** 操作类型 */
+    private Integer operationType;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
new file mode 100644
index 00000000..f9667267
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
@@ -0,0 +1,72 @@
+package com.openhis.administration.dto;
+
+import com.openhis.administration.domain.ChargeItem;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class ChargeItemBaseInfoDto extends ChargeItem {
+
+    /** 药品编号 */
+    private String baseBusNo;
+
+    /** 药品名称 */
+    private String name;
+
+    /** 药品分类 */
+    private String categoryCode;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 医保编码 */
+    private String ybNo;
+
+    /** 儿童用药标志 */
+    private Integer childrenFlag;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 处方标志 */
+    private Integer rxFlag;
+
+    /** 药品请求编码 */
+    private String requestBusNo;
+
+    /** 处方号 */
+    private String prescriptionNo;
+
+    /** 分组id */
+    private Long groupId;
+
+    /** 类别医保编码 */
+    private Integer ybClassEnum;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 代煎标识 | 0:否 , 1:是 */
+    private Integer sufferingFlag;
+
+    /** 中医标识 */
+    private Integer tcmFlag;
+
+    /** 开单科室名称 */
+    private String deptName;
+
+    /** 开单科室医保码 */
+    private String deptYbNo;
+
+    /** 开单医生名称 */
+    private String doctName;
+
+    /** 开单科室医保码 */
+    private String doctYbNo;
+
+    /** 自费还是医保收费  */
+    private String contractNo;
+
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java
new file mode 100644
index 00000000..b00fddb6
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.administration.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.openhis.administration.domain.ChargeItem;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * chargeItem 关联def的信息
+ *
+ * @author SunJQ
+ * @date 2025-08-07
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Accessors(chain = true)
+public class ChargeItemDefInfo extends ChargeItem {
+
+    /** 名称 */
+    private String chargeName;
+
+    /** 标题 */
+    private String title;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 机构ID */
+    private Long orgId;
+
+    /** 描述 */
+    private String description;
+
+    /** 代码 */
+    private String instanceTable;
+
+    /** 关联项目 */
+    private Long instanceId;
+
+    /** 有效时间开始 */
+    private Date effectiveStart;
+
+    /** 有效时间结束 */
+    private Date effectiveEnd;
+
+    /** 财务类别 */
+    private String typeCode;
+
+    /** 医保类别 */
+    private String ybType;
+
+    /** 是否使用详细价格规则 */
+    private Integer conditionFlag;
+
+    /** 基础价格 */
+    private BigDecimal price;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java
new file mode 100644
index 00000000..5114758f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.administration.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 挂号和账户的集合实体
+ *
+ * @author SunJQ
+ * @date 2025-08-04
+ */
+@Data
+@Accessors(chain = true)
+public class EncounterAccountDto {
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 结账状态枚举 */
+    private Integer billingStatusEnum;
+
+    // 2025.04.10 经确认此处原有的【1 CASH 个人现金账户 | 2 医保账户】改为【01医保电子凭证 | 02 居民身份证 | 03 社会保障卡 | 04 个人现金账户】
+    /** 账户类型编码 */
+    private String typeCode;
+
+    /** 编码 */
+    private String no;
+
+    /** 名称 */
+    private String name;
+
+    /** 患者id */
+    private Long patientId;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 账户余额 */
+    private BigDecimal balanceAmount;
+
+    /** 医保区域编码 */
+    private String ybAreaNo;
+
+    /** 合同编码 */
+    private String contractNo;
+
+    /** 欠费限制额度 */
+    private BigDecimal limitAccount;
+
+    /** 是否为就诊登记使用 */
+    private Integer encounterFlag;
+
+    /**
+     * 群组ID
+     */
+    private Long groupId;
+
+    /**
+     * 就诊编码
+     */
+    private String busNo;
+
+    /**
+     * 类别编码
+     */
+    private Integer classEnum;
+
+    /**
+     * 类别医保编码
+     */
+    private Integer ybClassEnum;
+
+    /**
+     * 类别医保文本
+     */
+    private String ybClassText;
+
+    /**
+     * 类别编码补充
+     */
+    private String classJson;
+
+    /**
+     * 优先级编码
+     */
+    private Integer priorityEnum;
+
+    /**
+     * 分类编码
+     */
+    private Integer typeEnum;
+
+    /**
+     * 服务ID
+     */
+    private Long serviceTypeId;
+
+    /**
+     * 就诊对象状态
+     */
+    private Integer subjectStatusEnum;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 接诊时间
+     */
+    private Date receptionTime;
+
+    /**
+     * 机构id
+     */
+    private Long organizationId;
+
+    /**
+     * 就诊序号
+     */
+    private Integer displayOrder;
+
+    /**
+     * 初复诊
+     */
+    private Integer firstEnum;
+
+    /**
+     * 入院类型
+     */
+    private String admitSourceCode;
+
+    /**
+     * 入院方式
+     */
+    private String inWayCode;
+
+    /**
+     * 门诊就诊id
+     */
+    private Long ambEncounterId;
+
+    /**
+     * 登记员id
+     */
+    private Long registrarId;
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java
similarity index 46%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java
index 3b0a16c0..14da365b 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java
@@ -3,15 +3,15 @@ package com.openhis.administration.mapper;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.domain.BodyStructure;
 
 /**
- * 就诊管理Mapper接口
+ * 身体部位管理Mapper接口
  *
- * @author system
- * @date 2025-02-20
+ * @author liuhr
+ * @date 2025-07-22
  */
 @Repository
-public interface EncounterMapper extends BaseMapper<Encounter> {
+public interface BodyStructureMapper extends BaseMapper<BodyStructure> {
 
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
new file mode 100644
index 00000000..00111913
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
@@ -0,0 +1,37 @@
+package com.openhis.administration.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.dto.ChargeItemBaseInfoDto;
+import com.openhis.administration.dto.ChargeItemDefInfo;
+
+/**
+ * 费用项管理Mapper接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Repository
+public interface ChargeItemMapper extends BaseMapper<ChargeItem> {
+
+    /**
+     * 根据收费项的ID查找基础信息
+     * 
+     * @param chargeItemIds
+     * @return
+     */
+    List<ChargeItemBaseInfoDto> getChargeItemBaseInfoByIds(@Param("chargeItemIds") List<Long> chargeItemIds);
+
+    /**
+     * 收费项关联Def项目集合
+     *
+     * @param chargeItemIds 集合
+     * @return 集合
+     */
+    List<ChargeItemDefInfo> getChargeItemDefInfoByIds(@Param("chargeItemIds") List<Long> chargeItemIds);
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
new file mode 100644
index 00000000..061911fb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
@@ -0,0 +1,31 @@
+package com.openhis.administration.mapper;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.dto.EncounterAccountDto;
+
+/**
+ * 就诊管理Mapper接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Repository
+public interface EncounterMapper extends BaseMapper<Encounter> {
+
+    /**
+     * 查询挂号信息
+     *
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 集合
+     */
+    List<EncounterAccountDto> getEncounterInfoByTime(@Param("startDate") Date startDate,
+        @Param("endDate") Date endDate);
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java
new file mode 100644
index 00000000..5c75152d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java
@@ -0,0 +1,17 @@
+package com.openhis.administration.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.Frequency;
+
+/**
+* @author 47826
+* @description 针对表【adm_frequency(频次配置表，用于频次、周期和相关信息)】的数据库操作Mapper
+* @createDate 2025-08-21 14:22:11
+* @Entity com/openhis/administration.domain.Frequency
+*/
+public interface FrequencyMapper extends BaseMapper<Frequency> {
+
+}
+
+
+
+
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java
new file mode 100644
index 00000000..f091bf79
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java
@@ -0,0 +1,31 @@
+package com.openhis.administration.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.TraceNoManage;
+
+/**
+ * 【追溯码管理】Mapper接口
+ *
+ * @author system
+ * @date 2025-07-07
+ */
+@Repository
+public interface TraceNoManageMapper extends BaseMapper<TraceNoManage> {
+
+    /**
+     * 查询追溯码信息
+     *
+     * @param itemTable 表名
+     * @param itemId 项目id
+     * @param locationId 药房id
+     * @param lotNumber 批号
+     * @return
+     */
+    List<TraceNoManage> getItemTraceNoInfo(@Param("itemTable") String itemTable, @Param("itemId") Long itemId,
+        @Param("locationId") Long locationId, @Param("lotNumber") String lotNumber);
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
similarity index 60%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
index f8443f2c..985e89d1 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
@@ -1,5 +1,7 @@
 package com.openhis.administration.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Account;
 
@@ -49,4 +51,37 @@ public interface IAccountService extends IService<Account> {
      * @return 是否成功
      */
     boolean isSelfPay(Account account);
+
+    /**
+     * 查找挂号时使用的账户
+     * 
+     * @param encounterId 就诊id
+     * @return 账户实体
+     */
+    Account getAccountByEncounterFlag(Long encounterId);
+
+    /**
+     * 查找挂号时使用的账户
+     * 
+     * @param encounterId 就诊id
+     * @return 账户实体
+     */
+    Account getYbAccount(Long encounterId);
+
+    /**
+     * 查找挂号时使用的账户
+     *
+     * @param encounterId 就诊id
+     * @return 账户实体
+     */
+    Account getSelfAccount(Long encounterId);
+
+    /**
+     * 查询就诊的所有账户
+     * 
+     * @param encounterId 就诊id
+     * @return 账户集合
+     */
+    List<Account> getAccountListByEncounter(Long encounterId);
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java
new file mode 100644
index 00000000..b83ae979
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java
@@ -0,0 +1,39 @@
+package com.openhis.administration.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.BodyStructure;
+import com.openhis.administration.domain.Organization;
+
+/**
+ * 身体部位管理Service接口
+ *
+ * @author liuhr
+ * @date 2025-07-22
+ */
+public interface IBodyStructureService extends IService<BodyStructure> {
+
+    /**
+     * 身体部位启用
+     *
+     * @param id 身体部位id
+     * @return 操作结果
+     */
+    boolean activeBodyStructure(Long id);
+
+    /**
+     * 身体部位停用
+     *
+     * @param id 身体部位id
+     * @return 操作结果
+     */
+    boolean inactiveBodyStructure(Long id);
+
+    /**
+     * 获取身体部位下拉列表
+     *
+     * @return 机构下拉列表
+     */
+    List<BodyStructure> getList();
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
similarity index 77%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
index 6f9fbcc9..4da661b9 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.dto.ChargeItemBaseInfoDto;
+import com.openhis.administration.dto.ChargeItemDefInfo;
 
 /**
  * 费用项管理Service接口
@@ -53,6 +55,7 @@ public interface IChargeItemService extends IService<ChargeItem> {
 
     /**
      * 根据集合更改收费状态
+     * 
      * @param chargeItemIdList 实体集合
      * @param value 状态值
      */
@@ -60,10 +63,11 @@ public interface IChargeItemService extends IService<ChargeItem> {
 
     /**
      * 根据表名和id删除费用项
+     * 
      * @param tableName 表名
      * @param serviceId id
      */
-    void deleteByServiceTableAndId(String tableName,Long serviceId);
+    void deleteByServiceTableAndId(String tableName, Long serviceId);
 
     /**
      * 根据就诊id查询患者因退费重新生成的账单
@@ -80,4 +84,21 @@ public interface IChargeItemService extends IService<ChargeItem> {
      * @return 收费项目信息
      */
     List<ChargeItem> getChargeItemInfoByReqId(List<Long> requestIdList);
+
+    /**
+     * 收费项基础信息集合
+     * 
+     * @param collect 集合
+     * @return 集合
+     */
+    List<ChargeItemBaseInfoDto> getChargeItemBaseInfoByIds(List<Long> collect);
+
+    /**
+     * 收费项关联Def项目集合
+     * 
+     * @param chargeItemIds 集合
+     * @return 集合
+     */
+    List<ChargeItemDefInfo> getChargeItemDefInfoByIds(List<Long> chargeItemIds);
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
similarity index 57%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
index 177d4399..77233c22 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
@@ -2,6 +2,7 @@ package com.openhis.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.EncounterDiagnosis;
+import com.openhis.common.enums.ybenums.YbIptDiseTypeCode;
 
 import java.util.List;
 
@@ -29,23 +30,42 @@ public interface IEncounterDiagnosisService extends IService<EncounterDiagnosis>
 
     /**
      * 查询 med_type 类型
-     * @param encounterId
-     * @return
+     * 
+     * @param encounterId 就诊id
+     * @return 诊断集合
      */
     List<String> getMetTypeList(Long encounterId);
 
     /**
      * 查询 EncounterDiagnosis
-     * @param encounterId
-     * @return
+     * 
+     * @param encounterId 就诊id
+     * @return 诊断集合
      */
     List<EncounterDiagnosis> getDiagnosisList(Long encounterId);
 
     /**
      * 查询 EncounterDiagnosis
-     * @param diaIdList
-     * @return
+     * 
+     * @param encounterId 就诊id
+     * @param ybIptDiseTypeCode 诊断类型
+     * @return 诊断集合
+     */
+    List<EncounterDiagnosis> getDiagnosisList(Long encounterId, YbIptDiseTypeCode ybIptDiseTypeCode);
+
+    /**
+     * 查询 EncounterDiagnosis
+     * 
+     * @param diaIdList 诊断主键id
+     * @return 诊断集合
      */
     List<EncounterDiagnosis> getDiagnosisList(List<Long> diaIdList);
 
+    /**
+     * 在诊断中筛选主诊断
+     * 
+     * @param list 诊断集合
+     * @return 主诊断
+     */
+    EncounterDiagnosis getMainDiagnosis(List<EncounterDiagnosis> list);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
new file mode 100644
index 00000000..c4555e19
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
@@ -0,0 +1,80 @@
+package com.openhis.administration.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.EncounterLocation;
+import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.LocationForm;
+
+/**
+ * 就诊位置管理Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IEncounterLocationService extends IService<EncounterLocation> {
+
+    /**
+     * 保存住院位置信息
+     * 
+     * @param encounterLocation 住院位置信息
+     */
+    void saveEncounterLocation(EncounterLocation encounterLocation);
+
+    /**
+     * 自定义插入或更新方法,根据就诊id，病区,判断是更新还是插入
+     * 
+     * @param encounterLocation 实体对象
+     * @return 是否成功
+     */
+    boolean saveOrUpdateEncounterLocation(EncounterLocation encounterLocation);
+
+    /**
+     * 创建住院位置
+     *
+     * @param encounterId 住院id
+     * @param startTime 开始时间
+     * @param locationId 位置id
+     * @param locationForm 位置类型
+     */
+    void creatEncounterLocation(Long encounterId, Date startTime, Long locationId, Integer locationForm);
+
+    /**
+     * 查询住院患者床位相关信息
+     *
+     * @param encounterId 住院id
+     * @return 床位相关信息
+     */
+    List<EncounterLocation> getEncounterLocationInfo(Long encounterId,Long locationId);
+
+    /**
+     * 更新位置使用状态
+     * 
+     * @param encounterId 住院id
+     * @param isTransfer 是否专科
+     * @return 更新结果
+     */
+    Integer updateEncounterLocationStatus(Long encounterId, boolean isTransfer);
+
+    /*
+     * 根据就诊id查询就诊位置信息
+     *
+     * @param encounterId 就诊id
+     * @return 就诊位置集合
+     */
+    List<EncounterLocation> getEncounterLocationList(Long encounterId);
+
+    /**
+     * 根据就诊id查询就诊位置信息(某个类型)(某个状态)
+     * 
+     * @param locationForm 类型
+     * @param encounterLocationStatus 状态
+     * @param encounterId 就诊id
+     * @return 就诊位置集合
+     */
+    List<EncounterLocation> getEncounterLocationList(Long encounterId, LocationForm locationForm,
+        EncounterLocationStatus encounterLocationStatus);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
new file mode 100644
index 00000000..49fbfaa1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
@@ -0,0 +1,58 @@
+package com.openhis.administration.service;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.EncounterParticipant;
+import com.openhis.common.enums.ParticipantType;
+
+import java.util.List;
+
+/**
+ * 就诊参与者管理Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IEncounterParticipantService extends IService<EncounterParticipant> {
+
+    /**
+     * 保存就诊参与者
+     * 
+     * @param encounterParticipant 就诊参与者信息
+     */
+    void saveEncounterParticipant(EncounterParticipant encounterParticipant);
+
+    /**
+     * 创建住院参与者
+     *
+     * @param encounterId 住院id
+     * @param startTime 入科时间
+     * @param practitionerId 参与者id
+     * @param typeCode 参与者类型
+     */
+    void creatEncounterParticipants(Long encounterId, Date startTime, Long practitionerId, String typeCode);
+
+    /**
+     * 更新医疗参与者状态
+     *
+     * @param encounterId 住院id
+     * @return 更新结果
+     */
+    Integer updateEncounterParticipantsStatus(Long encounterId);
+
+    /**
+     * 根据就诊id查询本次就诊的参与者
+     * @param encounterId 就诊id
+     * @return 就诊参与者集合
+     */
+    List<EncounterParticipant> getEncounterParticipantList(Long encounterId);
+
+    /**
+     *
+     * @param encounterId
+     * @return
+     */
+    List<EncounterParticipant> getEncounterParticipantListByTypeCode(Long encounterId, ParticipantType participantType);
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
similarity index 53%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
index f0c482a0..916b1e67 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
@@ -1,7 +1,11 @@
 package com.openhis.administration.service;
 
+import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.dto.EncounterAccountDto;
 
 /**
  * 就诊管理Service接口
@@ -32,14 +36,37 @@ public interface IEncounterService extends IService<Encounter> {
      */
     boolean saveOrUpdateEncounter(Encounter encounter);
 
-
     /**
      * 通过 id 更新 priorityEnum 字段
      *
-     * @param id             Encounter 的 id
-     * @param priorityEnum   要更新的 priorityEnum 值
+     * @param id Encounter 的 id
+     * @param priorityEnum 要更新的 priorityEnum 值
      * @return 更新是否成功
      */
     boolean updatePriorityEnumById(Long id, Integer priorityEnum);
 
+    /**
+     * 通過busNo查詢對應的Encoounter信息（醫保用）
+     * 
+     * @param iptOtpNo
+     */
+    Encounter getByBusNo(String iptOtpNo);
+
+    /**
+     * 更新患者状态
+     *
+     * @param encounterId 就诊id
+     * @param encounterStatus 状态
+     * @return 更新数量
+     */
+    Integer updateEncounterStatus(Long encounterId, Integer encounterStatus);
+
+    /**
+     * 查询挂号信息
+     * 
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 集合
+     */
+    List<EncounterAccountDto> getEncounterInfoByTime(Date startDate, Date endDate);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java
new file mode 100644
index 00000000..864eb2ef
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java
@@ -0,0 +1,16 @@
+package com.openhis.administration.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.Frequency;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+* @author 47826
+* @description 针对表【adm_frequency(频次配置表，用于频次、周期和相关信息)】的数据库操作Service
+* @createDate 2025-08-21 14:22:11
+*/
+public interface IFrequencyService extends IService<Frequency> {
+
+    Page<Frequency> getPageList(Integer pageNo, Integer pageSize, String code, HttpServletRequest request);
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
similarity index 95%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
index c5a1b36d..ab2c4e22 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
@@ -28,18 +28,19 @@ public interface ILocationService extends IService<Location> {
     List<Location> getCabinetList();
 
     /**
-     * 获取药房药库列表
+     * 获取仓库列表
      *
-     * @return 药房药库列表
+     * @return 仓库列表
      */
-    List<Location> getPharmacyCabinetList();
+    List<Location> getWarehouseList();
+
 
     /**
-     * 获取病区列表
+     * 获取药房药库列表
      *
-     * @return 病区列表
+     * @return 药房药库列表
      */
-    List<Location> getWardList();
+    List<Location> getPharmacyCabinetList();
 
     /**
      * 获取科室对应的病区列表
@@ -49,7 +50,6 @@ public interface ILocationService extends IService<Location> {
      */
     List<Location> getWardList(Long id);
 
-
     /**
      * 获取病区下对应的病床列表
      *
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
similarity index 82%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
index 5c113731..a4348d33 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
@@ -37,4 +37,12 @@ public interface IOrganizationService extends IService<Organization> {
      * @return 机构下拉列表
      */
     List<Organization> getList(Integer organizationType, Integer organizationClass);
+
+    /**
+     * 根据id查询科室集合
+     * 
+     * @param collect id集合
+     * @return 科室集合
+     */
+    List<Organization> getOrganizationListById(List<Long> collect);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
similarity index 80%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
index e910b312..bf6fb413 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
@@ -28,4 +28,11 @@ public interface IPractitionerService extends IService<Practitioner> {
      * @return 医疗参与者列表
      */
     List<Practitioner> getList();
+
+    /**
+     * 根据id查询参与者集合
+     * @param collect id集合
+     * @return 参与者集合
+     */
+    List<Practitioner> getPractitionerListById(List<Long> collect);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java
new file mode 100644
index 00000000..05553a28
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java
@@ -0,0 +1,24 @@
+package com.openhis.administration.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.TraceNoManage;
+
+import java.util.List;
+
+/**
+ * 【追溯码管理】Service接口
+ *
+ * @author system
+ * @date 2025-07-07
+ */
+public interface ITraceNoManageService extends IService<TraceNoManage> {
+
+    /**
+     * 获取在库的追溯码列表
+     *
+     * @param itemId 项目id
+     * @param lotNumber 批号
+     * @return 追溯码列表
+     */
+    List<String> getInventoryTraceNoList(Long itemId, String lotNumber);
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
similarity index 57%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
index 8a26e2d0..a029ecc2 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
@@ -1,7 +1,9 @@
 package com.openhis.administration.service.impl;
 
-import com.openhis.common.enums.AccountStatus;
-import com.openhis.common.enums.Whether;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,9 +11,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.Account;
 import com.openhis.administration.mapper.AccountMapper;
 import com.openhis.administration.service.IAccountService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.AccountStatus;
 import com.openhis.common.enums.AccountType;
-
-import javax.validation.constraints.NotNull;
+import com.openhis.common.enums.Whether;
 
 /**
  * 就诊账户管理Service业务层处理
@@ -44,7 +48,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     public Long getSelfPayAccount(Long encounterId) {
         Account account = baseMapper
             .selectOne(new LambdaQueryWrapper<Account>().select(Account::getId).eq(Account::getEncounterId, encounterId)
-                .eq(Account::getTypeCode, AccountType.PERSONAL_CASH_ACCOUNT.getCode()));
+                .eq(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .last(YbCommonConstants.sqlConst.LIMIT1));
         if (account != null) {
             return account.getId();
         }
@@ -61,7 +66,10 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     public Long getMedicalInsuranceAccount(Long encounterId) {
         Account account = baseMapper
             .selectOne(new LambdaQueryWrapper<Account>().select(Account::getId).eq(Account::getEncounterId, encounterId)
-                .eq(Account::getTypeCode, AccountType.MEDICAL_ELECTRONIC_CERTIFICATE.getCode()));
+                .in(Account::getTypeCode, AccountType.MEDICAL_ELECTRONIC_CERTIFICATE.getCode(),
+                    AccountType.ID_CARD.getCode(), AccountType.SOCIAL_SECURITY_CARD.getCode())
+                .ne(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .last(YbCommonConstants.sqlConst.LIMIT1));
         if (account != null) {
             return account.getId();
         }
@@ -101,8 +109,58 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         }
     }
 
+    /**
+     * 插入或更新 Account 实体
+     *
+     * @param account 实体对象
+     * @return 是否成功
+     */
     @Override
     public boolean isSelfPay(@NotNull Account account) {
-        return "0000".equals(account.getContractNo());
+        return CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(account.getContractNo());
+    }
+
+    /**
+     * 查找挂号时使用的账户
+     * 
+     * @param encounterId 就诊id
+     * @return 账户实体
+     */
+    @Override
+    public Account getAccountByEncounterFlag(Long encounterId) {
+        return baseMapper
+            .selectOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterFlag, Whether.YES.getValue())
+                .eq(Account::getEncounterId, encounterId).last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+
+    /**
+     * 查找挂号时使用的账户
+     *
+     * @param encounterId 就诊id
+     * @return 账户实体
+     */
+    @Override
+    public Account getYbAccount(Long encounterId) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<Account>()
+            .ne(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+            .eq(Account::getEncounterId, encounterId).last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+
+    /**
+     * 查找挂号时使用的账户
+     *
+     * @param encounterId 就诊id
+     * @return 账户实体
+     */
+    @Override
+    public Account getSelfAccount(Long encounterId) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<Account>()
+            .eq(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+            .eq(Account::getEncounterId, encounterId).last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+
+    @Override
+    public List<Account> getAccountListByEncounter(Long encounterId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, encounterId));
     }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java
new file mode 100644
index 00000000..9fcbaf36
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java
@@ -0,0 +1,65 @@
+package com.openhis.administration.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.administration.domain.BodyStructure;
+import com.openhis.administration.mapper.BodyStructureMapper;
+import com.openhis.administration.service.IBodyStructureService;
+import com.openhis.common.enums.PublicationStatus;
+
+/**
+ * 身体部位管理Service业务层处理
+ *
+ * @author liuhr
+ * @date 2025-07-22
+ */
+@Service
+public class BodyStructureServiceImpl extends ServiceImpl<BodyStructureMapper, BodyStructure>
+    implements IBodyStructureService {
+
+    /**
+     * 身体部位启用
+     *
+     * @param id 身体部位id
+     * @return 操作结果
+     */
+    @Override
+    public boolean activeBodyStructure(Long id) {
+
+        int updateCount = baseMapper.update(new BodyStructure().setStatusEnum(PublicationStatus.ACTIVE.getValue()),
+            new LambdaUpdateWrapper<BodyStructure>().eq(BodyStructure::getId, id));
+        return updateCount > 0;
+
+    }
+
+    /**
+     * 身体部位停用
+     *
+     * @param id 身体部位id
+     * @return 操作结果
+     */
+    @Override
+    public boolean inactiveBodyStructure(Long id) {
+
+        int updateCount = baseMapper.update(new BodyStructure().setStatusEnum(PublicationStatus.RETIRED.getValue()),
+            new LambdaUpdateWrapper<BodyStructure>().eq(BodyStructure::getId, id));
+        return updateCount > 0;
+    }
+
+    /**
+     * 获取身体部位下拉列表
+     *
+     * @return 身体部位下拉列表
+     */
+    @Override
+    public List<BodyStructure> getList() {
+         return baseMapper.selectList(new LambdaQueryWrapper<BodyStructure>()
+         .select(BodyStructure::getId, BodyStructure::getName).eq(BodyStructure::getDeleteFlag, '0'));
+  
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
similarity index 79%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
index cebdf239..ba13af9c 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
@@ -10,10 +10,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.dto.ChargeItemBaseInfoDto;
+import com.openhis.administration.dto.ChargeItemDefInfo;
 import com.openhis.administration.mapper.ChargeItemMapper;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.common.enums.ChargeItemContext;
 import com.openhis.common.enums.ChargeItemStatus;
+import com.openhis.common.enums.DelFlag;
 
 import lombok.AllArgsConstructor;
 
@@ -62,8 +65,12 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
      */
     @Override
     public boolean updateAccountType(Long encounterId, Long accountId) {
-        int update = baseMapper.update(new ChargeItem().setAccountId(accountId),
-            new LambdaUpdateWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, encounterId));
+        int update =
+            baseMapper.update(new ChargeItem().setAccountId(accountId),
+                new LambdaUpdateWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, encounterId)
+                    .in(ChargeItem::getStatusEnum, ChargeItemStatus.DRAFT.getValue(),
+                        ChargeItemStatus.PLANNED.getValue(), ChargeItemStatus.BILLABLE.getValue())
+                    .eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
         return update > 0;
     }
 
@@ -136,4 +143,26 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
     public List<ChargeItem> getChargeItemInfoByReqId(List<Long> requestIdList) {
         return baseMapper.selectList(new LambdaQueryWrapper<ChargeItem>().in(ChargeItem::getServiceId, requestIdList));
     }
+
+    /**
+     * 收费项基础信息集合
+     *
+     * @param collect 集合
+     * @return 集合
+     */
+    @Override
+    public List<ChargeItemBaseInfoDto> getChargeItemBaseInfoByIds(List<Long> collect) {
+        return baseMapper.getChargeItemBaseInfoByIds(collect);
+    }
+
+    /**
+     * 收费项关联Def项目集合
+     *
+     * @param chargeItemIds 集合
+     * @return 集合
+     */
+    @Override
+    public List<ChargeItemDefInfo> getChargeItemDefInfoByIds(List<Long> chargeItemIds) {
+        return baseMapper.getChargeItemDefInfoByIds(chargeItemIds);
+    }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
similarity index 68%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
index 8f2df884..8e685346 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
@@ -6,6 +6,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.openhis.common.enums.Whether;
+import com.openhis.common.enums.ybenums.YbIptDiseTypeCode;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -83,13 +85,44 @@ public class EncounterDiagnosisServiceImpl extends ServiceImpl<EncounterDiagnosi
     }
 
     /**
-     *
-     * @param diaIdList
-     * @return
+     * 查询 EncounterDiagnosis
+     * @param diaIdList 诊断主键id
+     * @return 诊断集合
      */
     @Override
     public List<EncounterDiagnosis> getDiagnosisList(List<Long> diaIdList) {
         return baseMapper
             .selectList(new LambdaQueryWrapper<EncounterDiagnosis>().in(EncounterDiagnosis::getId, diaIdList));
     }
+
+    /**
+     * 查询 EncounterDiagnosis
+     *
+     * @param encounterId 就诊id
+     * @param ybIptDiseTypeCode 诊断类型
+     * @return 诊断集合
+     */
+    @Override
+    public List<EncounterDiagnosis> getDiagnosisList(Long encounterId, YbIptDiseTypeCode ybIptDiseTypeCode) {
+        LambdaQueryWrapper<EncounterDiagnosis> queryWrapper = new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getEncounterId, encounterId);
+        if(ybIptDiseTypeCode!=null){
+            queryWrapper.eq(EncounterDiagnosis::getIptDiseTypeCode,ybIptDiseTypeCode.getValue());
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 在诊断中筛选主诊断
+     * @param list 诊断集合
+     * @return 主诊断
+     */
+    @Override
+    public EncounterDiagnosis getMainDiagnosis(List<EncounterDiagnosis> list) {
+        for (EncounterDiagnosis encounterDiagnosis : list) {
+            if(Whether.YES.getValue()==encounterDiagnosis.getMaindiseFlag()){
+                return encounterDiagnosis;
+            }
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
similarity index 30%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
index 4e1d1201..d1ee30e0 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
@@ -1,13 +1,20 @@
 package com.openhis.administration.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.openhis.common.enums.EncounterLocationStatus;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.EncounterLocation;
 import com.openhis.administration.mapper.EncounterLocationMapper;
 import com.openhis.administration.service.IEncounterLocationService;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.LocationForm;
 
 /**
  * 就诊位置管理Service业务层处理
@@ -20,17 +27,18 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
     implements IEncounterLocationService {
 
     /**
-     * 门诊挂号时保存就诊位置信息
+     * 保存住院位置信息
      *
-     * @param encounterLocation 就诊位置信息
+     * @param encounterLocation 住院位置信息
      */
     @Override
-    public void saveEncounterLocationByRegister(EncounterLocation encounterLocation) {
+    public void saveEncounterLocation(EncounterLocation encounterLocation) {
         baseMapper.insert(encounterLocation);
     }
 
     /**
      * 自定义插入或更新方法,根据就诊id，病区,判断是更新还是插入
+     * 
      * @param encounterLocation 实体对象
      * @return 是否成功
      */
@@ -38,7 +46,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
         // 创建 LambdaQueryWrapper
         LambdaQueryWrapper<EncounterLocation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EncounterLocation::getEncounterId, encounterLocation.getEncounterId())
-            .eq(EncounterLocation::getFormEnum,encounterLocation.getFormEnum())
+            .eq(EncounterLocation::getFormEnum, encounterLocation.getFormEnum())
             // 状态为使用中
             .eq(EncounterLocation::getStatusEnum, EncounterLocationStatus.ACTIVE.getValue());
 
@@ -54,4 +62,100 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
         }
     }
 
+    /**
+     * 创建住院位置
+     *
+     * @param encounterId 住院id
+     * @param startTime 开始时间
+     * @param locationId 位置id
+     * @param locationForm 位置类型
+     */
+    public void creatEncounterLocation(Long encounterId, Date startTime, Long locationId, Integer locationForm) {
+        EncounterLocation encounterLocation = new EncounterLocation();
+        encounterLocation.setEncounterId(encounterId).setStartTime(startTime).setLocationId(locationId)
+            .setFormEnum(locationForm);
+        baseMapper.insert(encounterLocation);
+    }
+
+    /**
+     * 查询住院患者床位相关信息
+     *
+     * @param encounterId 住院id
+     * @return 床位相关信息
+     */
+    @Override
+    public List<EncounterLocation> getEncounterLocationInfo(Long encounterId, Long locationId) {
+        LambdaQueryWrapper<EncounterLocation> queryWrapper = new LambdaQueryWrapper<EncounterLocation>()
+            .eq(EncounterLocation::getStatusEnum, EncounterLocationStatus.ACTIVE.getValue())
+            .eq(EncounterLocation::getDeleteFlag, DelFlag.NO.getCode());
+        if (locationId != null) {
+            queryWrapper.eq(EncounterLocation::getLocationId, locationId).eq(EncounterLocation::getFormEnum,
+                LocationForm.BED.getValue());
+        }
+        if (encounterId != null) {
+            queryWrapper.eq(EncounterLocation::getEncounterId, encounterId).in(EncounterLocation::getFormEnum,
+                LocationForm.BED.getValue(), LocationForm.HOUSE.getValue());
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 更新位置使用状态
+     *
+     * @param encounterId 住院id
+     * @param isTransfer 是否专科
+     * @return 更新结果
+     */
+    @Override
+    public Integer updateEncounterLocationStatus(Long encounterId, boolean isTransfer) {
+        // 动态拼接病区条件
+        List<Integer> locationForms = new ArrayList<>();
+        locationForms.add(LocationForm.BED.getValue());
+        locationForms.add(LocationForm.HOUSE.getValue());
+        if (isTransfer) {
+            locationForms.add(LocationForm.WARD.getValue());
+        }
+        // 更新状态为已完成
+        return baseMapper.update(null,
+            new LambdaUpdateWrapper<EncounterLocation>()
+                .set(EncounterLocation::getStatusEnum, EncounterLocationStatus.COMPLETED.getValue())
+                .eq(EncounterLocation::getEncounterId, encounterId).in(EncounterLocation::getFormEnum, locationForms));
+    }
+
+    /*
+     * 根据就诊id查询就诊位置信息
+     * 
+     * @param encounterId 就诊id
+     * @return 就诊位置集合
+     */
+    @Override
+    public List<EncounterLocation> getEncounterLocationList(Long encounterId) {
+        return baseMapper
+            .selectList(new LambdaQueryWrapper<EncounterLocation>().eq(EncounterLocation::getEncounterId, encounterId));
+    }
+
+    /**
+     * 根据就诊id查询就诊位置信息(某个类型)(某个状态)
+     * 
+     * @param locationForm 类型
+     * @param encounterLocationStatus 状态
+     * @param encounterId 就诊id
+     * @return 就诊位置集合
+     */
+    @Override
+    public List<EncounterLocation> getEncounterLocationList(Long encounterId, LocationForm locationForm,
+        EncounterLocationStatus encounterLocationStatus) {
+        LambdaQueryWrapper<EncounterLocation> queryWrapper =
+            new LambdaQueryWrapper<EncounterLocation>().eq(EncounterLocation::getEncounterId, encounterId)
+                .eq(EncounterLocation::getDeleteFlag, DelFlag.NO.getCode());
+
+        if (locationForm != null) {
+            queryWrapper.eq(EncounterLocation::getFormEnum, locationForm.getCode());
+        }
+
+        if (encounterLocationStatus != null) {
+            queryWrapper.eq(EncounterLocation::getStatusEnum, encounterLocationStatus.getCode());
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
new file mode 100644
index 00000000..e6c7601e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
@@ -0,0 +1,104 @@
+package com.openhis.administration.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.administration.domain.EncounterParticipant;
+import com.openhis.administration.mapper.EncounterParticipantMapper;
+import com.openhis.administration.service.IEncounterParticipantService;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.ParticipantType;
+
+/**
+ * 就诊参与者管理Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Service
+public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterParticipantMapper, EncounterParticipant>
+    implements IEncounterParticipantService {
+
+    /**
+     * 保存就诊参与者
+     *
+     * @param encounterParticipant 就诊参与者信息
+     */
+    @Override
+    public void saveEncounterParticipant(EncounterParticipant encounterParticipant) {
+        baseMapper.insert(encounterParticipant);
+    }
+
+    /**
+     * 创建住院参与者
+     *
+     * @param encounterId 住院id
+     * @param startTime 入科时间
+     * @param practitionerId 参与者id
+     * @param typeCode 参与者类型
+     */
+    @Override
+    public void creatEncounterParticipants(Long encounterId, Date startTime, Long practitionerId, String typeCode) {
+        EncounterParticipant encounterParticipant = new EncounterParticipant();
+        encounterParticipant.setEncounterId(encounterId).setStartTime(startTime).setPractitionerId(practitionerId)
+            .setTypeCode(typeCode);
+        baseMapper.insert(encounterParticipant);
+    }
+
+    /**
+     * 更新医疗参与者状态
+     *
+     * @param encounterId 住院id
+     * @return 更新结果
+     */
+    @Override
+    public Integer updateEncounterParticipantsStatus(Long encounterId) {
+        // 更新状态为已完成
+        return baseMapper.update(null,
+            new LambdaUpdateWrapper<EncounterParticipant>()
+                .set(EncounterParticipant::getStatusEnum, EncounterLocationStatus.COMPLETED.getValue())
+                .eq(EncounterParticipant::getEncounterId, encounterId).in(EncounterParticipant::getTypeCode,
+                    ParticipantType.ATTENDING_DOCTOR.getCode(), ParticipantType.CHIEF_DOCTOR.getCode(),
+                    ParticipantType.PRIMARY_NURSE.getCode(), ParticipantType.ADMITTING_DOCTOR.getCode()));
+    }
+
+    /*
+     * 根据就诊id查询参与者
+     * 
+     * @param encounterId
+     * @return
+     */
+    @Override
+    public List<EncounterParticipant> getEncounterParticipantList(Long encounterId) {
+        return baseMapper.selectList(
+            new LambdaQueryWrapper<EncounterParticipant>().eq(EncounterParticipant::getEncounterId, encounterId)
+                .eq(EncounterParticipant::getStatusEnum, EncounterLocationStatus.ACTIVE.getValue())
+                .eq(EncounterParticipant::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 查询某一个类型的参与者
+     * 
+     * @param encounterId
+     * @param participantType
+     * @return
+     */
+    @Override
+    public List<EncounterParticipant> getEncounterParticipantListByTypeCode(Long encounterId,
+        ParticipantType participantType) {
+        List<EncounterParticipant> list = new ArrayList<>();
+        for (EncounterParticipant encounterParticipant : getEncounterParticipantList(encounterId)) {
+            if (participantType.getCode().equals(encounterParticipant.getTypeCode())) {
+                list.add(encounterParticipant);
+            }
+        }
+        return list;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
similarity index 67%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
index bb59c4ce..6aab137a 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
@@ -1,19 +1,22 @@
 package com.openhis.administration.service.impl;
 
+import java.util.Date;
+import java.util.List;
+
 import javax.annotation.Resource;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Account;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.dto.EncounterAccountDto;
 import com.openhis.administration.mapper.EncounterMapper;
 import com.openhis.administration.service.IEncounterService;
+import com.openhis.common.constant.YbCommonConstants;
 import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.EncounterStatus;
 import com.openhis.common.enums.EncounterType;
@@ -38,9 +41,9 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
      */
     @Override
     public Long saveEncounterByRegister(Encounter encounter) {
-        if(StringUtils.isEmpty(encounter.getBusNo())){
-            // 生成就诊编码  医保挂号时是先生成码后生成实体
-            encounter.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 8));
+        if (StringUtils.isEmpty(encounter.getBusNo())) {
+            // 生成就诊编码 医保挂号时是先生成码后生成实体
+            encounter.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 4));
         }
         // 生成就诊序号 (患者ID + 科室ID 作为当日就诊号的唯一标识)
         String preFix = encounter.getPatientId() + String.valueOf(encounter.getOrganizationId());
@@ -79,8 +82,7 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
 
         // 创建 LambdaQueryWrapper
         LambdaQueryWrapper<Encounter> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Encounter::getPatientId, encounter.getPatientId())
-            .eq(Encounter::getId, encounter.getId());
+        queryWrapper.eq(Encounter::getPatientId, encounter.getPatientId()).eq(Encounter::getId, encounter.getId());
 
         // 查询是否存在记录
         Encounter existingEncounter = baseMapper.selectOne(queryWrapper);
@@ -90,7 +92,7 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
             return baseMapper.updateById(encounter) > 0;
         } else {
             // 使用基础采番，设置住院ID，10位数
-            String code = assignSeqUtil.getSeq(AssignSeqEnum.ADMISSION_NUM.getPrefix(), 10);
+            String code = assignSeqUtil.getSeqByDay(AssignSeqEnum.ADMISSION_NUM.getPrefix(), 10);
             encounter.setBusNo(code);
             // 如果记录不存在，插入新记录
             return baseMapper.insert(encounter) > 0;
@@ -100,18 +102,47 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
     /**
      * 通过 id 更新 priorityEnum 字段
      *
-     * @param id             Encounter 的 id
-     * @param priorityEnum   要更新的 priorityEnum 值
+     * @param id Encounter 的 id
+     * @param priorityEnum 要更新的 priorityEnum 值
      * @return 更新是否成功
      */
     public boolean updatePriorityEnumById(Long id, Integer priorityEnum) {
         // 创建更新条件
         LambdaUpdateWrapper<Encounter> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(Encounter::getId, id)
-            .set(Encounter::getPriorityEnum, priorityEnum);
+        updateWrapper.eq(Encounter::getId, id).set(Encounter::getPriorityEnum, priorityEnum);
 
         // 执行更新
         return update(updateWrapper);
     }
 
+    @Override
+    public Encounter getByBusNo(String iptOtpNo) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<Encounter>().eq(Encounter::getBusNo, iptOtpNo)
+            .last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+
+    /**
+     * 更新患者状态
+     *
+     * @param encounterId 就诊id
+     * @param encounterStatus 状态
+     * @return 更新数量
+     */
+    @Override
+    public Integer updateEncounterStatus(Long encounterId, Integer encounterStatus) {
+        return baseMapper.update(null, new LambdaUpdateWrapper<Encounter>().eq(Encounter::getId, encounterId)
+            .set(Encounter::getStatusEnum, encounterStatus));
+    }
+
+    /**
+     * 查询挂号信息
+     *
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 集合
+     */
+    @Override
+    public List<EncounterAccountDto> getEncounterInfoByTime(Date startDate, Date endDate) {
+        return baseMapper.getEncounterInfoByTime(startDate, endDate);
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java
new file mode 100644
index 00000000..418d47b8
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java
@@ -0,0 +1,36 @@
+package com.openhis.administration.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.administration.domain.Frequency;
+import com.openhis.administration.mapper.FrequencyMapper;
+import com.openhis.administration.service.IFrequencyService;
+import com.openhis.common.utils.HisPageUtils;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+* @author 47826
+* @description 针对表【adm_frequency(频次配置表，用于频次、周期和相关信息)】的数据库操作Service实现
+* @createDate 2025-08-21 14:22:11
+*/
+@Service
+public class FrequencyServiceImpl extends ServiceImpl<FrequencyMapper, Frequency>
+    implements IFrequencyService {
+
+    @Override
+    public Page<Frequency> getPageList(Integer pageNo, Integer pageSize, String code, HttpServletRequest request) {
+
+        Page<Frequency> page = new Page<>(pageNo, pageSize);
+       QueryWrapper<Frequency> queryWrapper = new QueryWrapper<Frequency>();
+       queryWrapper.eq("rate_code", code);
+        return  HisPageUtils.selectPage(this.baseMapper, queryWrapper, pageNo, pageSize, Frequency.class);
+    }
+}
+
+
+
+
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
similarity index 65%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
index 8cd1cea4..22502aa6 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
@@ -1,6 +1,5 @@
 package com.openhis.administration.service.impl;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -8,13 +7,12 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.mapper.LocationMapper;
 import com.openhis.administration.service.ILocationService;
-import com.openhis.common.enums.LocationBedStatus;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.LocationStatus;
 
 /**
  * 位置管理Service业务层处理
@@ -46,27 +44,26 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
         return baseMapper
             .selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.CABINET.getValue()));
     }
-
     /**
-     * 获取药房药库列表
+     * 获取仓库列表
      *
-     * @return 药房药库列表
+     * @return 仓库列表
      */
     @Override
-    public List<Location> getPharmacyCabinetList() {
-        return baseMapper.selectList(new LambdaQueryWrapper<Location>().in(Location::getFormEnum,
-            LocationForm.CABINET.getValue(), LocationForm.PHARMACY.getValue()));
+    public List<Location> getWarehouseList() {
+        return baseMapper
+            .selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.WAREHOUSE.getValue()));
     }
 
     /**
-     * 获取病区列表
+     * 获取药房药库列表
      *
-     * @return 病区列表
+     * @return 药房药库列表
      */
     @Override
-    public List<Location> getWardList() {
-        return baseMapper
-            .selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.WARD.getValue()));
+    public List<Location> getPharmacyCabinetList() {
+        return baseMapper.selectList(new LambdaQueryWrapper<Location>().in(Location::getFormEnum,
+            LocationForm.CABINET.getValue(), LocationForm.PHARMACY.getValue()));
     }
 
     /**
@@ -89,16 +86,14 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
      */
     @Override
     public List<Location> getWardList(Long id) {
-
         LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Location::getId, Location::getName) // 只查询 id 和 name 字段
-            .eq(Location::getOrganizationId, id) // 科室id
-            .eq(Location::getFormEnum, LocationForm.WARD.getValue()); // form 值为 4:病区
-
-        // 查询满足条件的 Location 对象列表
-        List<Location> locations = baseMapper.selectList(queryWrapper);
-
-        return locations;
+        queryWrapper.select(Location::getId, Location::getName)
+            .eq(Location::getStatusEnum, LocationStatus.ACTIVE.getValue())
+            .eq(Location::getFormEnum, LocationForm.WARD.getValue());
+        if (id != null) {
+            queryWrapper.eq(Location::getOrganizationId, id);
+        }
+        return baseMapper.selectList(queryWrapper);
     }
 
     /**
@@ -109,21 +104,19 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
      */
     @Override
     public List<Location> getBedList(Long id) {
-
-        Location location = baseMapper.selectById(id);
-        if (location == null || location.getBusNo() == null) {
-            return null;
-        }
-        LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Location::getId, Location::getName) // 只查询 id 和 name 字段
-            .likeRight(Location::getBusNo, location.getBusNo()) // 查询病区busNo开头的
-            .eq(Location::getFormEnum, LocationForm.BED.getValue()) // form 值为 8:病床
-            .eq(Location::getOperationalEnum, LocationBedStatus.U.getValue());// 空闲状态
+        //
+        // Location location = baseMapper.selectById(id);
+        // if (location == null || location.getBusNo() == null) {
+        // return null;
+        // }
+        // LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
+        // queryWrapper.select(Location::getId, Location::getName) // 只查询 id 和 name 字段
+        // .likeRight(Location::getBusNo, location.getBusNo()) // 查询病区busNo开头的
+        // .eq(Location::getFormEnum, LocationForm.BED.getValue()) // form 值为 8:病床
+        // .eq(Location::getOperationalEnum, LocationBedStatus.U.getValue());// 空闲状态
 
         // 查询满足条件的 Location 对象列表
-        List<Location> locations = baseMapper.selectList(queryWrapper);
-
-        return locations;
+        return null;
     }
 
     /**
@@ -157,21 +150,18 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
      */
     @Override
     public List<Location> getLocationList(List<Long> ids) {
-        // 如果 ids 是空的，获取当前登录用户的 orgId
-        if (ids == null || ids.isEmpty()) {
-            Long orgId = SecurityUtils.getLoginUser().getOrgId();
-            if (orgId != null) {
-                ids = Collections.singletonList(orgId); // 将 orgId 转换为单元素列表
-            }
-        }
-
+        // // 如果 ids 是空的，获取当前登录用户的 orgId
+        // if (ids == null || ids.isEmpty()) {
+        // Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        // if (orgId != null) {
+        // ids = Collections.singletonList(orgId); // 将 orgId 转换为单元素列表
+        // }
+        // }
         // 创建查询条件
         LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Location::getId, Location::getName) // 指定只查询 id 和 name 字段
-            .in(Location::getId, ids)// 条件：id 在传入的 ids 集合中
-            .eq(Location::getStatusEnum, PublicationStatus.ACTIVE.getValue()); // 状态有效的
-
-        // 查询满足条件的 Supplier 对象列表
+        queryWrapper.select(Location::getId, Location::getName, Location::getFormEnum, Location::getBusNo)
+            .in(Location::getId, ids).eq(Location::getDeleteFlag, DelFlag.NO.getCode())
+            .eq(Location::getStatusEnum, LocationStatus.ACTIVE.getValue());
         return baseMapper.selectList(queryWrapper);
     }
 
@@ -184,11 +174,9 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
      */
     @Override
     public boolean updateStatusById(Long id, Integer status) {
-
         Location location = new Location();
         location.setId(id);
-        location.setOperationalEnum(status);
-
+        location.setStatusEnum(status);
         return baseMapper.updateById(location) > 0;
     }
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
similarity index 81%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
index cfd0bd5a..e42b784b 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
@@ -2,6 +2,8 @@ package com.openhis.administration.service.impl;
 
 import java.util.List;
 
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.common.enums.DelFlag;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -61,4 +63,16 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
             .select(Organization::getId, Organization::getName).eq(Organization::getTypeEnum, organizationType)
             .eq(organizationClass != null, Organization::getClassEnum, organizationClass));
     }
+
+    /**
+     * 根据id查询科室集合
+     *
+     * @param collect id集合
+     * @return 科室集合
+     */
+    @Override
+    public List<Organization> getOrganizationListById(List<Long> collect) {
+        return baseMapper.selectList(new LambdaQueryWrapper<Organization>().in(Organization::getId, collect)
+                .eq(Organization::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
similarity index 91%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
index b1ac3387..d7deb380 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
@@ -130,15 +130,18 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
      */
     @Override
     public boolean addPatient(Patient patient) {
-
-        patientCommonSet(patient);
-
+        Long organizationId = SecurityUtils.getLoginUser().getHospitalId();
+        // 设置机构ID
+        patient.setOrganizationId(organizationId);
+        // 设置拼音首拼
+        patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
+        // 设置五笔首拼
+        patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
         // 不存在重复的证件号，新增患者
         if (idCardExists(patient) == null) {
             // 添加患者
             return baseMapper.insert(patient) > 0;
         }
-
         return false;
     }
 
@@ -149,10 +152,14 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
      */
     @Override
     public boolean updatePatient(Patient patient) {
-
         Patient patientExists = idCardExists(patient);
-        patientCommonSet(patient);
-
+        Long organizationId = SecurityUtils.getLoginUser().getHospitalId();
+        // 设置机构ID
+        patient.setOrganizationId(organizationId);
+        // 设置拼音首拼
+        patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
+        // 设置五笔首拼
+        patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
         // 根据证件号查询，不存在重复的证件号
         if (patientExists == null) {
             // 患者修改了证件号码且不重复，更新患者
@@ -161,29 +168,6 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
             // 患者未修改证件号码，更新患者
             return baseMapper.updateById(patient) > 0;
         }
-
         return false;
     }
-
-    /**
-     * 设置病人共通项目赋值
-     *
-     * @param patient 患者实体
-     */
-    public Patient patientCommonSet(Patient patient) {
-
-        // 使用基础采番，设置病人ID，10位数
-        String code = assignSeqUtil.getSeq(AssignSeqEnum.PATIENT_NUM.getPrefix(), 10);
-        patient.setBusNo(code);
-        Long organizationId = SecurityUtils.getLoginUser().getOrgId();
-        // 设置机构ID
-        patient.setOrganizationId(organizationId);
-        // 设置拼音首拼
-        patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
-        // 设置五笔首拼
-        patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
-
-        return patient;
-    }
-
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
similarity index 98%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
index 32867803..3119f51d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
@@ -79,7 +79,7 @@ public class PractitionerRoleServiceImpl extends ServiceImpl<PractitionerRoleMap
 
         // 使用 Stream 提取 locationId 字段
         List<Long> locationIds = practitionerRoleList.stream().map(PractitionerRole::getLocationId) // 提取 locationId 字段
-                .collect(Collectors.toList()); // 收集到 List 中
+            .collect(Collectors.toList()); // 收集到 List 中
         // 返回位置ID的集合
         return locationIds;
     }
@@ -107,12 +107,10 @@ public class PractitionerRoleServiceImpl extends ServiceImpl<PractitionerRoleMap
      */
     @Override
     public List<PractitionerRole> getNurseList(Long orgId) {
-
         return baseMapper.selectList(new LambdaQueryWrapper<PractitionerRole>()
             .select(PractitionerRole::getPractitionerId, PractitionerRole::getName)
             .eq(PractitionerRole::getOrgId, orgId)
             // 身份类型是护士
             .eq(PractitionerRole::getRoleCode, PractitionerRoles.NURSE.getCode()));
-
     }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
similarity index 75%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
index 310e6423..cee113f0 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
@@ -2,6 +2,7 @@ package com.openhis.administration.service.impl;
 
 import java.util.List;
 
+import com.openhis.common.enums.DelFlag;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,4 +45,16 @@ public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Pra
     public List<Practitioner> getList() {
         return baseMapper.selectList(new LambdaQueryWrapper<>());
     }
+
+    /**
+     * 根据id查询参与者集合
+     * 
+     * @param collect id集合
+     * @return 参与者集合
+     */
+    @Override
+    public List<Practitioner> getPractitionerListById(List<Long> collect) {
+        return baseMapper.selectList(new LambdaQueryWrapper<Practitioner>().in(Practitioner::getId, collect)
+            .eq(Practitioner::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
similarity index 97%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
index 1c7c84ed..fab16126 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
@@ -58,7 +58,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
      */
     @Override
     public List<Supplier> getList() {
-        return baseMapper.selectList(new LambdaQueryWrapper<Supplier>().select(Supplier::getId, Supplier::getName)
+        return baseMapper.selectList(new LambdaQueryWrapper<Supplier>().select(Supplier::getId, Supplier::getName, Supplier::getPhone)
             .eq(Supplier::getTypeEnum, SupplierType.ACTIVE.getValue())
             .eq(Supplier::getDeleteFlag, DelFlag.NO.getCode()).eq(Supplier::getActiveFlag, Whether.YES.getValue()));
     }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java
new file mode 100644
index 00000000..edf963a3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java
@@ -0,0 +1,67 @@
+package com.openhis.administration.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.administration.domain.TraceNoManage;
+import com.openhis.administration.mapper.TraceNoManageMapper;
+import com.openhis.administration.service.ITraceNoManageService;
+import com.openhis.common.enums.TraceNoStatus;
+
+/**
+ * 【追溯码管理】Service业务层处理
+ *
+ * @author system
+ * @date 2025-07-07
+ */
+@Service
+public class TraceNoManageServiceImpl extends ServiceImpl<TraceNoManageMapper, TraceNoManage>
+    implements ITraceNoManageService {
+
+    /**
+     * 获取在库的追溯码列表
+     *
+     * @param itemId 项目id
+     * @param lotNumber 批号
+     * @return 追溯码列表
+     */
+    @Override
+    public List<String> getInventoryTraceNoList(Long itemId, String lotNumber) {
+        // 根据批号查询一个项目在库存中的追溯码
+        List<TraceNoManage> traceNoManageList = baseMapper.selectList(new LambdaQueryWrapper<TraceNoManage>()
+            .eq(TraceNoManage::getItemId, itemId).eq(TraceNoManage::getLotNumber, lotNumber));
+        // 按追溯码分组
+        Map<String, List<TraceNoManage>> groupedByTraceNo =
+            traceNoManageList.stream().collect(Collectors.groupingBy(TraceNoManage::getTraceNo));
+        // 在库的追溯码列表
+        List<String> remainingTraceNos = new ArrayList<>();
+
+        // 遍历每个追溯码的记录
+        for (Map.Entry<String, List<TraceNoManage>> entry : groupedByTraceNo.entrySet()) {
+            String traceNo = entry.getKey();
+            List<TraceNoManage> records = entry.getValue();
+
+            // 统计进入和出去的数量
+            int inCount = 0;
+            int outCount = 0;
+            for (TraceNoManage record : records) {
+                if (TraceNoStatus.IN.getValue().equals(record.getStatusEnum())) {
+                    inCount++;
+                } else if (TraceNoStatus.OUT.getValue().equals(record.getStatusEnum())) {
+                    outCount++;
+                }
+            }
+            // 如果进入数量大于出去数量，说明还有剩余在库中
+            if (inCount > outCount) {
+                remainingTraceNos.add(traceNo);
+            }
+        }
+        return remainingTraceNos;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
similarity index 80%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
index 06b11008..4208c61c 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
@@ -1,21 +1,18 @@
 package com.openhis.clinical.domain;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.EventStatus;
-import com.openhis.common.enums.ProcedureCategory;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 手术与治疗管理Entity实体
+ * 手术与医嘱管理Entity实体
  *
  * @author system
  * @date 2025-02-20
@@ -30,24 +27,27 @@ public class Procedure extends HisBaseEntity {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
-    /** 手术申请ID */
-    private Long baseServiceReqId;
+    /** 医嘱id */
+    private Long requestId;
 
-    /** 用药申请ID */
-    private Long baseMedReqId;
+    /** 医嘱所在表 */
+    private String requestTable;
 
     /** 当前状态 */
-    private EventStatus statusEnum;
+    private Integer statusEnum;
 
     /** 当前状态原因 */
     private String statusReasonText;
 
     /** 分类 */
-    private ProcedureCategory categoryEnum;
+    private Integer categoryEnum;
 
     /** 手术编码 */
     private String procedureCode;
 
+    /** 就诊Id */
+    private Long encounterId;
+
     /** 患者Id */
     private Long patientId;
 
@@ -75,7 +75,10 @@ public class Procedure extends HisBaseEntity {
     /** 报告证据 */
     private Long reportedPatientId;
 
-    /** 位置 */
+    /** 执行科室 */
+    private Long orgId;
+
+    /** 执行位置 */
     private Long locationId;
 
     /** 理由 */
@@ -99,5 +102,9 @@ public class Procedure extends HisBaseEntity {
     /** 跟进指南 */
     private String followUpJson;
 
+    /** 组号 */
+    private Long groupId;
 
+    /** 取消执行id */
+    private Long refundId;
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
similarity index 92%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
index 8ba10631..94fac9e7 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
@@ -1,19 +1,18 @@
 package com.openhis.clinical.domain;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 手术与治疗执行人管理Entity实体
+ * 手术与医嘱执行人管理Entity实体
  *
  * @author system
  * @date 2025-02-20
@@ -46,5 +45,4 @@ public class ProcedurePerformer extends HisBaseEntity {
     /** 飞刀机构 */
     private String orgFromId;
 
-
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
new file mode 100644
index 00000000..ed57bd6a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
@@ -0,0 +1,65 @@
+package com.openhis.clinical.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 门诊预约记录Entity实体
+ *
+ * @author system
+ * @date 2025-07-14
+ */
+@Data
+@TableName("cli_reservation_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ReservationRecord extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 患者名称
+     */
+    private String patientName;
+
+    /**
+     * 患者联系方式
+     */
+    private String patientTel;
+
+    /**
+     * 主诉
+     */
+    private String chiefComplaint;
+
+    /**
+     * 就诊预约时间
+     */
+    private Date reservationTime;
+
+    /**
+     * 预约科室id
+     */
+    private Long orgId;
+
+    /**
+     * 预约医生id
+     */
+    private Long practitionerId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
similarity index 45%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
index 95428792..7c4cc7b3 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
@@ -1,17 +1,17 @@
-package com.openhis.administration.mapper;
+package com.openhis.clinical.mapper;
 
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.ChargeItem;
+import com.openhis.clinical.domain.ReservationRecord;
 
 /**
- * 费用项管理Mapper接口
+ * 门诊预约记录Mapper接口
  *
  * @author system
  * @date 2025-02-20
  */
 @Repository
-public interface ChargeItemMapper extends BaseMapper<ChargeItem> {
+public interface ReservationRecordMapper extends BaseMapper<ReservationRecord> {
 
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
similarity index 74%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
index 8aeb8f96..d0f44f58 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
@@ -19,4 +19,12 @@ public interface IAllergyIntoleranceService extends IService<AllergyIntolerance>
      */
     boolean saveOrUpdateAllergyIntolerance(AllergyIntolerance allergyIntolerance);
 
+    /**
+     * 根据药品请求id,获取皮试结果
+     *
+     * @param serviceRequestId 药品请求id
+     * @return 皮试结果
+     */
+    Integer getPsResultByRequestId(Long serviceRequestId);
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
similarity index 74%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
index 860f561a..62aaaabc 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
@@ -3,6 +3,8 @@ package com.openhis.clinical.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.clinical.domain.ConditionDefinition;
 
+import java.util.List;
+
 /**
  * 诊断定义管理Service接口
  *
@@ -26,4 +28,12 @@ public interface IConditionDefinitionService extends IService<ConditionDefinitio
      * @return
      */
     boolean addYbDisease(ConditionDefinition conditionDefinition);
+
+    /**
+     * 根据id查询诊断定义
+     * 
+     * @param collect id集合
+     * @return 诊断定义集合
+     */
+    List<ConditionDefinition> getConditionDefinitionListByIds(List<Long> collect);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
similarity index 71%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
index 3a302a6e..5498b16d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
@@ -3,6 +3,8 @@ package com.openhis.clinical.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.clinical.domain.Condition;
 
+import java.util.List;
+
 /**
  * 疾病与诊断管理Service接口
  *
@@ -19,4 +21,10 @@ public interface IConditionService extends IService<Condition> {
      */
     Long saveConditionByDoctor(Condition condition);
 
+    /**
+     * 根据id查诊断集合
+     * @param collect id集合
+     * @return 诊断集合
+     */
+    List<Condition> getConditionListById(List<Long> collect);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
similarity index 56%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
index 26e89808..f6a954df 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
@@ -1,5 +1,8 @@
 package com.openhis.clinical.service;
 
+import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.clinical.domain.ProcedurePerformer;
 
@@ -11,4 +14,12 @@ import com.openhis.clinical.domain.ProcedurePerformer;
  */
 public interface IProcedurePerformerService extends IService<ProcedurePerformer> {
 
+    /**
+     * 添加执行人记录
+     *
+     * @param procedureId 执行记录id
+     * @param now 执行时间
+     * @return 添加结果
+     */
+    boolean addPerformRecord(Long procedureId, Date now);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
new file mode 100644
index 00000000..d41c5c4b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
@@ -0,0 +1,55 @@
+package com.openhis.clinical.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.clinical.domain.Procedure;
+import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.ProcedureCategory;
+import com.openhis.medication.domain.MedicationRequest;
+
+/**
+ * 手术与治疗管理Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IProcedureService extends IService<Procedure> {
+
+    /**
+     * 查询执行记录
+     *
+     * @param requestId 医嘱ids
+     * @param requestTable 医嘱所在表
+     * @return 执行记录
+     */
+    List<Procedure> getProcedureRecords(List<Long> requestId, String requestTable);
+
+    /**
+     * 添加执行记录
+     *
+     * @param encounterId 就诊id
+     * @param patientId 患者id
+     * @param requestId 医嘱id
+     * @param requestTable 医嘱所在表
+     * @param eventStatus 执行状态
+     * @param procedureCategory 执行种类
+     * @param locationId 执行位置
+     * @param groupId 组号
+     * @param refundId 取消执行id
+     * @return 是否成功
+     */
+    boolean addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
+        EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Long groupId, Long refundId);
+
+    /**
+     * 添加药品执行记录
+     *
+     * @param medicationRequest 药品医嘱
+     * @param procedureCategory 执行种类
+     * @param locationId 执行位置
+     * @return 是否成功
+     */
+    boolean addMedicationProcedureRecord(MedicationRequest medicationRequest, ProcedureCategory procedureCategory,
+        Long locationId);
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
similarity index 47%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
index f2c4d255..7e22388d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
@@ -1,14 +1,14 @@
 package com.openhis.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.Procedure;
+import com.openhis.clinical.domain.ReservationRecord;
 
 /**
- * 手术与治疗管理Service接口
+ * 门诊预约记录Service接口
  *
  * @author system
  * @date 2025-02-20
  */
-public interface IProcedureService extends IService<Procedure> {
+public interface IReservationRecordService extends IService<ReservationRecord> {
 
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
similarity index 54%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
index 1e398fc2..31160c16 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
@@ -1,14 +1,16 @@
 package com.openhis.clinical.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.ClinicalStatus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.clinical.domain.AllergyIntolerance;
 import com.openhis.clinical.mapper.AllergyIntoleranceMapper;
 import com.openhis.clinical.service.IAllergyIntoleranceService;
+import com.openhis.common.enums.VerificationStatus;
+import com.openhis.workflow.mapper.ServiceRequestMapper;
 
 /**
  * 过敏与不耐受Service业务层处理
@@ -20,6 +22,9 @@ import com.openhis.clinical.service.IAllergyIntoleranceService;
 public class AllergyIntoleranceServiceImpl extends ServiceImpl<AllergyIntoleranceMapper, AllergyIntolerance>
     implements IAllergyIntoleranceService {
 
+    @Autowired
+    ServiceRequestMapper serviceRequestMapper;
+
     /**
      * 更新或者保存过敏与不耐受
      *
@@ -30,8 +35,8 @@ public class AllergyIntoleranceServiceImpl extends ServiceImpl<AllergyIntoleranc
 
         // 创建 LambdaQueryWrapper
         LambdaQueryWrapper<AllergyIntolerance> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AllergyIntolerance::getId, allergyIntolerance.getId())
-            .eq(AllergyIntolerance::getPatientId, allergyIntolerance.getPatientId());
+        queryWrapper.eq(AllergyIntolerance::getId, allergyIntolerance.getId()).eq(AllergyIntolerance::getPatientId,
+            allergyIntolerance.getPatientId());
 
         // 查询是否存在记录
         AllergyIntolerance existingEncounter = baseMapper.selectOne(queryWrapper);
@@ -45,4 +50,27 @@ public class AllergyIntoleranceServiceImpl extends ServiceImpl<AllergyIntoleranc
         }
     }
 
+    /**
+     * 根据药品请求id,获取皮试结果
+     *
+     * @param serviceRequestId 服务请求id
+     * @return 皮试结果
+     */
+    @Override
+    public Integer getPsResultByRequestId(Long serviceRequestId) {
+
+        // 创建 LambdaQueryWrapper
+        LambdaQueryWrapper<AllergyIntolerance> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AllergyIntolerance::getRequestId, serviceRequestId)
+            // 皮试结果是已确认的
+            .eq(AllergyIntolerance::getVerificationStatusEnum, VerificationStatus.CONFIRMED)
+            .eq(AllergyIntolerance::getDeleteFlag, '0');
+        // 根据服务请求id,获取皮试结果
+        AllergyIntolerance allergyIntolerance = baseMapper.selectOne(queryWrapper);
+        if (allergyIntolerance == null) {
+            //没查到默认返回 未知
+            return ClinicalStatus.UNKNOWN.getValue();
+        }
+        return allergyIntolerance.getVerificationStatusEnum();
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
similarity index 79%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
index 4176329f..b496412a 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
@@ -2,6 +2,7 @@ package com.openhis.clinical.service.impl;
 
 import java.util.List;
 
+import com.openhis.common.enums.DelFlag;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,10 +47,7 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
         }
         // 新增病种
         int insert = conditionDefinitionMapper.insert(conditionDefinition);
-        if (insert != 1) {
-            return false;
-        }
-        return true;
+        return insert == 1;
     }
 
     /**
@@ -62,4 +60,16 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
     public boolean addYbDisease(ConditionDefinition conditionDefinition) {
         return false;
     }
+
+    /**
+     * 根据id查询诊断定义
+     * 
+     * @param collect id集合
+     * @return 诊断定义集合
+     */
+    @Override
+    public List<ConditionDefinition> getConditionDefinitionListByIds(List<Long> collect) {
+        return baseMapper.selectList(new LambdaQueryWrapper<ConditionDefinition>()
+            .in(ConditionDefinition::getId, collect).eq(ConditionDefinition::getDescription, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
similarity index 59%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
index 207d188e..32edaacb 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
@@ -1,7 +1,10 @@
 package com.openhis.clinical.service.impl;
 
 import java.util.Date;
+import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.openhis.common.enums.DelFlag;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,8 +32,23 @@ public class ConditionServiceImpl extends ServiceImpl<ConditionMapper, Condition
     public Long saveConditionByDoctor(Condition condition) {
         condition.setRecordedDatetime(new Date());
         condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
-        baseMapper.insert(condition);
+        if (condition.getId() == null) {
+            baseMapper.insert(condition);
+        } else {
+            baseMapper.updateById(condition);
+        }
         return condition.getId();
     }
 
+    /**
+     * 根据id查诊断集合
+     * 
+     * @param collect id集合
+     * @return 诊断集合
+     */
+    @Override
+    public List<Condition> getConditionListById(List<Long> collect) {
+        return baseMapper.selectList(new LambdaQueryWrapper<Condition>().in(Condition::getId, collect)
+            .eq(Condition::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
similarity index 41%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
index 12ea355b..f655067e 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
@@ -1,8 +1,11 @@
 package com.openhis.clinical.service.impl;
 
+import java.util.Date;
+
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.SecurityUtils;
 import com.openhis.clinical.domain.ProcedurePerformer;
 import com.openhis.clinical.mapper.ProcedurePerformerMapper;
 import com.openhis.clinical.service.IProcedurePerformerService;
@@ -14,6 +17,21 @@ import com.openhis.clinical.service.IProcedurePerformerService;
  * @date 2025-02-20
  */
 @Service
-public class ProcedurePerformerServiceImpl extends ServiceImpl<ProcedurePerformerMapper, ProcedurePerformer> implements IProcedurePerformerService {
+public class ProcedurePerformerServiceImpl extends ServiceImpl<ProcedurePerformerMapper, ProcedurePerformer>
+    implements IProcedurePerformerService {
 
+    @Override
+    public boolean addPerformRecord(Long procedureId, Date now) {
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        ProcedurePerformer procedurePerformer = new ProcedurePerformer();
+        procedurePerformer
+            // 执行记录id
+            .setProcedureId(procedureId)
+            // 执行开始时间
+            .setStartTime(now)
+            // 执行人
+            .setPractitionerId(practitionerId);
+        int result = baseMapper.insert(procedurePerformer);
+        return result > 0;
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
new file mode 100644
index 00000000..141218a2
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
@@ -0,0 +1,149 @@
+package com.openhis.clinical.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.clinical.domain.Procedure;
+import com.openhis.clinical.mapper.ProcedureMapper;
+import com.openhis.clinical.service.IProcedurePerformerService;
+import com.openhis.clinical.service.IProcedureService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.ProcedureCategory;
+import com.openhis.medication.domain.MedicationRequest;
+
+/**
+ * 手术与治疗管理Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Service
+public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure> implements IProcedureService {
+
+    @Resource
+    private IProcedurePerformerService procedurePerformerService;
+
+    /**
+     * 查询执行记录
+     *
+     * @param requestIds 医嘱ids
+     * @param requestTable 医嘱所在表
+     * @return 执行记录
+     */
+    @Override
+    public List<Procedure> getProcedureRecords(List<Long> requestIds, String requestTable) {
+        LambdaQueryWrapper<Procedure> queryWrapper = new LambdaQueryWrapper<Procedure>()
+            .in(Procedure::getRequestId, requestIds).eq(Procedure::getDeleteFlag, DelFlag.NO.getCode());
+        if (requestTable != null) {
+            queryWrapper.eq(Procedure::getRequestTable, requestTable);
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 添加执行记录
+     *
+     * @param encounterId 就诊id
+     * @param patientId 患者id
+     * @param requestId 医嘱id
+     * @param requestTable 医嘱所在表
+     * @param eventStatus 执行状态
+     * @param procedureCategory 执行种类
+     * @param locationId 执行位置
+     * @param groupId 组号
+     * @param refundId 取消执行id
+     * @return 是否成功
+     */
+    @Override
+    public boolean addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
+        EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Long groupId, Long refundId) {
+        Date now = DateUtils.getNowDate();
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        Procedure procedure = new Procedure();
+        procedure
+            // 医嘱id
+            .setRequestId(requestId)
+            // 医嘱所在表
+            .setRequestTable(requestTable)
+            // 就诊id
+            .setEncounterId(encounterId)
+            // 执行科室
+            .setOrgId(orgId)
+            // 患者id
+            .setPatientId(patientId)
+            // 执行时间
+            .setOccurrenceTime(now)
+            // 执行状态
+            .setStatusEnum(eventStatus.getValue())
+            // 执行种类
+            .setCategoryEnum(procedureCategory.getValue());
+        if (locationId != null) {
+            // 执行位置
+            procedure.setLocationId(locationId);
+        }
+        if (groupId != null) {
+            // 组号
+            procedure.setGroupId(groupId);
+        }
+        if (refundId != null) {
+            procedure.setRefundId(refundId);
+        }
+        int result = baseMapper.insert(procedure);
+        if (result > 0) {
+            // 添加执行人子表
+            return procedurePerformerService.addPerformRecord(procedure.getId(), now);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 添加药品执行记录
+     *
+     * @param medicationRequest 药品医嘱
+     * @param procedureCategory 执行种类
+     * @param locationId 执行位置
+     * @return 是否成功
+     */
+    @Override
+    public boolean addMedicationProcedureRecord(MedicationRequest medicationRequest,
+        ProcedureCategory procedureCategory, Long locationId) {
+        Date now = DateUtils.getNowDate();
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        Procedure procedure = new Procedure();
+        procedure
+            // 药品医嘱id
+            .setRequestId(medicationRequest.getId())
+            // 药品申请表
+            .setRequestTable(CommonConstants.TableName.MED_MEDICATION_REQUEST)
+            // 就诊id
+            .setEncounterId(medicationRequest.getEncounterId())
+            // 执行科室
+            .setOrgId(orgId)
+            // 患者id
+            .setPatientId(medicationRequest.getPatientId())
+            // 执行时间
+            .setOccurrenceTime(now)
+            // 执行种类
+            .setCategoryEnum(procedureCategory.getValue())
+            // 执行位置
+            .setLocationId(locationId);
+        int result = baseMapper.insert(procedure);
+        if (result > 0) {
+            // 添加执行人子表
+            return procedurePerformerService.addPerformRecord(procedure.getId(), now);
+        } else {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
similarity index 37%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
index 938a7209..226a49b0 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
@@ -3,17 +3,18 @@ package com.openhis.clinical.service.impl;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.clinical.domain.Procedure;
-import com.openhis.clinical.mapper.ProcedureMapper;
-import com.openhis.clinical.service.IProcedureService;
+import com.openhis.clinical.domain.ReservationRecord;
+import com.openhis.clinical.mapper.ReservationRecordMapper;
+import com.openhis.clinical.service.IReservationRecordService;
 
 /**
- * 手术与治疗管理Service业务层处理
+ * 门诊预约记录Service业务层处理
  *
  * @author system
  * @date 2025-02-20
  */
 @Service
-public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure> implements IProcedureService {
+public class ReservationRecordServiceImpl extends ServiceImpl<ReservationRecordMapper, ReservationRecord>
+    implements IReservationRecordService {
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java
new file mode 100644
index 00000000..20b7cc2b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java
@@ -0,0 +1,113 @@
+package com.openhis.crosssystem.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.openhis.crosssystem.enums.LisOutsideFlg;
+import com.openhis.crosssystem.enums.LisPatientSex;
+import com.openhis.crosssystem.enums.LisPatientType;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * LIS申请参数
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class LisApplyDto {
+
+    /**
+     * 必填 【申请单号】 业务上需要保证唯一
+     */
+    private String applyNo;
+    /**
+     * 必填 【患者编号】
+     */
+    private String patientNo;
+    /**
+     * 必填 【病人类型】 门诊01 住院02 手动登记03 体检04
+     */
+    private LisPatientType patientType;
+    /**
+     * 必填 【病人姓名】
+     */
+    private String patientName;
+    /**
+     * 必填 【病人性别】 未知01 男02 女03
+     */
+    private LisPatientSex patientSex;
+    /**
+     * 非必填 【联系电话】
+     */
+    private String patientMobile;
+    /**
+     * 必填 【申请日期】
+     */
+    private Date applyDate;
+    /**
+     * 必填 【申请医生姓名】
+     */
+    private String applyDoctor;
+    /**
+     * 必填 【申请科室】
+     */
+    private String applyDept;
+    /**
+     * 必填 【年龄】
+     */
+    private Integer age;
+    /**
+     * 必填 【执行科室编码】
+     */
+    private String execDeptCode;
+    /**
+     * 必填 【执行科室名称】
+     */
+    private String execDeptName;
+    /**
+     * 非必填 【身份证号码】
+     */
+    private String idCard;
+    /**
+     * 非必填 【病区ID】
+     */
+    private String wardId;
+    /**
+     * 必填 【病房号】
+     */
+    private String roomNo;
+    /**
+     * 必填 【床位号】
+     */
+    private String bedNo;
+    /**
+     * 非必填 【是否急诊】
+     */
+    private String emergency;
+    /**
+     * 非必填 【临床诊断】
+     */
+    private String diagnose;
+    /**
+     * 必填 【外检FLG】 非外检0 外检1
+     */
+    private LisOutsideFlg outsideFlg;
+
+    /**
+     * 必填【申请部门编码】
+     */
+    private String applyDeptCode;
+    /**
+     * 必填【申请部门名称】
+     */
+    private String applyDeptName;
+
+    /**
+     * 必填【检查项目组】
+     */
+    List<LisApplyGroupDto> groupList;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java
new file mode 100644
index 00000000..09ff2080
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java
@@ -0,0 +1,23 @@
+package com.openhis.crosssystem.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * LIS申请单封装类
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class LisApplyGroupDto {
+
+    /**
+     * 必填 【检查项目编码】
+     */
+    private String groupCode;
+    /**
+     * 必填 【检查项目名称】
+     */
+    private String groupName;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java
new file mode 100644
index 00000000..1670bcd3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java
@@ -0,0 +1,23 @@
+package com.openhis.crosssystem.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * LIS申请单封装类
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class LisGroupInfo {
+
+    /**
+     * 必填 【检查项目编码】 多个用“+”连接
+     */
+    private String groupCode;
+    /**
+     * 必填 【检查项目名称】多个用“+”连接
+     */
+    private String groupName;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java
new file mode 100644
index 00000000..5d8d80bc
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java
@@ -0,0 +1,105 @@
+package com.openhis.crosssystem.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * LIS申请单封装类
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class LisPatientInfo {
+
+    /**
+     * 必填 【申请单号】 业务上需要保证唯一
+     */
+    private String applyNo;
+    /**
+     * 必填 【患者编号】
+     */
+    private String patientNo;
+    /**
+     * 必填 【病人类型】 门诊01 住院02 手动登记03 体检04
+     */
+    private String patientType;
+    /**
+     * 必填 【病人姓名】
+     */
+    private String patientName;
+    /**
+     * 必填 【病人性别】 未知01 男02 女03
+     */
+    private String patientSex;
+    /**
+     * 非必填 【联系电话】
+     */
+    private String patientMobile;
+    /**
+     * 必填 【申请日期】 格式：yyyy-MM-dd HH:mm:ss.S
+     */
+    private String applyDate;
+    /**
+     * 必填 【申请医生姓名】
+     */
+    private String applyDoctor;
+    /**
+     * 必填 【申请科室】
+     */
+    private String applyDept;
+    /**
+     * 必填 【年龄】
+     */
+    private Integer age;
+    /**
+     * 必填 【年龄单位】 岁01
+     */
+    private String ageUnit;
+    /**
+     * 必填 【执行科室编码】
+     */
+    private String execDeptCode;
+    /**
+     * 必填 【执行科室名称】
+     */
+    private String execDeptName;
+    /**
+     * 非必填 【身份证号码】
+     */
+    private String idCard;
+    /**
+     * 非必填 【病区ID】
+     */
+    private String wardId;
+    /**
+     * 必填 【病房号】
+     */
+    private String roomNo;
+    /**
+     * 必填 【床位号】
+     */
+    private String bedNo;
+    /**
+     * 非必填 【是否急诊】
+     */
+    private String emergency;
+    /**
+     * 非必填 【临床诊断】
+     */
+    private String diagnose;
+    /**
+     * 必填 【外检FLG】 非外检0 外检1
+     */
+    private Integer outsideFlg;
+
+    /**
+     * 必填【申请部门编码】
+     */
+    private String applyDeptCode;
+    /**
+     * 必填【申请部门名称】
+     */
+    private String applyDeptName;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java
new file mode 100644
index 00000000..b6d7f4bb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java
@@ -0,0 +1,115 @@
+package com.openhis.crosssystem.dto;
+
+import java.util.Date;
+
+import com.openhis.crosssystem.enums.PacsPatientSex;
+import com.openhis.crosssystem.enums.PacsPatientType;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * PACS申请参数
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class PacsApplyDto {
+
+    /**
+     * 必填 【申请单号】 业务上需要保证唯一
+     */
+    private String applyNo;
+    /**
+     * 必填 【患者编号】
+     */
+    private String patientNo;
+    /**
+     * 必填 【患者类型】 门诊01 住院02 手动登记03 体检04
+     */
+    private PacsPatientType patientType;
+    /**
+     * 必填 【患者姓名】
+     */
+    private String patientName;
+    /**
+     * 必填 【性别】 PACS中 男01 女02 未知03
+     */
+    private PacsPatientSex patientSex;
+    /**
+     * 非必填 【联系电话】
+     */
+    private String patientMobile;
+    /**
+     * 必填 【申请日期】 格式：yyyy-MM-dd HH:mm:ss
+     */
+    private Date applyDate;
+    /**
+     * 必填 【申请医生姓名】
+     */
+    private String applyDoctorName;
+    /**
+     * 必填 【申请医生编码】
+     */
+    private String applyDoctorCode;
+    /**
+     * 必填 【申请部门名称】
+     */
+    private String applyDeptName;
+    /**
+     * 必填 【申请部门编码】
+     */
+    private String applyDeptCode;
+    /**
+     * 必填 【年龄】
+     */
+    private Integer age;
+    /**
+     * 必填 【执行科室编码】
+     */
+    private String execDeptCode;
+    /**
+     * 必填 【执行科室名称】
+     */
+    private String execDeptName;
+    /**
+     * 必填 【检查部位】
+     */
+    private String examPart;
+    /**
+     * 非必填 【身份证号】
+     */
+    private String idCard;
+    /**
+     * 非必填 【病区ID】
+     */
+    private String wardId;
+    /**
+     * 非必填 【病房号】
+     */
+    private String roomNo;
+    /**
+     * 非必填 【病床号】
+     */
+    private String bedNo;
+    /**
+     * 非必填 【是否急诊】
+     */
+    private String emergency;
+    /**
+     * 非必填 【临床诊断】
+     */
+    private String diagnose;
+
+    /**
+     * 必填 【检查项目编码】
+     */
+    private String groupCode;
+
+    /**
+     * 必填 【检查项目名称】
+     */
+    private String groupName;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java
new file mode 100644
index 00000000..ebe9bd5e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java
@@ -0,0 +1,24 @@
+package com.openhis.crosssystem.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * PACS申请单封装类
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class PacsGroupInfo {
+
+    /**
+     * 必填 【检查项目编码】
+     */
+    private String groupCode;
+
+    /**
+     * 必填 【检查项目名称】
+     */
+    private String groupName;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java
new file mode 100644
index 00000000..9b2ad4e5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java
@@ -0,0 +1,104 @@
+package com.openhis.crosssystem.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * PACS申请单封装类
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class PacsPatientInfo {
+
+    /**
+     * 必填 【申请单号】 业务上需要保证唯一
+     */
+    private String applyNo;
+    /**
+     * 必填 【患者编号】
+     */
+    private String patientNo;
+    /**
+     * 必填 【患者类型】 门诊01 住院02 手动登记03 体检04
+     */
+    private String patientType;
+    /**
+     * 必填 【患者姓名】
+     */
+    private String patientName;
+    /**
+     * 必填 【性别】 PACS中 男01 女02 未知03
+     */
+    private String patientSex;
+    /**
+     * 非必填 【联系电话】
+     */
+    private String patientMobile;
+    /**
+     * 必填 【申请日期】 格式：yyyy-MM-dd HH:mm:ss
+     */
+    private String applyDate;
+    /**
+     * 必填 【申请医生姓名】
+     */
+    private String applyDoctorName;
+    /**
+     * 必填 【申请医生编码】
+     */
+    private String applyDoctorCode;
+    /**
+     * 必填 【申请部门名称】
+     */
+    private String applyDeptName;
+    /**
+     * 必填 【申请部门编码】
+     */
+    private String applyDeptCode;
+    /**
+     * 必填 【年龄】
+     */
+    private String age;
+    /**
+     * 必填 【年龄单位】 岁1
+     */
+    private String ageUnit;
+    /**
+     * 必填 【执行科室编码】
+     */
+    private String execDeptCode;
+    /**
+     * 必填 【执行科室名称】
+     */
+    private String execDeptName;
+    /**
+     * 必填 【检查部位】
+     */
+    private String examPart;
+    /**
+     * 非必填 【身份证号】
+     */
+    private String idCard;
+    /**
+     * 非必填 【病区ID】
+     */
+    private String wardId;
+    /**
+     * 非必填 【病房号】
+     */
+    private String roomNo;
+    /**
+     * 非必填 【病床号】
+     */
+    private String bedNo;
+    /**
+     * 非必填 【是否急诊】
+     */
+    private String emergency;
+    /**
+     * 非必填 【临床诊断】
+     */
+    private String diagnose;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java
new file mode 100644
index 00000000..08fc7dea
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java
@@ -0,0 +1,41 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * LIS年龄单位
+ *
+ * @author system
+ */
+public enum LisAgeUnit {
+    /**
+     * 岁
+     */
+    YEAR("01", "岁");
+
+    private final String code;
+    private final String name;
+
+    LisAgeUnit(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static LisAgeUnit getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (LisAgeUnit val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java
new file mode 100644
index 00000000..62f811d9
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java
@@ -0,0 +1,45 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * LIS外检FLG
+ *
+ * @author system
+ */
+public enum LisOutsideFlg {
+    /**
+     * 非外检
+     */
+    NO(0, "非外检"),
+    /**
+     * 外检
+     */
+    YES(1, "外检");
+
+    private final Integer code;
+    private final String name;
+
+    LisOutsideFlg(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static LisOutsideFlg getByCode(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (LisOutsideFlg val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java
new file mode 100644
index 00000000..8a4b14f3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java
@@ -0,0 +1,49 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * LIS病人性别
+ *
+ * @author system
+ */
+public enum LisPatientSex {
+    /**
+     * 未知
+     */
+    UNKNOWN("01", "未知"),
+    /**
+     * 男
+     */
+    MALE("02", "男"),
+    /**
+     * 女
+     */
+    FEMALE("03", "女");
+
+    private final String code;
+    private final String name;
+
+    LisPatientSex(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static LisPatientSex getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (LisPatientSex val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java
new file mode 100644
index 00000000..38f5f6f3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java
@@ -0,0 +1,53 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * LIS病人类型
+ *
+ * @author system
+ */
+public enum LisPatientType {
+    /**
+     * 门诊
+     */
+    OUTPATIENT("01", "门诊"),
+    /**
+     * 住院
+     */
+    INPATIENT("02", "住院"),
+    /**
+     * 手动登记
+     */
+    MANUAL_REGISTRATION("03", "手动登记"),
+    /**
+     * 体检
+     */
+    HEALTH_CHECKUP("04", "体检");
+
+    private final String code;
+    private final String name;
+
+    LisPatientType(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static LisPatientType getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (LisPatientType val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java
new file mode 100644
index 00000000..88f59238
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java
@@ -0,0 +1,41 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * PACS年龄单位
+ *
+ * @author system
+ */
+public enum PacsAgeUnit {
+    /**
+     * 岁
+     */
+    YEAR("1", "岁");
+
+    private final String code;
+    private final String name;
+
+    PacsAgeUnit(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static PacsAgeUnit getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (PacsAgeUnit val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java
new file mode 100644
index 00000000..9c168c35
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java
@@ -0,0 +1,49 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * PACS性别
+ *
+ * @author system
+ */
+public enum PacsPatientSex {
+    /**
+     * 男
+     */
+    MALE("01", "男"),
+    /**
+     * 女
+     */
+    FEMALE("02", "女"),
+    /**
+     * 未知
+     */
+    UNKNOWN("03", "未知");
+
+    private final String code;
+    private final String name;
+
+    PacsPatientSex(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static PacsPatientSex getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (PacsPatientSex val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java
new file mode 100644
index 00000000..144f5740
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java
@@ -0,0 +1,53 @@
+package com.openhis.crosssystem.enums;
+
+/**
+ * PACS患者类型
+ *
+ * @author system
+ */
+public enum PacsPatientType {
+    /**
+     * 门诊
+     */
+    OUTPATIENT("01", "门诊"),
+    /**
+     * 住院
+     */
+    INPATIENT("02", "住院"),
+    /**
+     * 手动登记
+     */
+    MANUAL_REGISTRATION("03", "手动登记"),
+    /**
+     * 体检
+     */
+    HEALTH_CHECKUP("04", "体检");
+
+    private final String code;
+    private final String name;
+
+    PacsPatientType(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static PacsPatientType getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (PacsPatientType val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java
new file mode 100644
index 00000000..9317d37f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java
@@ -0,0 +1,289 @@
+package com.openhis.crosssystem.utils;
+
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.StringUtils;
+import com.core.web.util.TenantOptionUtil;
+import com.openhis.crosssystem.dto.*;
+import com.openhis.crosssystem.enums.LisAgeUnit;
+import com.openhis.crosssystem.enums.PacsAgeUnit;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 跨系统发送申请工具类
+ *
+ * @author GuoRui
+ * @date 2025-06-25
+ */
+@Slf4j
+@Component
+public class CrossSystemSendApplyUtil {
+
+    /**
+     * 发送LIS申请
+     *
+     * @param lisApplyDto LIS申请参数
+     */
+    public void sendApplyToLis(LisApplyDto lisApplyDto) {
+        // 读取配置参数
+        String apiUrl = TenantOptionUtil.getOptionContent(TenantOptionDict.LIS_API_URL);
+        String appId = TenantOptionUtil.getOptionContent(TenantOptionDict.LIS_APP_ID);
+        String appSecret = TenantOptionUtil.getOptionContent(TenantOptionDict.LIS_APP_SECRET);
+        if (StringUtils.isEmpty(apiUrl) || StringUtils.isEmpty(appId) || StringUtils.isEmpty(appSecret)) {
+            throw new ServiceException("请在租户管理页面配置LIS相关接口参数");
+        }
+        // 作成申请参数
+        LisPatientInfo lisPatientInfo = new LisPatientInfo()
+            // 必填 【申请单号】 业务上需要保证唯一
+            .setApplyNo(lisApplyDto.getApplyNo())
+            // 必填 【患者编号】
+            .setPatientNo(lisApplyDto.getPatientNo())
+            // 必填 【病人类型】 门诊01 住院02 手动登记03 体检04
+            .setPatientType(lisApplyDto.getPatientType() == null ? null : lisApplyDto.getPatientType().getCode())
+            // 必填 【病人姓名】
+            .setPatientName(lisApplyDto.getPatientName())
+            // 必填 【病人性别】 未知01 男02 女03
+            .setPatientSex(lisApplyDto.getPatientSex() == null ? null : lisApplyDto.getPatientSex().getCode())
+            // 非必填 【联系电话】
+            .setPatientMobile(lisApplyDto.getPatientMobile())
+            // 必填 【申请日期】 格式：yyyy-MM-dd HH:mm:ss.S
+            .setApplyDate(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss.S", lisApplyDto.getApplyDate()))
+            // 必填 【申请医生姓名】
+            .setApplyDoctor(lisApplyDto.getApplyDoctor())
+            // 必填 【申请科室】
+            .setApplyDept(lisApplyDto.getApplyDept())
+            // 必填 【年龄】
+            .setAge(lisApplyDto.getAge())
+            // 必填 【年龄单位】 岁01
+            .setAgeUnit(LisAgeUnit.YEAR.getCode())
+            // 必填 【执行科室编码】
+            .setExecDeptCode(lisApplyDto.getExecDeptCode())
+            // 必填 【执行科室名称】
+            .setExecDeptName(lisApplyDto.getExecDeptName())
+            // 非必填 【身份证号码】
+            .setIdCard(lisApplyDto.getIdCard())
+            // 非必填 【病区ID】
+            .setWardId(lisApplyDto.getWardId())
+            // 必填 【病房号】
+            .setRoomNo(lisApplyDto.getRoomNo())
+            // 必填 【床位号】
+            .setBedNo(lisApplyDto.getBedNo())
+            // 非必填 【是否急诊】
+            .setEmergency(lisApplyDto.getEmergency())
+            // 非必填 【临床诊断】
+            .setDiagnose(lisApplyDto.getDiagnose())
+            // 必填 【外检FLG】 非外检0 外检1
+            .setOutsideFlg(lisApplyDto.getOutsideFlg() == null ? null : lisApplyDto.getOutsideFlg().getCode())
+            // 必填【申请部门编码】
+            .setApplyDeptCode(lisApplyDto.getApplyDeptCode())
+            // 必填【申请部门名称】
+            .setApplyDeptName(lisApplyDto.getApplyDeptName());
+        LisGroupInfo lisGroupInfo = new LisGroupInfo()
+            // 必填 【检查项目编码】 多个用“+”连接
+            .setGroupCode(lisApplyDto.getGroupList().stream().map(LisApplyGroupDto::getGroupCode)
+                .collect(Collectors.joining("+")))
+            // 必填 【检查项目名称】多个用“+”连接
+            .setGroupName(lisApplyDto.getGroupList().stream().map(LisApplyGroupDto::getGroupName)
+                .collect(Collectors.joining("+")));
+        // 设置超时时间
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5000).setConnectionRequestTimeout(3000)
+            .setSocketTimeout(30000).build();
+        // 创建无视SSL验证的HttpClient
+        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig)
+            .setSSLSocketFactory(createIgnoreSslSocketFactory()).build();
+        CloseableHttpResponse response = null;
+        // 发起HTTP请求
+        try {
+            HttpPost httpPost = new HttpPost(apiUrl);
+            httpPost.setHeader("App-Id", appId);
+            httpPost.setHeader("App-Secret", appSecret);
+            Map<String, Object> requestUrlParam = new HashMap<>();
+            requestUrlParam.put("patientInfo", lisPatientInfo);
+            requestUrlParam.put("groupInfo", lisGroupInfo);
+            String s = JSON.toJSONString(requestUrlParam);
+            StringEntity stringEntity = new StringEntity(s, ContentType.APPLICATION_JSON);
+            httpPost.setEntity(stringEntity);
+            response = httpClient.execute(httpPost);
+            JSONObject object = JSON.parseObject(EntityUtils.toString(response.getEntity(), "utf-8"));
+            // 获取结果CODE
+            String code = String.valueOf(object.getInnerMap().get("code"));
+            if (!"100000".equals(code)) {
+                throw new ServiceException("LIS申请返回失败信息：" + object);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException("LIS申请发生未知错误：" + e.getMessage());
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 发送PACS申请
+     * 
+     * @param pacsApplyDto PACS申请参数
+     */
+    public void sendApplyToPacs(PacsApplyDto pacsApplyDto) {
+        String apiUrl = TenantOptionUtil.getOptionContent(TenantOptionDict.PACS_API_URL);
+        String appId = TenantOptionUtil.getOptionContent(TenantOptionDict.PACS_APP_ID);
+        String appSecret = TenantOptionUtil.getOptionContent(TenantOptionDict.PACS_APP_SECRET);
+        if (StringUtils.isEmpty(apiUrl) || StringUtils.isEmpty(appId) || StringUtils.isEmpty(appSecret)) {
+            throw new ServiceException("请在租户管理页面配置PACS相关接口参数");
+        }
+        // 作成申请参数
+        PacsPatientInfo pacsPatientInfo = new PacsPatientInfo()
+            // 必填 【申请单号】 业务上需要保证唯一
+            .setApplyNo(pacsApplyDto.getApplyNo())
+            // 必填 【患者编号】
+            .setPatientNo(pacsApplyDto.getPatientNo())
+            // 必填 【患者类型】 门诊01 住院02 手动登记03 体检04
+            .setPatientType(pacsApplyDto.getPatientType() == null ? null : pacsApplyDto.getPatientType().getCode())
+            // 必填 【患者姓名】
+            .setPatientName(pacsApplyDto.getPatientName())
+            // 必填 【性别】 PACS中 男01 女02 未知03
+            .setPatientSex(pacsApplyDto.getPatientSex() == null ? null : pacsApplyDto.getPatientSex().getCode())
+            // 非必填 【联系电话】
+            .setPatientMobile(pacsApplyDto.getPatientMobile())
+            // 必填 【申请日期】 格式：yyyy-MM-dd HH:mm:ss
+            .setApplyDate(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", pacsApplyDto.getApplyDate()))
+            // 必填 【申请医生姓名】
+            .setApplyDoctorName(pacsApplyDto.getApplyDoctorName())
+            // 必填 【申请医生编码】
+            .setApplyDoctorCode(pacsApplyDto.getApplyDoctorCode())
+            // 必填 【申请部门名称】
+            .setApplyDeptName(pacsApplyDto.getApplyDeptName())
+            // 必填 【申请部门编码】
+            .setApplyDeptCode(pacsApplyDto.getApplyDeptCode())
+            // 必填 【年龄】
+            .setAge(pacsApplyDto.getAge() == null ? "" : pacsApplyDto.getAge().toString())
+            // 必填 【年龄单位】 岁1
+            .setAgeUnit(PacsAgeUnit.YEAR.getCode())
+            // 必填 【执行科室编码】
+            .setExecDeptCode(pacsApplyDto.getExecDeptCode())
+            // 必填 【执行科室名称】
+            .setExecDeptName(pacsApplyDto.getExecDeptName())
+            // 必填 【检查部位】
+            .setExamPart(pacsApplyDto.getExamPart())
+            // 非必填 【身份证号】
+            .setIdCard(pacsApplyDto.getIdCard())
+            // 非必填 【病区ID】
+            .setWardId(pacsApplyDto.getWardId())
+            // 非必填 【病房号】
+            .setRoomNo(pacsApplyDto.getRoomNo())
+            // 非必填 【病床号】
+            .setBedNo(pacsApplyDto.getBedNo())
+            // 非必填 【是否急诊】
+            .setEmergency(pacsApplyDto.getEmergency())
+            // 非必填 【临床诊断】
+            .setDiagnose(pacsApplyDto.getDiagnose());
+        PacsGroupInfo pacsGroupInfo = new PacsGroupInfo()
+            // 必填 【检查项目编码】
+            .setGroupCode(pacsApplyDto.getGroupCode())
+            // 必填 【检查项目名称】
+            .setGroupName(pacsApplyDto.getGroupName());
+        // 设置超时时间
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5000).setConnectionRequestTimeout(3000)
+            .setSocketTimeout(30000).build();
+        // 创建无视SSL验证的HttpClient
+        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig)
+            .setSSLSocketFactory(createIgnoreSslSocketFactory()).build();
+        CloseableHttpResponse response = null;
+        // 发起HTTP请求
+        try {
+            HttpPost httpPost = new HttpPost(apiUrl);
+            httpPost.setHeader("App-Id", appId);
+            httpPost.setHeader("App-Secret", appSecret);
+            Map<String, Object> requestUrlParam = new HashMap<>();
+            requestUrlParam.put("patientInfo", pacsPatientInfo);
+            requestUrlParam.put("groupInfo", pacsGroupInfo);
+            String s = JSON.toJSONString(requestUrlParam);
+            StringEntity stringEntity = new StringEntity(s, ContentType.APPLICATION_JSON);
+            httpPost.setEntity(stringEntity);
+            response = httpClient.execute(httpPost);
+            JSONObject object = JSON.parseObject(EntityUtils.toString(response.getEntity(), "utf-8"));
+            // 获取结果CODE
+            String code = String.valueOf(object.getInnerMap().get("code"));
+            if (!"100000".equals(code)) {
+                throw new ServiceException("PACS申请返回失败信息：" + object);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException("PACS申请发生未知错误：" + e.getMessage());
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 创建无视SSL验证的SSLSocketFactory
+     */
+    private static SSLConnectionSocketFactory createIgnoreSslSocketFactory() {
+        try {
+            // 创建信任所有证书的TrustManager
+            X509TrustManager trustAllCert = new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+
+                @Override
+                public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+
+                @Override
+                public X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[0];
+                }
+            };
+
+            // 初始化SSLContext
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, new TrustManager[] {trustAllCert}, new SecureRandom());
+
+            // 创建不验证主机名的SocketFactory
+            return new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE // 关键：禁用主机名验证
+            );
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            throw new RuntimeException("SSL配置失败", e);
+        }
+    }
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java
new file mode 100644
index 00000000..3dd500a9
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java
@@ -0,0 +1,95 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 文书定义：例如：门诊病历、体温单、患者护理记录单、患者跌倒压疮评估等
+ *
+ * @author wanghaiming
+ * @date 2025-08-14
+ */
+@Data
+@TableName("doc_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocDefinition extends HisBaseEntity {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    /**
+     * 文书名称
+     */
+    private String name;
+    /**
+     * 文书的版本号
+     */
+    private String version;
+    /**
+     * 文书类型 一级菜单 ，从枚举中获取 DocTypeEnum
+     */
+    private Integer primaryMenuEnum;
+    /**
+     * 文书类型 二级菜单，自定义
+     */
+    private String subMenu;
+    /**
+     * 文书编码 busNo，在新建时由系统自动生成
+     */
+
+    private String busNo;
+    /**
+     * vue路由地址
+     */
+    private String vueRouter;
+    /**
+     * 医院ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long hospitalId;
+    /**
+     * 是否有效 0-有效 1-无效
+     */
+    private Integer isValid;
+
+    /**
+     * 显示顺序
+     */
+    private Integer displayOrder;
+    /**
+     * 使用范围 0-暂不使用 1-全院使用 2-指定科室使用
+     */
+    private Integer useRangeEnum;
+    /**
+     * 医生权限 DocPermissionEnum
+     * 文书权限  0-不限制 1-查看 2- 编辑
+     */
+    private Integer doctorPermissionEnum;
+    /**
+     * 护士权限 DocPermissionEnum
+     * 文书权限 0-不限制 1-查看 2- 编辑
+     */
+    private Integer nursingPermissionEnum;
+    /**
+     * 医技权限 DocPermissionEnum
+     * 文书权限  0-不限制 1-查看 2- 编辑
+     */
+    private Integer medicalPermissionEnum;
+    /**
+     * 药剂师权限 DocPermissionEnum
+     * 文书权限  0-不限制 1-查看 2- 编辑
+     */
+    private Integer pharmacistPermissionEnum;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
new file mode 100644
index 00000000..86fc31a8
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
@@ -0,0 +1,35 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 科室文书对照表
+ *
+ * @author wanghaiming
+ * @date 2025-08-14
+ */
+@Data
+@TableName("doc_definition_organization")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocDefinitionOrganization extends HisBaseEntity {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    private Long definitionId;
+    private String busNo;
+    private Long organizationId;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
new file mode 100644
index 00000000..0b6b13d7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
@@ -0,0 +1,58 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 文档记录
+ *
+ * @author wanghaiming
+ * @date 2025-08-14
+ */
+@Data
+@TableName("doc_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocRecord extends HisBaseEntity {
+
+    private Long id;
+    /**
+     * 文书定义ID
+     */
+    private Long definitionId;
+
+    private String definitionBusNo;
+    /**
+     * 文档内容 存储为JSON格式
+     */
+    private String contentJson;
+
+    /**
+     * 记录状态 0草稿/暂存 1提交 2归档 3修改  DocStatusEnum 枚举类
+     * 0草稿/暂存 1提交 2归档 3修改
+     */
+    private Integer statusEnum;
+    /**
+     * 记录科室ID
+     */
+    private Long organizationId;
+    /**
+     * encounterId 就诊记录ID
+     */
+    private Long encounterId;
+    /**
+     * patientId 病人ID
+     */
+    private Long patientId;
+    private Date recordTime;
+    /**
+     * 是否编辑 0未编辑 1已编辑,当前正在编辑中
+     */
+    private Integer isEdit;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
new file mode 100644
index 00000000..796d24ba
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
@@ -0,0 +1,53 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@TableName("doc_statistics")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocStatistics extends HisBaseEntity {
+    private Long id;
+    /**
+     * 记录ID
+     */
+    private Long recordId;
+    /**
+     * 统计项定义ID
+     */
+    private Long statisticDefinitionId;
+    private Long encounterId;
+    private Long patientId;
+    /**
+     * 统计项编码
+     */
+    private String statisticDefinitionCode;
+    /**
+     * 记录科室ID
+     */
+    private Long orgnizationId;
+    /**
+     * 统计值
+     */
+    private String value;
+    /**
+     * 记录日期 yyyy-MM-dd
+     */
+    private Date recordingDate;
+    /**
+     * 记录时间 yyyy-MM-dd HH:mm:ss
+     */
+    private Date recordingTime;
+    /**
+     * 记录来源
+     */
+    private String source;
+
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
new file mode 100644
index 00000000..02b5d9c9
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
@@ -0,0 +1,49 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@TableName("doc_statistics_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocStatisticsDefinition extends HisBaseEntity {
+    private Long id;
+    /*
+     属性名称
+    */
+    private String name;
+
+    /*
+     属性类型 Input 、 Date 、 Checkbox 、Radio 、 Select 、 Textarea
+    */
+    private Integer typeEnum;
+    /*
+     属性代码
+    */
+    private String code;
+
+    /*
+     是否必填  1必填 0 不必填
+    */
+    private Integer required;
+    /*
+     备注
+    */
+    private String remark;
+    /*
+    是否统计    0：不统计  1：统计
+     */
+    private Integer isStatistics;
+    private Integer displayOrder;
+    /*
+      单位
+     */
+    private String unit;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
new file mode 100644
index 00000000..07aaabbd
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
@@ -0,0 +1,29 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@TableName("doc_statistics_definition_option")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocStatisticsDefinitionOption extends HisBaseEntity {
+    private Long id;
+    /*
+     属性编码
+    */
+    private Long docStatisticsDefinitionId;
+    /*
+    值，当属性类型为Checkbox\Radio\Select
+    */
+    private String option;
+
+    /*
+    显示顺序
+    */
+    private Integer displayOrder;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
new file mode 100644
index 00000000..e52c60f4
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
@@ -0,0 +1,53 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 文档模板实体类
+ **/
+
+@Data
+@TableName("doc_template")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocTemplate extends HisBaseEntity {
+    private Long id;
+    /**
+     * 模板名称
+     */
+    private String name;
+    /**
+     * 排序
+     */
+    private Integer displayOrder;
+    /**
+     * 模板内容
+     */
+    private String contextJson;
+
+    /**
+     * 文书定义ID
+     */
+    private Long definitionId;
+
+    /**
+     * 使用范围 0-暂不使用 1-全院使用 2-指定科室使用 3-个人使用
+     */
+    private Integer useRange;
+    /**
+     * 当useRange=1时，指定机构ID
+     */
+    private Long organizationId;
+    /**
+     * 当useRange=2时，指定用户ID
+     */
+    private Long userId;
+    /**
+     * 备注
+     */
+    private String remark;
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
similarity index 89%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
index bc6ad4b2..cd4a85bb 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
@@ -11,6 +11,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 病历信息Entity实体
  *
@@ -36,6 +38,9 @@ public class Emr extends HisBaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
+    /** 类别编码 */
+    private Integer classEnum;
+
     /** 病历信息 */
     private String contextJson;
 
@@ -45,4 +50,7 @@ public class Emr extends HisBaseEntity {
     /** 记录人 */
     private Long recordId;
 
+    /** 记录时间 */
+    private Date recordTime;
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
similarity index 92%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
index 72dbc687..2a1763d1 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
@@ -1,16 +1,12 @@
 package com.openhis.document.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
new file mode 100644
index 00000000..931d9e30
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
@@ -0,0 +1,76 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 医嘱过程表
+ *
+ * @author WangHuan
+ * @date 2025-09-02
+ */
+@Data
+@TableName("doc_order_process")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class OrderProcess extends HisBaseEntity {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /**
+     * 请求id
+     */
+    private Long requestId;
+
+    /**
+     * 请求表名
+     */
+    private String requestTableName;
+
+    /**
+     * 原科室
+     */
+    private Long originalOrganizationId;
+
+    /**
+     * 目标科室
+     */
+    private Long targetOrganizationId;
+
+    /**
+     * 原病区
+     */
+    private Long originalLocationId;
+
+    /**
+     * 目标病区
+     */
+    private Long targetLocationId;
+
+    /**
+     * 出院方式
+     */
+    private String outWayCode;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
new file mode 100644
index 00000000..956ac422
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
@@ -0,0 +1,63 @@
+package com.openhis.document.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 申请单管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+@Data
+@TableName("doc_request_form")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class RequestForm extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 处方号
+     */
+    private String prescriptionNo;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 申请人
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requesterId;
+
+    /**
+     * 描述内容
+     */
+    private String descJson;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
new file mode 100644
index 00000000..7b5c411c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
@@ -0,0 +1,63 @@
+package com.openhis.document.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 生命体征管理Entity实体
+ *
+ * @author system
+ * @date 2025-06-03
+ */
+@Data
+@TableName("doc_ital_signs")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class VitalSigns extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 患者id */
+    private Long patientId;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 记录日期 */
+    private Date recordingDate;
+
+    /** 记录时间 */
+    private Date timePoint;
+
+    /** 生命体征编码 */
+    private String vitalSignsCode;
+
+    /** 生命体征值 */
+    private String vitalSignsValues;
+
+    /** 单位 */
+    private String units;
+
+    /** 婴儿编号 */
+    private Integer babyNo;
+
+    /** 科室编码 */
+    private Integer locationId;
+
+    /** 记录人员 */
+    private String recorder;
+
+    /** 备注 */
+    private String remake;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
new file mode 100644
index 00000000..9aca1cf0
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
@@ -0,0 +1,10 @@
+package com.openhis.document.mapper;
+
+import com.openhis.document.domain.DocDefinition;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+@Repository
+public interface DocDefinitionMapper extends BaseMapper<DocDefinition> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
new file mode 100644
index 00000000..38373714
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
@@ -0,0 +1,10 @@
+package com.openhis.document.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.DocDefinitionOrganization;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DocDefinitionOrganizationMapper extends BaseMapper<DocDefinitionOrganization> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
new file mode 100644
index 00000000..fe046dae
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
@@ -0,0 +1,11 @@
+
+package com.openhis.document.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocRecord;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DocRecordMapper extends BaseMapper<DocRecord> {
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
new file mode 100644
index 00000000..33378890
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
@@ -0,0 +1,10 @@
+
+package com.openhis.document.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocStatisticsDefinition;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DocStatisticsDefinitionMapper extends BaseMapper<DocStatisticsDefinition> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
new file mode 100644
index 00000000..baf2940a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
@@ -0,0 +1,10 @@
+
+package com.openhis.document.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocStatisticsDefinitionOption;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DocStatisticsDefinitionOptionMapper extends BaseMapper<DocStatisticsDefinitionOption> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
new file mode 100644
index 00000000..e4dbd451
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
@@ -0,0 +1,11 @@
+
+package com.openhis.document.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.DocStatistics;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DocStatisticsMapper extends BaseMapper<DocStatistics> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
new file mode 100644
index 00000000..ffc03c7a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
@@ -0,0 +1,11 @@
+
+package com.openhis.document.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocRecord;
+import com.openhis.document.domain.DocTemplate;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DocTemplateMapper extends BaseMapper<DocTemplate> {
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
new file mode 100644
index 00000000..3968bf29
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
@@ -0,0 +1,18 @@
+package com.openhis.document.mapper;
+
+import com.openhis.document.domain.OrderProcess;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.Emr;
+
+/**
+ * 医嘱过程Mapper接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+@Repository
+public interface OrderProcessMapper extends BaseMapper<OrderProcess> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
new file mode 100644
index 00000000..4875a25c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
@@ -0,0 +1,17 @@
+package com.openhis.document.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.RequestForm;
+
+/**
+ * 申请单管理Mapper接口
+ *
+ * @author system
+ * @date 2025-02-22
+ */
+@Repository
+public interface RequestFormMapper extends BaseMapper<RequestForm> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
new file mode 100644
index 00000000..ade53455
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
@@ -0,0 +1,17 @@
+package com.openhis.document.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.VitalSigns;
+
+/**
+ * 生命体征管理Mapper接口
+ *
+ * @author system
+ * @date 2025-06-03
+ */
+@Repository
+public interface VitalSignsMapper extends BaseMapper<VitalSigns> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
new file mode 100644
index 00000000..85c3836f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
@@ -0,0 +1,15 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.DocDefinitionOrganization;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocDefinitionOrganizationService extends IService<DocDefinitionOrganization> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
new file mode 100644
index 00000000..f8f467a5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
@@ -0,0 +1,15 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.EmrTemplate;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocDefinitionService extends IService<DocDefinition> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
new file mode 100644
index 00000000..d6652eb7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocRecord;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocRecordService extends IService<DocRecord> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
new file mode 100644
index 00000000..c3c81661
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
@@ -0,0 +1,15 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocStatisticsDefinition;
+import com.openhis.document.domain.DocStatisticsDefinitionOption;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocStatisticsDefinitionOptionService extends IService<DocStatisticsDefinitionOption> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
new file mode 100644
index 00000000..9e727aac
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
@@ -0,0 +1,15 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.document.domain.DocStatisticsDefinition;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocStatisticsDefinitionService extends IService<DocStatisticsDefinition> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
new file mode 100644
index 00000000..59b5eca5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocStatistics;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocStatisticsService extends IService<DocStatistics> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
new file mode 100644
index 00000000..52d1fc7b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocTemplate;
+
+/**
+ * 病历定义服务接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IDocTemplateService extends IService<DocTemplate> {
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
new file mode 100644
index 00000000..b9d709fc
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.OrderProcess;
+
+/**
+ * 医嘱过程Service接口
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+public interface IOrderProcessService extends IService<OrderProcess> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
new file mode 100644
index 00000000..3da96509
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.RequestForm;
+
+/**
+ * 申请单管理Service接口
+ *
+ * @author system
+ * @date 2025-02-22
+ */
+public interface IRequestFormService extends IService<RequestForm> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
new file mode 100644
index 00000000..deb2e066
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
@@ -0,0 +1,56 @@
+package com.openhis.document.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.VitalSigns;
+
+/**
+ * 生命体征管理Service接口
+ *
+ * @author system
+ * @date 2025-06-03
+ */
+public interface IVitalSignsService extends IService<VitalSigns> {
+
+    /**
+     * 查询同个时间点是否存在数据
+     * 
+     * @param vitalSigns 实体对象
+     * @return vitalSigns
+     */
+    VitalSigns selectVitalSigns(VitalSigns vitalSigns);
+
+    /**
+     * 查询当前list中的数据是否在表中存在
+     *
+     * @param vitalSignsList 实体对象
+     * @return 是否成功
+     */
+    boolean selectBatchVitalSigns(List<VitalSigns> vitalSignsList);
+
+    /**
+     * 自定义插入或更新方法
+     * 
+     * @param vitalSigns 实体对象
+     * @return 是否成功
+     */
+    boolean saveOrUpdateVitalSigns(VitalSigns vitalSigns);
+
+    /**
+     * 批量保存或者更新
+     *
+     * @param vitalSignsList 实体对象
+     * @return 是否成功
+     */
+    boolean saveOrUpdateBatchVitalSigns(List<VitalSigns> vitalSignsList);
+
+    /**
+     * 删除方法
+     * 
+     * @param vitalSigns 实体对象
+     * @return 是否成功
+     */
+    boolean deleteVitalSigns(VitalSigns vitalSigns);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
new file mode 100644
index 00000000..6b65be3d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.DocDefinitionOrganization;
+import com.openhis.document.mapper.DocDefinitionMapper;
+import com.openhis.document.mapper.DocDefinitionOrganizationMapper;
+import com.openhis.document.service.IDocDefinitionOrganizationService;
+import com.openhis.document.service.IDocDefinitionService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocDefinitionOrganizationServiceImpl extends ServiceImpl<DocDefinitionOrganizationMapper, DocDefinitionOrganization> implements IDocDefinitionOrganizationService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
new file mode 100644
index 00000000..f64c4ad4
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
@@ -0,0 +1,15 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.EmrDetail;
+import com.openhis.document.mapper.DocDefinitionMapper;
+import com.openhis.document.mapper.EmrDetailMapper;
+import com.openhis.document.service.IDocDefinitionService;
+import com.openhis.document.service.IEmrDetailService;
+import nonapi.io.github.classgraph.json.Id;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocDefinitionServiceImpl extends ServiceImpl<DocDefinitionMapper, DocDefinition> implements IDocDefinitionService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
new file mode 100644
index 00000000..166614c0
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocRecord;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.document.mapper.DocRecordMapper;
+import com.openhis.document.mapper.DocStatisticsMapper;
+import com.openhis.document.service.IDocRecordService;
+import com.openhis.document.service.IDocStatisticsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocRecordServiceImpl extends ServiceImpl<DocRecordMapper, DocRecord> implements IDocRecordService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
new file mode 100644
index 00000000..a4f888f9
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocStatisticsDefinition;
+import com.openhis.document.domain.DocStatisticsDefinitionOption;
+import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
+import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper;
+import com.openhis.document.service.IDocStatisticsDefinitionOptionService;
+import com.openhis.document.service.IDocStatisticsDefinitionService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocStatisticsDefinitionOptionServiceImpl extends ServiceImpl<DocStatisticsDefinitionOptionMapper, DocStatisticsDefinitionOption> implements IDocStatisticsDefinitionOptionService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
new file mode 100644
index 00000000..2c2c9dda
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.document.domain.DocStatisticsDefinition;
+import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
+import com.openhis.document.mapper.DocStatisticsMapper;
+import com.openhis.document.service.IDocStatisticsDefinitionService;
+import com.openhis.document.service.IDocStatisticsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocStatisticsDefinitionServiceImpl extends ServiceImpl<DocStatisticsDefinitionMapper, DocStatisticsDefinition> implements IDocStatisticsDefinitionService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
new file mode 100644
index 00000000..afea5e36
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
@@ -0,0 +1,14 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocDefinition;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.document.mapper.DocDefinitionMapper;
+import com.openhis.document.mapper.DocStatisticsMapper;
+import com.openhis.document.service.IDocDefinitionService;
+import com.openhis.document.service.IDocStatisticsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocStatisticsServiceImpl extends ServiceImpl<DocStatisticsMapper, DocStatistics> implements IDocStatisticsService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
new file mode 100644
index 00000000..57b9fc0f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
@@ -0,0 +1,11 @@
+package com.openhis.document.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocTemplate;
+import com.openhis.document.mapper.DocTemplateMapper;
+import com.openhis.document.service.IDocTemplateService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocTemplateServiceImpl extends ServiceImpl<DocTemplateMapper, DocTemplate> implements IDocTemplateService {
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
new file mode 100644
index 00000000..544b788f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
@@ -0,0 +1,20 @@
+package com.openhis.document.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.OrderProcess;
+import com.openhis.document.mapper.OrderProcessMapper;
+import com.openhis.document.service.IOrderProcessService;
+
+/**
+ * 医嘱过程Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-21
+ */
+@Service
+public class OrderProcessServiceImpl extends ServiceImpl<OrderProcessMapper, OrderProcess>
+    implements IOrderProcessService {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
new file mode 100644
index 00000000..2abcdcca
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
@@ -0,0 +1,19 @@
+package com.openhis.document.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.RequestForm;
+import com.openhis.document.mapper.RequestFormMapper;
+import com.openhis.document.service.IRequestFormService;
+
+/**
+ * 申请单管理Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-22
+ */
+@Service
+public class RequestFormServiceImpl extends ServiceImpl<RequestFormMapper, RequestForm> implements IRequestFormService {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
new file mode 100644
index 00000000..f1a93ab2
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
@@ -0,0 +1,138 @@
+package com.openhis.document.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.VitalSigns;
+import com.openhis.document.mapper.VitalSignsMapper;
+import com.openhis.document.service.IVitalSignsService;
+
+/**
+ * 就诊位置管理Service业务层处理
+ *
+ * @author system
+ * @date 2025-06-03
+ */
+@Service
+public class VitalSignsServiceImpl extends ServiceImpl<VitalSignsMapper, VitalSigns> implements IVitalSignsService {
+
+    /**
+     * 查询同个时间点是否存在数据
+     *
+     * @param vitalSigns 实体对象
+     * @return vitalSigns
+     */
+    public VitalSigns selectVitalSigns(VitalSigns vitalSigns) {
+        // 查询是否存在记录
+        return baseMapper.selectOne(this.queryWrapperSet(vitalSigns));
+    }
+
+    /**
+     * 查询当前list中的数据是否在表中存在
+     *
+     * @param vitalSignsList 实体对象
+     * @return 是否存在
+     */
+    public boolean selectBatchVitalSigns(List<VitalSigns> vitalSignsList) {
+        boolean exitFlag = false;
+        for (VitalSigns vitalSigns : vitalSignsList) {
+            // 查询是否存在记录
+            long count = baseMapper.selectCount(this.queryWrapperSet(vitalSigns));
+            // 存在的场合
+            if (count > 0) {
+                exitFlag = true;
+            }
+        }
+        return exitFlag;
+    }
+
+    /**
+     * 自定义插入或更新方法,根据就诊ID，记录时间，生命体征值,判断是更新还是插入
+     *
+     * @param vitalSigns 实体对象
+     * @return 是否成功
+     */
+    public boolean saveOrUpdateVitalSigns(VitalSigns vitalSigns) {
+
+        // 查询是否存在记录
+        VitalSigns existingRecord = baseMapper.selectOne(this.queryWrapperSet(vitalSigns));
+        if (existingRecord != null) {
+            // 如果记录存在，更新记录
+            vitalSigns.setId(existingRecord.getId());
+            return baseMapper.updateById(vitalSigns) > 0;
+        } else {
+            // 如果记录不存在，插入新记录
+            return baseMapper.insert(vitalSigns) > 0;
+        }
+    }
+
+    /**
+     * 根据就诊ID，记录时间，生命体征值，判断批量保存或者更新
+     *
+     * @param vitalSignsList 实体对象
+     * @return 是否成功
+     */
+    public boolean saveOrUpdateBatchVitalSigns(List<VitalSigns> vitalSignsList) {
+        boolean saveOrUpdateFlag = false;
+        for (VitalSigns vitalSigns : vitalSignsList) {
+            // 判断是更新还是插入
+            saveOrUpdateFlag = this.saveOrUpdateVitalSigns(vitalSigns);
+        }
+        return saveOrUpdateFlag;
+    }
+
+    /**
+     * 删除方法
+     *
+     * @param vitalSigns 实体对象
+     * @return 是否成功
+     */
+    public boolean deleteVitalSigns(VitalSigns vitalSigns) {
+
+        // 查询是否存在记录
+        VitalSigns existingRecord = baseMapper.selectOne(this.queryWrapperSet(vitalSigns));
+        if (existingRecord != null) {
+            // 删除记录
+            return baseMapper.deleteById(existingRecord) > 0;
+        } else {
+            // 如果记录不存在，返回false
+            return false;
+        }
+    }
+
+    /**
+     * 检索条件设定
+     *
+     * @param vitalSigns 实体对象
+     * @return 是否成功
+     */
+    private LambdaQueryWrapper queryWrapperSet(VitalSigns vitalSigns) {
+        // 创建 LambdaQueryWrapper
+        LambdaQueryWrapper<VitalSigns> queryWrapper = new LambdaQueryWrapper<>();
+        // 有效性检查
+        // 患者ID
+        if (vitalSigns.getPatientId() != null) {
+            queryWrapper.eq(VitalSigns::getPatientId, vitalSigns.getPatientId());
+        }
+        // 就诊ID
+        if (vitalSigns.getEncounterId() != null) {
+            queryWrapper.eq(VitalSigns::getEncounterId, vitalSigns.getEncounterId());
+        }
+        // 记录日期
+        if (vitalSigns.getRecordingDate() != null) {
+            queryWrapper.eq(VitalSigns::getRecordingDate, vitalSigns.getRecordingDate());
+        }
+        // 记录时间
+        if (vitalSigns.getTimePoint() != null) {
+            queryWrapper.eq(VitalSigns::getTimePoint, vitalSigns.getTimePoint());
+        }
+        // 生命体征编码
+        if (vitalSigns.getVitalSignsCode() != null) {
+            queryWrapper.eq(VitalSigns::getVitalSignsCode, vitalSigns.getVitalSignsCode());
+        }
+        return queryWrapper;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
similarity index 56%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
index 58706f2f..831be86c 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
@@ -46,6 +46,43 @@ public class Contract extends HisBaseEntity {
     /** 是否医保 */
     private Integer ybFlag;
 
+    /** 優先使用標志 */
+    private Integer sort;
+
     /** 医保区划 */
     private String admVs;
+
+    //2025-06-18 新加字段，医保相关配置信息从sys_option表迁移至本表
+    /** 医保PrvKey */
+    private String cliPrvKey;
+
+    /** 医保PubKey */
+    private String cliPubKey;
+
+    /**  */
+    private String serverPubKey;//暂时不知用处
+
+    /** 医保终端授权范围 */
+    private String scope;
+
+    /** 医保终端授权类型 */
+    private String grantType;
+
+    /** 医保密码 */
+    private String password;
+
+    /** 医保账号 */
+    private String username;
+
+    /** 医保客户端密钥 */
+    private String clientSecret;
+
+    /** 医保客户端Id */
+    private String clientId;
+
+    /** fixmedinsCode */
+    private String fixmedinsCode;
+
+    /** fixmedinsName */
+    private String fixmedinsName;
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java
new file mode 100644
index 00000000..a15ba32e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.financial.domain;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 付款记录的快照（用于统计报表等使用）
+ *
+ * @author SunJQ
+ * @date 2025-08-08
+ */
+@Data
+@TableName("fin_payment_rec_static")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class PaymentRecStatic extends HisBaseEntity {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 付款id
+     */
+    private Long reconciliationId;
+
+    /**
+     * 统计方式：1-字典fin_type_code；2-医保十四项med_chrgitm_type 默认值为2
+     */
+    private Integer countBy;
+
+    /**
+     * 编码（字典码）：1时用财富分类字典，2时用医保分类的字典
+     */
+    private String typeCode;
+
+    /**
+     * 编码名称（字典名称）
+     */
+    private String typeName;// 2025/08/08 李要求加此字段，但是实际使用的时候该字段可能不好用，要查字典然后save
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 关联收费项Id
+     */
+    private String chargeItemIds;
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
similarity index 49%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
index 7ec9c0e3..e88abe59 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
@@ -1,9 +1,13 @@
 package com.openhis.financial.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.financial.domain.PaymentRecDetail;
+import com.openhis.financial.model.PaymentRecDetailAccountResult;
 
 /**
  * 付款管理Mapper接口
@@ -14,4 +18,11 @@ import com.openhis.financial.domain.PaymentRecDetail;
 @Repository
 public interface PaymentRecDetailMapper extends BaseMapper<PaymentRecDetail> {
 
+    /**
+     * 根据paymentId集合查询详情信息
+     *
+     * @param paymentIdList 集合
+     * @return 集合
+     */
+    List<PaymentRecDetailAccountResult> getListByReconciliationIds(@Param("paymentIdList") List<Long> paymentIdList);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java
new file mode 100644
index 00000000..c8b8cd42
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.financial.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.financial.domain.PaymentRecStatic;
+
+/**
+ * 付款管理Mapper接口
+ *
+ * @author SunJQ
+ * @date 2025-08-08
+ */
+@Repository
+public interface PaymentRecStaticMapper extends BaseMapper<PaymentRecStatic> {}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java
new file mode 100644
index 00000000..b554842f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.financial.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 付款详情与账户信息实体
+ *
+ * @author SunJQ
+ * @date 2025-08-05
+ */
+@Data
+@Accessors(chain = true)
+public class PaymentRecDetailAccountResult {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 先前支付明细id */
+    private Long predecessorId;
+
+    /** 付款id */
+    private Long reconciliationId;
+
+    /** 付款类型 */
+    private Integer targetEnum;// 暂时没用
+
+    /** 账户 */
+    private Long accountId;
+
+    /** 账户类型 */
+    private String accountCode;
+
+    /** 支付类型 */
+    private Integer payEnum;
+
+    /** 支付类型等级 */
+    private Integer payLevelEnum;
+
+    /** 金额 */
+    private BigDecimal amount;
+
+    /** 找零 */
+    private BigDecimal returnAmount;
+
+    /** 交款 */
+    private BigDecimal chargeAmount;
+
+    /** 支付平台返回交易号 医保批次号 */
+    private String payTransNo;
+
+    /** 支付平台返回交易信息 医保结算ID */
+    private String payTransText;
+
+    /** 支付平台返回交易时间 */
+    private Date payTransDate;
+
+    /** 支付平台账前余额 */
+    private BigDecimal beforeBalance;
+
+    /** 支付平台账后余额 */
+    private BigDecimal afterBalance;
+
+    /** 单笔交易结果 */
+    private Integer resultEnum;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 结账状态枚举 */
+    private Integer billingStatusEnum;
+
+    // 2025.04.10 经确认此处原有的【1 CASH 个人现金账户 | 2 医保账户】改为【01医保电子凭证 | 02 居民身份证 | 03 社会保障卡 | 04 个人现金账户】
+    /** 账户类型编码 */
+    private String typeCode;
+
+    /** 编码 */
+    private String no;
+
+    /** 名称 */
+    private String name;
+
+    /** 患者id */
+    private Long patientId;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 账户余额 */
+    private BigDecimal balanceAmount;
+
+    /** 医保区域编码 */
+    private String ybAreaNo;
+
+    /** 合同编码 */
+    private String contractNo;
+
+    /** 欠费限制额度 */
+    private BigDecimal limitAccount;
+
+    /** 是否为就诊登记使用 */
+    private Integer encounterFlag;
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
new file mode 100644
index 00000000..77c54008
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
@@ -0,0 +1,100 @@
+package com.openhis.financial.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.financial.domain.Contract;
+
+/**
+ * 合同管理Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IContractService extends IService<Contract> {
+
+    /**
+     * 根据医保码找合同信息
+     *
+     * @param contractNo 医保码
+     * @return 合同实体
+     */
+    Contract getByContractNo(String contractNo);
+
+    /**
+     * 查询租户合同信息分页
+     *
+     * @param tenantId 租户ID
+     * @param pageNum 当前页
+     * @param pageSize 每页多少条
+     * @return 租户合同信息分页
+     */
+    IPage<Contract> getTenantContractPage(Integer tenantId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 查询租户合同信息详情
+     *
+     * @param id ID
+     * @return 租户合同信息详情
+     */
+    Contract getTenantContractDetail(Long id);
+
+    /**
+     * 新增租户合同信息
+     *
+     * @param contract 合同管理实体
+     */
+    void addTenantContract(Contract contract);
+
+    /**
+     * 编辑租户合同信息
+     *
+     * @param contract 合同管理实体
+     */
+    void editTenantContract(Contract contract);
+
+    /**
+     * 删除租户合同信息
+     *
+     * @param id ID
+     */
+    void delTenantContract(Long id);
+
+    /**
+     * 查詢合同的集合
+     * 
+     * @return
+     */
+    List<Contract> getContractList();
+
+    /**
+     * 查詢合同的集合
+     * 
+     * @return
+     */
+    List<Contract> getRedisContractList();
+
+    /**
+     * 通過合同編碼查詢合同
+     * 
+     * @return
+     */
+    Contract getContract(String contractNo);
+
+    /**
+     * 根据参保地信息找到对应的合同
+     * 
+     * @param insuplcAdmdvs
+     * @return
+     */
+    Contract getContractByInsuplcAdmdvs(String insuplcAdmdvs);
+
+    /**
+     * 查詢合同的集合
+     * 
+     * @return 合同集合
+     */
+    List<Contract> getContractListByYb();
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
similarity index 56%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
index 70945b03..8be403be 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
@@ -1,8 +1,11 @@
 package com.openhis.financial.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.common.enums.PaymentResult;
 import com.openhis.financial.domain.PaymentRecDetail;
+import com.openhis.financial.model.PaymentRecDetailAccountResult;
 
 /**
  * 付款管理Service接口
@@ -14,8 +17,18 @@ public interface IPaymentRecDetailService extends IService<PaymentRecDetail> {
 
     /**
      * 根据paymentId更改结算结果
-     * @param id
-     * @param paid
+     * 
+     * @param id id
+     * @param paid PaymentResult
      */
     void updateResultByPaymentId(Long id, PaymentResult paid);
+
+    /**
+     * 根据paymentId集合查询详情信息
+     * 
+     * @param paymentIdList 集合
+     * @return 集合
+     */
+    List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList);
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java
new file mode 100644
index 00000000..64307610
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.financial.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.dto.ChargeItemDefInfo;
+import com.openhis.common.enums.PaymentStatisticalMethod;
+import com.openhis.common.enums.PaymentType;
+import com.openhis.financial.domain.PaymentRecStatic;
+
+/**
+ * 付款管理Service接口
+ *
+ * @author SunJQ
+ * @date 2025-08-08
+ */
+public interface IPaymentRecStaticService extends IService<PaymentRecStatic> {
+    /**
+     * 批量保存付款快照信息
+     *
+     * @param paymentId 付款id
+     * @param paymentType 付款/退款
+     * @param paymentStatisticalMethod 统计方式：字典/医保分类
+     * @param chargeItemDefInfoList chargeItem基础信息
+     */
+    void savePaymentRecStatics(Long paymentId, PaymentType paymentType,
+        PaymentStatisticalMethod paymentStatisticalMethod, List<ChargeItemDefInfo> chargeItemDefInfoList);
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
similarity index 42%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
index cd792b2a..166e89fd 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
@@ -3,12 +3,15 @@ package com.openhis.financial.service;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.common.enums.PaymentKind;
 import com.openhis.common.enums.PaymentStatus;
 import com.openhis.common.enums.ybenums.YbMdtrtCertType;
+import com.openhis.financial.domain.Contract;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.financial.model.PaymentResult;
 import com.openhis.financial.model.PaymentedItemModel;
 import com.openhis.financial.model.PrePaymentResult;
+import com.openhis.yb.dto.PaymentInpatientDto;
 
 /**
  * 付款管理Service接口
@@ -33,13 +36,63 @@ public interface IPaymentReconciliationService extends IService<PaymentReconcili
      */
     void updateRefundingStatus(List<Long> paymentIdList);
 
-    PrePaymentResult prePayment(YbMdtrtCertType ybMdtrtCertType, String busiCardInfo, String contractBusNo,
+    /**
+     * 【门诊预结算】
+     * 
+     * @param ybMdtrtCertType 医保凭证类型
+     * @param busiCardInfo 读卡获取的密钥
+     * @param contractBusNo 合同编号
+     * @param paymentedItemList 收费项
+     * @return 结果
+     */
+    PrePaymentResult preSettle(YbMdtrtCertType ybMdtrtCertType, String busiCardInfo, String contractBusNo,
         List<PaymentedItemModel> paymentedItemList);
 
-    PaymentResult settle(String payTransNo, YbMdtrtCertType byValue, String busiCardInfo, Integer minpacuntDrugTracCnt,
-        Integer mcsTracCnt);
+    /**
+     * 【门诊结算】
+     * 
+     * @param contract 合同
+     * @param payTransNo 收费批次号
+     * @param byValue 医保凭证类型
+     * @param busiCardInfo 读卡获取的密钥
+     * @param minpacuntDrugTracCnt 追溯码相关
+     * @param mcsTracCnt 追溯码相关
+     * @return 结算结果
+     */
+    PaymentResult settle(Contract contract, String payTransNo, YbMdtrtCertType byValue, String busiCardInfo,
+        Integer minpacuntDrugTracCnt, Integer mcsTracCnt);
 
+    /**
+     * 更改付款状态
+     * 
+     * @param id paymentId
+     * @param success 付款状态
+     */
     void updatePaymentStatusById(Long id, PaymentStatus success);
 
+    /**
+     * 更改状态
+     * 
+     * @param id 主键id
+     * @param success 付款状态
+     * @param settleId 医保结算id
+     */
     void updatePaymentStatusAndSettleIdsById(Long id, PaymentStatus success, List<String> settleId);
+
+    /**
+     * 【住院结算】
+     *
+     * @param contract 合同
+     * @param paymentDto 收费参数
+     * @return 结算结果
+     */
+    PaymentResult inpatientSettle(Contract contract, PaymentInpatientDto paymentDto);
+
+    /**
+     * 查询付款实体
+     *
+     * @param encounterId 就诊id
+     * @return 付款实体
+     */
+    PaymentReconciliation getByEncounterId(Long encounterId, PaymentKind kindEnum);
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
new file mode 100644
index 00000000..b2ab9295
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
@@ -0,0 +1,177 @@
+package com.openhis.financial.service.impl;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.core.redis.RedisCache;
+import com.core.common.enums.DeleteFlag;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.Whether;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.mapper.ContractMapper;
+import com.openhis.financial.service.IContractService;
+
+/**
+ * 合同管理Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Service
+public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> implements IContractService {
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     *
+     * @param contractNo 医保码
+     * @return
+     */
+    @Override
+    public Contract getByContractNo(String contractNo) {
+        return baseMapper.selectOne(new LambdaUpdateWrapper<Contract>().eq(Contract::getBusNo, contractNo)
+            .last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+
+    /**
+     * 查询租户合同信息分页
+     *
+     * @param tenantId 租户ID
+     * @param pageNum 当前页
+     * @param pageSize 每页多少条
+     * @return 租户合同信息分页
+     */
+    @Override
+    public IPage<Contract> getTenantContractPage(Integer tenantId, Integer pageNum, Integer pageSize) {
+        return baseMapper.selectPage(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<Contract>()
+            .eq(Contract::getTenantId, tenantId).eq(Contract::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+    }
+
+    /**
+     * 查询租户合同信息详情
+     *
+     * @param id ID
+     * @return 租户合同信息详情
+     */
+    @Override
+    public Contract getTenantContractDetail(Long id) {
+        return baseMapper.selectById(id);
+    }
+
+    /**
+     * 新增租户合同信息
+     *
+     * @param contract 合同管理实体
+     */
+    @Override
+    public void addTenantContract(Contract contract) {
+        baseMapper.insert(contract);
+
+    }
+
+    /**
+     * 编辑租户合同信息
+     *
+     * @param contract 合同管理实体
+     */
+    @Override
+    public void editTenantContract(Contract contract) {
+        baseMapper.updateById(contract);
+    }
+
+    /**
+     * 删除租户合同信息
+     *
+     * @param id ID
+     */
+    @Override
+    public void delTenantContract(Long id) {
+        baseMapper.update(new Contract(), new LambdaUpdateWrapper<Contract>().eq(Contract::getId, id)
+            .set(Contract::getDeleteFlag, DeleteFlag.DELETED.getCode()));
+    }
+
+    /**
+     * 查詢合同的集合
+     * 
+     * @return
+     */
+    @Override
+    public List<Contract> getContractList() {
+        return baseMapper.selectList(
+            new LambdaQueryWrapper<Contract>().eq(Contract::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+    }
+
+    /**
+     * 查詢合同的集合
+     * 
+     * @return
+     */
+    @Override
+    @Cacheable(value = "contractListCache", key = "'contractList'")
+    public List<Contract> getRedisContractList() {
+        return getContractList();
+    }
+
+    /**
+     * 查詢合同的集合
+     * 
+     * @return
+     */
+    @Override
+    public Contract getContract(String contractNo) {
+        List<Contract> contractList = getRedisContractList();
+        for (Contract contract : contractList) {
+            if (contractNo.equals(contract.getBusNo())) {
+                return contract;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据参保地信息找到对应的合同
+     * 
+     * @param insuplcAdmdvs
+     * @return
+     */
+    @Override
+    public Contract getContractByInsuplcAdmdvs(String insuplcAdmdvs) {
+        List<Contract> contractList = getRedisContractList();
+        for (Contract contract : contractList) {
+            if (insuplcAdmdvs.equals(contract.getBusNo())) {
+                return contract;
+            }
+        }
+        if (!contractList.isEmpty()) {
+            Optional<Contract> max = contractList.stream().max(Comparator.comparingInt(Contract::getSort));
+            if (max.isPresent()) {
+                return max.get();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 查詢合同的集合
+     *
+     * @return 合同集合
+     */
+    @Override
+    public List<Contract> getContractListByYb() {
+        return baseMapper.selectList(new LambdaQueryWrapper<Contract>().eq(Contract::getYbFlag, Whether.YES.getValue())
+            .eq(Contract::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+    }
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
similarity index 46%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
index 9ecd98ed..3f2bf19a 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
@@ -1,12 +1,15 @@
 package com.openhis.financial.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.openhis.common.enums.PaymentResult;
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.common.enums.PaymentResult;
 import com.openhis.financial.domain.PaymentRecDetail;
 import com.openhis.financial.mapper.PaymentRecDetailMapper;
+import com.openhis.financial.model.PaymentRecDetailAccountResult;
 import com.openhis.financial.service.IPaymentRecDetailService;
 
 /**
@@ -16,9 +19,29 @@ import com.openhis.financial.service.IPaymentRecDetailService;
  * @date 2025-02-20
  */
 @Service
-public class PaymentRecDetailServiceImpl extends ServiceImpl<PaymentRecDetailMapper, PaymentRecDetail> implements IPaymentRecDetailService {
+public class PaymentRecDetailServiceImpl extends ServiceImpl<PaymentRecDetailMapper, PaymentRecDetail>
+    implements IPaymentRecDetailService {
+
+    /**
+     * 根据paymentId更改结算结果
+     * 
+     * @param id id
+     * @param paid PaymentResult
+     */
     @Override
     public void updateResultByPaymentId(Long id, PaymentResult paid) {
-        baseMapper.update(new PaymentRecDetail() .setResultEnum(PaymentResult.PAID.getValue()),new LambdaQueryWrapper<PaymentRecDetail>().eq(PaymentRecDetail::getReconciliationId,id));
+        baseMapper.update(new PaymentRecDetail().setResultEnum(PaymentResult.PAID.getValue()),
+            new LambdaQueryWrapper<PaymentRecDetail>().eq(PaymentRecDetail::getReconciliationId, id));
+    }
+
+    /**
+     * 根据paymentId集合查询详情信息
+     * 
+     * @param paymentIdList 集合
+     * @return 集合
+     */
+    @Override
+    public List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList) {
+        return baseMapper.getListByReconciliationIds(paymentIdList);
     }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java
new file mode 100644
index 00000000..362128bc
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.financial.service.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.administration.dto.ChargeItemDefInfo;
+import com.openhis.common.enums.PaymentStatisticalMethod;
+import com.openhis.common.enums.PaymentType;
+import com.openhis.financial.domain.PaymentRecStatic;
+import com.openhis.financial.mapper.PaymentRecStaticMapper;
+import com.openhis.financial.service.IPaymentRecStaticService;
+
+/**
+ * 付款管理Service业务层处理
+ *
+ * @author SunJQ
+ * @date 2025-08-08
+ */
+@Service
+public class PaymentRecStaticServiceImpl extends ServiceImpl<PaymentRecStaticMapper, PaymentRecStatic>
+    implements IPaymentRecStaticService {
+
+    /**
+     * 批量保存付款快照信息
+     * 
+     * @param paymentId 付款id
+     * @param paymentType 付款/退款
+     * @param paymentStatisticalMethod 统计方式：字典/医保分类
+     * @param chargeItemDefInfoList chargeItem基础信息
+     */
+    @Override
+    public void savePaymentRecStatics(Long paymentId, PaymentType paymentType,
+        PaymentStatisticalMethod paymentStatisticalMethod, List<ChargeItemDefInfo> chargeItemDefInfoList) {
+        if (chargeItemDefInfoList.isEmpty()) {
+            return;
+        }
+        Map<String, List<ChargeItemDefInfo>> collect;
+        List<PaymentRecStatic> paymentRecStatics = new ArrayList<>();
+        if (paymentStatisticalMethod == PaymentStatisticalMethod.FIN_TYPE_CODE) {
+            collect = chargeItemDefInfoList.stream().collect(Collectors.groupingBy(ChargeItemDefInfo::getTypeCode));
+            getPaymentRecStaticList(paymentId, paymentType, paymentStatisticalMethod, collect, paymentRecStatics);
+        } else if (paymentStatisticalMethod == PaymentStatisticalMethod.MED_CHRGITM_TYPE) {
+            collect = chargeItemDefInfoList.stream().collect(Collectors.groupingBy(ChargeItemDefInfo::getYbType));
+            getPaymentRecStaticList(paymentId, paymentType, paymentStatisticalMethod, collect, paymentRecStatics);
+        } else {
+            collect = chargeItemDefInfoList.stream().collect(Collectors.groupingBy(ChargeItemDefInfo::getTypeCode));
+            getPaymentRecStaticList(paymentId, paymentType, PaymentStatisticalMethod.FIN_TYPE_CODE, collect,
+                paymentRecStatics);
+            collect = chargeItemDefInfoList.stream().collect(Collectors.groupingBy(ChargeItemDefInfo::getYbType));
+            getPaymentRecStaticList(paymentId, paymentType, PaymentStatisticalMethod.MED_CHRGITM_TYPE, collect,
+                paymentRecStatics);
+        }
+        saveBatch(paymentRecStatics);
+    }
+
+    /**
+     *
+     * @param paymentId 付款id
+     * @param paymentType 付款/退款
+     * @param paymentStatisticalMethod 统计方式：字典/医保分类
+     * @param collect map
+     * @param paymentRecStatics 集合
+     */
+    public void getPaymentRecStaticList(Long paymentId, PaymentType paymentType,
+        PaymentStatisticalMethod paymentStatisticalMethod, Map<String, List<ChargeItemDefInfo>> collect,
+        List<PaymentRecStatic> paymentRecStatics) {
+        PaymentRecStatic paymentRecStatic;
+        BigDecimal bigDecimal;
+        for (Map.Entry<String, List<ChargeItemDefInfo>> stringListEntry : collect.entrySet()) {
+            paymentRecStatic = new PaymentRecStatic();
+            bigDecimal = BigDecimal.ZERO;
+            for (ChargeItemDefInfo chargeItemDefInfo : stringListEntry.getValue()) {
+                bigDecimal = bigDecimal.add(chargeItemDefInfo.getTotalPrice().multiply(paymentType.getMultiplier()));
+            }
+            paymentRecStatic.setAmount(bigDecimal).setReconciliationId(paymentId).setTypeCode(stringListEntry.getKey())
+                .setChargeItemIds(JSON.toJSONString(
+                    stringListEntry.getValue().stream().map(ChargeItemDefInfo::getId).collect(Collectors.toList())))
+                .setCountBy(paymentStatisticalMethod.getValue());
+            paymentRecStatics.add(paymentRecStatic);
+        }
+        // return paymentRecStatics;
+    }
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
similarity index 62%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
index 519986a3..8cba0cc7 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
@@ -20,18 +20,24 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.PaymentKind;
 import com.openhis.common.enums.PaymentStatus;
 import com.openhis.common.enums.ybenums.YbMdtrtCertType;
 import com.openhis.common.enums.ybenums.YbMedType;
+import com.openhis.financial.domain.Contract;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.financial.mapper.PaymentReconciliationMapper;
 import com.openhis.financial.model.PaymentResult;
 import com.openhis.financial.model.PaymentedItemModel;
 import com.openhis.financial.model.PrePaymentResult;
+import com.openhis.financial.service.IContractService;
 import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.yb.domain.ClinicSettle;
 import com.openhis.yb.dto.Clinic2206OrderOutput;
 import com.openhis.yb.dto.ClinicReg2201Output;
+import com.openhis.yb.dto.PaymentInpatientDto;
+import com.openhis.yb.dto.Yb2304OutputSetlInfo;
 import com.openhis.yb.model.Clinic2207OrderModel;
 import com.openhis.yb.service.YbManager;
 
@@ -47,7 +53,7 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
     @Resource
     private AssignSeqUtil assignSeqUtil;
     @Autowired
-    private PaymentReconciliationMapper paymentReconciliationMapper;
+    private IContractService iContractService;
     @Autowired
     private YbManager ybManager;
 
@@ -62,7 +68,7 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
 
         // 根据支付id获取支付信息
         List<PaymentReconciliation> paymentReconciliationList =
-            paymentReconciliationMapper.selectList(new LambdaQueryWrapper<PaymentReconciliation>()
+            baseMapper.selectList(new LambdaQueryWrapper<PaymentReconciliation>()
                 .select(PaymentReconciliation::getChargeItemIds).in(PaymentReconciliation::getId, paymentIdList));
         if (paymentReconciliationList.isEmpty()) {
             return null;
@@ -95,19 +101,31 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
     }
 
     /**
-     * // 对chargeItem分付款方式 2025/05/23 ChargeItem分完付款方式之后，医保支付的ChargeItem还要分特慢病和普通门诊，特慢病等支付与常规门诊支付传参不一样
+     * PS：对chargeItem分付款方式 2025/05/23 ChargeItem分完付款方式之后，医保支付的ChargeItem还要分特慢病和普通门诊，特慢病等支付与常规门诊支付传参不一样
+     */
+    /**
+     * 【预结算】
+     * 
+     * @param ybMdtrtCertType 医保凭证类型
+     * @param busiCardInfo 读卡获取的密钥
+     * @param contractBusNo 合同编号
+     * @param paymentedItemList 收费项
+     * @return 预结算结果
      */
     @Override
-    public PrePaymentResult prePayment(YbMdtrtCertType ybMdtrtCertType, String busiCardInfo, String contractBusNo,
+    public PrePaymentResult preSettle(YbMdtrtCertType ybMdtrtCertType, String busiCardInfo, String contractBusNo,
         List<PaymentedItemModel> paymentedItemList) {
 
         PrePaymentResult prePaymentResult = null;
         String ybSwitchFlag = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
         if (ybSwitchFlag.equals("0")) {
-            contractBusNo = "0000";
+            contractBusNo = CommonConstants.BusinessName.DEFAULT_CONTRACT_NO;
         }
+
+        Contract contract = iContractService.getContract(contractBusNo);
+
         switch (contractBusNo) {
-            case "0000":
+            case CommonConstants.BusinessName.DEFAULT_CONTRACT_NO:
                 prePaymentResult = new PrePaymentResult();
                 BigDecimal sumAmount = BigDecimal.ZERO;
                 for (PaymentedItemModel item : paymentedItemList) {
@@ -117,10 +135,11 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
                 prePaymentResult.setFulamtOwnpayAmt(sumAmount);
                 prePaymentResult.setPsnPartAmt(sumAmount);
                 prePaymentResult.setPsnCashPay(sumAmount);
-                prePaymentResult.setChrgBchno("0000");
+                prePaymentResult.setChrgBchno(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
                 break;
             case "229900":// 吉林省医保
-            case "220199":// 长春市医保
+            case "220199":// 长春市医保(农大)
+            case "220100":// 长春市医保(长大)
                 Map<String, List<PaymentedItemModel>> collect =
                     paymentedItemList.stream().collect(Collectors.groupingBy(PaymentedItemModel::getMedType));
                 PrePaymentResult result;
@@ -130,19 +149,20 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
                     if (!medTypeKV.getKey().equals(YbMedType.GENERAL_OUTPATIENT.getValue()) && "1".equals(
                         SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))) {
                         // 不是普通门诊就诊类型，补充挂号信息
-                        reg2201Output = ybManager.createRegWithMedType(ybMdtrtCertType, busiCardInfo,
+                        reg2201Output = ybManager.createRegWithMedType(contract, ybMdtrtCertType, busiCardInfo,
                             medTypeKV.getValue().get(0).getEncounterId(),
                             YbMedType.getByValue(medTypeKV.getValue().get(0).getMedType()));
-                        reg2201Output.setMedType(medTypeKV.getKey());//2025/06/05慢病挂号后上传2206信息报错，2201返回值没有medType，此处更正赋值
+                        reg2201Output.setMedType(medTypeKV.getKey());// 2025/06/05慢病挂号后上传2206信息报错，2201返回值没有medType，此处更正赋值
                     } else {
                         // 从数据库里取reg2201
                         reg2201Output =
                             ybManager.getClinicRegByEncounterId(medTypeKV.getValue().get(0).getEncounterId());
                     }
                     // 调用预结算
-                    clinic2206OrderOutput = ybManager.preSettle(medTypeKV.getValue().get(0).getEncounterId(),
+                    clinic2206OrderOutput = ybManager.preSettle(contract, medTypeKV.getValue().get(0).getEncounterId(),
                         ybMdtrtCertType, busiCardInfo, reg2201Output, "01", medTypeKV.getValue().stream()
-                            .map(PaymentedItemModel::getChargeItemId).collect(Collectors.toList()));
+                            .map(PaymentedItemModel::getChargeItemId).collect(Collectors.toList()),
+                        YbMedType.getByValue(medTypeKV.getKey()));
                     prePaymentResult = new PrePaymentResult();
                     BeanUtils.copyProperties(clinic2206OrderOutput, prePaymentResult);
                 }
@@ -153,36 +173,82 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
         return prePaymentResult;
     }
 
+    /**
+     * 【门诊结算】
+     * 
+     * @param contract 合同
+     * @param payTransNo 支付批次号
+     * @param ybMdtrtCertType 凭证类型
+     * @param busiCardInfo 读卡获取到的凭证
+     * @param minpacuntDrugTracCnt 追溯码相关信息
+     * @param mcsTracCnt 追溯码相关信息
+     * @return 结算结果
+     */
     @Override
-    public PaymentResult settle(String payTransNo, YbMdtrtCertType ybMdtrtCertType, String busiCardInfo,
-        Integer minpacuntDrugTracCnt, Integer mcsTracCnt) {
+    public PaymentResult settle(Contract contract, String payTransNo, YbMdtrtCertType ybMdtrtCertType,
+        String busiCardInfo, Integer minpacuntDrugTracCnt, Integer mcsTracCnt) {
         PaymentResult paymentResult = null;
-        if (!"0000".equals(payTransNo)) {
+        if (!CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(payTransNo)) {
             // 医保支付 todo：支付的详细信息在于结算中已经存好了，但是还没有存储卡余额
             Clinic2207OrderModel clinic2207OrderModel =
-                ybManager.settle(payTransNo, busiCardInfo, ybMdtrtCertType, minpacuntDrugTracCnt, mcsTracCnt);
+                ybManager.settle(contract, payTransNo, busiCardInfo, ybMdtrtCertType, minpacuntDrugTracCnt, mcsTracCnt);
             paymentResult = new PaymentResult();
             BeanUtils.copyProperties(clinic2207OrderModel, paymentResult);
         } else {
-            //自费返回new实体
+            // 自费返回new实体
+            paymentResult = new PaymentResult();
+        }
+        return paymentResult;
+    }
+
+    /**
+     * 【住院结算】
+     *
+     * @param contract 合同
+     * @param paymentDto 收费参数
+     * @return 结算结果
+     */
+    @Override
+    public PaymentResult inpatientSettle(Contract contract, PaymentInpatientDto paymentDto) {
+        PaymentResult paymentResult = null;
+        if (!CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(contract.getBusNo())) {
+            // 医保支付 todo：支付的详细信息在于结算中已经存好了，但是还没有存储卡余额
+            Yb2304OutputSetlInfo yb2304OutputSetlInfo = ybManager.inpatientSettle(contract, paymentDto);
+            paymentResult = new PaymentResult();
+            BeanUtils.copyProperties(yb2304OutputSetlInfo, paymentResult);
+        } else {
+            // 自费返回new实体
             paymentResult = new PaymentResult();
         }
         return paymentResult;
     }
 
+    /**
+     * 更改付款状态
+     *
+     * @param id paymentId
+     * @param success 付款状态
+     */
     @Override
     public void updatePaymentStatusById(Long id, PaymentStatus success) {
-        paymentReconciliationMapper.update(new PaymentReconciliation().setStatusEnum(success.getValue()),
+        baseMapper.update(new PaymentReconciliation().setStatusEnum(success.getValue()),
             new LambdaQueryWrapper<PaymentReconciliation>().eq(PaymentReconciliation::getId, id));
     }
 
+    /**
+     * 更改payment状态以及医保支付结算id
+     * 
+     * @param id 主键id
+     * @param success 状态
+     * @param settleId 医保结算id
+     */
     @Override
     public void updatePaymentStatusAndSettleIdsById(Long id, PaymentStatus success, List<String> settleId) {
         if (settleId.isEmpty()) {
-            paymentReconciliationMapper.update(new PaymentReconciliation().setStatusEnum(success.getValue()),
+            baseMapper.update(new PaymentReconciliation().setStatusEnum(success.getValue()),
                 new LambdaQueryWrapper<PaymentReconciliation>().eq(PaymentReconciliation::getId, id));
         } else {
-            paymentReconciliationMapper.update(
+            baseMapper.update(
                 new PaymentReconciliation().setStatusEnum(success.getValue())
                     .setYbSettleIds(String.join(",", settleId)),
                 new LambdaQueryWrapper<PaymentReconciliation>().eq(PaymentReconciliation::getId, id));
@@ -190,21 +256,16 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
     }
 
     /**
-     * 初始化一个医保结算信息
-     *
-     * @return 预结算的参数
+     * 查询付款实体
+     * 
+     * @param encounterId 就诊id
+     * @return 付款实体
      */
-    private ClinicSettle initClinic2206OrderResult() {
-        ClinicSettle clinicSettle = new ClinicSettle();
-        return clinicSettle.setMedfeeSumamt(new BigDecimal("0.0")).setFulamtOwnpayAmt(new BigDecimal("0.0"))
-            .setOverlmtSelfpay(new BigDecimal("0.0")).setPreselfpayAmt(new BigDecimal("0.0"))
-            .setInscpScpAmt(new BigDecimal("0.0")).setActPayDedc(new BigDecimal("0.0"))
-            .setHifpPay(new BigDecimal("0.0")).setPoolPropSelfpay(new BigDecimal("0.0"))
-            .setCvlservPay(new BigDecimal("0.0")).setHifesPay(new BigDecimal("0.0")).setHifmiPay(new BigDecimal("0.0"))
-            .setHifobPay(new BigDecimal("0.00")).setMafPay(new BigDecimal("0.0")).setOthPay(new BigDecimal("0.0"))
-            .setFundPaySumamt(new BigDecimal("0.0")).setPsnPartAmt(new BigDecimal("0.0"))
-            .setAcctPay(new BigDecimal("0.0")).setPsnCashPay(new BigDecimal("0.0"))
-            .setHospPartAmt(new BigDecimal("0.0")).setBalc(new BigDecimal("0.0"))
-            .setAcctMulaidPay(new BigDecimal("0.0")).setHifdmPay(new BigDecimal("0.0"));
+    @Override
+    public PaymentReconciliation getByEncounterId(Long encounterId, PaymentKind paymentKind) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<PaymentReconciliation>()
+            .eq(PaymentReconciliation::getEncounterId, encounterId)
+            .eq(PaymentReconciliation::getKindEnum, PaymentKind.HOSPITAL_DEPOSIT.getValue())
+            .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode()).last(YbCommonConstants.sqlConst.LIMIT1));
     }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
similarity index 96%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
index 4c48597e..6f51b88c 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
@@ -209,4 +209,10 @@ public class MedicationDetail extends HisBaseEntity {
     /** 处方标志 */
     private Integer rxFlag;
 
+    /** 最小库存警戒数量(常规单位) */
+    private BigDecimal itemMinQuantity;
+
+    /** 最大库存警戒数量(常规单位) */
+    private BigDecimal itemMaxQuantity;
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
similarity index 97%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
index e93118ac..c0ff73d1 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
@@ -85,6 +85,9 @@ public class MedicationDispense extends HisBaseEntity {
     /** 限制发药时间 */
     private Date limitTime;
 
+    /** 预定发药时间 */
+    private Date plannedDispenseTime;
+
     /** 发药目的地 */
     private String desLocationId;
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
similarity index 94%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
index 16ace256..940ba14d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
@@ -218,4 +218,19 @@ public class MedicationRequest extends HisBaseEntity {
      */
     private Integer tcmFlag;
 
+    /**
+     * 排序号
+     */
+    private Integer sortNumber;
+
+    /** 校对人 */
+    private Long performerCheckId;
+
+    /** 校对时间 */
+    private Date checkTime;
+
+    /**
+     * 签发编码
+     */
+    private String signCode;
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
similarity index 71%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
index 45d14f5c..182e5329 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.medication.domain.MedicationDispense;
 import com.openhis.medication.domain.MedicationRequest;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 药品发放管理Service接口
@@ -59,4 +60,26 @@ public interface IMedicationDispenseService extends IService<MedicationDispense>
      * @return 验证结果
      */
     boolean verifyAbleEdit(Long medicationDefId);
+
+    /**
+     * 通过请求id获取药品发放信息
+     *
+     * @param requestIdList 请求id
+     * @return 发放信息
+     */
+    List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList);
+    /**
+     * 通过id获取药品发放信息
+     *
+     * @param idList 请求id
+     * @return 发放信息
+     */
+    List<MedicationDispense> selectByIdList(@Param("idList") List<Long> idList);
+
+    /**
+     * 更新药品状态：已汇总
+     *
+     * @param medDispenseId 发放id列表
+     */
+    void updateDispenseStatusSummarized(List<Long> medDispenseId);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
similarity index 48%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
index 061db4f7..6359b848 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
@@ -1,7 +1,10 @@
 package com.openhis.medication.service;
 
+import java.util.Date;
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.medication.domain.MedicationRequest;
 
@@ -17,15 +20,25 @@ public interface IMedicationRequestService extends IService<MedicationRequest> {
      * 更新请求状态：已完成
      *
      * @param requestIdList 药品请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
-    void updateCompletedStatusBatch(List<Long> requestIdList);
+    void updateCompletedStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate);
 
     /**
      * 更新请求状态：待发送
      *
      * @param requestIdList 药品请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
-    void updateDraftStatusBatch(List<Long> requestIdList);
-
+    void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate);
 
+    /**
+     * 通过id获取药品请求信息
+     *
+     * @param idList 请求id
+     * @return 发放信息
+     */
+    List<MedicationRequest> selectByIdList(@Param("idList") List<Long> idList);
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
similarity index 75%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
index 273bc012..70650d68 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
@@ -1,9 +1,13 @@
 package com.openhis.medication.service.impl;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -43,7 +47,7 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
     public void handleMedicationDispense(MedicationRequest medicationRequest, String dbOpType) {
         MedicationDispense medicationDispense = new MedicationDispense();
         // 药品发放id
-        medicationDispense.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 10));
+        medicationDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
         // 药品发放状态
         medicationDispense.setStatusEnum(DispenseStatus.DRAFT.getValue());
         // 状态变更时间
@@ -83,6 +87,15 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
         // 单次最大剂量
         medicationDispense.setMaxUnit(medicationRequest.getMaxDose());
 
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        // 增加2小时
+        LocalDateTime newTime = now.plusHours(2);
+        // 转换为Date对象（如果需要保持使用Date类型）
+        Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant());
+        // 设置限制发药时间
+        medicationDispense.setLimitTime(limitTime);
+
         if (DbOpType.INSERT.getCode().equals(dbOpType)) {
             baseMapper.insert(medicationDispense);
         } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
@@ -156,4 +169,41 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
                     .eq(MedicationDispense::getStatusEnum, DispenseStatus.REFUNDED.getValue()))
                 .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
     }
+    /**
+     * 通过请求id获取药品发放信息
+     *
+     * @param requestIdList 请求id
+     * @return 发放信息
+     */
+    @Override
+    public  List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList){
+        return baseMapper.selectList( new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getMedReqId, requestIdList)
+            .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 通过id获取药品发放信息
+     *
+     * @param idList 请求id
+     * @return 发放信息
+     */
+    @Override
+    public List<MedicationDispense> selectByIdList(@Param("idList") List<Long> idList){
+        return baseMapper.selectList( new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, idList)
+            .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 更新药品状态：已汇总
+     *
+     * @param medDispenseId 发放id列表
+     */
+    @Override
+    public  void updateDispenseStatusSummarized(List<Long> medDispenseId){
+        baseMapper.update(null,
+            new LambdaUpdateWrapper<MedicationDispense>()
+                .set(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())
+                .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
+                .in(MedicationDispense::getId, medDispenseId));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
similarity index 46%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
index 9a9bcf3f..4e026bf3 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
@@ -1,11 +1,15 @@
 package com.openhis.medication.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.medication.mapper.MedicationRequestMapper;
@@ -25,9 +29,11 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
      * 更新请求状态：已完成
      *
      * @param requestIdList 药品请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
     @Override
-    public void updateCompletedStatusBatch(List<Long> requestIdList) {
+    public void updateCompletedStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate) {
         baseMapper.update(new MedicationRequest().setStatusEnum(RequestStatus.COMPLETED.getValue()),
             new LambdaUpdateWrapper<MedicationRequest>().in(MedicationRequest::getId, requestIdList));
     }
@@ -36,11 +42,33 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
      * 更新请求状态：待发送
      *
      * @param requestIdList 药品请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
     @Override
-    public void updateDraftStatusBatch(List<Long> requestIdList) {
-        baseMapper.update(null, new LambdaUpdateWrapper<MedicationRequest>().in(MedicationRequest::getId, requestIdList)
-            .set(MedicationRequest::getStatusEnum, RequestStatus.DRAFT.getValue()));
+    public void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate) {
+        LambdaUpdateWrapper<MedicationRequest> updateWrapper =
+            new LambdaUpdateWrapper<MedicationRequest>().in(MedicationRequest::getId, requestIdList)
+                .set(MedicationRequest::getStatusEnum, RequestStatus.DRAFT.getValue());
+        if (practitionerId != null) {
+            updateWrapper.set(MedicationRequest::getPerformerCheckId, practitionerId);
+        }
+        if (checkDate != null) {
+            updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
+        }
+        baseMapper.update(null, updateWrapper);
+    }
+
+    /**
+     * 通过id获取药品请求信息
+     *
+     * @param idList 请求id
+     * @return 发放信息
+     */
+    @Override
+    public List<MedicationRequest> selectByIdList(@Param("idList") List<Long> idList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<MedicationRequest>().in(MedicationRequest::getId, idList)
+            .eq(MedicationRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
 
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
similarity index 98%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
index 0e59a1a0..8ecd538a 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
@@ -72,7 +72,7 @@ public class MedicationServiceImpl extends ServiceImpl<MedicationMapper, Medicat
         // 根据药品编码判断药品是否存在
         List<Medication> medications = medicationMapper.selectList(
             new LambdaQueryWrapper<Medication>().eq(Medication::getMedicationDefId, medication.getMedicationDefId()));
-        if (medications.size() > 0) {
+        if (!medications.isEmpty()) {
             return false;
         }
         // 新增药品目录
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
similarity index 96%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
index d57598dd..16730e33 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
@@ -92,6 +92,9 @@ public class DeviceDispense extends HisBaseEntity {
     /** 限制发药时间 */
     private Date limitTime;
 
+    /** 预定发药时间 */
+    private Date plannedDispenseTime;
+
     /** 发药目的地 */
     private String desLocationId;
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
similarity index 95%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
index d793234a..bead6e3d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
@@ -27,7 +27,7 @@ public class ElepMedicationRequest extends HisBaseEntity {
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)
-    private Integer id;
+    private Long id;
 
     /** 医院内部处方编号 */
     private String prescriptionNo;
@@ -120,6 +120,8 @@ public class ElepMedicationRequest extends HisBaseEntity {
 
     /** 处方类别 */
     private Integer rxTypeCode;
+    /** 处方项目类别 */
+    private Integer rxItemTypeCode;
     /** 支持用药信息 */
     private String supportInfo;
     /** 服药时间(开始) */
@@ -135,4 +137,7 @@ public class ElepMedicationRequest extends HisBaseEntity {
 
     /** 每次发药供应天数 */
     private Integer dispensePerDuration;
+
+    /** 药品版本号 */
+    private String version;
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
similarity index 93%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
index f9ea021b..41df9982 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
@@ -87,9 +87,12 @@ public class ServiceRequest extends HisBaseEntity {
     /** 执行人 */
     private Long performerId;
 
-    /** 核对人 */
+    /** 校对人 */
     private Long performerCheckId;
 
+    /** 校对时间 */
+    private Date checkTime;
+
     /** 执行位置 */
     private Long locationId;
 
@@ -141,4 +144,12 @@ public class ServiceRequest extends HisBaseEntity {
      */
     private Long encounterDiagnosisId;
 
+    /** 治疗类型 */
+    private Integer therapyEnum;
+
+    /**
+     * 签发编码
+     */
+    private String signCode;
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
similarity index 89%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
index 089d9ea1..507ae926 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.DispenseStatus;
 import com.openhis.common.enums.SupplyType;
 
 import lombok.Data;
@@ -51,6 +51,12 @@ public class SupplyDelivery extends HisBaseEntity {
     /** 发放项目id */
     private Long itemId;
 
+    /** 请求基于什么 */
+    private String basedOnTable;
+
+    /** 请求基于什么的ID */
+    private String basedOnIds;
+
     /** 计量单位 */
     private String unitCode;
 
@@ -92,7 +98,7 @@ public class SupplyDelivery extends HisBaseEntity {
 
     public SupplyDelivery() {
         // 默认发放状态：进行中
-        this.statusEnum = EventStatus.IN_PROGRESS.getValue();
+        this.statusEnum = DispenseStatus.DRAFT.getValue();
         // 默认发放类型：
         this.typeEnum = SupplyType.PRODUCT_TRANSFER.getValue();
     }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
similarity index 86%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
index 3fb3872a..91058e07 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
@@ -67,6 +67,9 @@ public class SupplyRequest extends HisBaseEntity {
     /** 数量 */
     private BigDecimal itemQuantity;
 
+    /** 合计数量 */
+    private BigDecimal totalQuantity;
+
     /** 物品编码 */
     private Long itemId;
 
@@ -127,6 +130,15 @@ public class SupplyRequest extends HisBaseEntity {
     /** 追溯码 */
     private String traceNo;
 
+    /** 追溯码单位 */
+    private String traceNoUnitCode;
+
+    /** 包装情况 */
+    private Integer packagingConditionEnum;
+
+    /** 验收结果 */
+    private Integer acceptanceResultEnum;
+
     /** 发票号 */
     private String invoiceNo;
 
@@ -142,6 +154,17 @@ public class SupplyRequest extends HisBaseEntity {
     /** 总价 */
     private BigDecimal totalPrice;
 
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 零售总价 */
+    private BigDecimal totalRetailPrice;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
     /** 备注 */
     private String remake;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java
new file mode 100644
index 00000000..a584c37b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java
@@ -0,0 +1,179 @@
+package com.openhis.workflow.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.ActPriority;
+import com.openhis.common.enums.SupplyCategory;
+import com.openhis.common.enums.SupplyStatus;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 供应申请管理Entity实体（保存定时盘点信息）
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("wor_aut_supply_request")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class SupplyRequestAuto extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 原始单据号 */
+    private String originalBusNo;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 意图 */
+    private Integer intentEnum;
+
+    /** 分类 */
+    private Integer categoryEnum;
+
+    /** 优先权 */
+    private Integer priorityEnum;
+
+    /** 汇总编号 */
+    private Long summaryId;
+
+    /** 交付 */
+    private Long deliverId;
+
+    /** 患者id */
+    private Long patientId;
+
+    /** 项目 */
+    private String itemTable;
+
+    /** 数量 */
+    private BigDecimal itemQuantity;
+
+    /** 合计数量 */
+    private BigDecimal totalQuantity;
+
+    /** 物品编码 */
+    private Long itemId;
+
+    /** 物品计量单位 */
+    private String unitCode;
+
+    /** 请求细节 */
+    private String detailJson;
+
+    /** 期望时间 */
+    private Date occurrenceTime;
+
+    /** 供应人 */
+    private Long practitionerId;
+
+    /** 供应商 */
+    private Long supplierId;
+
+    /** 理由 */
+    private String reason;
+
+    /** 理由类型 */
+    private String reasonCode;
+
+    /** 源仓库类型 */
+    private Integer sourceTypeEnum;
+
+    /** 源仓库 */
+    private Long sourceLocationId;
+
+    /** 源仓位 */
+    private Long sourceLocationStoreId;
+
+    /** 目的类型 */
+    private Integer purposeTypeEnum;
+
+    /** 目的仓库 */
+    private Long purposeLocationId;
+
+    /** 目的仓位 */
+    private Long purposeLocationStoreId;
+
+    /** 审批人 */
+    private Long approverId;
+
+    /** 审批时间 */
+    private Date approvalTime;
+
+    /** 申请人 */
+    private Long applicantId;
+
+    /** 申请时间 */
+    private Date applyTime;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码单位 */
+    private String traceNoUnitCode;
+
+    /** 包装情况 */
+    private Integer packagingConditionEnum;
+
+    /** 验收结果 */
+    private Integer acceptanceResultEnum;
+
+    /** 发票号 */
+    private String invoiceNo;
+
+    /** 开始时间 */
+    private Date startTime;
+
+    /** 结束时间 */
+    private Date endTime;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 零售总价 */
+    private BigDecimal totalRetailPrice;
+
+    /** 批次库存 */
+    private BigDecimal batchInventory;
+
+    /** 规格库存 */
+    private BigDecimal specificationInventory;
+    /** 备注 */
+    private String remake;
+
+    public SupplyRequestAuto() {
+        // 默认单据状态：待审核
+        this.statusEnum = SupplyStatus.PENDING_APPROVAL.getValue();
+        // 默认单据分类：库存供应
+        this.categoryEnum = SupplyCategory.STOCK_SUPPLY.getValue();
+        // 默认优先级：常规
+        this.priorityEnum = ActPriority.ROUTINE.getValue();
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java
new file mode 100644
index 00000000..d73c0438
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java
@@ -0,0 +1,18 @@
+package com.openhis.workflow.mapper;
+
+import com.openhis.workflow.domain.SupplyRequestAuto;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+
+/**
+ * 供应申请管理Mapper接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Repository
+public interface SupplyRequestAutoMapper extends BaseMapper<SupplyRequestAuto> {
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
similarity index 85%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
index 9ed2a44b..64dca4f4 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
@@ -6,10 +6,12 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.core.common.core.domain.model.LoginUser;
 import com.openhis.administration.domain.Practitioner;
+import com.openhis.medication.domain.MedicationDispense;
 import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.DeviceRequest;
 import com.openhis.workflow.domain.ServiceRequest;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 器材发放管理Service接口
@@ -101,4 +103,19 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
      * @param devReqIdList 请求id列表
      */
     void updateOnHoldDispenseStatus(List<Long> devReqIdList);
+
+    /**
+     * 更新药品状态：已汇总
+     *
+     * @param devDispenseId 发放id列表
+     */
+    void updateDispenseStatusSummarized(List<Long> devDispenseId);
+
+    /**
+     * 通过id获取耗材发放信息
+     *
+     * @param idList 发放id
+     * @return 发放信息
+     */
+    List<DeviceDispense> selectByIdList(@Param("idList") List<Long> idList);
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
similarity index 98%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
index df158209..0b3313b1 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
@@ -29,7 +29,7 @@ public interface IElepMedicationRequestService extends IService<ElepMedicationRe
      *
      * @param idList id
      */
-    List<ElepMedicationRequest> selectElepMedicationRequestById(List<Integer> idList);
+    List<ElepMedicationRequest> selectElepMedicationRequestById(List<Long> idList);
 
 
     /**
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
similarity index 78%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
index fa7e3675..db62604c 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
@@ -26,12 +26,11 @@ public interface IInventoryItemService extends IService<InventoryItem> {
      * 更新库房数量
      *
      * @param id 主键
-     * @param baseQuantity 常规单位库存数量
-     * @param minQuantity 最小单位库存数量
+     * @param quantity 最小单位库存数量
      * @param now 当前时间
      * @return 更新件数
      */
-    Boolean updateInventoryQuantity(Long id, BigDecimal baseQuantity, BigDecimal minQuantity, Date now);
+    Boolean updateInventoryQuantity(Long id, BigDecimal quantity, Date now);
 
     /**
      * 查询
@@ -42,6 +41,6 @@ public interface IInventoryItemService extends IService<InventoryItem> {
      * @param tenantId 租户id
      * @return 单据详情
      */
-    List<InventoryItem> selectInventoryByItemId(Long itemId, String lotNumber, Long locationId,Integer tenantId);
+    List<InventoryItem> selectInventoryByItemId(Long itemId, String lotNumber, Long locationId, Integer tenantId);
 
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
similarity index 73%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
index c88d1f28..d1953143 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
@@ -3,14 +3,9 @@ package com.openhis.workflow.service;
 import java.util.Date;
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.core.common.core.domain.model.LoginUser;
 import com.openhis.administration.domain.Practitioner;
-import com.openhis.common.enums.RequestStatus;
 import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
 
 /**
  * 服务申请管理Service接口
@@ -35,6 +30,15 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
      */
     void updateStopRequestStatus(List<Long> serReqIdList);
 
+    /**
+     * 更新执行诊疗状态：完成
+     *
+     * @param serReqIdList 服务请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
+     */
+    void updateCompleteRequestStatus(List<Long> serReqIdList, Long practitionerId, Date checkDate);
+
     /**
      * 获取执行过的诊疗数据
      *
@@ -71,7 +75,7 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
      * @param orgId 执行科室
      * @return 更新结果
      */
-    boolean updateCancelledStatus(Long serviceReqId, Date now, Long practitionerId,Long orgId);
+    boolean updateCancelledStatus(Long serviceReqId, Date now, Long practitionerId, Long orgId);
 
     /**
      * 服务申请状态：已发送
@@ -80,14 +84,16 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
      * @param now 当前时间
      * @param loginUser 登录用户信息
      */
-     boolean activeStatusEnum(Long id, Date now, Practitioner loginUser);
+    boolean activeStatusEnum(Long id, Date now, Practitioner loginUser);
 
     /**
-     * 更新服务状态：待执行
+     * 更新服务状态：待发送（医嘱退回）
      *
      * @param serviceRequestIdList 请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
-    void updatePreparationStatus(List<Long> serviceRequestIdList);
+    void updateDraftStatus(List<Long> serviceRequestIdList, Long practitionerId, Date checkDate);
 
     /**
      * 更新服务状态：待发送
@@ -103,6 +109,14 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
      * @param num 打印次数
      * @return 更新结果
      */
-    void updateCountPint(Long id,Integer num);
+    void updateCountPint(Long id, Integer num);
+
+    /**
+     * 根据药品请求id,查询对应的服务请求实体
+     *
+     * @param medRequestId 药品请求id
+     * @return 服务请求实体
+     */
+    ServiceRequest selectByMedRequestId(Long medRequestId);
 
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
similarity index 71%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
index 62f17b4a..9eb76f0b 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
@@ -31,4 +31,21 @@ public interface ISupplyDeliveryService extends IService<SupplyDelivery> {
      * @param supplyReqIdList 供应申请id列表
      */
     boolean supplyDeliveryValidation(List<Long> supplyReqIdList);
+
+    /**
+     * 更新请求状态：同意
+     *
+     * @param supplyDeliveryIdList 供应发放id列表
+     */
+    void updateCompletedStatusBatch(List<Long> supplyDeliveryIdList);
+
+    /**
+     * 根据id，获取供应发放列表
+     *
+     * @param deliveryIdList id列表
+     * @return 供应发放列表
+     */
+    List<SupplyDelivery> selectByIdList(List<Long> deliveryIdList);
+
+
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java
new file mode 100644
index 00000000..92309981
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java
@@ -0,0 +1,18 @@
+package com.openhis.workflow.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.domain.SupplyRequestAuto;
+
+/**
+ * 供应申请管理Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface ISupplyRequestAutoService extends IService<SupplyRequestAuto> {
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
similarity index 53%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
index be69a296..e4a8a207 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.core.common.core.domain.model.LoginUser;
+import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
 
 /**
@@ -23,6 +24,14 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      */
     List<SupplyRequest> getSupplyByBusNo(String busNo);
 
+    /**
+     * 通过原始单据号查询单据信息
+     *
+     * @param originalBusNo 原始单据号
+     * @return 单据信息
+     */
+    List<SupplyRequest> getSupplyByOriginalBusNo(String originalBusNo);
+
     /**
      * 同意申请
      *
@@ -30,7 +39,32 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param now 当前时间
      * @return 单据详情
      */
-    List<SupplyRequest> agreeRequest(String busNo,Date now);
+    List<SupplyRequest> agreeRequest(String busNo, Date now);
+
+    /**
+     * 添加原始单据号
+     *
+     * @param busNo 单据号
+     * @param originalBusNo 原始单据号
+     * @return 单据详情
+     */
+    List<SupplyRequest> addOriginalBusNo(String busNo, String originalBusNo);
+
+    /**
+     * 将原始单据号信息的原始单据号删除
+     *
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    boolean updateByBusNo(String busNo);
+
+    /**
+     * 将原始单据号信息的状态改为已失效
+     *
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    boolean updateStatusEnumByBusNo(String busNo);
 
     /**
      * 提交审批
@@ -48,6 +82,14 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      */
     boolean withdrawApproval(String busNo);
 
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    boolean removeByBusNo(String busNo);
+
     /**
      * 驳回申请
      *
@@ -85,4 +127,24 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @return 校验结果
      */
     boolean verifyAbleEdit(Long itemId);
+    /**
+     * 通过单据号删除单据信息
+     *
+     * @param busNo 单据号
+     */
+    boolean deleteRequest(String busNo);
+
+    /**
+     * 更新请求状态：同意
+     *
+     * @param supplyRequestIdList 供应申请id列表
+     */
+    void updateCompletedStatusBatch(List<Long> supplyRequestIdList);
+    /**
+     * 根据id，获取供应申请列表
+     *
+     * @param requestIdList id列表
+     * @return 供应发放列表
+     */
+    List<SupplyRequest> selectByIdList(List<Long> requestIdList);
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
similarity index 82%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
index 3cc646fc..61c329be 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
@@ -1,10 +1,16 @@
 package com.openhis.workflow.service.impl;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.core.common.utils.DateUtils;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.medication.domain.MedicationDispense;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,7 +50,7 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
     public void handleDeviceDispense(DeviceRequest deviceRequest, String dbOpType) {
         DeviceDispense deviceDispense = new DeviceDispense();
         // 器材发放id
-        deviceDispense.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 10));
+        deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
         // 器材请求id
         deviceDispense.setDeviceReqId(deviceRequest.getId());
         // 器材发放状态
@@ -74,6 +80,15 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
         // 发药频次
         deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode());
 
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        // 增加2小时
+        LocalDateTime newTime = now.plusHours(2);
+        // 转换为Date对象（如果需要保持使用Date类型）
+        Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant());
+        // 设置限制发药时间
+        deviceDispense.setLimitTime(limitTime);
+
         if (DbOpType.INSERT.getCode().equals(dbOpType)) {
             baseMapper.insert(deviceDispense);
         } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
@@ -225,9 +240,34 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
     @Override
     public void updateOnHoldDispenseStatus(List<Long> devReqIdList) {
         baseMapper.update(null,
-                new LambdaUpdateWrapper<DeviceDispense>()
-                        .set(DeviceDispense::getStatusEnum, DispenseStatus.ON_HOLD.getValue())
-                        .in(DeviceDispense::getDeviceDefId, devReqIdList));
+            new LambdaUpdateWrapper<DeviceDispense>()
+                .set(DeviceDispense::getStatusEnum, DispenseStatus.ON_HOLD.getValue())
+                .in(DeviceDispense::getDeviceDefId, devReqIdList));
+    }
+
+    /**
+     * 更新药品状态：已汇总
+     *
+     * @param devDispenseId 发放id列表
+     */
+    @Override
+    public void updateDispenseStatusSummarized(List<Long> devDispenseId) {
+        baseMapper.update(null,
+            new LambdaUpdateWrapper<DeviceDispense>()
+                .set(DeviceDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())
+                .in(DeviceDispense::getId, devDispenseId));
+    }
+
+    /**
+     * 通过id获取耗材发放信息
+     *
+     * @param idList 发放id
+     * @return 发放信息
+     */
+    @Override
+    public List<DeviceDispense> selectByIdList(@Param("idList") List<Long> idList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, idList)
+            .eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
     }
 
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
similarity index 78%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
index dc2babe4..544c2b13 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
@@ -1,23 +1,15 @@
 package com.openhis.workflow.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.openhis.common.enums.EventStatus;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.workflow.domain.ElepMedicationRequest;
 import com.openhis.workflow.mapper.ElepMedicationRequestMapper;
 import com.openhis.workflow.service.IElepMedicationRequestService;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  * 【请填写功能名称】Service业务层处理
  *
@@ -38,13 +30,15 @@ public class ElepMedicationRequestServiceImpl extends ServiceImpl<ElepMedication
         return (baseMapper.selectList(new LambdaQueryWrapper<ElepMedicationRequest>()
             .eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)));
     }
+
     /**
      * 获取处方信息
      *
      * @param prescriptionNoList 处方号
      */
     @Override
-    public List<ElepMedicationRequest> selectElepMedicationRequestByPrescriptionNoList(List<String> prescriptionNoList) {
+    public List<ElepMedicationRequest>
+        selectElepMedicationRequestByPrescriptionNoList(List<String> prescriptionNoList) {
         return (baseMapper.selectList(new LambdaQueryWrapper<ElepMedicationRequest>()
             .in(ElepMedicationRequest::getPrescriptionNo, prescriptionNoList)));
     }
@@ -55,9 +49,9 @@ public class ElepMedicationRequestServiceImpl extends ServiceImpl<ElepMedication
      * @param idList id
      */
     @Override
-    public List<ElepMedicationRequest> selectElepMedicationRequestById(List<Integer> idList) {
-        return (baseMapper.selectList(new LambdaQueryWrapper<ElepMedicationRequest>()
-            .in(ElepMedicationRequest::getId, idList)));
+    public List<ElepMedicationRequest> selectElepMedicationRequestById(List<Long> idList) {
+        return (baseMapper
+            .selectList(new LambdaQueryWrapper<ElepMedicationRequest>().in(ElepMedicationRequest::getId, idList)));
 
     }
 
@@ -91,7 +85,7 @@ public class ElepMedicationRequestServiceImpl extends ServiceImpl<ElepMedication
         // 创建查询条件
         LambdaQueryWrapper<ElepMedicationRequest> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)
-            .in(ElepMedicationRequest::getRxTypeCode, list).eq(ElepMedicationRequest::getTenantId, tenantId);
+            .in(ElepMedicationRequest::getRxItemTypeCode, list).eq(ElepMedicationRequest::getTenantId, tenantId);
 
         // 调用 Mapper 的 selectCount 方法
         return this.baseMapper.selectCount(queryWrapper);
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
similarity index 73%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
index db7e2969..38b002c9 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
@@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.PublicationStatus;
 import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.mapper.InventoryItemMapper;
 import com.openhis.workflow.service.IInventoryItemService;
@@ -31,10 +33,7 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
     @Override
     public void stockIn(List<InventoryItem> inventoryItemList) {
         for (InventoryItem inventoryItem : inventoryItemList) {
-            // 此判断是为了避免插入时主键重复
-            if (inventoryItem.getId() == null) {
-                baseMapper.insert(inventoryItem);
-            }
+            baseMapper.insert(inventoryItem);
         }
     }
 
@@ -42,15 +41,14 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
      * 更新库房数量
      *
      * @param id 主键
-     * @param baseQuantity 常规单位库存数量
-     * @param minQuantity 最小单位库存数量
+     * @param quantity 最小单位库存数量
      * @param now 当前时间
      * @return 更新件数
      */
     @Override
-    public Boolean updateInventoryQuantity(Long id, BigDecimal baseQuantity, BigDecimal minQuantity, Date now) {
+    public Boolean updateInventoryQuantity(Long id, BigDecimal quantity, Date now) {
         int updateCount = baseMapper.update(null, new LambdaUpdateWrapper<InventoryItem>().eq(InventoryItem::getId, id)
-            .set(InventoryItem::getUpdateTime, now).set(InventoryItem::getQuantity, minQuantity));
+            .set(InventoryItem::getUpdateTime, now).set(InventoryItem::getQuantity, quantity));
         return updateCount > 0;
 
     }
@@ -67,9 +65,10 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
     @Override
     public List<InventoryItem> selectInventoryByItemId(Long itemId, String lotNumber, Long locationId,
         Integer tenantId) {
-        LambdaQueryWrapper<InventoryItem> queryWrapper =
-            new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getItemId, itemId)
-                .eq(InventoryItem::getLotNumber, lotNumber).eq(InventoryItem::getTenantId, tenantId);
+        LambdaQueryWrapper<InventoryItem> queryWrapper = new LambdaQueryWrapper<InventoryItem>()
+            .eq(InventoryItem::getItemId, itemId).eq(InventoryItem::getLotNumber, lotNumber)
+            .eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue())
+            .eq(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue());
         if (locationId != null) {
             queryWrapper.eq(InventoryItem::getLocationId, locationId);
         }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
similarity index 76%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
index a7176241..20855728 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
@@ -8,8 +8,11 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.mapper.ServiceRequestMapper;
@@ -46,7 +49,21 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
     @Override
     public void updateStopRequestStatus(List<Long> serReqIdList) {
         baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.STOPPED.getValue()),
-            new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serReqIdList));
+            new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serReqIdList)
+                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 更新执行诊疗状态：完成
+     *
+     * @param serReqIdList 服务请求id列表
+     */
+    @Override
+    public void updateCompleteRequestStatus(List<Long> serReqIdList, Long practitionerId, Date checkDate) {
+        baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.COMPLETED.getValue())
+            .setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()),
+            new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serReqIdList)
+                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
 
     /**
@@ -148,16 +165,18 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
     }
 
     /**
-     * 更新服务状态：待执行
+     * 更新服务状态：待发送（医嘱退回）
      *
      * @param serviceRequestIdList 请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
     @Override
-    public void updatePreparationStatus(List<Long> serviceRequestIdList) {
-        baseMapper.update(null,
-            new LambdaUpdateWrapper<ServiceRequest>()
-                .set(ServiceRequest::getStatusEnum, RequestStatus.IN_PROGRESS.getValue())
-                .in(ServiceRequest::getId, serviceRequestIdList));
+    public void updateDraftStatus(List<Long> serviceRequestIdList, Long practitionerId, Date checkDate) {
+        baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue())
+            .setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()),
+            new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serviceRequestIdList)
+                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
 
     /**
@@ -194,4 +213,22 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
         }
     }
 
+    /**
+     * 根据药品请求id,查询对应的服务请求实体
+     *
+     * @param medRequestId 药品请求id
+     * @return 服务请求实体
+     */
+    @Override
+    public ServiceRequest selectByMedRequestId(Long medRequestId) {
+
+        // 获取服务请求id
+        // 创建 LambdaQueryWrapper
+        LambdaQueryWrapper<ServiceRequest> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ServiceRequest::getBasedOnTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
+            .eq(ServiceRequest::getBasedOnId, medRequestId).eq(ServiceRequest::getDeleteFlag, '0');
+        return baseMapper.selectOne(queryWrapper);
+
+    }
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
similarity index 71%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
index 2caa6fc7..eed67d6c 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
@@ -5,11 +5,16 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.EventStatus;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.DispenseStatus;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
 import com.openhis.workflow.mapper.SupplyDeliveryMapper;
@@ -42,8 +47,8 @@ public class SupplyDeliveryServiceImpl extends ServiceImpl<SupplyDeliveryMapper,
             supplyDelivery
                 // 请求id
                 .setRequestId(supplyRequest.getId())
-                // 发放状态：已完成
-                .setStatusEnum(EventStatus.COMPLETED.getValue())
+                // 发放状态：已发放
+                .setStatusEnum(DispenseStatus.COMPLETED.getValue())
                 // 单据类型
                 .setTypeEnum(supplyRequest.getTypeEnum())
                 // 发放项目所在表
@@ -93,8 +98,34 @@ public class SupplyDeliveryServiceImpl extends ServiceImpl<SupplyDeliveryMapper,
         if (!deliveryList.isEmpty()) {
             List<Integer> deliveryStatusList =
                 deliveryList.stream().map(SupplyDelivery::getStatusEnum).collect(Collectors.toList());
-            return deliveryStatusList.stream().anyMatch(x -> x.equals(EventStatus.COMPLETED.getValue()));
+            return deliveryStatusList.stream().anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()));
         }
         return false;
     }
+
+    /**
+     * 更新请求状态：已完成
+     *
+     * @param supplyDeliveryIdList 供应发放id列表
+     */
+    @Override
+    public void updateCompletedStatusBatch(List<Long> supplyDeliveryIdList) {
+        baseMapper.update(
+            new SupplyDelivery().setStatusEnum(DispenseStatus.COMPLETED.getValue())
+                .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId())
+                .setOccurrenceTime(DateUtils.getNowDate()).setReceiveTime(DateUtils.getNowDate()),
+            new LambdaUpdateWrapper<SupplyDelivery>().in(SupplyDelivery::getId, supplyDeliveryIdList));
+    }
+
+    /**
+     * 根据id，获取供应发放列表
+     *
+     * @param deliveryIdList id列表
+     * @return 供应发放列表
+     */
+    @Override
+    public List<SupplyDelivery> selectByIdList(List<Long> deliveryIdList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyDelivery>().in(SupplyDelivery::getId, deliveryIdList)
+            .eq(SupplyDelivery::getDeleteFlag, DelFlag.YES.getCode()));
+    }
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
new file mode 100644
index 00000000..08e6c043
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
@@ -0,0 +1,38 @@
+package com.openhis.workflow.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.openhis.workflow.domain.SupplyRequestAuto;
+import com.openhis.workflow.mapper.SupplyRequestAutoMapper;
+import com.openhis.workflow.service.ISupplyRequestAutoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.SupplyStatus;
+import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.mapper.SupplyRequestMapper;
+import com.openhis.workflow.service.ISupplyRequestService;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 供应申请管理Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class SupplyRequestAutoServiceImpl extends ServiceImpl<SupplyRequestAutoMapper, SupplyRequestAuto>
+    implements ISupplyRequestAutoService {
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
similarity index 59%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
index 42b2c067..e192d14e 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.openhis.medication.domain.MedicationDispense;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -43,6 +44,16 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
         return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
     }
 
+    /**
+     * 通过原始单据号查询单据信息
+     *
+     * @param originalBusNo 原始单据号
+     * @return 单据信息
+     */
+    @Override
+    public  List<SupplyRequest> getSupplyByOriginalBusNo(String originalBusNo){
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getOriginalBusNo, originalBusNo));
+    }
     /**
      * 同意申请
      *
@@ -62,6 +73,49 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
         return this.getSupplyByBusNo(busNo);
     }
 
+    /**
+     * 添加原始单据号
+     *
+     * @param busNo 单据号
+     * @param originalBusNo 原始单据号
+     * @return 单据详情
+     */
+    @Override
+    public List<SupplyRequest> addOriginalBusNo(String busNo,String originalBusNo){
+        // 更新单据状态
+        baseMapper.update(null,
+            new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+                .set(SupplyRequest::getOriginalBusNo, originalBusNo));
+        // 返回单据详情
+        return this.getSupplyByBusNo(busNo);
+    }
+    /**
+     * 将原始单据号信息的原始单据号删除
+     *
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    @Override
+    public boolean updateByBusNo(String busNo) {
+        int updateCount = baseMapper.update(null,
+            new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+                .set(SupplyRequest::getOriginalBusNo, ""));
+        return updateCount > 0;
+    }
+
+    /**
+     * 将原始单据号信息的状态改为已失效
+     *
+     * @param busNo 单据号
+     * @return 单据详情
+     */
+    @Override
+    public  boolean updateStatusEnumByBusNo(String busNo){
+        int updateCount = baseMapper.update(null,
+            new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+                .set(SupplyRequest::getStatusEnum, SupplyStatus.EXPIRED_INVALIDATED.getValue()));
+        return updateCount > 0;
+    }
     /**
      * 提交审批
      *
@@ -91,7 +145,19 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
                 .set(SupplyRequest::getStatusEnum, SupplyStatus.WITHDRAW.getValue()));
         return updateCount > 0;
     }
-
+    /**
+     * 删除单据
+     *
+     * @param busNo 单据号
+     * @return 操作结果
+     */
+    @Override
+    public  boolean removeByBusNo(String busNo){
+        int updateCount = baseMapper.update(null,
+                new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+                        .set(SupplyRequest::getDeleteFlag,DelFlag.YES.getCode() ));
+        return updateCount > 0;
+    }
     /**
      * 驳回申请
      *
@@ -162,4 +228,37 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
         return baseMapper.exists(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getItemId, itemId)
             .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
+
+    /**
+     * 通过单据号删除单据信息
+     *
+     * @param busNo 单据号
+     */
+    @Override public boolean deleteRequest(String busNo) {
+        // 更新单据状态
+        int deleteCount = baseMapper.delete(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
+
+        return deleteCount > 0;
+    }
+
+    /**
+     * 更新请求状态：同意
+     *
+     * @param supplyRequestIdList 供应申请id列表
+     */
+    @Override public void updateCompletedStatusBatch(List<Long> supplyRequestIdList) {
+        baseMapper.update(new SupplyRequest().setStatusEnum(SupplyStatus.AGREE.getValue())
+                .setApproverId(SecurityUtils.getLoginUser().getPractitionerId()).setApprovalTime(DateUtils.getNowDate()),
+            new LambdaUpdateWrapper<SupplyRequest>().in(SupplyRequest::getId, supplyRequestIdList));
+    }
+    /**
+     * 根据id，获取供应申请列表
+     *
+     * @param requestIdList id列表
+     * @return 供应发放列表
+     */
+    @Override public  List<SupplyRequest> selectByIdList(List<Long> requestIdList){
+        return baseMapper.selectList( new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getId, requestIdList)
+            .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/File.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/File.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/File.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/File.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
similarity index 80%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
index 6fe2458e..ddec6451 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
@@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.data.redis.core.index.PathBasedRedisIndexDefinition;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -35,26 +36,26 @@ public class FinancialApplyRecord {
     //开始时间
     private Date begndate;
 
-    //医院id
+    //结束时间
     private Date enddate;
 
     //清算类别
-    private Date clrType;
+    private String clrType;
 
     //医疗费总额
-    private Date medfeeSumamt;
+    private BigDecimal medfeeSumamt;
 
     //医保认可费用总额
-    private Date medSumfee;
+    private BigDecimal medSumfee;
 
     //基金申报总额
-    private Date fundAppySum;
+    private BigDecimal fundAppySum;
 
     //现金支付金额
-    private Date cashPayamt;
+    private BigDecimal cashPayamt;
 
     //个人账户支出
-    private Date acctPay;
+    private BigDecimal acctPay;
 
     //申请人
     private Long praId;
@@ -62,7 +63,7 @@ public class FinancialApplyRecord {
     //入参
     private String param;
 
-    //
+    //医保输出参数：申请清算id
     private String outResult;
 
     //申请状态
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java
new file mode 100644
index 00000000..eef815b6
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2402】出院办理
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_discharge")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientDischarge extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 险种类型
+     */
+    @JSONField(name = "insutype")
+    private String insutype;
+
+    /**
+     * 结束时间（出院时间，格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date endtime;
+
+    /**
+     * 病种编码（按照标准编码填写：按病种结算病种目录代码(bydise_setl_list_code)、日间手术病种目录代码(daysrg_dise_list_code)）
+     */
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 病种名称
+     */
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 手术操作代码（日间手术病种时必填）
+     */
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 手术操作名称
+     */
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 计划生育服务证号
+     */
+    @JSONField(name = "fpsc_no")
+    private String fpscNo;
+
+    /**
+     * 生育类别
+     */
+    @JSONField(name = "matn_type")
+    private String matnType;
+
+    /**
+     * 计划生育手术类别
+     */
+    @JSONField(name = "birctrl_type")
+    private String birctrlType;
+
+    /**
+     * 晚育标志
+     */
+    @JSONField(name = "latechb_flag")
+    private String latechbFlag;
+
+    /**
+     * 孕周数
+     */
+    @JSONField(name = "esso_val")
+    private Integer essoVal;
+
+    /**
+     * 胎次
+     */
+    @JSONField(name = "fetts")
+    private Integer fetts;
+
+    /**
+     * 胎儿数
+     */
+    @JSONField(name = "fetus_cnt")
+    private Integer fetusCnt;
+
+    /**
+     * 早产标志
+     */
+    @JSONField(name = "pret_flag")
+    private String pretFlag;
+
+    /**
+     * 计划生育手术或生育日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "birctrl_matn_date", format = "yyyy-MM-dd")
+    private Date birctrlMatnDate;
+
+    /**
+     * 伴有并发症标志
+     */
+    @JSONField(name = "cop_flag")
+    private String copFlag;
+
+    /**
+     * 出院科室编码
+     */
+    @JSONField(name = "dscg_dept_codg")
+    private String dscgDeptCodg;
+
+    /**
+     * 出院科室名称
+     */
+    @JSONField(name = "dscg_dept_name")
+    private String dscgDeptName;
+
+    /**
+     * 出院床位
+     */
+    @JSONField(name = "dscg_bed")
+    private String dscgBed;
+
+    /**
+     * 离院方式
+     */
+    @JSONField(name = "dscg_way")
+    private String dscgWay;
+
+    /**
+     * 死亡日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "die_date", format = "yyyy-MM-dd")
+    private Date dieDate;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java
new file mode 100644
index 00000000..2a7aeccd
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java
@@ -0,0 +1,227 @@
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2301】费用明细上传
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_fee_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientFeeDetail extends HisBaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+    /**
+     * 费用明细流水号 单次就诊内唯一(对应chargeItem的busNo)
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 原费用流水号 退单时传入被退单的费用明细流水号
+     */
+    @JsonProperty("init_feedetl_sn")
+    private String initFeedetlSn;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 医嘱号
+     */
+    @JsonProperty("drord_no")
+    private String drordNo;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 费用发生时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("fee_ocur_time")
+    private Date feeOcurTime;
+
+    /**
+     * 医保目录编码
+     */
+    @JsonProperty("med_list_codg")
+    private String medListCodg;
+
+    /**
+     * 医药机构目录编码
+     */
+    @JsonProperty("medins_list_codg")
+    private String medinsListCodg;
+
+    /**
+     * 明细项目费用总额
+     */
+    @JsonProperty("det_item_fee_sumamt")
+    private BigDecimal detItemFeeSumamt;
+
+    /**
+     * 数量 退单时数量填写负数
+     */
+    @JsonProperty("cnt")
+    private BigDecimal cnt;
+
+    /**
+     * 单价
+     */
+    @JsonProperty("pric")
+    private BigDecimal pric;
+
+    /**
+     * 开单科室编码
+     */
+    @JsonProperty("bilg_dept_codg")
+    private String bilgDeptCodg;
+
+    /**
+     * 开单科室名称
+     */
+    @JsonProperty("bilg_dept_name")
+    private String bilgDeptName;
+
+    /**
+     * 开单医生编码
+     */
+    @JsonProperty("bilg_dr_codg")
+    private String bilgDrCodg;
+
+    /**
+     * 开单医师姓名
+     */
+    @JsonProperty("bilg_dr_name")
+    private String bilgDrName;
+
+    /**
+     * 定价上限金额
+     */
+    @JsonProperty("pric_uplmt_amt")
+    private BigDecimal pricUplmtAmt;
+
+    /**
+     * 自付比例
+     */
+    @JsonProperty("selfpay_prop")
+    private BigDecimal selfpayProp;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_amt")
+    private BigDecimal overlmtAmt;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 收费项目等级
+     */
+    @JsonProperty("chrgitm_lv")
+    private String chrgitmLv;
+
+    /**
+     * 医疗收费项目类别
+     */
+    @JsonProperty("med_chrgitm_type")
+    private String medChrgitmType;
+
+    /**
+     * 基本药物标志
+     */
+    @JsonProperty("bas_medn_flag")
+    private String basMednFlag;
+
+    /**
+     * 医保谈判药品标志
+     */
+    @JsonProperty("hi_nego_drug_flag")
+    private String hiNegoDrugFlag;
+
+    /**
+     * 儿童用药标志
+     */
+    @JsonProperty("chld_medc_flag")
+    private String chldMedcFlag;
+
+    /**
+     * 目录特项标志
+     */
+    @JsonProperty("list_sp_item_flag")
+    private String listSpItemFlag;
+
+    /**
+     * 限制使用标志
+     */
+    @JsonProperty("lmt_used_flag")
+    private String lmtUsedFlag;
+
+    /**
+     * 直报标志
+     */
+    @JsonProperty("drt_reim_flag")
+    private String drtReimFlag;
+
+    /**
+     * 关联就诊id
+     */
+    private String encounterId;
+
+    private String inputParam;
+
+    private String outputResult;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java
new file mode 100644
index 00000000..0426d6bb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2303】住院预结算
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_pre_settle")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientPreSettle extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 出院时间 格式：yyyy-MM-dd
+     */
+    @JsonProperty("dscgTime")
+    private Date dscgTime;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 伤残人员医疗保障基金支出 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java
new file mode 100644
index 00000000..6bf53db0
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2401】入院办理
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_reg")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientReg extends HisBaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 险种类型
+     */
+    @JSONField(name = "insutype")
+    private String insutype;
+
+    /**
+     * 联系人姓名
+     */
+    @JSONField(name = "coner_name")
+    private String conerName;
+
+    /**
+     * 联系电话
+     */
+    @JSONField(name = "tel")
+    private String tel;
+
+    /**
+     * 开始时间（入院时间，格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date begntime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JSONField(name = "mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号（就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号）
+     */
+    @JSONField(name = "mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗类别
+     */
+    @JSONField(name = "med_type")
+    private String medType;
+
+    /**
+     * 住院号（院内就诊流水号）
+     */
+    @JSONField(name = "ipt_no")
+    private String iptNo;
+
+    /**
+     * 病历号
+     */
+    @JSONField(name = "medrcdno")
+    private String medrcdno;
+
+    /**
+     * 主治医生编码
+     */
+    @JSONField(name = "atddr_no")
+    private String atddrNo;
+
+    /**
+     * 主诊医师姓名
+     */
+    @JSONField(name = "chfpdr_name")
+    private String chfpdrName;
+
+    /**
+     * 入院诊断描述
+     */
+    @JSONField(name = "adm_diag_dscr")
+    private String admDiagDscr;
+
+    /**
+     * 入院科室编码
+     */
+    @JSONField(name = "adm_dept_codg")
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    @JSONField(name = "adm_dept_name")
+    private String admDeptName;
+
+    /**
+     * 入院床位
+     */
+    @JSONField(name = "adm_bed")
+    private String admBed;
+
+    /**
+     * 住院主诊断代码
+     */
+    @JSONField(name = "dscg_maindiag_code")
+    private String dscgMaindiagCode;
+
+    /**
+     * 住院主诊断名称
+     */
+    @JSONField(name = "dscg_maindiag_name")
+    private String dscgMaindiagName;
+
+    /**
+     * 主要病情描述
+     */
+    @JSONField(name = "main_cond_dscr")
+    private String mainCondDscr;
+
+    /**
+     * 病种编码（按照标准编码填写：按病种结算病种目录代码(bydise_setl_list_code)、日间手术病种目录代码(daysrg_dise_list_code)）
+     */
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 病种名称
+     */
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 手术操作代码（日间手术病种时必填）
+     */
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 手术操作名称
+     */
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 计划生育服务证号
+     */
+    @JSONField(name = "fpsc_no")
+    private String fpscNo;
+
+    /**
+     * 生育类别
+     */
+    @JSONField(name = "matn_type")
+    private String matnType;
+
+    /**
+     * 计划生育手术类别
+     */
+    @JSONField(name = "birctrl_type")
+    private String birctrlType;
+
+    /**
+     * 晚育标志
+     */
+    @JSONField(name = "latechb_flag")
+    private String latechbFlag;
+
+    /**
+     * 孕周数
+     */
+    @JSONField(name = "geso_val")
+    private Integer gesoVal;
+
+    /**
+     * 胎次
+     */
+    @JSONField(name = "fetts")
+    private Integer fetts;
+
+    /**
+     * 胎儿数
+     */
+    @JSONField(name = "fetus_cnt")
+    private Integer fetusCnt;
+
+    /**
+     * 早产标志
+     */
+    @JSONField(name = "pret_flag")
+    private String pretFlag;
+
+    /**
+     * 计划生育手术或生育日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "birctrl_matn_date", format = "yyyy-MM-dd")
+    private Date birctrlMatnDate;
+
+    /**
+     * 病种类型
+     */
+    @JSONField(name = "dise_type_code")
+    private String diseTypeCode;
+
+    /**
+     * 字段扩展
+     */
+    @JSONField(name = "exp_content")
+    private String expContent;
+
+    /**
+     * 参保地医保区划
+     */
+    @JSONField(name = "insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JSONField(name = "mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 就诊id
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java
new file mode 100644
index 00000000..6de3b953
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2403】住院信息变更
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_info_recorde")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientRegInfoUpdateRecorde extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 联系人姓名
+     */
+    @JSONField(name = "coner_name")
+    private String conerName;
+
+    /**
+     * 联系电话
+     */
+    @JSONField(name = "tel")
+    private String tel;
+
+    /**
+     * 开始时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date begntime;
+
+    /**
+     * 结束时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date endtime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JSONField(name = "mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JSONField(name = "med_type")
+    private String medType;
+
+    /**
+     * 住院/门诊号
+     */
+    @JSONField(name = "ipt_otp_no")
+    private String iptOtpNo;
+
+    /**
+     * 病历号
+     */
+    @JSONField(name = "medrcdno")
+    private String medrcdno;
+
+    /**
+     * 主治医生编码
+     */
+    @JSONField(name = "atddr_no")
+    private String atddrNo;
+
+    /**
+     * 主诊医师姓名
+     */
+    @JSONField(name = "chfpdr_name")
+    private String chfpdrName;
+
+    /**
+     * 入院诊断描述
+     */
+    @JSONField(name = "adm_diag_dscr")
+    private String admDiagDscr;
+
+    /**
+     * 入院科室编码
+     */
+    @JSONField(name = "adm_dept_codg")
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    @JSONField(name = "adm_dept_name")
+    private String admDeptName;
+
+    /**
+     * 入院床位
+     */
+    @JSONField(name = "adm_bed")
+    private String admBed;
+
+    /**
+     * 住院主诊断代码
+     */
+    @JSONField(name = "dscg_maindiag_code")
+    private String dscgMaindiagCode;
+
+    /**
+     * 住院主诊断名称
+     */
+    @JSONField(name = "dscg_maindiag_name")
+    private String dscgMaindiagName;
+
+    /**
+     * 主要病情描述
+     */
+    @JSONField(name = "main_cond_dscr")
+    private String mainCondDscr;
+
+    /**
+     * 病种编码（按照标准编码填写：按病种结算病种目录代码(bydise_setl_list_code)、日间手术病种目录代码(daysrg_dise_list_code)）
+     */
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 病种名称
+     */
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 手术操作代码（日间手术病种时必填）
+     */
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 手术操作名称
+     */
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 计划生育服务证号
+     */
+    @JSONField(name = "fpsc_no")
+    private String fpscNo;
+
+    /**
+     * 生育类别
+     */
+    @JSONField(name = "matn_type")
+    private String matnType;
+
+    /**
+     * 计划生育手术类别
+     */
+    @JSONField(name = "birctrl_type")
+    private String birctrlType;
+
+    /**
+     * 晚育标志
+     */
+    @JSONField(name = "latechb_flag")
+    private String latechbFlag;
+
+    /**
+     * 孕周数
+     */
+    @JSONField(name = "esso_val")
+    private Integer essoVal;
+
+    /**
+     * 胎次
+     */
+    @JSONField(name = "fetts")
+    private Integer fetts;
+
+    /**
+     * 胎儿数
+     */
+    @JSONField(name = "fetus_cnt")
+    private Integer fetusCnt;
+
+    /**
+     * 早产标志
+     */
+    @JSONField(name = "pret_flag")
+    private String pretFlag;
+
+    /**
+     * 计划生育手术或生育日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "birctrl_matn_date", format = "yyyy-MM-dd")
+    private Date birctrlMatnDate;
+
+    /**
+     * 病种编号
+     */
+    @JSONField(name = "dise_type_code")
+    private String diseTypeCode;
+
+    private String inputParam;
+
+    private String outputResult;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java
new file mode 100644
index 00000000..4333dad1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java
@@ -0,0 +1,319 @@
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2304】住院结算
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_settle")
+@Accessors(chain = true)
+public class InpatientSettle extends HisBaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 人员编号
+     */
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    private String setlId;
+
+    /**
+     * 个人账户使用标志
+     */
+    private String acctUsedFlag;
+
+    /**
+     * 险种类型
+     */
+    private String insutype;
+
+    /**
+     * 参保地医保区划
+     */
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 出院时间 格式：yyyy-MM-dd
+     */
+    private Date dscgTime;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 伤残人员医疗保障基金支出 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java
new file mode 100644
index 00000000..6ac8a764
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2405】撤销出院记录
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_un_discharge")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientUnDischarge extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java
new file mode 100644
index 00000000..af48ca81
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2404】【】 入院撤销
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_un_reg")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientUnReg extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java
new file mode 100644
index 00000000..bf03617c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2305】住院结算策撤销
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_un_settle")
+@Accessors(chain = true)
+public class InpatientUnSettle extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_Id")
+    private String setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 结算时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 人员参保关系ID
+     */
+    @JsonProperty("psn_insu_rlts_id")
+    private String psnInsuRltsId;
+
+    /**
+     * 参保机构行政区划
+     */
+    @JsonProperty("insu_admdvs")
+    private String insuAdmdvs;
+
+    /**
+     * 开始日期
+     */
+    @JsonProperty("begndate")
+    private Date begndate;
+
+    /**
+     * 结算日期
+     */
+    @JsonProperty("enddate")
+    private Date enddate;
+
+    /**
+     * 就诊凭证编号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 结算类别
+     */
+    @JsonProperty("setl_type")
+    private String setlType;
+
+    /**
+     * 本次起付线
+     */
+    @JsonProperty("crt_dedc")
+    private BigDecimal crtDedc;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java
new file mode 100644
index 00000000..d78ff89f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.domain;
+
+import java.io.Serializable;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+@TableName("yb_inpatient_cancel_fee_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InpatientcancelFeeDetail extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 费用明细流水号 单次就诊内唯一
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 人员编号 退单时传入被退单的费用明细流水号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+
+    private String inputParam;
+
+    private String outputResult;
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
similarity index 97%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
index 8d1c64af..56c5ec8d 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
@@ -87,6 +87,9 @@ public class BaseInfo {
     private String templatePath;
     private String outputPath;
     private String hospitalSealPath;
+    private String medType;
+    private String dutyDoctorName;
+
     /********************共通参数********************/
     //是否解密
     private String decryptFlag;
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
similarity index 70%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
index 7b3ace53..86155328 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 
 /**
- * 【2206】医保基金支付详情
+ * 【2206】医保基金支付详情(【2207】【23系列】住院结算接口共用，后续考虑全局改类名)
  *
  * @author SunJQ
  * @date 2025-04-19
@@ -20,23 +20,23 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class Clinic2206FundPaymentResult {
     // 主键字段（根据Y标识判断）
-    @JSONField(name = "fund_pay_type")
+    //@JSONField(name = "fund_pay_type")
     private String fundPayType; // 基金支付类型
 
     // 数值型字段使用BigDecimal保证精度
-    @JSONField(name = "inscp_scp_amt")
+    //@JSONField(name = "inscp_scp_amt")
     private BigDecimal inscpScpAmt; // 符合政策范围金额
 
-    @JSONField(name = "crt_payb_lmt_amt")
+    //@JSONField(name = "crt_payb_lmt_amt")
     private BigDecimal crtPaybLmtAmt; // 本次可支付限额金额
 
-    @JSONField(name = "fund_payamt")
+    //@JSONField(name = "fund_payamt")
     private BigDecimal fundPayamt; // 基金支付金额
 
     // 字符型字段
-    @JSONField(name = "fund_pay_type_name")
+    //@JSONField(name = "fund_pay_type_name")
     private String fundPayTypeName; // 基金支付类型名称
 
-    @JSONField(name = "setl_proc_info")
+    //@JSONField(name = "setl_proc_info")
     private String setlProcInfo; // 结算过程信息
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
similarity index 69%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
index c4be7887..dc820975 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
@@ -3,13 +3,13 @@
  */
 package com.openhis.yb.dto;
 
-import lombok.Data;
-import lombok.experimental.Accessors;
-
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 /**
  * 【2206】医保预结算的输出参数
  *
@@ -92,7 +92,7 @@ public class Clinic2206OrderOutput {
 
     private BigDecimal acctMulaidPay; // 个人账户共济支付金额
 
-    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
+    private String medinsSetlId; // 医药机构结算ID 存放发送方报文ID
 
     private String clrOptins; // 清算经办机构
 
@@ -111,4 +111,30 @@ public class Clinic2206OrderOutput {
     private String chrgBchno; // 收费批次号
 
     private String busNo; // 挂号采访码
+
+    // 构造方法：初始化所有字段为0.0
+    public Clinic2206OrderOutput() {
+        this.medfeeSumamt = new BigDecimal("0.0");
+        this.fulamtOwnpayAmt = new BigDecimal("0.0");
+        this.overlmtSelfpay = new BigDecimal("0.0");
+        this.preselfpayAmt = new BigDecimal("0.0");
+        this.inscpScpAmt = new BigDecimal("0.0");
+        this.actPayDedc = new BigDecimal("0.0");
+        this.hifpPay = new BigDecimal("0.0");
+        this.poolPropSelfpay = new BigDecimal("0.0");
+        this.cvlservPay = new BigDecimal("0.0");
+        this.hifesPay = new BigDecimal("0.0");
+        this.hifmiPay = new BigDecimal("0.0");
+        this.hifobPay = new BigDecimal("0.00");
+        this.mafPay = new BigDecimal("0.0");
+        this.othPay = new BigDecimal("0.0");
+        this.fundPaySumamt = new BigDecimal("0.0");
+        this.psnPartAmt = new BigDecimal("0.0");
+        this.acctPay = new BigDecimal("0.0");
+        this.psnCashPay = new BigDecimal("0.0");
+        this.hospPartAmt = new BigDecimal("0.0");
+        this.balc = new BigDecimal("0.0");
+        this.acctMulaidPay = new BigDecimal("0.0");
+        this.hifdmPay = new BigDecimal("0.0");
+    }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java
new file mode 100644
index 00000000..4e38f16d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java
@@ -0,0 +1,14 @@
+package com.openhis.yb.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class File9101Param {
+
+    private MultipartFile file;
+
+    private String filename;
+
+    private String fixmedinsCode;
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
similarity index 89%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
index 5326b545..b604eead 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
@@ -5,6 +5,8 @@ package com.openhis.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
@@ -15,7 +17,8 @@ import java.math.BigDecimal;
  * @author SunJQ
  * @date 2025-04-22
  */
-@Data
+@Getter
+@Setter
 @Accessors(chain = true)
 public class Financial3202FileParam {
     // 1. 结算ID（字符型，30位，必填）
@@ -51,6 +54,10 @@ public class Financial3202FileParam {
         return setlId + "," + mdtrtId + "," + psnNo + "," + medfeeSumamt + "," + fundPaySumamt + "," + acctPay + "," + refdSetlFlag;
     }
 
+    public String getTxt() {
+        return setlId + "\t" + mdtrtId + "\t" + psnNo + "\t" + medfeeSumamt + "\t" + fundPaySumamt + "\t" + acctPay + "\t" + refdSetlFlag;
+    }
+
     public Financial3202FileParam() {
     }
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java
new file mode 100644
index 00000000..a2cc8b73
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java
@@ -0,0 +1,19 @@
+package com.openhis.yb.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FinancialClearing3203AWebParam {
+
+    /** 结算经办机构 */
+    private String setlOptins;
+    /** 清算类别 */
+    private String clrType;
+    /** 开始时间 */
+    private String stmtBegnDate;//年月日
+    /** 结束时间 */
+    private String stmtEndDate;
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
similarity index 91%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
index ea754e42..83836218 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
@@ -70,7 +70,7 @@ public class PatientInfoDto {
     private Integer categoryEnum;//弃用 2025/05/23
 
     /** 合同编码 */
-    private String contractBusNo;//弃用 2025/05/23
+    private String contractBusNo;//弃用 2025/05/23    2025/07/23 因考虑住院部分代码开发，非常规门诊转住院的情况下需要刷卡识别身份获取省市医保
 
     /** 机构 */
     private Long contractOrgId;//弃用 2025/05/23
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
similarity index 82%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
index ecad6d97..f6507fbc 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
@@ -3,11 +3,13 @@
  */
 package com.openhis.yb.dto;
 
+import java.math.BigDecimal;
+
+import com.openhis.common.annotation.Dict;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-
 /**
  * 支付详情
  *
@@ -18,12 +20,10 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class PaymentDetailDto {
 
-
     /** 支付类型 */
+    @Dict(dictCode = "pay_enum")
     private Integer payEnum;
-
-    /** 支付类型等级 */
-    private Integer payLevelEnum;
+    private String payEnum_dictText;
 
     /** 金额 */
     private BigDecimal amount;
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
similarity index 57%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
index b26fa49d..af0f22d7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentDto.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
@@ -1,14 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.openhis.yb.dto;
 
-import java.math.BigDecimal;
 import java.util.List;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -29,20 +26,20 @@ public class PaymentDto {
     /**
      * 付款id
      */
-    private Long id;//paymentId
+    private Long id;// paymentId
 
     /** 就诊ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
     /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
+    private List<Long> chargeItemIds;// 收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
 
     /** 支付详细 */
     @NotEmpty
     private List<PaymentDetailDto> paymentDetails;
 
-    private String ybMdtrtCertType;//社保卡/身份证/电子医保码
+    private String ybMdtrtCertType;// 社保卡/身份证/电子医保码
 
-    private String busiCardInfo;//社保卡号/身份证号/ecToken
+    private String busiCardInfo;// 社保卡号/身份证号/ecToken
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java
similarity index 46%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java
index 5634dbf6..dcc0bfed 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java
@@ -3,16 +3,16 @@
  */
 package com.openhis.yb.dto;
 
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
  * 付款入参
  *
@@ -21,42 +21,35 @@ import java.util.List;
  */
 @Data
 @Accessors(chain = true)
-public class PaymentDto {
+public class PaymentInpatientDto {
 
     /**
-     * id
+     * 付款id（业务单）
      */
-    private Long id;
+    private Long id;// paymentId
 
-    /** 收款员 */
-    private Long entererId;
-
-    /** 支付的患者ID */
-    @NotNull
-    private Long patientId;
-
-    /** 应收金额 */
-    private BigDecimal tenderedAmount;
-
-    /** 找零金额 */
-    private BigDecimal returnedAmount;
+    /**
+     * 付款id(预交金原单)
+     */
+    private Long oldId;
 
-    /** 付款总额 */
-    private BigDecimal displayAmount;
+    /**
+     * 付款id(多退少补单)
+     */
+    private Long newId;
 
     /** 就诊ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
     /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
+    private List<Long> chargeItemIds;// 收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
 
     /** 支付详细 */
     @NotEmpty
     private List<PaymentDetailDto> paymentDetails;
 
-    /** 支付批次号 */
-    private List<String> chrgBchnoList;//医保预结算时返回，医保结算时必传，否则结算时一直预结算
-
+    private String ybMdtrtCertType;// 社保卡/身份证/电子医保码
 
+    private String busiCardInfo;// 社保卡号/身份证号/ecToken
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
similarity index 72%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
index a4cd08ea..91c6c1e2 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
@@ -3,12 +3,13 @@
  */
 package com.openhis.yb.dto;
 
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.List;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
  * 预结算入参
@@ -34,5 +35,12 @@ public class PrePaymentDto {
     @NotEmpty
     private List<Long> chargeItemIds;//
 
-    private String busiCardInfo;//社保卡号/身份证号/ecToken
+    /**
+     * 类型 医保挂号时使用
+     */
+    private String ybMdtrtCertType;// 社保卡/身份证/电子医保码
+    /**
+     * 类型 医保挂号时使用
+     */
+    private String busiCardInfo;// 社保卡号/身份证号/ecToken
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java
new file mode 100644
index 00000000..56945856
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java
@@ -0,0 +1,194 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+//@TableName("yb_inpatient_fee_detail") // 替换为实际表名
+public class Yb2301InputFeeDetail {
+
+        /**
+         * 费用明细流水号
+         * 单次就诊内唯一
+         */
+        @JsonProperty("feedetl_sn")
+        private String feedetlSn;
+
+        /**
+         * 原费用流水号
+         * 退单时传入被退单的费用明细流水号
+         */
+        @JsonProperty("init_feedetl_sn")
+        private String initFeedetlSn;
+
+        /**
+         * 就诊ID
+         */
+        @JsonProperty("mdtrt_id")
+        private String mdtrtId;
+
+        /**
+         * 医嘱号
+         */
+        @JsonProperty("drord_no")
+        private String drordNo;
+
+        /**
+         * 人员编号
+         */
+        @JsonProperty("psn_no")
+        private String psnNo;
+
+        /**
+         * 医疗类别
+         */
+        @JsonProperty("med_type")
+        private String medType;
+
+        /**
+         * 费用发生时间
+         * 格式：yyyy-MM-dd HH:mm:ss
+         */
+        @JsonProperty("fee_ocur_time")
+        private Date feeOcurTime;
+
+        /**
+         * 医保目录编码
+         */
+        @JsonProperty("med_list_codg")
+        private String medListCodg;
+
+        /**
+         * 医药机构目录编码
+         */
+        @JsonProperty("medins_list_codg")
+        private String medinsListCodg;
+
+        /**
+         * 明细项目费用总额
+         */
+        @JsonProperty("det_item_fee_sumamt")
+        private BigDecimal detItemFeeSumamt;
+
+        /**
+         * 数量
+         * 退单时数量填写负数
+         */
+        @JsonProperty("cnt")
+        private BigDecimal cnt;
+
+        /**
+         * 单价
+         */
+        @JsonProperty("pric")
+        private BigDecimal pric;
+
+        /**
+         * 开单科室编码
+         */
+        @JsonProperty("bilg_dept_codg")
+        private String bilgDeptCodg;
+
+        /**
+         * 开单科室名称
+         */
+        @JsonProperty("bilg_dept_name")
+        private String bilgDeptName;
+
+        /**
+         * 开单医生编码
+         */
+        @JsonProperty("bilg_dr_codg")
+        private String bilgDrCodg;
+
+        /**
+         * 开单医师姓名
+         */
+        @JsonProperty("bilg_dr_name")
+        private String bilgDrName;
+
+        /**
+         * 受单科室编码
+         */
+        @JsonProperty("acord_dept_codg")
+        private String acordDeptCodg;
+
+        /**
+         * 受单科室名称
+         */
+        @JsonProperty("acord_dept_name")
+        private String acordDeptName;
+
+        /**
+         * 受单医生编码
+         */
+        @JsonProperty("orders_dr_code")
+        private String ordersDrCode;
+
+        /**
+         * 受单医生姓名
+         */
+        @JsonProperty("orders_dr_name")
+        private String ordersDrName;
+
+        /**
+         * 医院审批标志
+         */
+        @JsonProperty("hosp_appr_flag")
+        private String hospApprFlag;
+
+        /**
+         * 中药使用方式
+         */
+        @JsonProperty("tcmdrug_used_way")
+        private String tcmdrugUsedWay;
+
+        /**
+         * 外检标志
+         */
+        @JsonProperty("etip_flag")
+        private String etipFlag;
+
+        /**
+         * 外检医院编码
+         */
+        @JsonProperty("etip_hosp_code")
+        private String etipHospCode;
+
+        /**
+         * 出院带药标志
+         */
+        @JsonProperty("dscg_tkdrug_flag")
+        private String dscgTkdrugFlag;
+
+        /**
+         * 生育费用标志
+         */
+        @JsonProperty("matn_fee_flag")
+        private String matnFeeFlag;
+
+        /**
+         * 备注
+         */
+        @JsonProperty("memo")
+        private String memo;
+
+        /**
+         * 组套编号
+         */
+        @JsonProperty("comb_no")
+        private String combNo;
+
+        /**
+         * 字段扩展
+         * 格式：JSON
+         */
+        @JsonProperty("exp_content")
+        private String expContent;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java
new file mode 100644
index 00000000..e1a6f370
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【2301】参数
+ *
+ * @author SunJQ
+ * @date 2025-08-09
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2301InputFeeDetailModel {
+    /**
+     * 费用明细
+     */
+    List<Yb2301InputFeeDetail> feedetail;
+
+    /**
+     * 参保地
+     */
+    String insuplcAdmdvs;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java
new file mode 100644
index 00000000..e49d91c2
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java
@@ -0,0 +1,124 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class Yb2301OutputResult {
+
+    /**
+     * 费用明细流水号
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 明细项目费用总额
+     */
+    @JsonProperty("det_item_fee_sumamt")
+    private BigDecimal detItemFeeSumamt;
+
+    /**
+     * 数量
+     */
+    @JsonProperty("cnt")
+    private BigDecimal cnt;
+
+    /**
+     * 单价
+     */
+    @JsonProperty("pric")
+    private BigDecimal pric;
+
+    /**
+     * 定价上限金额
+     */
+    @JsonProperty("pric_uplmt_amt")
+    private BigDecimal pricUplmtAmt;
+
+    /**
+     * 自付比例
+     */
+    @JsonProperty("selfpay_prop")
+    private BigDecimal selfpayProp;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_amt")
+    private BigDecimal overlmtAmt;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 收费项目等级
+     */
+    @JsonProperty("chrgitm_lv")
+    private String chrgitmLv;
+
+    /**
+     * 医疗收费项目类别
+     */
+    @JsonProperty("med_chrgitm_type")
+    private String medChrgitmType;
+
+    /**
+     * 基本药物标志
+     */
+    @JsonProperty("bas_medn_flag")
+    private String basMednFlag;
+
+    /**
+     * 医保谈判药品标志
+     */
+    @JsonProperty("hi_nego_drug_flag")
+    private String hiNegoDrugFlag;
+
+    /**
+     * 儿童用药标志
+     */
+    @JsonProperty("chld_medc_flag")
+    private String chldMedcFlag;
+
+    /**
+     * 目录特项标志
+     */
+    @JsonProperty("list_sp_item_flag")
+    private String listSpItemFlag;
+
+    /**
+     * 限制使用标志
+     */
+    @JsonProperty("lmt_used_flag")
+    private String lmtUsedFlag;
+
+    /**
+     * 直报标志
+     */
+    @JsonProperty("drt_reim_flag")
+    private String drtReimFlag;
+
+    /**
+     * 备注
+     */
+    @JsonProperty("memo")
+    private String memo;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java
new file mode 100644
index 00000000..5884763b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java
@@ -0,0 +1,35 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Yb2302InputInpatient {
+    /**
+     * 费用明细流水号
+     * 单次就诊内唯一
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 人员编号
+     * 退单时传入被退单的费用明细流水号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java
new file mode 100644
index 00000000..4233bc37
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java
@@ -0,0 +1,123 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class Yb2303InputInpatient {
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号
+     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 出院时间
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("dscgTime")
+    private Date dscgTime;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java
new file mode 100644
index 00000000..961811c7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java
@@ -0,0 +1,292 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Yb2303OutputSetInfo {
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 伤残人员医疗保障基金支出 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 基金支付详情
+     */
+    @JSONField(name = "setldetail")
+    private List<Clinic2206FundPaymentResult> setldetail;
+
+    public Yb2303OutputSetInfo() {
+        this.medfeeSumamt = BigDecimal.ZERO;
+        this.fulamtOwnpayAmt = BigDecimal.ZERO;
+        this.overlmtSelfpay = BigDecimal.ZERO;
+        this.preselfpayAmt = BigDecimal.ZERO;
+        this.inscpScpAmt = BigDecimal.ZERO;
+        this.actPayDedc = BigDecimal.ZERO;
+        this.hifpPay = BigDecimal.ZERO;
+        this.poolPropSelfpay = BigDecimal.ZERO;
+        this.cvlservPay = BigDecimal.ZERO;
+        this.hifesPay = BigDecimal.ZERO;
+        this.hifmiPay = BigDecimal.ZERO;
+        this.hifobPay = BigDecimal.ZERO;
+        this.mafPay = BigDecimal.ZERO;
+        this.othPay = BigDecimal.ZERO;
+        this.fundPaySumamt = BigDecimal.ZERO;
+        this.psnPartAmt = BigDecimal.ZERO;
+        this.acctPay = BigDecimal.ZERO;
+        this.psnCashPay = BigDecimal.ZERO;
+        this.hospPartAmt = BigDecimal.ZERO;
+        this.balc = BigDecimal.ZERO;
+        this.acctMulaidPay = BigDecimal.ZERO;
+        this.hifdmPay = BigDecimal.ZERO;
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java
new file mode 100644
index 00000000..2a4bafd3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java
@@ -0,0 +1,31 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2304InputExpContent {
+    /**
+     * 实际就医区划
+     */
+    @JsonProperty("med_admdvs")
+    private BigDecimal medAdmdvs;
+
+    /**
+     * 外报就医医院编号
+     */
+    @JsonProperty("med_hosp_no")
+    private BigDecimal medHospNo;
+
+    /**
+     * 外报就医医院名称
+     */
+    @JsonProperty("med_hosp_name")
+    private BigDecimal medHospName;
+
+    /**
+     * 外报类型
+     */
+    @JsonProperty("out_submit_type")
+    private String outSubmitType;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java
new file mode 100644
index 00000000..2dc87b6d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java
@@ -0,0 +1,115 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@Accessors(chain = true)
+public class Yb2304InputInpatient {
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号
+     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java
new file mode 100644
index 00000000..de231002
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java
@@ -0,0 +1,279 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2304OutputSetlInfo {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_id")
+    private String setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 医院负担金额（原始）
+     */
+    @JsonProperty("hosp_part_amt_old")
+    private BigDecimal hospPartAmtOld;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 字段扩展
+     * 1.5.4新增
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     * 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 医院负担金额
+     * 1.5.4新增
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java
new file mode 100644
index 00000000..add6df8f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java
@@ -0,0 +1,35 @@
+package com.openhis.yb.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@Accessors(chain = true)
+public class Yb2305InputInpatient {
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_Id")
+    private String setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java
new file mode 100644
index 00000000..9d3f9c59
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java
@@ -0,0 +1,224 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Yb2305OutputSetlInfo {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_id")
+    private String setlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 结算时间 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 人员参保关系ID
+     */
+    @JsonProperty("psn_insu_rlts_id")
+    private String psnInsuRltsId;
+
+    /**
+     * 参保机构行政区划
+     */
+    @JsonProperty("insu_admdvs")
+    private String insuAdmdvs;
+
+    /**
+     * 开始日期
+     */
+    @JsonProperty("begndate")
+    private Date begndate;
+
+    /**
+     * 结算日期
+     */
+    @JsonProperty("enddate")
+    private Date enddate;
+
+    /**
+     * 就诊凭证编号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 结算类别
+     */
+    @JsonProperty("setl_type")
+    private String setlType;
+
+    /**
+     * 本次起付线
+     */
+    @JsonProperty("crt_dedc")
+    private BigDecimal crtDedc;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java
new file mode 100644
index 00000000..77f617c3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import java.util.Date;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+public class Yb2401InputInpatientDiseInfo {
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 诊断类别
+     */
+    @JSONField(name = "diag_type")
+    private String diagType;
+
+    /**
+     * 主诊断标志
+     */
+    @JSONField(name = "maindiag_flag")
+    private String maindiagFlag;
+
+    /**
+     * 诊断排序号
+     */
+    @JSONField(name = "diag_srt_no")
+    private Integer diagSrtNo;
+
+    /**
+     * 诊断代码
+     */
+    @JSONField(name = "diag_code")
+    private String diagCode;
+
+    /**
+     * 诊断名称
+     */
+    @JSONField(name = "diag_name")
+    private String diagName;
+
+    /**
+     * 入院病情
+     */
+    @JSONField(name = "adm_cond")
+    private String admCond;
+
+    /**
+     * 诊断科室
+     */
+    @JSONField(name = "diag_dept")
+    private String diagDept;
+
+    /**
+     * 诊断医生编码
+     */
+    @JSONField(name = "dise_dor_no")
+    private String diseDorNo;
+
+    /**
+     * 诊断医生姓名
+     */
+    @JSONField(name = "dise_dor_name")
+    private String diseDorName;
+
+    /**
+     * 诊断时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "diag_time", format = "yyyy-MM-dd HH:mm:ss")
+    private Date diagTime;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java
new file mode 100644
index 00000000..b5129361
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import liquibase.pro.packaged.A;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+
+@Data
+@Accessors(chain = true)
+public class Yb2401InputInpatientMdtrtInfo {
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 险种类型
+     */
+    @JSONField(name = "insutype")
+    private String insutype;
+
+    /**
+     * 联系人姓名
+     */
+    @JSONField(name = "coner_name")
+    private String conerName;
+
+    /**
+     * 联系电话
+     */
+    @JSONField(name = "tel")
+    private String tel;
+
+    /**
+     * 开始时间（入院时间，格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date begntime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JSONField(name = "mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号（就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号）
+     */
+    @JSONField(name = "mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗类别
+     */
+    @JSONField(name = "med_type")
+    private String medType;
+
+    /**
+     * 住院号（院内就诊流水号）
+     */
+    @JSONField(name = "ipt_no")
+    private String iptNo;
+
+    /**
+     * 病历号
+     */
+    @JSONField(name = "medrcdno")
+    private String medrcdno;
+
+    /**
+     * 主治医生编码
+     */
+    @JSONField(name = "atddr_no")
+    private String atddrNo;
+
+    /**
+     * 主诊医师姓名
+     */
+    @JSONField(name = "chfpdr_name")
+    private String chfpdrName;
+
+    /**
+     * 入院诊断描述
+     */
+    @JSONField(name = "adm_diag_dscr")
+    private String admDiagDscr;
+
+    /**
+     * 入院科室编码
+     */
+    @JSONField(name = "adm_dept_codg")
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    @JSONField(name = "adm_dept_name")
+    private String admDeptName;
+
+    /**
+     * 入院床位
+     */
+    @JSONField(name = "adm_bed")
+    private String admBed;
+
+    /**
+     * 住院主诊断代码
+     */
+    @JSONField(name = "dscg_maindiag_code")
+    private String dscgMaindiagCode;
+
+    /**
+     * 住院主诊断名称
+     */
+    @JSONField(name = "dscg_maindiag_name")
+    private String dscgMaindiagName;
+
+    /**
+     * 主要病情描述
+     */
+    @JSONField(name = "main_cond_dscr")
+    private String mainCondDscr;
+
+    /**
+     * 病种编码（按照标准编码填写：按病种结算病种目录代码(bydise_setl_list_code)、日间手术病种目录代码(daysrg_dise_list_code)）
+     */
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 病种名称
+     */
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 手术操作代码（日间手术病种时必填）
+     */
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 手术操作名称
+     */
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 计划生育服务证号
+     */
+    @JSONField(name = "fpsc_no")
+    private String fpscNo;
+
+    /**
+     * 生育类别
+     */
+    @JSONField(name = "matn_type")
+    private String matnType;
+
+    /**
+     * 计划生育手术类别
+     */
+    @JSONField(name = "birctrl_type")
+    private String birctrlType;
+
+    /**
+     * 晚育标志
+     */
+    @JSONField(name = "latechb_flag")
+    private String latechbFlag;
+
+    /**
+     * 孕周数
+     */
+    @JSONField(name = "geso_val")
+    private Integer gesoVal;
+
+    /**
+     * 胎次
+     */
+    @JSONField(name = "fetts")
+    private Integer fetts;
+
+    /**
+     * 胎儿数
+     */
+    @JSONField(name = "fetus_cnt")
+    private Integer fetusCnt;
+
+    /**
+     * 早产标志
+     */
+    @JSONField(name = "pret_flag")
+    private String pretFlag;
+
+    /**
+     * 计划生育手术或生育日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "birctrl_matn_date", format = "yyyy-MM-dd")
+    private Date birctrlMatnDate;
+
+    /**
+     * 病种类型
+     */
+    @JSONField(name = "dise_type_code")
+    private String diseTypeCode;
+
+    /**
+     * 字段扩展
+     */
+    @JSONField(name = "exp_content")
+    private String expContent;
+
+    /**
+     * 参保地医保区划
+     */
+    @JSONField(name = "insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JSONField(name = "mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java
new file mode 100644
index 00000000..1d6ea7db
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.core.common.annotation.DataSource;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2401InputInpatientTrumContent {
+    /**
+     * 外伤标识（外伤就医时必填）
+     */
+    @JSONField(name = "trum_flag")
+    private String trumFlag;
+
+    /**
+     * 涉及第三方标志（承诺是否涉及第三方，trum_flag外伤标志为“1“时，此项为必填。0 代表不涉及第三方，1代表涉及第三方）
+     */
+    @JSONField(name = "rel_ttp_flag")
+    private String relTtpFlag;
+
+    /**
+     * 就诊人群类型
+     */
+    @JSONField(name = "mdtrt_grp_type")
+    private String mdtrtGrpType;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java
new file mode 100644
index 00000000..4b4a655c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.core.common.annotation.DataSource;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2402InputInpatientDiseInfo {
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 诊断类别
+     */
+    @JSONField(name = "diag_type")
+    private String diagType;
+
+    /**
+     * 主诊断标志
+     */
+    @JSONField(name = "maindiag_flag")
+    private String maindiagFlag;
+
+    /**
+     * 诊断排序号
+     */
+    @JSONField(name = "diag_srt_no")
+    private Integer diagSrtNo;
+
+    /**
+     * 诊断代码
+     */
+    @JSONField(name = "diag_code")
+    private String diagCode;
+
+    /**
+     * 诊断名称
+     */
+    @JSONField(name = "diag_name")
+    private String diagName;
+
+    /**
+     * 诊断科室
+     */
+    @JSONField(name = "diag_dept")
+    private String diagDept;
+
+    /**
+     * 诊断医生编码
+     */
+    @JSONField(name = "dise_dor_no")
+    private String diseDorNo;
+
+    /**
+     * 诊断医生姓名
+     */
+    @JSONField(name = "dise_dor_name")
+    private String diseDorName;
+
+    /**
+     * 诊断时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "diag_time", format = "yyyy-MM-dd HH:mm:ss")
+    private Date diagTime;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java
new file mode 100644
index 00000000..c937858f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2402InputInpatientDscgInfo {
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 险种类型
+     */
+    @JSONField(name = "insutype")
+    private String insutype;
+
+    /**
+     * 结束时间（出院时间，格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date endtime;
+
+    /**
+     * 病种编码（按照标准编码填写：按病种结算病种目录代码(bydise_setl_list_code)、日间手术病种目录代码(daysrg_dise_list_code)）
+     */
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 病种名称
+     */
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 手术操作代码（日间手术病种时必填）
+     */
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 手术操作名称
+     */
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 计划生育服务证号
+     */
+    @JSONField(name = "fpsc_no")
+    private String fpscNo;
+
+    /**
+     * 生育类别
+     */
+    @JSONField(name = "matn_type")
+    private String matnType;
+
+    /**
+     * 计划生育手术类别
+     */
+    @JSONField(name = "birctrl_type")
+    private String birctrlType;
+
+    /**
+     * 晚育标志
+     */
+    @JSONField(name = "latechb_flag")
+    private String latechbFlag;
+
+    /**
+     * 孕周数
+     */
+    @JSONField(name = "esso_val")
+    private Integer essoVal;
+
+    /**
+     * 胎次
+     */
+    @JSONField(name = "fetts")
+    private Integer fetts;
+
+    /**
+     * 胎儿数
+     */
+    @JSONField(name = "fetus_cnt")
+    private Integer fetusCnt;
+
+    /**
+     * 早产标志
+     */
+    @JSONField(name = "pret_flag")
+    private String pretFlag;
+
+    /**
+     * 计划生育手术或生育日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "birctrl_matn_date", format = "yyyy-MM-dd")
+    private Date birctrlMatnDate;
+
+    /**
+     * 伴有并发症标志
+     */
+    @JSONField(name = "cop_flag")
+    private String copFlag;
+
+    /**
+     * 出院科室编码
+     */
+    @JSONField(name = "dscg_dept_codg")
+    private String dscgDeptCodg;
+
+    /**
+     * 出院科室名称
+     */
+    @JSONField(name = "dscg_dept_name")
+    private String dscgDeptName;
+
+    /**
+     * 出院床位
+     */
+    @JSONField(name = "dscg_bed")
+    private String dscgBed;
+
+    /**
+     * 离院方式
+     */
+    @JSONField(name = "dscg_way")
+    private String dscgWay;
+
+    /**
+     * 死亡日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "die_date", format = "yyyy-MM-dd")
+    private Date dieDate;
+
+    /**
+     * 字段扩展
+     */
+    @JSONField(name = "exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java
new file mode 100644
index 00000000..191c91bb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 2402接口封装类
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+public class Yb2402InputParam {
+    /**
+     * 出院诊断
+     */
+    List<Yb2402InputInpatientDiseInfo> yb2402InputInpatientDiseInfo;
+    /**
+     * 出院信息
+     */
+    Yb2402InputInpatientDscgInfo yb2402InputInpatientDscgInfo;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java
new file mode 100644
index 00000000..f15225a1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2403InputAdmInfo {
+
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 联系人姓名
+     */
+    @JSONField(name = "coner_name")
+    private String conerName;
+
+    /**
+     * 联系电话
+     */
+    @JSONField(name = "tel")
+    private String tel;
+
+    /**
+     * 开始时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date begntime;
+
+    /**
+     * 结束时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss")
+    private Date endtime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JSONField(name = "mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JSONField(name = "med_type")
+    private String medType;
+
+    /**
+     * 住院/门诊号
+     */
+    @JSONField(name = "ipt_otp_no")
+    private String iptOtpNo;
+
+    /**
+     * 病历号
+     */
+    @JSONField(name = "medrcdno")
+    private String medrcdno;
+
+    /**
+     * 主治医生编码
+     */
+    @JSONField(name = "atddr_no")
+    private String atddrNo;
+
+    /**
+     * 主诊医师姓名
+     */
+    @JSONField(name = "chfpdr_name")
+    private String chfpdrName;
+
+    /**
+     * 入院诊断描述
+     */
+    @JSONField(name = "adm_diag_dscr")
+    private String admDiagDscr;
+
+    /**
+     * 入院科室编码
+     */
+    @JSONField(name = "adm_dept_codg")
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    @JSONField(name = "adm_dept_name")
+    private String admDeptName;
+
+    /**
+     * 入院床位
+     */
+    @JSONField(name = "adm_bed")
+    private String admBed;
+
+    /**
+     * 住院主诊断代码
+     */
+    @JSONField(name = "dscg_maindiag_code")
+    private String dscgMaindiagCode;
+
+    /**
+     * 住院主诊断名称
+     */
+    @JSONField(name = "dscg_maindiag_name")
+    private String dscgMaindiagName;
+
+    /**
+     * 主要病情描述
+     */
+    @JSONField(name = "main_cond_dscr")
+    private String mainCondDscr;
+
+    /**
+     * 病种编码（按照标准编码填写：按病种结算病种目录代码(bydise_setl_list_code)、日间手术病种目录代码(daysrg_dise_list_code)）
+     */
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 病种名称
+     */
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 手术操作代码（日间手术病种时必填）
+     */
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 手术操作名称
+     */
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 计划生育服务证号
+     */
+    @JSONField(name = "fpsc_no")
+    private String fpscNo;
+
+    /**
+     * 生育类别
+     */
+    @JSONField(name = "matn_type")
+    private String matnType;
+
+    /**
+     * 计划生育手术类别
+     */
+    @JSONField(name = "birctrl_type")
+    private String birctrlType;
+
+    /**
+     * 晚育标志
+     */
+    @JSONField(name = "latechb_flag")
+    private String latechbFlag;
+
+    /**
+     * 孕周数
+     */
+    @JSONField(name = "esso_val")
+    private Integer essoVal;
+
+    /**
+     * 胎次
+     */
+    @JSONField(name = "fetts")
+    private Integer fetts;
+
+    /**
+     * 胎儿数
+     */
+    @JSONField(name = "fetus_cnt")
+    private Integer fetusCnt;
+
+    /**
+     * 早产标志
+     */
+    @JSONField(name = "pret_flag")
+    private String pretFlag;
+
+    /**
+     * 计划生育手术或生育日期（格式：yyyy-MM-dd）
+     */
+    @JSONField(name = "birctrl_matn_date", format = "yyyy-MM-dd")
+    private Date birctrlMatnDate;
+
+    /**
+     * 病种编号
+     */
+    @JSONField(name = "dise_type_code")
+    private String diseTypeCode;
+
+    /**
+     * 字段扩展
+     */
+    @JSONField(name = "exp_content")
+    private String expContent;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java
new file mode 100644
index 00000000..527eedda
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2403InputDiseInfo {
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 诊断类别
+     */
+    @JSONField(name = "diag_type")
+    private String diagType;
+
+    /**
+     * 主诊断标志
+     */
+    @JSONField(name = "maindiag_flag")
+    private String maindiagFlag;
+
+    /**
+     * 诊断排序号
+     */
+    @JSONField(name = "diag_srt_no")
+    private Integer diagSrtNo;
+
+    /**
+     * 诊断代码
+     */
+    @JSONField(name = "diag_code")
+    private String diagCode;
+
+    /**
+     * 诊断名称
+     */
+    @JSONField(name = "diag_name")
+    private String diagName;
+
+    /**
+     * 入院病情
+     */
+    @JSONField(name = "adm_cond")
+    private String admCond;
+
+    /**
+     * 诊断科室
+     */
+    @JSONField(name = "diag_dept")
+    private String diagDept;
+
+    /**
+     * 诊断医生编码
+     */
+    @JSONField(name = "dise_dor_no")
+    private String diseDorNo;
+
+    /**
+     * 诊断医生姓名
+     */
+    @JSONField(name = "dise_dor_name")
+    private String diseDorName;
+
+    /**
+     * 诊断时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    @JSONField(name = "diag_time", format = "yyyy-MM-dd HH:mm:ss")
+    private Date diagTime;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java
new file mode 100644
index 00000000..ca99e2e7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+public class Yb2403InputMdtrtGrpContent {
+
+    @JSONField(name = "mdtrt_grp_type")
+    private String mdtrtGrpType;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java
new file mode 100644
index 00000000..acafa1e9
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Data
+public class Yb2403InputParam {
+    /**
+     *
+     */
+    Yb2403InputAdmInfo yb2403InputAdmInfo;
+    /**
+     *
+     */
+    List<Yb2403InputDiseInfo> yb2403InputDiseInfo;
+    /**
+     *
+     */
+    Yb2403InputMdtrtGrpContent yb2403InputMdtrtGrpContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java
new file mode 100644
index 00000000..99847a6a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2403InputTrumContent {
+    /**
+     * 外伤标识（外伤就医时必填）
+     */
+    @JSONField(name = "trum_flag")
+    private String trumFlag;
+
+    /**
+     * 涉及第三方标志（承诺是否涉及第三方，trum_flag外伤标志为“1“时，此项为必填。0 代表不涉及第三方，1代表涉及第三方）
+     */
+    @JSONField(name = "rel_ttp_flag")
+    private String relTtpFlag;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java
new file mode 100644
index 00000000..b018a616
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2404InputInpatient {
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 字段扩展
+     */
+    @JSONField(name = "exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java
new file mode 100644
index 00000000..fa78ab38
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-29
+ */
+@Data
+@Accessors(chain = true)
+public class Yb2405InputInpatient {
+
+    /**
+     * 就诊ID
+     */
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 字段扩展
+     */
+    @JSONField(name = "exp_content")
+    private String expContent;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
new file mode 100644
index 00000000..f0ccf5d3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
@@ -0,0 +1,52 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】就诊诊断信息
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101AdapterEncounterDiagnoseInfo {
+
+    /**
+     * 诊断标识：诊断记录唯一标识
+     */
+    private String diseId;
+
+    /**
+     * 住院患者疾病诊断类型代码
+     */
+    private String iptDiseTypeCode;
+
+    /**
+     * 主诊断标志：参考字典表
+     */
+    private String maindiseFlag;
+
+    /**
+     * 诊断排序号：例如：1,2,3…
+     */
+    private String diasSrtNo;
+
+    /**
+     * 诊断(疾病)编码
+     */
+    private String diseCodg;
+
+    /**
+     * 诊断(疾病)名称
+     */
+    private String diseName;
+
+    /**
+     * 诊断日期
+     */
+    private Date diseDate;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java
new file mode 100644
index 00000000..1df006df
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java
@@ -0,0 +1,128 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】就诊患者信息
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101AdapterEncounterPatientInfo {
+
+    /**
+     * 参保人标识：参保人唯一ID
+     */
+    private String patnId;
+
+    /**
+     * 姓名
+     */
+    private String patnName;
+
+    /**
+     * 性别
+     */
+    private String gend;
+
+    /**
+     * 出生日期
+     */
+    private Date brdy;
+
+    /**
+     * 统筹区编码：参保人所属统筹区
+     */
+    private String poolarea;
+
+    /**
+     * 就诊标识：就诊记录唯一ID
+     */
+    private String mdtrtId;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 医疗服务机构标识：定点医疗机构ID
+     */
+    private String medinsId;
+
+    /**
+     * 医疗机构名称
+     */
+    private String medinsName;
+
+    /**
+     * 医疗机构行政区划编码
+     */
+    private String medinsAdmdvs;
+
+    /**
+     * 入院日期
+     */
+    private Date admDate;
+
+    /**
+     * 出院日期
+     */
+    private Date dscgDate;
+
+    /**
+     * 医师标识：医生唯一ID
+     */
+    private String drCodg;
+
+    /**
+     * 入院科室标识：科室唯一ID
+     */
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    private String admDeptName;
+
+    /**
+     * 出院科室标识：科室唯一ID
+     */
+    private String dscgDeptCodg;
+
+    /**
+     * 出院科室名称
+     */
+    private String dscgDeptName;
+
+    /**
+     * 医疗类别：参考字典表
+     */
+    private String medType;
+
+    /**
+     * 自费金额
+     */
+    private BigDecimal ownpayAmt;
+
+    /**
+     * 自付金额
+     */
+    private BigDecimal selfpayAmt;
+
+    /**
+     * 结算总次数
+     */
+    private Integer setlTotlnum;
+
+    /**
+     * 险种：参考字典表
+     */
+    private String insutype;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java
new file mode 100644
index 00000000..d8fbe06e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java
@@ -0,0 +1,118 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】处方（医嘱）信息
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101AdapterOrderInfo {
+
+    /**
+     * 处方(医嘱)标识：处方(医嘱)记录唯一ID
+     */
+    private String rxId;
+
+    /**
+     * 处方号
+     */
+    private String rxno;
+
+    /**
+     * 组编号
+     */
+    private String grpno;
+
+    /**
+     * 治疗类型
+     */
+    private Integer therapyEnum;
+
+    /**
+     * 目录类别：参考字典表
+     */
+    private String ybType;
+
+    /**
+     * 医保目录代码：国家统一标准编码
+     */
+    private String hilistCode;
+
+    /**
+     * 医保目录名称：国家统一标准名称
+     */
+    private String hilistName;
+
+    /**
+     * 医保目录(药品)剂型：国家统一标准药品剂型
+     */
+    private String hilistDosform;
+
+    /**
+     * 医保目录等级
+     */
+    private String hilistLv;
+
+    /**
+     * 数量
+     */
+    private Integer cnt;
+
+    /**
+     * 单价
+     */
+    private BigDecimal pric;
+
+    /**
+     * 总费用
+     */
+    private BigDecimal sumamt;
+
+    /**
+     * 规格：例如：0.25g×12片/盒
+     */
+    private String spec;
+
+    /**
+     * 数量单位：例如：盒
+     */
+    private String specUnt;
+
+    /**
+     * 医嘱开始日期：格式：yyyy-MM-dd HH:mm:ss
+     */
+    private Date drordBegnDate;
+
+    /**
+     * 下达医嘱的科室标识
+     */
+    private String drordDeptCodg;
+
+    /**
+     * 下达医嘱科室名称
+     */
+    private String drordDeptName;
+
+    /**
+     * 开处方(医嘱)医生标识
+     */
+    private String drordDrCodg;
+
+    /**
+     * 开处方(医嘱)医生姓名
+     */
+    private String drordDrName;
+
+    /**
+     * 开处方(医嘱)医职称：参考字典表
+     */
+    private String drordDrProfttl;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java
new file mode 100644
index 00000000..e1a0bcf5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java
@@ -0,0 +1,58 @@
+package com.openhis.yb.dto;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输入-规则分析信息（节点标识：data）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101InputData {
+
+    /**
+     * 系统编码：调用方系统简码标识
+     */
+    @NotBlank
+    @Length(max = 10)
+    @JSONField(name = "syscode")
+    private String syscode;
+
+    /**
+     * 参保人信息
+     */
+    @NotEmpty
+    @JSONField(name = "patient_dtos")
+    private List<Yb3101InputPatientDto> patientDtos;
+
+    /**
+     * 规则标识集合
+     */
+    @JSONField(name = "rule_ids")
+    private List<String> ruleIds;
+
+    /**
+     * 任务ID：每次请求的唯一标识
+     */
+    @JSONField(name = "task_id")
+    private String taskId;
+
+    /**
+     * 触发场景：此值与ruleIds指定其一即可,请优先指定此值
+     */
+    @Length(max = 3)
+    @JSONField(name = "trig_scen")
+    private String trigScen;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java
new file mode 100644
index 00000000..a8153257
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java
@@ -0,0 +1,81 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输入-诊断信息（节点标识：fsi_diagnose_dtos）
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101InputFsiDiagnoseDto {
+
+    /**
+     * 诊断标识：诊断记录唯一标识
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "dise_id")
+    private String diseId;
+
+    /**
+     * 出入诊断类别：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "inout_dise_type")
+    private String inoutDiseType;
+
+    /**
+     * 主诊断标志：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "maindise_flag")
+    private String maindiseFlag;
+
+    /**
+     * 诊断排序号：例如：1,2,3…
+     */
+    @NotBlank
+    @Length(max = 2)
+    @JSONField(name = "dias_srt_no")
+    private String diasSrtNo;
+
+    /**
+     * 诊断(疾病)编码
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "dise_codg")
+    private String diseCodg;
+
+    /**
+     * 诊断(疾病)名称
+     */
+    @NotBlank
+    @Length(max = 200)
+    @JSONField(name = "dise_name")
+    private String diseName;
+
+    /**
+     * 诊断日期：格式：yyyy-MM-dd HH:mm:ss
+     */
+    @NotNull
+    @JSONField(name = "dise_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date diseDate;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java
new file mode 100644
index 00000000..7cb2c7d7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java
@@ -0,0 +1,283 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输入-就诊信息（节点标识：fsi_encounter_dtos）
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101InputFsiEncounterDto {
+
+    /**
+     * 就诊标识：就诊记录唯一ID
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 医疗服务机构标识：定点医疗机构ID
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "medins_id")
+    private String medinsId;
+
+    /**
+     * 医疗机构名称
+     */
+    @NotBlank
+    @Length(max = 200)
+    @JSONField(name = "medins_name")
+    private String medinsName;
+
+    /**
+     * 医疗机构行政区划编码
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "medins_admdvs")
+    private String medinsAdmdvs;
+
+    /**
+     * 医疗服务机构类型：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "medins_type")
+    private String medinsType;
+
+    /**
+     * 医疗机构等级：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "medins_lv")
+    private String medinsLv;
+
+    /**
+     * 病区标识
+     */
+    @Length(max = 20)
+    @JSONField(name = "wardarea_codg")
+    private String wardareaCodg;
+
+    /**
+     * 病房号
+     */
+    @Length(max = 20)
+    @JSONField(name = "wardno")
+    private String wardno;
+
+    /**
+     * 病床号
+     */
+    @Length(max = 20)
+    @JSONField(name = "bedno")
+    private String bedno;
+
+    /**
+     * 入院日期
+     */
+    @NotNull
+    @JSONField(name = "adm_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date admDate;
+
+    /**
+     * 出院日期
+     */
+    @NotNull
+    @JSONField(name = "dscg_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dscgDate;
+
+    /**
+     * 主诊断编码：例如：I63.9
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "dscg_main_dise_codg")
+    private String dscgMainDiseCodg;
+
+    /**
+     * 主诊断名称：例如：脑梗塞
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "dscg_main_dise_name")
+    private String dscgMainDiseName;
+
+    /**
+     * 诊断信息集合
+     */
+    @NotEmpty
+    @JSONField(name = "fsi_diagnose_dtos")
+    private List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos;
+
+    /**
+     * 医师标识：医生唯一ID
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "dr_codg")
+    private String drCodg;
+
+    /**
+     * 入院科室标识：科室唯一ID
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "adm_dept_codg")
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "adm_dept_name")
+    private String admDeptName;
+
+    /**
+     * 出院科室标识：科室唯一ID
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "dscg_dept_codg")
+    private String dscgDeptCodg;
+
+    /**
+     * 出院科室名称
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "dscg_dept_name")
+    private String dscgDeptName;
+
+    /**
+     * 就诊类型：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "med_mdtrt_type")
+    private String medMdtrtType;
+
+    /**
+     * 医疗类别：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "med_type")
+    private String medType;
+
+    /**
+     * 处方(医嘱)信息集合
+     */
+    @NotEmpty
+    @JSONField(name = "fsi_order_dtos")
+    private List<Yb3101InputFsiOrderDto> fsiOrderDtos;
+
+    /**
+     * 生育状态：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "matn_stas")
+    private String matnStas;
+
+    /**
+     * 总费用
+     */
+    @NotNull
+    @JSONField(name = "medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 自费金额
+     */
+    @NotNull
+    @JSONField(name = "ownpay_amt")
+    private BigDecimal ownpayAmt;
+
+    /**
+     * 自付金额
+     */
+    @NotNull
+    @JSONField(name = "selfpay_amt")
+    private BigDecimal selfpayAmt;
+
+    /**
+     * 个人账户支付金额
+     */
+    @JSONField(name = "acct_payamt")
+    private BigDecimal acctPayamt;
+
+    /**
+     * 救助金支付金额
+     */
+    @JSONField(name = "ma_amt")
+    private BigDecimal maAmt;
+
+    /**
+     * 统筹金支付金额
+     */
+    @JSONField(name = "hifp_payamt")
+    private BigDecimal hifpPayamt;
+
+    /**
+     * 结算总次数
+     */
+    @NotNull
+    @JSONField(name = "setl_totlnum")
+    private Integer setlTotlnum;
+
+    /**
+     * 险种：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "insutype")
+    private String insutype;
+
+    /**
+     * 报销标志：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "reim_flag")
+    private String reimFlag;
+
+    /**
+     * 异地结算标志：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "out_setl_flag")
+    private String outSetlFlag;
+
+    /**
+     * 手术操作集合
+     */
+    @JSONField(name = "fsi_operation_dtos")
+    private List<Yb3101InputFsiOperationDto> fsiOperationDtos;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java
new file mode 100644
index 00000000..5a70885b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java
@@ -0,0 +1,94 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输入-手术操作信息（节点标识：fsi_operation_dtos）
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101InputFsiOperationDto {
+
+    /**
+     * 手术操作ID
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "setl_list_oprn_id")
+    private String setlListOprnId;
+
+    /**
+     * 手术操作代码
+     */
+    @Length(max = 30)
+    @JSONField(name = "oprn_code")
+    private String oprnCode;
+
+    /**
+     * 手术操作名称
+     */
+    @Length(max = 500)
+    @JSONField(name = "oprn_name")
+    private String oprnName;
+
+    /**
+     * 主手术操作标志
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "main_oprn_flag")
+    private String mainOprnFlag;
+
+    /**
+     * 手术操作日期
+     */
+    @JSONField(name = "oprn_date")
+    private Date oprnDate;
+
+    /**
+     * 麻醉方式
+     */
+    @Length(max = 30)
+    @JSONField(name = "anst_way")
+    private String anstWay;
+
+    /**
+     * 术者医师姓名
+     */
+    @Length(max = 50)
+    @JSONField(name = "oper_dr_name")
+    private String operDrName;
+
+    /**
+     * 术者医师代码
+     */
+    @Length(max = 30)
+    @JSONField(name = "oper_dr_code")
+    private String operDrCode;
+
+    /**
+     * 麻醉医师姓名
+     */
+    @Length(max = 50)
+    @JSONField(name = "anst_dr_name")
+    private String anstDrName;
+
+    /**
+     * 麻醉医师代码
+     */
+    @Length(max = 30)
+    @JSONField(name = "anst_dr_code")
+    private String anstDrCode;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java
new file mode 100644
index 00000000..7c09fca3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java
@@ -0,0 +1,281 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输入-处方（医嘱）信息（节点标识：fsi_order_dtos）
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101InputFsiOrderDto {
+
+    /**
+     * 处方(医嘱)标识：处方(医嘱)记录唯一ID
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "rx_id")
+    private String rxId;
+
+    /**
+     * 处方号
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "rxno")
+    private String rxno;
+
+    /**
+     * 组编号
+     */
+    @Length(max = 20)
+    @JSONField(name = "grpno")
+    private String grpno;
+
+    /**
+     * 是否为长期医嘱：[1=是,0=否]
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "long_drord_flag")
+    private String longDrordFlag;
+
+    /**
+     * 目录类别：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "hilist_type")
+    private String hilistType;
+
+    /**
+     * 收费类别：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "chrg_type")
+    private String chrgType;
+
+    /**
+     * 医嘱行为：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "drord_bhvr")
+    private String drordBhvr;
+
+    /**
+     * 医保目录代码：国家统一标准编码
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "hilist_code")
+    private String hilistCode;
+
+    /**
+     * 医保目录名称：国家统一标准名称
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "hilist_name")
+    private String hilistName;
+
+    /**
+     * 医保目录(药品)剂型：国家统一标准药品剂型
+     */
+    @Length(max = 50)
+    @JSONField(name = "hilist_dosform")
+    private String hilistDosform;
+
+    /**
+     * 医保目录等级
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "hilist_lv")
+    private String hilistLv;
+
+    /**
+     * 医保目录价格
+     */
+    @NotNull
+    @JSONField(name = "hilist_pric")
+    private BigDecimal hilistPric;
+
+    /**
+     * 一级医院目录价格
+     */
+    @JSONField(name = "lv1_hosp_item_pric")
+    private BigDecimal lv1HospItemPric;
+
+    /**
+     * 二级医院目录价格
+     */
+    @JSONField(name = "lv2_hosp_item_pric")
+    private BigDecimal lv2HospItemPric;
+
+    /**
+     * 三级医院目录价格
+     */
+    @JSONField(name = "lv3_hosp_item_pric")
+    private BigDecimal lv3HospItemPric;
+
+    /**
+     * 医保目录备注
+     */
+    @Length(max = 200)
+    @JSONField(name = "hilist_memo")
+    private String hilistMemo;
+
+    /**
+     * 医院目录代码
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "hosplist_code")
+    private String hosplistCode;
+
+    /**
+     * 医院目录名称
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "hosplist_name")
+    private String hosplistName;
+
+    /**
+     * 医院目录(药品)剂型
+     */
+    @Length(max = 20)
+    @JSONField(name = "hosplist_dosform")
+    private String hosplistDosform;
+
+    /**
+     * 数量
+     */
+    @NotNull
+    @JSONField(name = "cnt")
+    private BigDecimal cnt;
+
+    /**
+     * 单价
+     */
+    @NotNull
+    @JSONField(name = "pric")
+    private BigDecimal pric;
+
+    /**
+     * 总费用
+     */
+    @NotNull
+    @JSONField(name = "sumamt")
+    private BigDecimal sumamt;
+
+    /**
+     * 自费金额
+     */
+    @NotNull
+    @JSONField(name = "ownpay_amt")
+    private BigDecimal ownpayAmt;
+
+    /**
+     * 自付金额
+     */
+    @NotNull
+    @JSONField(name = "selfpay_amt")
+    private BigDecimal selfpayAmt;
+
+    /**
+     * 规格：例如：0.25g×12片/盒
+     */
+    @NotBlank
+    @Length(max = 100)
+    @JSONField(name = "spec")
+    private String spec;
+
+    /**
+     * 数量单位：例如：盒
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "spec_unt")
+    private String specUnt;
+
+    /**
+     * 医嘱开始日期：格式：yyyy-MM-dd HH:mm:ss
+     */
+    @NotNull
+    @JSONField(name = "drord_begn_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date drordBegnDate;
+
+    /**
+     * 医嘱停止日期：格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JSONField(name = "drord_stop_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String drordStopDate;
+
+    /**
+     * 下达医嘱的科室标识
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "drord_dept_codg")
+    private String drordDeptCodg;
+
+    /**
+     * 下达医嘱科室名称
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "drord_dept_name")
+    private String drordDeptName;
+
+    /**
+     * 开处方(医嘱)医生标识
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "drord_dr_codg")
+    private String drordDrCodg;
+
+    /**
+     * 开处方(医嘱)医生姓名
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "drord_dr_name")
+    private String drordDrName;
+
+    /**
+     * 开处方(医嘱)医职称：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "drord_dr_profttl")
+    private String drordDrProfttl;
+
+    /**
+     * 是否当前处方(医嘱)：本次处方(医嘱)标记[1=是,0=否]
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "curr_drord_flag")
+    private String currDrordFlag;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java
new file mode 100644
index 00000000..874075bb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java
@@ -0,0 +1,88 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输入-参保人信息（节点标识：patient_dtos）
+ * 
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101InputPatientDto {
+
+    /**
+     * 参保人标识：参保人唯一ID
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "patn_id")
+    private String patnId;
+
+    /**
+     * 姓名
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "patn_name")
+    private String patnName;
+
+    /**
+     * 性别：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "gend")
+    private String gend;
+
+    /**
+     * 出生日期：格式：yyyy-MM-dd
+     */
+    @NotNull
+    @JSONField(name = "brdy")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date brdy;
+
+    /**
+     * 统筹区编码：参保人所属统筹区
+     */
+    @NotBlank
+    @Length(max = 10)
+    @JSONField(name = "poolarea")
+    private String poolarea;
+
+    /**
+     * 当前就诊标识：本次就诊记录唯一ID
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "curr_mdtrt_id")
+    private String currMdtrtId;
+
+    /**
+     * 就诊信息集合
+     */
+    @NotEmpty
+    @JSONField(name = "fsi_encounter_dtos")
+    private List<Yb3101InputFsiEncounterDto> fsiEncounterDtos;
+
+    /**
+     * 医院信息
+     */
+    @JSONField(name = "fsi_his_data_dto")
+    private String fsiHisDataDto;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java
new file mode 100644
index 00000000..e24926f3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java
@@ -0,0 +1,69 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输出-违规明细信息（节点标识：judge_result_detail_dtos）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101OutputJudgeResultDetailDto {
+
+    /**
+     * 违规明细标识：违规明细唯一标识
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "jrd_id")
+    private String jrdId;
+
+    /**
+     * 参保人标识
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "patn_id")
+    private String patnId;
+
+    /**
+     * 就诊标识
+     */
+    @Length(max = 50)
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 处方(医嘱)标识
+     */
+    @Length(max = 50)
+    @JSONField(name = "rx_id")
+    private String rxId;
+
+    /**
+     * 违规明细类型：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "vola_item_type")
+    private String volaItemType;
+
+    /**
+     * 违规金额
+     */
+    @NotNull
+    @JSONField(name = "vola_amt")
+    private BigDecimal volaAmt;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java
new file mode 100644
index 00000000..8a57cc56
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java
@@ -0,0 +1,124 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3101】输出-违规信息（节点标识：result）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3101OutputResult {
+
+    /**
+     * 违规标识：计算结果记录唯一ID
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "jr_id")
+    private String jrId;
+
+    /**
+     * 规则ID：例如：R01
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "rule_id")
+    private String ruleId;
+
+    /**
+     * 规则名称：例如：配伍禁忌
+     */
+    @NotBlank
+    @Length(max = 200)
+    @JSONField(name = "rule_name")
+    private String ruleName;
+
+    /**
+     * 违规内容：例如：患者处方中存在配伍禁忌的药品【A药】、【B药】。
+     */
+    @NotBlank
+    @Length(max = 500)
+    @JSONField(name = "vola_cont")
+    private String volaCont;
+
+    /**
+     * 参保人ID：（注意：当是多患者导致违规时，这里是其中一个患者ID）
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "patn_id")
+    private String patnId;
+
+    /**
+     * 就诊ID：（注意：当是多就诊导致违规时，这里是其中一个就诊ID）
+     */
+    @Length(max = 50)
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 违规明细集合
+     */
+    @NotEmpty
+    @JSONField(name = "judge_result_detail_dtos")
+    private List<Yb3101OutputJudgeResultDetailDto> judgeResultDetailDtos;
+
+    /**
+     * 违规金额
+     */
+    @NotNull
+    @JSONField(name = "vola_amt")
+    private BigDecimal volaAmt;
+
+    /**
+     * 违规金额计算状态：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "vola_amt_stas")
+    private String volaAmtStas;
+
+    /**
+     * 严重程度：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "sev_deg")
+    private String sevDeg;
+
+    /**
+     * 违规依据
+     */
+    @Length(max = 500)
+    @JSONField(name = "vola_evid")
+    private String volaEvid;
+
+    /**
+     * 违规行为分类：参考字典表
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "vola_bhvr_type")
+    private String volaBhvrType;
+
+    /**
+     * 规则ID：例如：R01
+     */
+    @JSONField(name = "task_id")
+    private String taskId;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java
new file mode 100644
index 00000000..dc559ab2
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java
@@ -0,0 +1,39 @@
+package com.openhis.yb.dto;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3103】输入（节点标识：data）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3103InputData {
+
+    /**
+     * 反馈类型：1.事前 2.事中
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "warn_type")
+    private String warnType;
+
+    /**
+     * 处理数据集合
+     */
+    @NotEmpty
+    @JSONField(name = "warns")
+    private List<Yb3103InputWarn> warns;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java
new file mode 100644
index 00000000..754ff685
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java
@@ -0,0 +1,42 @@
+package com.openhis.yb.dto;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【3103】输入（节点标识：warns）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb3103InputWarn {
+
+    /**
+     * 违规标识：事前提醒，事中预警出参结果唯一标识
+     */
+    @NotBlank
+    @Length(max = 40)
+    @JSONField(name = "warn_rslt_id")
+    private String warnRsltId;
+
+    /**
+     * 处理方式：1.继续执行医嘱 2.返回修改医嘱
+     */
+    @NotBlank
+    @JSONField(name = "dspo_way")
+    private String dspoWay;
+
+    /**
+     * 处理原因：如果为dspoWay 为1必填 （20250630修改）
+     */
+    @JSONField(name = "dspo_way_rea")
+    private String dspoWayRea;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java
new file mode 100644
index 00000000..58608b9f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java
@@ -0,0 +1,67 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】结算清单信息
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AAdapterSettleInfo {
+
+    /**
+     * 人员编号
+     */
+    private String psnNo;
+
+    /**
+     * 就诊ID
+     */
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    private String setlId;
+
+    /**
+     * 国籍
+     */
+    private String ntly;
+
+    /**
+     * 职业
+     */
+    private String prfs;
+
+    /**
+     * 出院科别：参照科室代码（dept）
+     */
+    private String dscgCaty;
+
+    /**
+     * 票据代码
+     */
+    private String billCode;
+
+    /**
+     * 票据号码
+     */
+    private String billNo;
+
+    /**
+     * 业务流水号
+     */
+    private String bizSn;
+
+    /**
+     * 结算日期
+     */
+    private Date setlDate;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java
new file mode 100644
index 00000000..060f7ee7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java
@@ -0,0 +1,40 @@
+package com.openhis.yb.dto;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】输血信息（节点标识：bldinfo）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AInputBldinfo {
+
+    /**
+     * 输血品种
+     */
+    @Length(max = 3)
+    @JSONField(name = "bld_cat")
+    private String bldCat;
+
+    /**
+     * 输血量
+     */
+    @Length(max = 6)
+    @JSONField(name = "bld_amt")
+    private Integer bldAmt;
+
+    /**
+     * 输血计量单位
+     */
+    @Length(max = 3)
+    @JSONField(name = "bld_unt")
+    private String bldUnt;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java
new file mode 100644
index 00000000..4434c8c3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java
@@ -0,0 +1,61 @@
+package com.openhis.yb.dto;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】住院诊断信息（节点标识：diseinfo）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AInputDiseinfo {
+
+    /**
+     * 诊断类别
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "diag_type")
+    private String diagType;
+
+    /**
+     * 诊断代码
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "diag_code")
+    private String diagCode;
+
+    /**
+     * 诊断名称
+     */
+    @NotBlank
+    @Length(max = 100)
+    @JSONField(name = "diag_name")
+    private String diagName;
+
+    /**
+     * 入院病情类型
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "adm_cond_type")
+    private String admCondType;
+
+    /**
+     * 主诊断标志
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "maindiag_flag")
+    private String maindiagFlag;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java
new file mode 100644
index 00000000..d58ac044
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java
@@ -0,0 +1,54 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】重症监护信息（节点标识：icuinfo）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AInputIcuinfo {
+
+    /**
+     * 重症监护病房类型：使用字典ICU_TYPE
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "scs_cutd_ward_type")
+    private String scsCutdWardType;
+
+    /**
+     * 手术操作开始时间
+     */
+    @JSONField(name = "scs_cutd_inpool_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scsCutdInpoolTime;
+
+    /**
+     * 手术操作结束时间
+     */
+    @JSONField(name = "scs_cutd_exit_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scsCutdExitTime;
+
+    /**
+     * 重症监护合计时长：格式：天数/小时数/分钟数 例：1/13/24
+     */
+    @NotBlank
+    @Length(max = 10)
+    @JSONField(name = "scs_cutd_sum_dura")
+    private String scsCutdSumDura;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java
new file mode 100644
index 00000000..af61e15e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java
@@ -0,0 +1,98 @@
+package com.openhis.yb.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】手术操作信息（节点标识：oprninfo）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AInputOprninfo {
+
+    /**
+     * 手术操作类别
+     */
+    @NotBlank
+    @Length(max = 3)
+    @JSONField(name = "oprn_oprt_type")
+    private String oprnOprtType;
+
+    /**
+     * 手术操作名称
+     */
+    @NotBlank
+    @Length(max = 500)
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 手术操作代码
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+    /**
+     * 麻醉方式：参照麻醉-方法代码
+     */
+    @Length(max = 6)
+    @JSONField(name = "anst_way")
+    private String anstWay;
+
+    /**
+     * 术者医师代码
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "oper_dr_code")
+    private String operDrCode;
+
+    /**
+     * 麻醉医师代码
+     */
+    @Length(max = 20)
+    @JSONField(name = "anst_dr_code")
+    private String anstDrCode;
+
+    /**
+     * 手术操作开始时间
+     */
+    @JSONField(name = "oprn_oprt_begntime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date oprnOprtBegntime;
+
+    /**
+     * 手术操作结束时间
+     */
+    @JSONField(name = "oprn_oprt_endtime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date oprnOprtEndtime;
+
+    /**
+     * 麻醉开始时间
+     */
+    @JSONField(name = "anst_begntime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date anstBegntime;
+
+    /**
+     * 麻醉结束时间
+     */
+    @JSONField(name = "anst_endtime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date anstEndtime;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java
new file mode 100644
index 00000000..869353d1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java
@@ -0,0 +1,53 @@
+package com.openhis.yb.dto;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】门诊慢特病诊断信息（节点标识：opspdiseinfo）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AInputOpspdiseinfo {
+
+    /**
+     * 诊断名称：与结算时慢特病保持一致
+     */
+    @NotBlank
+    @Length(max = 100)
+    @JSONField(name = "diag_name")
+    private String diagName;
+
+    /**
+     * 诊断代码：与结算时慢特病保持一致
+     */
+    @NotBlank
+    @Length(max = 20)
+    @JSONField(name = "diag_code")
+    private String diagCode;
+
+    /**
+     * 手术操作名称
+     */
+    @NotBlank
+    @Length(max = 500)
+    @JSONField(name = "oprn_oprt_name")
+    private String oprnOprtName;
+
+    /**
+     * 手术操作代码
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "oprn_oprt_code")
+    private String oprnOprtCode;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java
new file mode 100644
index 00000000..8aa147cb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java
@@ -0,0 +1,446 @@
+package com.openhis.yb.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】结算清单信息（节点标识setlinfo）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AInputSetlinfo {
+
+    /**
+     * 人员编号
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊ID
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @NotBlank
+    @Length(max = 30)
+    @JSONField(name = "setl_id")
+    private String setlId;
+
+    /**
+     * 医保编号
+     */
+    @Length(max = 30)
+    @JSONField(name = "hi_no")
+    private String hiNo;
+
+    /**
+     * 病案号
+     */
+    @Length(max = 30)
+    @JSONField(name = "medcasno")
+    private String medcasno;
+
+    /**
+     * 申报时间：结算清单上报时间，接收时自动填充
+     */
+    @JSONField(name = "dcla_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dclaTime;
+
+    /**
+     * 国籍
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "ntly")
+    private String ntly;
+
+    /**
+     * 职业
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "prfs")
+    private String prfs;
+
+    /**
+     * 现住址
+     */
+    @Length(max = 200)
+    @JSONField(name = "curr_addr")
+    private String currAddr;
+
+    /**
+     * 单位名称
+     */
+    @Length(max = 200)
+    @JSONField(name = "emp_name")
+    private String empName;
+
+    /**
+     * 单位地址
+     */
+    @Length(max = 200)
+    @JSONField(name = "emp_addr")
+    private String empAddr;
+
+    /**
+     * 单位电话
+     */
+    @Length(max = 50)
+    @JSONField(name = "emp_tel")
+    private String empTel;
+
+    /**
+     * 邮编
+     */
+    @Length(max = 6)
+    @JSONField(name = "poscode")
+    private String poscode;
+
+    /**
+     * 联系人姓名
+     */
+    @Length(max = 50)
+    @JSONField(name = "coner_name")
+    private String conerName;
+
+    /**
+     * 与患者关系：当coner_name非空时必填
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "patn_rlts")
+    private String patnRlts;
+
+    /**
+     * 联系人地址：当coner_name非空时必填
+     */
+    @NotBlank
+    @Length(max = 200)
+    @JSONField(name = "coner_addr")
+    private String conerAddr;
+
+    /**
+     * 联系人电话：当coner_name非空时必填
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "coner_tel")
+    private String conerTel;
+
+    /**
+     * 新生儿入院类型
+     */
+    @Length(max = 50)
+    @JSONField(name = "nwb_adm_type")
+    private String nwbAdmType;
+
+    /**
+     * 新生儿出生体重：精确到10克（g）
+     */
+    @JSONField(name = "nwb_bir_wt")
+    private BigDecimal nwbBirWt;
+
+    /**
+     * 新生儿入院体重：精确到10克（g）
+     */
+    @JSONField(name = "nwb_adm_wt")
+    private BigDecimal nwbAdmWt;
+
+    /**
+     * 多新生儿出生体重
+     */
+    @Length(max = 50)
+    @JSONField(name = "mul_nwb_bir_wt")
+    private String mulNwbBirWt;
+
+    /**
+     * 多新生儿入院体重
+     */
+    @Length(max = 50)
+    @JSONField(name = "mul_nwb_adm_wt")
+    private String mulNwbAdmWt;
+
+    /**
+     * 门诊慢特病诊断科别
+     */
+    @Length(max = 50)
+    @JSONField(name = "opsp_diag_caty")
+    private String opspDiagCaty;
+
+    /**
+     * 门诊慢特病就诊日期
+     */
+    @JSONField(name = "opsp_mdtrt_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date opspMdtrtDate;
+
+    /**
+     * 入院途径
+     */
+    @Length(max = 30)
+    @JSONField(name = "adm_way")
+    private String admWay;
+
+    /**
+     * 治疗类别
+     */
+    @Length(max = 3)
+    @JSONField(name = "trt_type")
+    private String trtType;
+
+    /**
+     * 入院时间
+     */
+    @JSONField(name = "adm_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date admTime;
+
+    /**
+     * 转科科别：参照科室代码（dept），如果超过一次以上的转科，用“→”转接表示
+     */
+    @Length(max = 50)
+    @JSONField(name = "refldept_dept")
+    private String refldeptDept;
+
+    /**
+     * 出院时间
+     */
+    @JSONField(name = "dscg_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dscgTime;
+
+    /**
+     * 出院科别：参照科室代码（dept）
+     */
+    @NotBlank
+    @Length(max = 6)
+    @JSONField(name = "dscg_caty")
+    private String dscgCaty;
+
+    /**
+     * 门（急）诊诊断（西医诊断）
+     */
+    @Length(max = 200)
+    @JSONField(name = "otp_wm_dise")
+    private String otpWmDise;
+
+    /**
+     * 西医疾病代码
+     */
+    @Length(max = 20)
+    @JSONField(name = "wm_dise_code")
+    private String wmDiseCode;
+
+    /**
+     * 门（急）诊诊断（中医诊断）
+     */
+    @Length(max = 200)
+    @JSONField(name = "otp_tcm_dise")
+    private String otpTcmDise;
+
+    /**
+     * 中医疾病代码
+     */
+    @Length(max = 20)
+    @JSONField(name = "tcm_dise_code")
+    private String tcmDiseCode;
+
+    /**
+     * 呼吸机使用时长：格式：天数/小时数/分钟数 例：1/13/24
+     */
+    @Length(max = 10)
+    @JSONField(name = "vent_used_dura")
+    private String ventUsedDura;
+
+    /**
+     * 颅脑损伤患者入院前昏迷时长：格式：天数/小时数/分钟数 例：1/13/24
+     */
+    @Length(max = 10)
+    @JSONField(name = "pwcry_bfadm_coma_dura")
+    private String pwcryBfadmComaDura;
+
+    /**
+     * 颅脑损伤患者入院后昏迷时长：格式：天数/小时数/分钟数 例：1/13/24
+     */
+    @Length(max = 10)
+    @JSONField(name = "pwcry_afadm_coma_dura")
+    private String pwcryAfadmComaDura;
+
+    /**
+     * 特级护理天数
+     */
+    @JSONField(name = "spga_nurscare_days")
+    private BigDecimal spgaNurscareDays;
+
+    /**
+     * 一级护理天数
+     */
+    @JSONField(name = "lv1_nurscare_days")
+    private BigDecimal lv1NurscareDays;
+
+    /**
+     * 二级护理天数
+     */
+    @JSONField(name = "scd_nurscare_days")
+    private BigDecimal scdNurscareDays;
+
+    /**
+     * 三级护理天数
+     */
+    @JSONField(name = "lv3_nurscare_days")
+    private Integer lv3NurscareDays;
+
+    /**
+     * 离院方式
+     */
+    @Length(max = 3)
+    @JSONField(name = "dscg_way")
+    private String dscgWay;
+
+    /**
+     * 拟接收机构名称：说明当离院方式为“2”时，如果接收患者的医疗机构明确，需要填写转入医疗机构的名称； 当离院方式为“3”时，如果接收患者的社区卫生服务机构明确，需要填写社区卫生服务机构/乡镇卫生院名称
+     */
+    @Length(max = 100)
+    @JSONField(name = "acp_medins_name")
+    private String acpMedinsName;
+
+    /**
+     * 拟接收机构代码：当离院方式为“2”或“3”时，如果接收患者的医疗机构或社区卫生服务机构明确，需要填写机构对应的医保定点医疗机构代码
+     */
+    @Length(max = 30)
+    @JSONField(name = "acp_optins_code")
+    private String acpOptinsCode;
+
+    /**
+     * 票据代码
+     */
+    @Length(max = 50)
+    @JSONField(name = "bill_code")
+    private String billCode;
+
+    /**
+     * 票据号码
+     */
+    @Length(max = 30)
+    @JSONField(name = "bill_no")
+    private String billNo;
+
+    /**
+     * 业务流水号
+     */
+    @Length(max = 50)
+    @JSONField(name = "biz_sn")
+    private String bizSn;
+
+    /**
+     * 出院31天内再住院计划标志
+     */
+    @Length(max = 3)
+    @JSONField(name = "days_rinp_flag_31")
+    private String daysRinpFlag31;
+
+    /**
+     * 出院31天内再住院计划目的
+     */
+    @Length(max = 200)
+    @JSONField(name = "days_rinp_pup_31")
+    private String daysRinpPup31;
+
+    /**
+     * 主诊医师代码：主诊医师在《医保医师代码》中的代码，在就医地未完成标准化前，可传医师在就医地系统中的唯一编号
+     */
+    @Length(max = 30)
+    @JSONField(name = "chfpdr_code")
+    private String chfpdrCode;
+
+    /**
+     * 结算开始日期
+     */
+    @NotNull
+    @JSONField(name = "setl_begn_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date setlBegnDate;
+
+    /**
+     * 结算结束日期
+     */
+    @NotNull
+    @JSONField(name = "setl_end_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date setlEndDate;
+
+    /**
+     * 医疗机构填报部门
+     */
+    @NotBlank
+    @Length(max = 100)
+    @JSONField(name = "medins_fill_dept")
+    private String medinsFillDept;
+
+    /**
+     * 医疗机构填报人
+     */
+    @NotBlank
+    @Length(max = 50)
+    @JSONField(name = "medins_fill_psn")
+    private String medinsFillPsn;
+
+    /**
+     * 责任护士代码
+     */
+    @Length(max = 50)
+    @JSONField(name = "resp_nurs_code")
+    private String respNursCode;
+
+    /**
+     * 状态分类
+     */
+    @Length(max = 10)
+    @JSONField(name = "stas_type")
+    private String stasType;
+
+    /**
+     * 医保支付方式
+     */
+    @Length(max = 3)
+    @JSONField(name = "hi_paymtd")
+    private String hiPaymtd;
+
+    /**
+     * 入院科室编码
+     */
+    @Length(max = 30)
+    @JSONField(name = "adm_dept_codg")
+    private String admDeptCodg;
+
+    /**
+     * 入院科室名称
+     */
+    @Length(max = 100)
+    @JSONField(name = "adm_dept_name")
+    private String admDeptName;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java
new file mode 100644
index 00000000..583c517b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java
@@ -0,0 +1,29 @@
+package com.openhis.yb.dto;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 【4101A】输出（节点标识：data）
+ *
+ * @author GuoRui
+ */
+@Data
+@Accessors(chain = true)
+public class Yb4101AOutputData {
+
+    /**
+     * 清单流水号
+     */
+    @NotBlank
+    @Length(max = 9)
+    @JSONField(name = "setl_list_id")
+    private String setlListId;
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java
new file mode 100644
index 00000000..c2cf1b4d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java
@@ -0,0 +1,10 @@
+package com.openhis.yb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.yb.domain.InpatientFeeDetail;
+import com.openhis.yb.domain.InventoryChangeRecord;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InpatientFeeDetailMapper extends BaseMapper<InpatientFeeDetail> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java
new file mode 100644
index 00000000..6baffce4
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.yb.domain.FinancialReconcileRecord;
+import com.openhis.yb.domain.InpatientReg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TODO:请概括描述当前接口的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Repository
+public interface InpatientRegMapper extends BaseMapper<InpatientReg> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java
new file mode 100644
index 00000000..78ca6ac3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java
@@ -0,0 +1,10 @@
+package com.openhis.yb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.yb.domain.InpatientFeeDetail;
+import com.openhis.yb.domain.InpatientSettle;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InpatientSettleMapper extends BaseMapper<InpatientSettle> {
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
similarity index 97%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
index e21483f1..4b802d97 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
@@ -56,5 +56,5 @@ public interface MedicalInsuranceMapper {
 
     List<PaymentDecDetailUniAccountDto> getPaymentDecDetailUniAccountDtoListByPaymentIdList(
             @Param("idList")List<Long> idList, @Param("startTime")Date startTime,
-            @Param("endTime")Date endTime);
+            @Param("endTime")Date endTime, @Param("draft")Integer draft);
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
similarity index 96%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
index c223f7c9..f35e3bcf 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
@@ -48,4 +48,6 @@ public class CancelRegPaymentModel {
     private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算
 
     private String setlId;//结算id
+
+    private String contractNo;//合同編號
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
similarity index 87%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
index aa8ff813..4e295fbe 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
@@ -14,4 +14,6 @@ public class OutpatientRegistrationModel {
     private String psnSetlWay;
     //总价
     private BigDecimal totalPrice;
+    //合同編號
+    private String contractNo;
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
similarity index 60%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
index a66cdb2d..1894ac18 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
@@ -1,5 +1,7 @@
 package com.openhis.yb.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.yb.domain.ClinicUnSettle;
 
@@ -11,4 +13,11 @@ import com.openhis.yb.domain.ClinicUnSettle;
  */
 public interface IClinicUnSettleService extends IService<ClinicUnSettle> {
 
+    /**
+     * 根据settleId查询集合
+     * 
+     * @param settleIds 集合
+     * @return 集合
+     */
+    List<ClinicUnSettle> getBySettleIds(List<String> settleIds);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java
similarity index 36%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java
index cf757085..80bee252 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java
@@ -1,13 +1,8 @@
 package com.openhis.yb.service;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.yb.domain.InfoPerson;
+import com.openhis.yb.domain.InpatientFeeDetail;
 
-/**
- * @Description: 人员基础信息
- * @Author: jeecg-boot
- * @Date:   2021-08-27
- * @Version: V1.0
- */
-public interface IPerinfoService extends IService<InfoPerson> {
-    InfoPerson getPerInfoByIdCard(String idCard,Integer tenantId);
+public interface IInpatientFeeDetailService extends IService<InpatientFeeDetail> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java
new file mode 100644
index 00000000..79d69e5a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.yb.domain.InpatientReg;
+import com.openhis.yb.domain.InventorySaleReturnRecord;
+
+/**
+ * TODO:请概括描述当前接口的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+
+public interface IInpatientRegService extends IService<InpatientReg> {
+
+    /**
+     * 根据busNo查询住院挂号信息
+     * @param busNo 业务流水号
+     * @return 医保住院挂号信息
+     */
+    InpatientReg getInpatientRegByIptNo(String busNo);
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java
new file mode 100644
index 00000000..58545a98
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java
@@ -0,0 +1,14 @@
+package com.openhis.yb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.yb.domain.InpatientSettle;
+
+public interface IInpatientSettleService extends IService<InpatientSettle> {
+    /**
+     * 根据医保结算id找到住院结算id
+     * @param ybSettleIds
+     * @return
+     */
+    InpatientSettle getBySettleId(String ybSettleIds);
+
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
new file mode 100644
index 00000000..1b64a0ac
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
@@ -0,0 +1,44 @@
+package com.openhis.yb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.yb.domain.InfoPerson;
+
+/**
+ * @Description: 人员基础信息
+ * @Author: jeecg-boot
+ * @Date: 2021-08-27
+ * @Version: V1.0
+ */
+public interface IPerinfoService extends IService<InfoPerson> {
+
+    InfoPerson getPerInfoByIdCard(String idCard, Integer tenantId);
+
+    InfoPerson getByPsnNo(String psnNo);
+
+    /**
+     * 是否异地就医(省内异地)
+     * 
+     * @param psnNo 人员编号
+     * @param admVs 就异地统筹区号
+     * @return
+     */
+    boolean assessIntraCrossRegionalSettlement(String psnNo, String admVs);
+
+    /**
+     * 是否异地就医（省外异地）
+     * 
+     * @param psnNo 人员编号
+     * @param admVs 就异地统筹区号
+     * @return
+     */
+    boolean assessInterCrossRegionalSettlement(String psnNo, String admVs);
+
+    /**
+     * 是否异地就医
+     * 
+     * @param psnNo 人员编号
+     * @param admVs 就异地统筹区号
+     * @return
+     */
+    boolean assessCrossRegionalSettlement(String psnNo, String admVs);
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
similarity index 47%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
index 4a7eaddb..59f62a20 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
@@ -8,32 +8,43 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import com.core.common.utils.DateUtils;
-import com.openhis.common.enums.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.core.common.core.domain.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.impl.SysUserServiceImpl;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.dto.ChargeItemBaseInfoDto;
 import com.openhis.administration.service.*;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.clinical.service.IConditionService;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.*;
 import com.openhis.common.enums.ybenums.*;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.Contract;
 import com.openhis.financial.domain.PaymentRecDetail;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.financial.service.IContractService;
@@ -72,6 +83,22 @@ public class YbDao {
     @Autowired
     private IEncounterService iEncounterService;
     @Autowired
+    private IEncounterParticipantService iEncounterParticipantService;
+    @Autowired
+    private IAccountService iAccountService;
+    @Autowired
+    private IEncounterDiagnosisService iEncounterDiagnosisService;
+    @Autowired
+    private IConditionService iConditionService;
+    @Autowired
+    private IConditionDefinitionService iConditionDefinitionService;
+    @Autowired
+    private IOrganizationService iOrganizationService;
+    @Autowired
+    private ILocationService iLocationService;
+    @Autowired
+    private IEncounterLocationService iEncounterLocationService;
+    @Autowired
     private IAccountService accountService;
     @Autowired
     private IChargeItemService iChargeItemService;
@@ -93,6 +120,10 @@ public class YbDao {
     @Autowired
     private IRegService iRegService;
     @Autowired
+    private IInpatientRegService iInpatientRegService;
+    @Autowired
+    private IInpatientSettleService inpatientSettleService;
+    @Autowired
     private IClinicUnRegService iClinicUnRegService;
     @Autowired
     private ISignService iSignService;
@@ -123,6 +154,8 @@ public class YbDao {
     @Autowired
     private IFinancialApplyRecordService iFinancialApplyRecordService;
     @Autowired
+    private IInpatientFeeDetailService inpatientFeeDetailService;
+    @Autowired
     private YbParamBuilderUtil ybUtil;
     @Autowired
     private IMedicationDispenseService medicationDispenseService;
@@ -136,7 +169,6 @@ public class YbDao {
      *
      * @return 【1101】入参
      */
-
     public Info1101ReadcardParam getReadCard(String certType, String certNo) {
         return ybUtil.getReadCard(certType, certNo);
     }
@@ -147,7 +179,6 @@ public class YbDao {
      * @param readcard 读卡信息
      * @param perInfo 身份信息
      */
-
     public void saveReadcardAndPerinfo(Info1101ReadcardParam readcard, Info1101Output perInfo) {
         InfoPerson infoPerson = new InfoPerson();
         BeanUtils.copyProperties(readcard, infoPerson);
@@ -163,7 +194,6 @@ public class YbDao {
      * @param tenantId 租户
      * @return 【2201】入参
      */
-
     public ClinicReg getReg(YbMdtrtCertType ybMdtrtCertTypeLong, String busiCardInfo, Long encounterId,
         YbMedType medType, Integer tenantId) {
         return ybUtil.getReg(ybMdtrtCertTypeLong, busiCardInfo, encounterId, medType, tenantId);
@@ -174,7 +204,6 @@ public class YbDao {
      *
      * @param regResult 2201挂号信息
      */
-
     public void saveReg(ClinicReg2201Output regResult) {
         ClinicReg clinicReg = new ClinicReg();
         BeanUtils.copyProperties(regResult, clinicReg);
@@ -190,7 +219,6 @@ public class YbDao {
      * 
      * @param regResult
      */
-
     public void UpdateRegByMdtrtId(ClinicReg regResult) {
         if (StringUtils.isEmpty(regResult.getMdtrtId())) {
             throw new ServiceException("医保挂号编号为空");
@@ -210,10 +238,9 @@ public class YbDao {
      * @param tenantId 租户
      * @return 【2203】就诊信息
      */
-
     public Clinic2203MedicalParam getClinicMedical2203Param(Long encounterId, Integer tenantId,
-        ClinicReg2201Output reg2201Output) {
-        return ybUtil.getClinicMedical2203Param(encounterId, tenantId, reg2201Output);
+        ClinicReg2201Output reg2201Output, YbMedType ybMedType) {
+        return ybUtil.getClinicMedical2203Param(encounterId, tenantId, reg2201Output, ybMedType);
     }
 
     /**
@@ -273,7 +300,6 @@ public class YbDao {
      * @param clinicOrder2207 2207入参
      * @param clinic2207OrderResult 2207出参
      */
-
     public void saveClinic2207OrderResult(String paymentNo, Clinic2207OrderParam clinicOrder2207,
         Clinic2207OrderModel clinic2207OrderResult) {
         // 保存结算信息
@@ -291,14 +317,13 @@ public class YbDao {
      * @param clinicOrder2207 2207入参
      * @param clinic2207OrderResult 2207出参
      */
-
     public void saveUnSettleRecord(String settleId, Clinic2208UnSetlInfoParam clinicOrder2207,
         Clinic2208UnSetlInfoOutput clinic2207OrderResult) {
 
         ClinicUnSettle clinicSettle = new ClinicUnSettle();
         BeanUtils.copyProperties(clinic2207OrderResult, clinicSettle);
         clinicSettle.setParam2208(JSON.toJSONString(clinicOrder2207))
-            .setResult2208(JSON.toJSONString(clinic2207OrderResult)).setSettleId(settleId);
+            .setResult2208(JSON.toJSONString(clinic2207OrderResult)).setSettleId(clinic2207OrderResult.getSetlId());
         // 保存结算信息
         iClinicUnSettleService.save(clinicSettle);
     }
@@ -619,7 +644,6 @@ public class YbDao {
      * @param clinic2204OrderParam 2204医保入参
      * @param clinic2204OrderResult 2204医保输出
      */
-
     public void saveClinicOrder2206Param(Clinic2206OrderParam clinic2206OrderParam,
         Clinic2206OrderOutput clinic2206OrderResult, Clinic2203MedicalParam clinic2203MedicalParam,
         Clinic2204OrderParam clinic2204OrderParam, Clinic2204OrderResult clinic2204OrderResult) {
@@ -643,7 +667,6 @@ public class YbDao {
      * @param signParam 【9001】参数
      * @param signResult 【9001】参数
      */
-
     public void saveSign(Sign signParam, Sign9001Result signResult) {
         com.openhis.yb.domain.Sign sign = new com.openhis.yb.domain.Sign();
         BeanUtils.copyProperties(signParam, sign);
@@ -657,7 +680,6 @@ public class YbDao {
      *
      * @param regResult 【2202】参数
      */
-
     public void saveUnReg(ClinicReg2201Output regResult) {
         ClinicUnReg clinicUnReg = new ClinicUnReg();
         BeanUtils.copyProperties(regResult, clinicUnReg);
@@ -672,7 +694,6 @@ public class YbDao {
      * @param settleId 结算id
      * @return 【2208】参数
      */
-
     public Clinic2208UnSetlInfoParam getClinicOrder2208(Integer tenantId, String settleId) {
         return ybUtil.getClinicOrder2208(tenantId, settleId);
     }
@@ -684,7 +705,6 @@ public class YbDao {
      * @param id 主键
      * @return 【3301】入参
      */
-
     public MedicalDirectory3301Param getMedicalDirectory3301Param(String tableName, Long id) {
         return ybUtil.getMedicalDirectory3301Param(tableName, id);
     }
@@ -696,7 +716,6 @@ public class YbDao {
      * @param id 主键
      * @return
      */
-
     public MedicalDirectory3302Param getMedicalDirectory3302Param(String tableName, Long id) {
         return ybUtil.getMedicalDirectory3302Param(tableName, id);
     }
@@ -707,33 +726,34 @@ public class YbDao {
      * @param reconciliation3201Param 参数信息
      * @return 入参
      */
-
     public Financial3201Param getFinancial3201Param(Settlement3201WebParam reconciliation3201Param) {
         String insuType = reconciliation3201Param.getInsuType();
-        if(StringUtils.isEmpty(insuType)){
-            //insuType = "310";
-            //reconciliation3201Param.setInsuType("310");
+        if (StringUtils.isEmpty(insuType)) {
+            // insuType = "310";
+            // reconciliation3201Param.setInsuType("310");
             throw new ServiceException("请选择险种类型");
         }
         String clrType = reconciliation3201Param.getClrType();
-        if(StringUtils.isEmpty(clrType)){
+        if (StringUtils.isEmpty(clrType)) {
             throw new ServiceException("请选择医疗类型：住院/门诊");
         }
         String contractNo = reconciliation3201Param.getContractNo();
-        if(StringUtils.isEmpty(contractNo)){
+        if (StringUtils.isEmpty(contractNo)) {
             throw new ServiceException("请选择合同类型");
         }
         Settlement3201DetailDto settlement3201DetailDto = null;
-        List<Settlement3201DetailDto> settlement3201DetailDtos = this.reconcileGeneralLedgerDetail(reconciliation3201Param);
+        List<Settlement3201DetailDto> settlement3201DetailDtos =
+            this.reconcileGeneralLedgerDetail(reconciliation3201Param);
         for (Settlement3201DetailDto item : settlement3201DetailDtos) {
-            if(contractNo.equals(item.getContractNo())&&insuType.equals(item.getInsutype().toString())&&clrType.equals(item.getClrType())){
+            if (contractNo.equals(item.getContractNo()) && insuType.equals(item.getInsutype().toString())
+                && clrType.equals(item.getClrType())) {
                 settlement3201DetailDto = item;
             }
         }
-        if(settlement3201DetailDto==null){
+        if (settlement3201DetailDto == null) {
             throw new ServiceException("未查询到相关信息");
         }
-        return ybUtil.getFinancial3201Param(reconciliation3201Param,settlement3201DetailDto);
+        return ybUtil.getFinancial3201Param(reconciliation3201Param, settlement3201DetailDto);
     }
 
     /**
@@ -744,7 +764,6 @@ public class YbDao {
      * @param s 类型 3301/3302
      * @param medicalDirectory3301Param 参数信息
      */
-
     public void saveDirectoryHistory(String tableName, Long id, Integer s,
         MedicalDirectory3301Param medicalDirectory3301Param) {
         Long hospitalId = SecurityUtils.getLoginUser().getHospitalId();
@@ -762,7 +781,6 @@ public class YbDao {
      * @param s 类型 3301/3302
      * @param medicalDirectory3302Param 参数信息
      */
-
     public void saveDirectoryHistory(String tableName, Long id, Integer s,
         MedicalDirectory3302Param medicalDirectory3302Param) {
         Long hospitalId = SecurityUtils.getLoginUser().getHospitalId();
@@ -794,11 +812,19 @@ public class YbDao {
      * 
      * @param financial3201Output 对账结果信息
      */
-
-    public void saveReconcileGeneralLedger(Financial3201Output financial3201Output) {
+    public void saveReconcileGeneralLedger(Financial3201Output financial3201Output,
+        Financial3201Param financial3201Param) {
         FinancialReconcileRecord financialReconcileRecord = new FinancialReconcileRecord();
         BeanUtils.copyProperties(financial3201Output, financialReconcileRecord);
         financialReconcileRecord.setParam(JSON.toJSONString(financial3201Output));
+        financialReconcileRecord.setFixmedinsName(financial3201Param.getFixmedinsName());
+        financialReconcileRecord.setAcctPay(financial3201Param.getAcctPay());
+        financialReconcileRecord.setFundPaySumamt(financial3201Param.getFundPaySumamt());
+        financialReconcileRecord.setFixmedinsCode(financial3201Param.getFixmedinsCode());
+        financialReconcileRecord.setClrType(financial3201Param.getClrType());
+        financialReconcileRecord.setFixmedinsSetlCnt(financial3201Param.getFixmedinsSetlCnt());
+        financialReconcileRecord.setMedfeeSumamt(financial3201Param.getMedfeeSumamt());
+        financialReconcileRecord.setSetlOptins(financial3201Param.getSetlOptins());
         iFinancialReconcileRecordService.save(financialReconcileRecord);
     }
 
@@ -808,7 +834,6 @@ public class YbDao {
      * @param settlement3202WebParam 前台参数
      * @return 3202参数
      */
-
     public FinancialSettlement3202Param getFinancialSettlement3202Param(Settlement3202WebParam settlement3202WebParam) {
         return ybUtil.getFinancialSettlement3202Param(settlement3202WebParam);
     }
@@ -819,7 +844,6 @@ public class YbDao {
      * @param settlement3209AWebParam 前台参数
      * @return 结果
      */
-
     public FinancialSettlement3209AParam
         getFinancialSettlement3209AParam(Settlement3209AWebParam settlement3209AWebParam) {
         return ybUtil.getFinancialSettlement3209AParam(settlement3209AWebParam);
@@ -831,10 +855,101 @@ public class YbDao {
      * @param financial3203AWebParam 前台参数
      * @return 结果
      */
-
     public Financial3203AParam getFinancial3203AParam(Financial3203AWebParam financial3203AWebParam) {
-        //查询3202的所有实体记录
-        List<Financial3202FileParam> financial3202FileParams = paymentCompareYbSettle(financial3203AWebParam.getSettlementIdList());
+        // 查询3202的所有实体记录
+        List<Financial3202FileParam> financial3202FileParams =
+            paymentCompareYbSettle(financial3203AWebParam.getSettlementIdList());
+        // 处理赋值
+        Financial3203AParam busMonthSetlApply = getInitFinancial3203AParam(financial3202FileParams);
+        // 时间处理
+        getFinancial3203AParamForTime(busMonthSetlApply,
+            DateUtils.parseDateToStr("yyyy-MM-dd hh:mm:ss:", financial3203AWebParam.getStmtBegnDate()),
+            DateUtils.parseDateToStr("yyyy-MM-dd hh:mm:ss:", financial3203AWebParam.getStmtEndDate()));
+        // 将 Date 转换为 LocalDate（Java 8+）
+        // LocalDate begnLocalDate = financial3203AWebParam.getStmtBegnDate().toInstant()
+        // .atZone(ZoneId.systemDefault())
+        // .toLocalDate();
+        // LocalDate endLocalDate = financial3203AWebParam.getStmtEndDate().toInstant()
+        // .atZone(ZoneId.systemDefault())
+        // .toLocalDate();
+
+        // 格式化为 "yyyy-MM-dd"
+        // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        // String begnDateStr = begnLocalDate.format(formatter);
+        // String endDateStr = endLocalDate.format(formatter);
+
+        // Financial3203AParam busMonthSetlApply = new Financial3203AParam();
+        // 赋值
+        busMonthSetlApply.setClrType(financial3203AWebParam.getClrType())
+            // .setBegndate(DateUtils.dateTime("yyyy-MM-dd", begnDateStr))
+            // .setEnddate(DateUtils.dateTime("yyyy-MM-dd", endDateStr))
+            .setClrOptins(financial3203AWebParam.getClrOptins());
+        return busMonthSetlApply;
+    }
+
+    /**
+     * 自动申请清算
+     *
+     * @param financial3202FileParams
+     * @param beginTime
+     * @param endTime
+     * @param clrType
+     * @param clrOptins
+     * @return
+     */
+    public Financial3203AParam getFinancial3203AParam(List<Financial3202FileParam> financial3202FileParams,
+        String beginTime, String endTime, String clrType, String clrOptins) {
+        if (financial3202FileParams.isEmpty()) {
+            throw new ServiceException("无医保结算数据");
+        }
+        Financial3203AParam financial3203AParam = getInitFinancial3203AParam(financial3202FileParams);
+
+        getFinancial3203AParamForTime(financial3203AParam, beginTime, endTime);
+
+        return financial3203AParam.setClrType(clrType).setClrOptins(clrOptins);
+    }
+
+    /**
+     * 自动申请清算
+     *
+     * @param financial3203AParam
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    public Financial3203AParam getFinancial3203AParamForTime(Financial3203AParam financial3203AParam,
+        @NotNull String beginTime, @NotNull String endTime) {
+
+        // 定义日期时间格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 解析成 LocalDateTime（包含日期+时间）
+        LocalDateTime begnLocalDateTime = LocalDateTime.parse(beginTime, formatter);
+        LocalDateTime endLocalDateTime = LocalDateTime.parse(endTime, formatter);
+
+        // 转换成 LocalDate（自动丢弃时间部分）
+        LocalDate begnLocalDate = begnLocalDateTime.toLocalDate();
+        LocalDate endLocalDate = endLocalDateTime.toLocalDate();
+
+        // 格式化为 "yyyy-MM-dd"
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String begnDateStr = begnLocalDate.format(dateFormatter);
+        String endDateStr = endLocalDate.format(dateFormatter);
+
+        // Financial3203AParam busMonthSetlApply = new Financial3203AParam();
+        // 再赋值
+        financial3203AParam.setBegndate(DateUtils.dateTime("yyyy-MM-dd", begnDateStr))
+            .setEnddate(DateUtils.dateTime("yyyy-MM-dd", endDateStr));
+        return financial3203AParam;
+    }
+
+    /**
+     * 【3203A】Financial3203AParam清算申请参数处理(吉林省)
+     *
+     * @param financial3202FileParams 入参
+     * @return 结果
+     */
+    public Financial3203AParam getInitFinancial3203AParam(List<Financial3202FileParam> financial3202FileParams) {
 
         BigDecimal medfeeSumamt = BigDecimal.ZERO;
         BigDecimal fundPaySumamt = BigDecimal.ZERO;
@@ -842,21 +957,22 @@ public class YbDao {
         BigDecimal acctPay = BigDecimal.ZERO;
         BigDecimal cashPay = BigDecimal.ZERO;
         for (Financial3202FileParam financial3202FileParam : financial3202FileParams) {
-            if(financial3202FileParam instanceof Financial3202OtherParam otherParam){
-                medfeeSumamt=medfeeSumamt.add(otherParam.getMedfeeSumamt());
-                fundPaySumamt=fundPaySumamt.add(otherParam.getFundPaySumamt());
-                acctPay=acctPay.add(otherParam.getAcctPay());
-                cashPay=cashPay.add(otherParam.getCashPayamt());
-                medSumfee=medSumfee.add(otherParam.getMedSumfee());
+            if (financial3202FileParam instanceof Financial3202OtherParam otherParam) {
+                medfeeSumamt = medfeeSumamt.add(otherParam.getMedfeeSumamt());
+                fundPaySumamt = fundPaySumamt.add(otherParam.getFundPaySumamt());
+                acctPay = acctPay.add(otherParam.getAcctPay());
+                cashPay = cashPay.add(otherParam.getCashPayamt());
+                medSumfee = medSumfee.add(otherParam.getMedSumfee());
             }
         }
+        // 赋值
         Financial3203AParam busMonthSetlApply = new Financial3203AParam();
-        busMonthSetlApply.setClrType(financial3203AWebParam.getClrType()).setMedfeeSumamt(medfeeSumamt)
-                .setMedSumfee(medSumfee).setCashPayamt(cashPay)
-                .setAcctPay(acctPay)
-                .setBegndate(DateUtils.dateTime("yyyy-MM-dd", financial3203AWebParam.getStmtBegnDate().toString()))
-                .setEnddate(DateUtils.dateTime("yyyy-MM-dd", financial3203AWebParam.getStmtEndDate().toString()))
-                .setClrOptins(financial3203AWebParam.getClrOptins());
+        busMonthSetlApply.setMedfeeSumamt(medfeeSumamt).setMedSumfee(medSumfee).setCashPayamt(cashPay)
+            .setAcctPay(acctPay);
+        // .setClrType(financial3203AWebParam.getClrType())
+        // .setClrOptins(financial3203AWebParam.getClrOptins())
+        // .setBegndate(DateUtils.dateTime("yyyy-MM-dd", begnDateStr))
+        // .setEnddate(DateUtils.dateTime("yyyy-MM-dd", endDateStr));
         return busMonthSetlApply;
     }
 
@@ -866,7 +982,6 @@ public class YbDao {
      * @param clearing3205AWebParma 前台参数
      * @return 结果
      */
-
     public Clearing3205AParma getClearing3205AParma(Clearing3205AWebParma clearing3205AWebParma) {
         return ybUtil.getClearing3205AParma(clearing3205AWebParma);
     }
@@ -878,7 +993,6 @@ public class YbDao {
      * @param talentId 租户id
      * @return 结果
      */
-
     public MedicalInventory3501Param getMedicalInventory3501Param(Long id, Integer talentId) {
         return ybUtil.getMedicalInventory3501Param(id, talentId);
     }
@@ -891,7 +1005,6 @@ public class YbDao {
      * @param talentId 租户id
      * @return 结果
      */
-
     public MedicalInventory3502Param getMedicalInventory3502Param(Long id, String invChgType, Integer talentId) {
         return ybUtil.getMedicalInventory3502Param(id, invChgType, talentId);
     }
@@ -903,7 +1016,6 @@ public class YbDao {
      * @param talentId 租户id
      * @return 结果
      */
-
     public Medical3503Param getMedical3503Param(Long id, Integer talentId) {
         return ybUtil.getMedical3503Param(id, talentId);
     }
@@ -915,7 +1027,6 @@ public class YbDao {
      * @param talentId 租户id
      * @return 结果
      */
-
     public MedicalPurchase3504Param getMedicalPurchase3504Param(Long id, Integer talentId) {
         return ybUtil.getMedicalPurchase3504Param(id, talentId);
     }
@@ -928,7 +1039,6 @@ public class YbDao {
      * @param talentId 租户id
      * @return 结果
      */
-
     public Medical3505Param getMedical3505Param(Long id, String ListType, Integer talentId) {
         return ybUtil.getMedical3505Param(id, ListType, talentId);
     }
@@ -941,7 +1051,6 @@ public class YbDao {
      * @param talentId 租户id
      * @return 3506参数
      */
-
     public Medical3506Param getMedical3506Param(Long id, String ListType, Integer talentId) {
         return ybUtil.getMedical3506Param(id, ListType, talentId);
     }
@@ -953,7 +1062,6 @@ public class YbDao {
      * @param invDataType 进销存类型
      * @return 3507参数
      */
-
     public Medical3507Param getMedical3507Param(Long id, String invDataType) {
         return ybUtil.getMedical3507Param(id, invDataType);
     }
@@ -964,13 +1072,12 @@ public class YbDao {
      * @param financial3203AParam 3203A入参
      * @param s 一包返回结果
      */
-
     public void save3203AFinancialClearingApplycation(Financial3203AParam financial3203AParam, String s) {
         FinancialApplyRecord financialApplyRecord = new FinancialApplyRecord();
         BeanUtils.copyProperties(financial3203AParam, financialApplyRecord);
         financialApplyRecord.setParam(JSON.toJSONString(financial3203AParam)).setOutResult(s)
             .setPraId(SecurityUtils.getLoginUser().getPractitionerId()).setStatus("0");
-        iFinancialApplyRecordService.save(new FinancialApplyRecord());
+        iFinancialApplyRecordService.save(financialApplyRecord);
     }
 
     /**
@@ -979,7 +1086,6 @@ public class YbDao {
      * @param clrAppyEvtId 时间id
      * @param clrOptins 清算机构
      */
-
     public void save3204AFinancialClearingApplycation(String clrAppyEvtId, String clrOptins) {
         iFinancialApplyRecordService.update(new FinancialApplyRecord().setStatus("1"),
             new LambdaUpdateWrapper<FinancialApplyRecord>().eq(FinancialApplyRecord::getOutResult, clrAppyEvtId));
@@ -1004,7 +1110,6 @@ public class YbDao {
      * 
      * @param medical3507Param 3507参数
      */
-
     public void saveInventoryDelRecord(Medical3507Param medical3507Param) {
         InventoryDelRecord inventoryDelRecord = new InventoryDelRecord();
         BeanUtils.copyProperties(medical3507Param, inventoryDelRecord);
@@ -1017,7 +1122,6 @@ public class YbDao {
      * 
      * @param medical3506Param 3506参数
      */
-
     public void saveInventorySaleReturnRecord(Medical3506Param medical3506Param, String retRslt) {
         InventorySaleReturnRecord inventorySaleReturnRecord = new InventorySaleReturnRecord();
         BeanUtils.copyProperties(medical3506Param, inventorySaleReturnRecord);
@@ -1031,7 +1135,6 @@ public class YbDao {
      * 
      * @param medical3505Param 3505参数
      */
-
     public void saveInventorySaleRecord(Medical3505Param medical3505Param, String retRslt) {
         InventorySaleRecord inventorySaleRecord = new InventorySaleRecord();
         BeanUtils.copyProperties(medical3505Param, inventorySaleRecord);
@@ -1046,7 +1149,6 @@ public class YbDao {
      * 
      * @param medicalPurchase3504Param 3504参数
      */
-
     public void saveInventoryPurchaseReturnRecord(MedicalPurchase3504Param medicalPurchase3504Param,
         String resultMessage) {
         InventoryPurchaseReturnRecord inventoryPurchaseReturnRecord = new InventoryPurchaseReturnRecord();
@@ -1061,7 +1163,6 @@ public class YbDao {
      * 
      * @param medical3503Param 3503参数
      */
-
     public void saveInventoryPurchaseRecord(Medical3503Param medical3503Param, String resultMessage) {
         InventoryPurchaseRecord inventoryPurchaseRecord = new InventoryPurchaseRecord();
         BeanUtils.copyProperties(medical3503Param, inventoryPurchaseRecord);
@@ -1075,7 +1176,6 @@ public class YbDao {
      * 
      * @param medicalInventory3502Param 3502参数
      */
-
     public void saveInventoryChangeRecord(MedicalInventory3502Param medicalInventory3502Param, String resultMessage) {
         InventoryChangeRecord inventoryChangeRecord = new InventoryChangeRecord();
         BeanUtils.copyProperties(medicalInventory3502Param, inventoryChangeRecord);
@@ -1084,6 +1184,13 @@ public class YbDao {
         iInventoryChangeRecordService.save(inventoryChangeRecord);
     }
 
+    /**
+     * 保存医保结算参数等信息（挂号用）
+     *
+     * @param paymentNo
+     * @param clinicOrder2207
+     * @param clinic2206OrderResult
+     */
     public void saveClinic2207Record(String paymentNo, Clinic2207OrderParam clinicOrder2207,
         Clinic2207OrderModel clinic2206OrderResult) {
         ClinicSettle clinicSettle = new ClinicSettle();
@@ -1093,6 +1200,12 @@ public class YbDao {
         iClinicSettleService.save(clinicSettle);
     }
 
+    /**
+     * 保存医保结算参数等信息（常规结算用）
+     *
+     * @param clinicOrder2207
+     * @param clinic2206OrderResult
+     */
     public void saveClinic2207Record(Clinic2207OrderParam clinicOrder2207, Clinic2207OrderModel clinic2206OrderResult) {
         ClinicSettle clinicSettle = new ClinicSettle();
         BeanUtils.copyProperties(clinic2206OrderResult, clinicSettle);
@@ -1131,13 +1244,12 @@ public class YbDao {
         PatientInfoDto patientInfoDto = new PatientInfoDto();
         BeanUtils.copyProperties(patient, patientInfoDto);
         // 查合同 2025/05/23 弃用，费用性质固定，如农大只有省医保，费用性质只显示省医保和自费即可，由@GetMapping(value = "/contract-list")接口提供数据
-        // Contract contract = iContractService
-        // .getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getAdmVs, perInfo.getInsuplcAdmdvs()));
-        // if (contract != null) {
-        // BeanUtils.copyProperties(contract, patientInfoDto);
-        // patientInfoDto.setContractOrgId(contract.getOrgId()).setContractId(contract.getId())
-        // .setContractBusNo(contract.getBusNo());
-        // }
+        Contract contract = iContractService
+            .getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getAdmVs, perInfo.getInsuplcAdmdvs()));
+        if (contract != null) {
+            // BeanUtils.copyProperties(contract, patientInfoDto);
+            patientInfoDto.setContractBusNo(contract.getBusNo());
+        }
         patientInfoDto.setId(patient.getId()).setFeedetail(perInfo.getFeedetail());
 
         return patientInfoDto;
@@ -1164,130 +1276,162 @@ public class YbDao {
     }
 
     public List<Settlement3201DetailDto> reconcileGeneralLedgerDetail(Settlement3201WebParam settlement3201WebParam) {
-        //获取条件
-        String clrType = settlement3201WebParam.getClrType();//住院 or 门诊
-        String contractNo = settlement3201WebParam.getContractNo();//省市医保
-        String insuType = settlement3201WebParam.getInsuType();//职工 or 居民保险
-        String stmtBegnDate = settlement3201WebParam.getStmtBegnDate();//开始时间
-        String stmtEndDate = settlement3201WebParam.getStmtEndDate();//结束时间
+        // 获取条件
+        String clrType = settlement3201WebParam.getClrType();// 住院 or 门诊
+        String contractNo = settlement3201WebParam.getContractNo();// 省市医保
+        String insuType = settlement3201WebParam.getInsuType();// 职工 or 居民保险
+        String stmtBegnDate = settlement3201WebParam.getStmtBegnDate();// 开始时间
+        String stmtEndDate = settlement3201WebParam.getStmtEndDate();// 结束时间
         Date startDate = DateUtils.parseDate(stmtBegnDate);
         Date endDate = DateUtils.parseDate(stmtEndDate);
-        //处理时间
-        if(StringUtils.isEmpty(stmtBegnDate)||StringUtils.isEmpty(stmtEndDate)){
+        // 处理时间
+        if (StringUtils.isEmpty(stmtBegnDate) || StringUtils.isEmpty(stmtEndDate)) {
             // 获取当前日期
             LocalDate currentDate = LocalDate.now();
 
-            if(StringUtils.isEmpty(stmtBegnDate)) {
+            if (StringUtils.isEmpty(stmtBegnDate)) {
                 // 获取当月的开始时间（当月的1号 00:00:00）
                 LocalDateTime startOfMonth = LocalDateTime.of(currentDate, LocalTime.MIN);
                 startDate = Date.from(startOfMonth.atZone(ZoneId.systemDefault()).toInstant());
-                stmtBegnDate = DateUtils.parseDateToStr("yyyy-MM-dd hh:mm:ss.SSS",startDate);
+                stmtBegnDate = DateUtils.parseDateToStr("yyyy-MM-dd hh:mm:ss.SSS", startDate);
             }
 
-            if(StringUtils.isEmpty(stmtEndDate)) {
+            if (StringUtils.isEmpty(stmtEndDate)) {
                 // 获取当月的结束时间（当月的最后一天 23:59:59）
                 LocalDate endOfMonthDate = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
                 LocalDateTime endOfMonth = LocalDateTime.of(endOfMonthDate, LocalTime.MAX);
                 endDate = Date.from(endOfMonth.atZone(ZoneId.systemDefault()).toInstant());
-                stmtEndDate = DateUtils.parseDateToStr("yyyy-MM-dd hh:mm:ss.SSS",endDate);
+                stmtEndDate = DateUtils.parseDateToStr("yyyy-MM-dd hh:mm:ss.SSS", endDate);
             }
         }
-        //查询该段时间内的payment
-        List<PaymentReconciliation> paymentReconciliations = iPaymentReconciliationService.list(new LambdaQueryWrapper<PaymentReconciliation>().between(PaymentReconciliation::getBillDate, startDate, endDate).ne(PaymentReconciliation::getStatusEnum, PaymentStatus.DRAFT.getValue()).isNotNull(PaymentReconciliation::getYbSettleIds));
-        //过滤医保结算id
-        List<String> settleIdList = paymentReconciliations.stream().filter(e -> StringUtils.isNotEmpty(e.getYbSettleIds())).map(PaymentReconciliation::getYbSettleIds).collect(Collectors.toList());
-
-        //List<String> allSettleIds = settleIdList.stream().flatMap(ids -> Stream.of(ids.split(","))).filter(id -> !id.isEmpty()).collect(Collectors.toList());
-        //获取新的paymentId集合
-        List<Long> paymentReconciliationIdList = paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
-        //List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getReconciliationId, paymentReconciliationIdList));
-        //List<Long> accountIds = paymentRecDetailList.stream().map(PaymentRecDetail::getAccountId).collect(Collectors.toList());
-        //List<Account>  accountList = accountService.list(new LambdaQueryWrapper<Account>().in(Account::getId, accountIds));
-        //查询支付详情记录信息
-        List<PaymentDecDetailUniAccountDto> paymentDecDetailUniAccountDtos = medicalInsuranceMapper.getPaymentDecDetailUniAccountDtoListByPaymentIdList(paymentReconciliationIdList,startDate,endDate);
-        //声明变量
+        // 查询该段时间内的payment
+        List<PaymentReconciliation> paymentReconciliations =
+            iPaymentReconciliationService.list(new LambdaQueryWrapper<PaymentReconciliation>()
+                .between(PaymentReconciliation::getBillDate, startDate, endDate)
+                .ne(PaymentReconciliation::getStatusEnum, PaymentStatus.DRAFT.getValue())
+                .eq(PaymentReconciliation::getKindEnum, PaymentKind.OUTPATIENT_CLINIC.getValue())
+                .isNotNull(PaymentReconciliation::getYbSettleIds));
+        // 过滤医保结算id
+        List<String> settleIdList =
+            paymentReconciliations.stream().filter(e -> StringUtils.isNotEmpty(e.getYbSettleIds()))
+                .map(PaymentReconciliation::getYbSettleIds).collect(Collectors.toList());
+
+        // List<String> allSettleIds = settleIdList.stream().flatMap(ids -> Stream.of(ids.split(","))).filter(id ->
+        // !id.isEmpty()).collect(Collectors.toList());
+        // 获取新的paymentId集合
+        List<Long> paymentReconciliationIdList =
+            paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+        // List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService.list(new
+        // LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getReconciliationId,
+        // paymentReconciliationIdList));
+        // List<Long> accountIds =
+        // paymentRecDetailList.stream().map(PaymentRecDetail::getAccountId).collect(Collectors.toList());
+        // List<Account> accountList = accountService.list(new LambdaQueryWrapper<Account>().in(Account::getId,
+        // accountIds));
+        // 查询支付详情记录信息
+        List<PaymentDecDetailUniAccountDto> paymentDecDetailUniAccountDtos =
+            medicalInsuranceMapper.getPaymentDecDetailUniAccountDtoListByPaymentIdList(paymentReconciliationIdList,
+                startDate, endDate, PaymentStatus.DRAFT.getValue());
+        // 声明变量
         List<Settlement3201DetailDto> settlement3201DetailDtos = new ArrayList<>();
-        //Settlement3201DetailDto settlement3201ProEMPOutDto = new Settlement3201DetailDto();//省医保门诊职工
-        //Settlement3201DetailDto settlement3201CityEMPOutDto = new Settlement3201DetailDto();//市医保门诊居民
-        //Settlement3201DetailDto settlement3201ProRESOutDto = new Settlement3201DetailDto();//省医保门诊职工
-        //Settlement3201DetailDto settlement3201CityRESOutDto = new Settlement3201DetailDto();//市医保门诊居民
-        //Settlement3201DetailDto settlement3201ProEMPInDto = new Settlement3201DetailDto();//省医保住院职工
-        //Settlement3201DetailDto settlement3201CityEMPInDto = new Settlement3201DetailDto();//市医保住院居民
-        //Settlement3201DetailDto settlement3201ProRESInDto = new Settlement3201DetailDto();//省医保住院职工
-        //Settlement3201DetailDto settlement3201CityRESInDto = new Settlement3201DetailDto();//市医保住院居民
-        Settlement3201DetailDto settlement3201Dto ;//声明变量
-        //分组处理
-        for (PaymentDecDetailUniAccountDto paymentDecDetailUniAccountDto : paymentDecDetailUniAccountDtos) {
-            if(StringUtils.isEmpty(paymentDecDetailUniAccountDto.getContractNo())){
-                System.out.println(paymentDecDetailUniAccountDto.getId());
-            }
-        }
+        // Settlement3201DetailDto settlement3201ProEMPOutDto = new Settlement3201DetailDto();//省医保门诊职工
+        // Settlement3201DetailDto settlement3201CityEMPOutDto = new Settlement3201DetailDto();//市医保门诊居民
+        // Settlement3201DetailDto settlement3201ProRESOutDto = new Settlement3201DetailDto();//省医保门诊职工
+        // Settlement3201DetailDto settlement3201CityRESOutDto = new Settlement3201DetailDto();//市医保门诊居民
+        // Settlement3201DetailDto settlement3201ProEMPInDto = new Settlement3201DetailDto();//省医保住院职工
+        // Settlement3201DetailDto settlement3201CityEMPInDto = new Settlement3201DetailDto();//市医保住院居民
+        // Settlement3201DetailDto settlement3201ProRESInDto = new Settlement3201DetailDto();//省医保住院职工
+        // Settlement3201DetailDto settlement3201CityRESInDto = new Settlement3201DetailDto();//市医保住院居民
+        Settlement3201DetailDto settlement3201Dto;// 声明变量
+        // 分组处理
+        // for (PaymentDecDetailUniAccountDto paymentDecDetailUniAccountDto : paymentDecDetailUniAccountDtos) {
+        // if(StringUtils.isEmpty(paymentDecDetailUniAccountDto.getContractNo())){
+        // System.out.println(paymentDecDetailUniAccountDto.getId());
+        // }
+        // }
         for (PaymentDecDetailUniAccountDto paymentDecDetailUniAccountDto : paymentDecDetailUniAccountDtos) {
-            if(StringUtils.isEmpty(paymentDecDetailUniAccountDto.getContractNo())){
-                System.out.println(paymentDecDetailUniAccountDto.getId()+"payment主键："+paymentDecDetailUniAccountDto.getReconciliationId());
+            if (StringUtils.isEmpty(paymentDecDetailUniAccountDto.getContractNo())) {
+                System.out.println(paymentDecDetailUniAccountDto.getId() + "payment主键："
+                    + paymentDecDetailUniAccountDto.getReconciliationId());
             }
         }
 
-        Map<String, List<PaymentDecDetailUniAccountDto>> paymentDecDetailUniAccountDtoMapGroupByContract = paymentDecDetailUniAccountDtos.stream().collect(Collectors.groupingBy(PaymentDecDetailUniAccountDto::getContractNo));
-        //分省市医保
-        for (Map.Entry<String, List<PaymentDecDetailUniAccountDto>> stringListEntry : paymentDecDetailUniAccountDtoMapGroupByContract.entrySet()) {
-            if("0000".equals(stringListEntry.getKey())){
+        Map<String, List<PaymentDecDetailUniAccountDto>> paymentDecDetailUniAccountDtoMapGroupByContract =
+            paymentDecDetailUniAccountDtos.stream()
+                .collect(Collectors.groupingBy(PaymentDecDetailUniAccountDto::getContractNo));
+        // 分省市医保
+        for (Map.Entry<String,
+            List<PaymentDecDetailUniAccountDto>> stringListEntry : paymentDecDetailUniAccountDtoMapGroupByContract
+                .entrySet()) {
+            if (CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(stringListEntry.getKey())) {
                 continue;
             }
-            if(stringListEntry.getValue().isEmpty()){
+            if (stringListEntry.getValue().isEmpty()) {
                 continue;
             }
-            if(!StringUtils.isEmpty(contractNo)&&!stringListEntry.getKey().equals(contractNo)){
+            if (!StringUtils.isEmpty(contractNo) && !stringListEntry.getKey().equals(contractNo)) {
                 continue;
             }
-            //分住院门诊
-            Map<String, List<PaymentDecDetailUniAccountDto>> paymentDecDetailUniAccountDtoMapGroupByMedType = stringListEntry.getValue().stream().collect(Collectors.groupingBy(PaymentDecDetailUniAccountDto::getMedType));
-            for (Map.Entry<String, List<PaymentDecDetailUniAccountDto>> listEntry : paymentDecDetailUniAccountDtoMapGroupByMedType.entrySet()) {
-                if(listEntry.getValue().isEmpty()){
+            // 分住院门诊
+            Map<String, List<PaymentDecDetailUniAccountDto>> paymentDecDetailUniAccountDtoMapGroupByMedType =
+                stringListEntry.getValue().stream()
+                    .collect(Collectors.groupingBy(PaymentDecDetailUniAccountDto::getMedType));
+            for (Map.Entry<String,
+                List<PaymentDecDetailUniAccountDto>> listEntry : paymentDecDetailUniAccountDtoMapGroupByMedType
+                    .entrySet()) {
+                if (listEntry.getValue().isEmpty()) {
                     continue;
                 }
-                if(!StringUtils.isEmpty(clrType)&&!listEntry.getKey().equals(clrType)){
+                if (!StringUtils.isEmpty(clrType) && !listEntry.getKey().equals(clrType)) {
                     continue;
                 }
-                //分职工居民
-                Map<String, List<PaymentDecDetailUniAccountDto>> collect = listEntry.getValue().stream().collect(Collectors.groupingBy(PaymentDecDetailUniAccountDto::getInsutype));
+                // 分职工居民
+                Map<String, List<PaymentDecDetailUniAccountDto>> collect = listEntry.getValue().stream()
+                    .collect(Collectors.groupingBy(PaymentDecDetailUniAccountDto::getInsutype));
                 for (Map.Entry<String, List<PaymentDecDetailUniAccountDto>> entry : collect.entrySet()) {
-                    if(entry.getValue().isEmpty()){
+                    if (entry.getValue().isEmpty()) {
                         continue;
                     }
-                    if(!StringUtils.isEmpty(insuType)&&!entry.getKey().equals(insuType)){
+                    if (!StringUtils.isEmpty(insuType) && !entry.getKey().equals(insuType)) {
                         continue;
                     }
                     int count = 0;
                     settlement3201Dto = new Settlement3201DetailDto();
-                    settlement3201Dto.setContractNo(stringListEntry.getKey()).setInsutype(Integer.parseInt(entry.getKey()))
-                            .setClrType(listEntry.getKey());
+                    settlement3201Dto.setContractNo(stringListEntry.getKey())
+                        .setInsutype(Integer.parseInt(entry.getKey())).setClrType(listEntry.getKey());
                     for (PaymentDecDetailUniAccountDto paymentDecDetailUniAccountDto : entry.getValue()) {
-                        if(YbPayment.YB_FUND_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())){
-                            //基金支付
-                            settlement3201Dto.setFundPaySumAmt(paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getFundPaySumAmt()));
+                        if (YbPayment.YB_FUND_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())) {
+                            // 基金支付
+                            settlement3201Dto.setFundPaySumAmt(
+                                paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getFundPaySumAmt()));
                             count++;
                         }
-                        if(YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())){
-                            //账户支付
-                            settlement3201Dto.setAcctPay(paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getAcctPay()));
+                        if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())) {
+                            // 账户支付
+                            settlement3201Dto.setAcctPay(
+                                paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getAcctPay()));
                         }
-                        if(YbPayment.SELF_YB_ZH_GJ_VALUE.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())){
-                            //账户共济支付
-                            settlement3201Dto.setAcctGjPay(paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getAcctGjPay()));
+                        if (YbPayment.SELF_YB_ZH_GJ_VALUE.getValue()
+                            .equals(paymentDecDetailUniAccountDto.getPayEnum())) {
+                            // 账户共济支付
+                            settlement3201Dto.setAcctGjPay(
+                                paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getAcctGjPay()));
                         }
-                        if(YbPayment.SELF_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())||YbPayment.OTHER_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())||YbPayment.YB_FUND_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())){
-                            //合计医疗费用
-                            settlement3201Dto.setMedFeeSumAmt(paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getMedFeeSumAmt()));
+                        if (YbPayment.SELF_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())
+                            || YbPayment.OTHER_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())
+                            || YbPayment.YB_FUND_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())) {
+                            // 合计医疗费用
+                            settlement3201Dto.setMedFeeSumAmt(
+                                paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getMedFeeSumAmt()));
                         }
                     }
-                    //结算笔数
+                    // 结算笔数
                     settlement3201Dto.setFixMedInsSetlCnt(count);
                     settlement3201DetailDtos.add(settlement3201Dto);
                 }
             }
         }
-        //返回参数
+        // 返回参数
         return settlement3201DetailDtos;
     }
 
@@ -1300,7 +1444,7 @@ public class YbDao {
             iRegService.getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getIptOtpNo, encounter.getBusNo()));
         ClinicReg2201Output clinicReg2201Output = new ClinicReg2201Output();
         BeanUtils.copyProperties(clinicReg, clinicReg2201Output);
-        clinicReg2201Output.setMedType(clinicReg.getMedType());//copyProperties会有概率copy失败，此处打补丁赋值
+        clinicReg2201Output.setMedType(clinicReg.getMedType());// copyProperties会有概率copy失败，此处打补丁赋值
         return clinicReg2201Output;
     }
 
@@ -1314,139 +1458,178 @@ public class YbDao {
 
     /**
      * 系統數據比較
+     *
      * @param settlement3202WebParam
      */
     public List<Financial3202FileParam> paymentCompareYbSettle(Settlement3202WebParam settlement3202WebParam) {
-        //比较yb_clinic_settle表和payment系列表数据是否一致
+        // 比较yb_clinic_settle表和payment系列表数据是否一致
         String stmtBegnDate = String.valueOf(settlement3202WebParam.getStmtBegnDate());
         String stmtEndDate = String.valueOf(settlement3202WebParam.getStmtEndDate());
-        if(StringUtils.isEmpty(stmtBegnDate)||StringUtils.isEmpty(stmtEndDate)){
-            throw new ServiceException("未選擇開始與結束時間");
+        if (StringUtils.isEmpty(stmtBegnDate) || StringUtils.isEmpty(stmtEndDate)) {
+            throw new ServiceException("未选择开始与结束时间");
         }
 
         Date startDate = DateUtils.parseDate(stmtBegnDate);
         Date endDate = DateUtils.parseDate(stmtEndDate);
 
-        //查询该段时间内的payment
-        List<PaymentReconciliation> paymentReconciliations = iPaymentReconciliationService.list(new LambdaQueryWrapper<PaymentReconciliation>().between(PaymentReconciliation::getBillDate, startDate, endDate).ne(PaymentReconciliation::getStatusEnum, PaymentStatus.DRAFT.getValue()).ne(PaymentReconciliation::getYbSettleIds,"0000").ne(PaymentReconciliation::getYbSettleIds,"null").isNotNull(PaymentReconciliation::getYbSettleIds));
-        if(paymentReconciliations.isEmpty()){
+        // 查询该段时间内的payment
+        List<PaymentReconciliation> paymentReconciliations =
+            iPaymentReconciliationService.list(new LambdaQueryWrapper<PaymentReconciliation>()
+                .between(PaymentReconciliation::getBillDate, startDate, endDate)
+                .ne(PaymentReconciliation::getStatusEnum, PaymentStatus.DRAFT.getValue())
+                .ne(PaymentReconciliation::getYbSettleIds, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentReconciliation::getYbSettleIds, "null").isNotNull(PaymentReconciliation::getYbSettleIds)
+                .eq(PaymentReconciliation::getKindEnum, PaymentKind.OUTPATIENT_CLINIC.getValue()));
+        if (paymentReconciliations.isEmpty()) {
             throw new ServiceException("该时间内无付款记录");
         }
 
-        //过滤医保结算id
-        List<String> settleIdList = paymentReconciliations.stream().filter(e -> StringUtils.isNotEmpty(e.getYbSettleIds())).map(PaymentReconciliation::getYbSettleIds).collect(Collectors.toList());
+        // 过滤医保结算id
+        List<String> settleIdList = paymentReconciliations.stream()
+            .filter(e -> StringUtils.isNotEmpty(e.getYbSettleIds())).map(PaymentReconciliation::getYbSettleIds)
+            .flatMap(ybSettleIds -> Arrays.stream(ybSettleIds.split(","))).collect(Collectors.toList());
+        if (settleIdList.isEmpty()) {
+            throw new ServiceException("该时间内无医保付款记录");
+        }
 
-        //查询医保表数据
-        List<ClinicSettle> clinicSettles = iClinicSettleService.list(new LambdaQueryWrapper<ClinicSettle>().in(ClinicSettle::getSetlId, settleIdList));
-        List<ClinicUnSettle> clinicUnSettles = iClinicUnSettleService.list(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settleIdList));
+        // 查询医保表数据
+        List<ClinicSettle> clinicSettles =
+            iClinicSettleService.list(new LambdaQueryWrapper<ClinicSettle>().in(ClinicSettle::getSetlId, settleIdList));
+        List<ClinicUnSettle> clinicUnSettles = iClinicUnSettleService
+            .list(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settleIdList));
 
-        //payment的id集合
-        List<Long> paymentReconciliationIdList = paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+        // payment的id集合
+        List<Long> paymentReconciliationIdList =
+            paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
 
-        //查询详情表数据
-        List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getReconciliationId, paymentReconciliationIdList).ne(PaymentRecDetail::getPayTransNo, "0000").ne(PaymentRecDetail::getPayTransText, "0000").ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_ALI_VALUE.getValue()).ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VX_VALUE.getValue()).ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_UNION_VALUE.getValue()).ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VALUE.getValue()));
-        if(paymentRecDetailList.isEmpty()){
+        // 查询详情表数据
+        List<PaymentRecDetail> paymentRecDetailList =
+            iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
+                .in(PaymentRecDetail::getReconciliationId, paymentReconciliationIdList)
+                .ne(PaymentRecDetail::getPayTransNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentRecDetail::getPayTransText, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_ALI_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VX_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_UNION_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VALUE.getValue()));
+        if (paymentRecDetailList.isEmpty()) {
             throw new ServiceException("该时间内无付款明细记录");
         }
         // 该部分代码为辅助调试时使用，无任何业务处理 start
-        for (PaymentRecDetail paymentRecDetail : paymentRecDetailList) {
-            if(StringUtils.isEmpty(paymentRecDetail.getPayTransText())){
-                System.out.println("*******************************************************************");
-                System.out.println(paymentRecDetail.getId()+"主键:"+paymentRecDetail.getReconciliationId());
-                System.out.println(JSON.toJSONString(paymentRecDetail));
-                //throw new ServiceException("paymentDetail无返回交易码");
-            }
-        }
-        //end
+        // for (PaymentRecDetail paymentRecDetail : paymentRecDetailList) {
+        // if (StringUtils.isEmpty(paymentRecDetail.getPayTransText())) {
+        // System.out.println("*******************************************************************");
+        // System.out.println(paymentRecDetail.getId() + "主键:" + paymentRecDetail.getReconciliationId());
+        // System.out.println(JSON.toJSONString(paymentRecDetail));
+        // // throw new ServiceException("paymentDetail无返回交易码");
+        // }
+        // }
+        // end
 
-        Map<String, List<PaymentRecDetail>> paymentRecDetailMapBySettleId = paymentRecDetailList.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransText));
+        Map<String, List<PaymentRecDetail>> paymentRecDetailMapBySettleId =
+            paymentRecDetailList.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransText));
 
         List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
         Financial3202FileParam financial3202FileParam;
         for (Map.Entry<String, List<PaymentRecDetail>> stringListEntry : paymentRecDetailMapBySettleId.entrySet()) {
-            //获取settleId
+            // 获取settleId
             String settleId = stringListEntry.getKey();
-            if("0000".equals(settleId)){
+            if (CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(settleId) || StringUtils.isEmpty(settleId)) {
                 continue;
             }
-            Optional<ClinicSettle> settleOptional = clinicSettles.stream().filter(e -> settleId.equals(e.getSetlId())).findAny();
-            Optional<ClinicUnSettle> unSettleOptional = clinicUnSettles.stream().filter(e -> settleId.equals(e.getSettleId())).findAny();
-            if(!settleOptional.isPresent()&&!unSettleOptional.isPresent()){
-                throw new ServiceException("付款详情中结算id在医保记录中不存在，错误信息：paymentId："+stringListEntry.getValue().get(0).getReconciliationId()+"；医保结算id"+settleId);
+            Optional<ClinicSettle> settleOptional =
+                clinicSettles.stream().filter(e -> settleId.equals(e.getSetlId())).findAny();
+            Optional<ClinicUnSettle> unSettleOptional =
+                clinicUnSettles.stream().filter(e -> settleId.equals(e.getSettleId())).findAny();
+            if (!settleOptional.isPresent() && !unSettleOptional.isPresent()) {
+                throw new ServiceException("付款详情中结算id在医保记录中不存在，错误信息：paymentId："
+                    + stringListEntry.getValue().get(0).getReconciliationId() + "；医保结算id" + settleId);
             }
-            if(settleOptional.isPresent()&&unSettleOptional.isPresent()){
-                throw new ServiceException("付款详情中结算id在医保记录中同时存在正结和反结，错误信息：paymentId："+stringListEntry.getValue().get(0).getReconciliationId()+"；医保结算id"+settleId);
+            if (settleOptional.isPresent() && unSettleOptional.isPresent()) {
+                throw new ServiceException("付款详情中结算id在医保记录中同时存在正结和反结，错误信息：paymentId："
+                    + stringListEntry.getValue().get(0).getReconciliationId() + "；医保结算id" + settleId);
             }
-            //校对金额
+            // 校对金额
             BigDecimal medfeeSumamt = BigDecimal.ZERO;
             BigDecimal fundPaySumamt = BigDecimal.ZERO;
             BigDecimal acctPay = BigDecimal.ZERO;
-            String refdSetlFlag = Whether.NO.getCode();//1 是退费; 0否
+            String refdSetlFlag = Whether.NO.getCode();// 1 是退费; 0否
             String psnNo = "";
             String mdtrtId = "";
             String patientName = "";
             String setlTime = "";
 
             for (PaymentRecDetail paymentRecDetail : stringListEntry.getValue()) {
-                if(YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                if (YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
                     fundPaySumamt = fundPaySumamt.add(paymentRecDetail.getAmount());
                 }
-                if(YbPayment.SELF_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                if (YbPayment.SELF_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
                 }
-                //if(YbPayment.OTHER_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
-                //    medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
-                //}
-                if(YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                // if(YbPayment.OTHER_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                // medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
+                // }
+                if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     acctPay = acctPay.add(paymentRecDetail.getAmount());
                 }
             }
 
-            if(settleOptional.isPresent()){
+            if (settleOptional.isPresent()) {
                 ClinicSettle clinicSettle = settleOptional.get();
-                if(clinicSettle.getAcctPay().compareTo(acctPay)!=0){
-                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSetlId()+" 账户支付："+clinicSettle.getAcctPay()+" payment记录账户支付金额："+acctPay);
+                if (clinicSettle.getAcctPay().compareTo(acctPay) != 0) {
+                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSetlId()
+                        + " 账户支付：" + clinicSettle.getAcctPay() + " payment记录账户支付金额：" + acctPay);
                 }
-                if(clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt)!=0){
-                    throw new ServiceException("医保正结记录与业务记录医疗总金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSetlId()+" 医疗总金额："+clinicSettle.getMedfeeSumamt()+" payment记录医疗总金额："+medfeeSumamt);
+                if (clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt) != 0) {
+                    throw new ServiceException("医保正结记录与业务记录医疗总金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSetlId()
+                        + " 医疗总金额：" + clinicSettle.getMedfeeSumamt() + " payment记录医疗总金额：" + medfeeSumamt);
                 }
-                if(clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt)!=0){
-                    throw new ServiceException("医保正结记录与业务记录基金金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSetlId()+" 基金金额："+clinicSettle.getFundPaySumamt()+" payment记录基金金额："+fundPaySumamt);
+                if (clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt) != 0) {
+                    throw new ServiceException("医保正结记录与业务记录基金金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSetlId()
+                        + " 基金金额：" + clinicSettle.getFundPaySumamt() + " payment记录基金金额：" + fundPaySumamt);
                 }
                 String param2207 = clinicSettle.getParam2207();
                 Clinic2207OrderParam clinic2207OrderParam = JSON.parseObject(param2207, Clinic2207OrderParam.class);
                 psnNo = clinic2207OrderParam.getPsnNo();
                 mdtrtId = clinic2207OrderParam.getMdtrtId();
-                Clinic2207OrderModel clinic2207OrderModel = JSON.parseObject(clinicSettle.getResult2207(), Clinic2207OrderModel.class);
+                Clinic2207OrderModel clinic2207OrderModel =
+                    JSON.parseObject(clinicSettle.getResult2207(), Clinic2207OrderModel.class);
                 patientName = clinic2207OrderModel.getPsnName();
                 setlTime = String.valueOf(clinic2207OrderModel.getSetlTime());
             }
 
-            if(unSettleOptional.isPresent()){
+            if (unSettleOptional.isPresent()) {
                 ClinicUnSettle clinicSettle = unSettleOptional.get();
-                if(clinicSettle.getAcctPay().compareTo(acctPay)!=0){
-                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSettleId()+" 账户支付："+clinicSettle.getAcctPay()+" payment记录账户支付金额："+acctPay);
+                if (clinicSettle.getAcctPay().compareTo(acctPay) != 0) {
+                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSettleId()
+                        + " 账户支付：" + clinicSettle.getAcctPay() + " payment记录账户支付金额：" + acctPay);
                 }
-                if(clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt)!=0){
-                    throw new ServiceException("医保反结记录与业务记录医疗费用总金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSettleId()+" 医疗费用总金额："+clinicSettle.getMedfeeSumamt()+" payment记录医疗费用总金额："+medfeeSumamt);
+                if (clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt) != 0) {
+                    throw new ServiceException("医保反结记录与业务记录医疗费用总金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSettleId()
+                        + " 医疗费用总金额：" + clinicSettle.getMedfeeSumamt() + " payment记录医疗费用总金额：" + medfeeSumamt);
                 }
-                if(clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt)!=0){
-                    throw new ServiceException("医保反结记录与业务记录基金金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSettleId()+" 基金金额："+clinicSettle.getFundPaySumamt()+" payment记录基金金额："+fundPaySumamt);
+                if (clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt) != 0) {
+                    throw new ServiceException("医保反结记录与业务记录基金金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSettleId()
+                        + " 基金金额：" + clinicSettle.getFundPaySumamt() + " payment记录基金金额：" + fundPaySumamt);
                 }
                 refdSetlFlag = Whether.YES.getCode();
                 String param2208 = clinicSettle.getParam2208();
-                Clinic2208UnSetlInfoParam clinic2208UnSetlInfoParam = JSON.parseObject(param2208, Clinic2208UnSetlInfoParam.class);
+                Clinic2208UnSetlInfoParam clinic2208UnSetlInfoParam =
+                    JSON.parseObject(param2208, Clinic2208UnSetlInfoParam.class);
                 psnNo = clinic2208UnSetlInfoParam.getPsnNo();
                 mdtrtId = clinic2208UnSetlInfoParam.getMdtrtId();
-                Clinic2208UnSetlInfoOutput clinic2207OrderModel = JSON.parseObject(clinicSettle.getResult2208(), Clinic2208UnSetlInfoOutput.class);
-                //patientName = clinic2207OrderModel.getPsnName();
+                Clinic2208UnSetlInfoOutput clinic2207OrderModel =
+                    JSON.parseObject(clinicSettle.getResult2208(), Clinic2208UnSetlInfoOutput.class);
+                // patientName = clinic2207OrderModel.getPsnName();
                 setlTime = String.valueOf(clinic2207OrderModel.getSetlTime());
             }
 
             financial3202FileParam = new Financial3202FileParam();
 
-            financial3202FileParam.setSetlId(settleId).setAcctPay(acctPay).setFundPaySumamt(fundPaySumamt).setMdtrtId(mdtrtId).setPsnNo(psnNo).setMedfeeSumamt(medfeeSumamt).setRefdSetlFlag(refdSetlFlag).setPatientName(patientName).setSetlTime(setlTime);
+            financial3202FileParam.setSetlId(settleId).setAcctPay(acctPay).setFundPaySumamt(fundPaySumamt)
+                .setMdtrtId(mdtrtId).setPsnNo(psnNo).setMedfeeSumamt(medfeeSumamt).setRefdSetlFlag(refdSetlFlag)
+                .setPatientName(patientName).setSetlTime(setlTime);
 
             financial3202FileParamList.add(financial3202FileParam);
         }
@@ -1456,91 +1639,111 @@ public class YbDao {
 
     /**
      * 系統數據比較
+     *
      * @param settlementIdList
      */
     public List<Financial3202FileParam> paymentCompareYbSettle(List<String> settlementIdList) {
-        //比较yb_clinic_settle表和payment系列表数据是否一致
-        //查询医保表数据
-        List<ClinicSettle> clinicSettles = iClinicSettleService.list(new LambdaQueryWrapper<ClinicSettle>().in(ClinicSettle::getSetlId, settlementIdList));
-        List<ClinicUnSettle> clinicUnSettles = iClinicUnSettleService.list(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settlementIdList));
-
-        //payment的id集合
-        //List<Long> paymentReconciliationIdList = paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
-
-        //查询详情表数据
-        List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getPayTransText, settlementIdList).ne(PaymentRecDetail::getPayTransNo, "0000").ne(PaymentRecDetail::getPayTransText,"0000").isNotNull(PaymentRecDetail::getPayTransText));
-        if(paymentRecDetailList.isEmpty()){
+        // 比较yb_clinic_settle表和payment系列表数据是否一致
+        // 查询医保表数据
+        List<ClinicSettle> clinicSettles = iClinicSettleService
+            .list(new LambdaQueryWrapper<ClinicSettle>().in(ClinicSettle::getSetlId, settlementIdList));
+        List<ClinicUnSettle> clinicUnSettles = iClinicUnSettleService
+            .list(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settlementIdList));
+
+        // payment的id集合
+        // List<Long> paymentReconciliationIdList =
+        // paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+
+        // 查询详情表数据
+        List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService
+            .list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getPayTransText, settlementIdList)
+                .ne(PaymentRecDetail::getPayTransNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentRecDetail::getPayTransText, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_ALI_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VX_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_UNION_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VALUE.getValue())
+                .isNotNull(PaymentRecDetail::getPayTransText));
+        if (paymentRecDetailList.isEmpty()) {
             throw new ServiceException("该时间内无付款明细记录");
         }
         // 该部分代码为辅助调试时使用，无任何业务处理 start
         for (PaymentRecDetail paymentRecDetail : paymentRecDetailList) {
-            if(StringUtils.isEmpty(paymentRecDetail.getPayTransNo())){
+            if (StringUtils.isEmpty(paymentRecDetail.getPayTransText())) {
                 System.out.println(JSON.toJSONString(paymentRecDetail));
                 throw new ServiceException("paymentDetail无返回交易码");
             }
         }
-        //end
+        // end
 
-        Map<String, List<PaymentRecDetail>> paymentRecDetailMapBySettleId = paymentRecDetailList.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransText));
+        Map<String, List<PaymentRecDetail>> paymentRecDetailMapBySettleId =
+            paymentRecDetailList.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransText));
 
         List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
         Financial3202OtherParam financial3202OtherParam;
         for (Map.Entry<String, List<PaymentRecDetail>> stringListEntry : paymentRecDetailMapBySettleId.entrySet()) {
-            //获取settleId
+            // 获取settleId
             String settleId = stringListEntry.getKey();
-            if("0000".equals(settleId)){
+            if (CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(settleId)) {
                 continue;
             }
-            Optional<ClinicSettle> settleOptional = clinicSettles.stream().filter(e -> settleId.equals(e.getSetlId())).findAny();
-            Optional<ClinicUnSettle> unSettleOptional = clinicUnSettles.stream().filter(e -> settleId.equals(e.getSettleId())).findAny();
-            if(!settleOptional.isPresent()&&!unSettleOptional.isPresent()){
-                throw new ServiceException("付款详情中结算id在医保记录中不存在，错误信息：paymentId："+stringListEntry.getValue().get(0).getReconciliationId()+"；医保结算id"+settleId);
+            Optional<ClinicSettle> settleOptional =
+                clinicSettles.stream().filter(e -> settleId.equals(e.getSetlId())).findAny();
+            Optional<ClinicUnSettle> unSettleOptional =
+                clinicUnSettles.stream().filter(e -> settleId.equals(e.getSettleId())).findAny();
+            if (!settleOptional.isPresent() && !unSettleOptional.isPresent()) {
+                throw new ServiceException("付款详情中结算id在医保记录中不存在，错误信息：paymentId："
+                    + stringListEntry.getValue().get(0).getReconciliationId() + "；医保结算id" + settleId);
             }
-            if(settleOptional.isPresent()&&unSettleOptional.isPresent()){
-                throw new ServiceException("付款详情中结算id在医保记录中同时存在正结和反结，错误信息：paymentId："+stringListEntry.getValue().get(0).getReconciliationId()+"；医保结算id"+settleId);
+            if (settleOptional.isPresent() && unSettleOptional.isPresent()) {
+                throw new ServiceException("付款详情中结算id在医保记录中同时存在正结和反结，错误信息：paymentId："
+                    + stringListEntry.getValue().get(0).getReconciliationId() + "；医保结算id" + settleId);
             }
-            //校对金额
+            // 校对金额
             BigDecimal medfeeSumamt = BigDecimal.ZERO;
             BigDecimal fundPaySumamt = BigDecimal.ZERO;
             BigDecimal acctPay = BigDecimal.ZERO;
             BigDecimal cashPay = BigDecimal.ZERO;
             BigDecimal medSumfee = BigDecimal.ZERO;
-            String refdSetlFlag = Whether.NO.getCode();//1 是退费; 0否
+            String refdSetlFlag = Whether.NO.getCode();// 1 是退费; 0否
             String psnNo = "";
             String mdtrtId = "";
 
             for (PaymentRecDetail paymentRecDetail : stringListEntry.getValue()) {
-                if(YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                if (YbPayment.YB_FUND_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
                     fundPaySumamt = fundPaySumamt.add(paymentRecDetail.getAmount());
                 }
-                if(YbPayment.SELF_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                if (YbPayment.SELF_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
                 }
-                if(YbPayment.OTHER_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
-                    medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
-                }
-                if(YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                // if(YbPayment.OTHER_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                // medfeeSumamt = medfeeSumamt.add(paymentRecDetail.getAmount());
+                // }
+                if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     acctPay = acctPay.add(paymentRecDetail.getAmount());
                 }
-                if(YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())){
+                if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
                     cashPay = cashPay.add(paymentRecDetail.getAmount());
                 }
-                if(YbPayment.INSCP_SCP_AMT.getValue().equals(paymentRecDetail.getPayEnum())){
+                if (YbPayment.INSCP_SCP_AMT.getValue().equals(paymentRecDetail.getPayEnum())) {
                     medSumfee = medSumfee.add(paymentRecDetail.getAmount());
                 }
             }
 
-            if(settleOptional.isPresent()){
+            if (settleOptional.isPresent()) {
                 ClinicSettle clinicSettle = settleOptional.get();
-                if(clinicSettle.getAcctPay().compareTo(acctPay)!=0){
-                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSetlId()+" 账户支付："+clinicSettle.getAcctPay()+" payment记录账户支付金额："+acctPay);
+                if (clinicSettle.getAcctPay().compareTo(acctPay) != 0) {
+                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSetlId()
+                        + " 账户支付：" + clinicSettle.getAcctPay() + " payment记录账户支付金额：" + acctPay);
                 }
-                if(clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt)!=0){
-                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSetlId()+" 账户支付："+clinicSettle.getMedfeeSumamt()+" payment记录账户支付金额："+medfeeSumamt);
+                if (clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt) != 0) {
+                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSetlId()
+                        + " 账户支付：" + clinicSettle.getMedfeeSumamt() + " payment记录账户支付金额：" + medfeeSumamt);
                 }
-                if(clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt)!=0){
-                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSetlId()+" 账户支付："+clinicSettle.getFundPaySumamt()+" payment记录账户支付金额："+fundPaySumamt);
+                if (clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt) != 0) {
+                    throw new ServiceException("医保正结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSetlId()
+                        + " 账户支付：" + clinicSettle.getFundPaySumamt() + " payment记录账户支付金额：" + fundPaySumamt);
                 }
                 String param2207 = clinicSettle.getParam2207();
                 Clinic2207OrderParam clinic2207OrderParam = JSON.parseObject(param2207, Clinic2207OrderParam.class);
@@ -1548,20 +1751,24 @@ public class YbDao {
                 mdtrtId = clinic2207OrderParam.getMdtrtId();
             }
 
-            if(unSettleOptional.isPresent()){
+            if (unSettleOptional.isPresent()) {
                 ClinicUnSettle clinicSettle = unSettleOptional.get();
-                if(clinicSettle.getAcctPay().compareTo(acctPay)!=0){
-                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSettleId()+" 账户支付："+clinicSettle.getAcctPay()+" payment记录账户支付金额："+acctPay);
+                if (clinicSettle.getAcctPay().compareTo(acctPay) != 0) {
+                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSettleId()
+                        + " 账户支付：" + clinicSettle.getAcctPay() + " payment记录账户支付金额：" + acctPay);
                 }
-                if(clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt)!=0){
-                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSettleId()+" 账户支付："+clinicSettle.getMedfeeSumamt()+" payment记录账户支付金额："+medfeeSumamt);
+                if (clinicSettle.getMedfeeSumamt().compareTo(medfeeSumamt) != 0) {
+                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSettleId()
+                        + " 账户支付：" + clinicSettle.getMedfeeSumamt() + " payment记录账户支付金额：" + medfeeSumamt);
                 }
-                if(clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt)!=0){
-                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id："+clinicSettle.getSettleId()+" 账户支付："+clinicSettle.getFundPaySumamt()+" payment记录账户支付金额："+fundPaySumamt);
+                if (clinicSettle.getFundPaySumamt().compareTo(fundPaySumamt) != 0) {
+                    throw new ServiceException("医保反结记录与业务记录账户支付金额不等！请核对！错误信息：医保结算id：" + clinicSettle.getSettleId()
+                        + " 账户支付：" + clinicSettle.getFundPaySumamt() + " payment记录账户支付金额：" + fundPaySumamt);
                 }
                 refdSetlFlag = Whether.YES.getCode();
                 String param2208 = clinicSettle.getParam2208();
-                Clinic2208UnSetlInfoParam clinic2208UnSetlInfoParam = JSON.parseObject(param2208, Clinic2208UnSetlInfoParam.class);
+                Clinic2208UnSetlInfoParam clinic2208UnSetlInfoParam =
+                    JSON.parseObject(param2208, Clinic2208UnSetlInfoParam.class);
                 psnNo = clinic2208UnSetlInfoParam.getPsnNo();
                 mdtrtId = clinic2208UnSetlInfoParam.getMdtrtId();
             }
@@ -1569,7 +1776,7 @@ public class YbDao {
             financial3202OtherParam = new Financial3202OtherParam();
 
             financial3202OtherParam.setSetlId(settleId).setAcctPay(acctPay).setFundPaySumamt(fundPaySumamt)
-                    .setMdtrtId(mdtrtId).setPsnNo(psnNo).setMedfeeSumamt(medfeeSumamt).setRefdSetlFlag(refdSetlFlag);
+                .setMdtrtId(mdtrtId).setPsnNo(psnNo).setMedfeeSumamt(medfeeSumamt).setRefdSetlFlag(refdSetlFlag);
             financial3202OtherParam.setCashPayamt(cashPay).setMedSumfee(medSumfee);
             financial3202FileParamList.add(financial3202OtherParam);
         }
@@ -1579,98 +1786,937 @@ public class YbDao {
 
     /**
      * 获取3202的现金支付金额
+     *
      * @param settlementIdList
      */
-    public FinancialSettlement3202Param getFinancialSettlement3202Param(List<String> settlementIdList, BigDecimal a,BigDecimal b) {
+    public FinancialSettlement3202Param getFinancialSettlement3202Param(List<String> settlementIdList, BigDecimal a,
+        BigDecimal b) {
 
-        //Financial3202OtherParam financial3202OtherParam = new Financial3202OtherParam();
+        // Financial3202OtherParam financial3202OtherParam = new Financial3202OtherParam();
         BigDecimal cashPay = BigDecimal.ZERO;
 
-        //比较yb_clinic_settle表和payment系列表数据是否一致
-        //查询医保表数据
-        List<ClinicSettle> clinicSettles = iClinicSettleService.list(new LambdaQueryWrapper<ClinicSettle>().in(ClinicSettle::getSetlId, settlementIdList));
-        List<ClinicUnSettle> clinicUnSettles = iClinicUnSettleService.list(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settlementIdList));
-        //防空指针
-        if(clinicSettles==null){
+        // 比较yb_clinic_settle表和payment系列表数据是否一致
+        // 查询医保表数据
+        List<ClinicSettle> clinicSettles = iClinicSettleService
+            .list(new LambdaQueryWrapper<ClinicSettle>().in(ClinicSettle::getSetlId, settlementIdList));
+        List<ClinicUnSettle> clinicUnSettles = iClinicUnSettleService
+            .list(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settlementIdList));
+        // 防空指针
+        if (clinicSettles == null) {
             clinicSettles = new ArrayList<>();
         }
-        if(clinicUnSettles==null){
+        if (clinicUnSettles == null) {
             clinicUnSettles = new ArrayList<>();
         }
-        List<Date> clinicSettleTime = clinicSettles.stream().map(ClinicSettle::getSetlTime).collect(Collectors.toList());
-        List<Date> clinicUnSettleTime = clinicUnSettles.stream().map(ClinicUnSettle::getSetlTime).collect(Collectors.toList());
+        List<Date> clinicSettleTime =
+            clinicSettles.stream().map(ClinicSettle::getSetlTime).collect(Collectors.toList());
+        List<Date> clinicUnSettleTime =
+            clinicUnSettles.stream().map(ClinicUnSettle::getSetlTime).collect(Collectors.toList());
         clinicSettleTime.addAll(clinicUnSettleTime);
 
         Date stmtBegndate = null;
         Date stmtEnddate = null;
 
         // 获取最早的日期
-        Optional<Date> minDate = clinicSettleTime.stream()
-                .min(Date::compareTo);
+        Optional<Date> minDate = clinicSettleTime.stream().min(Date::compareTo);
 
         // 获取最晚的日期
-        Optional<Date> maxDate = clinicSettleTime.stream()
-                .max(Date::compareTo);
+        Optional<Date> maxDate = clinicSettleTime.stream().max(Date::compareTo);
 
-        if(!minDate.isPresent()||!maxDate.isPresent()){
+        if (!minDate.isPresent() || !maxDate.isPresent()) {
             throw new ServiceException("未查询到医保结算时间");
         }
         stmtBegndate = minDate.get();
         stmtEnddate = maxDate.get();
 
-        //payment的id集合
-        //List<Long> paymentReconciliationIdList = paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
-
-        //查询详情表数据
-        List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getPayTransText, settlementIdList).ne(PaymentRecDetail::getPayTransNo, "0000").ne(PaymentRecDetail::getPayTransText,"0000").isNotNull(PaymentRecDetail::getPayTransText));
-        if(paymentRecDetailList.isEmpty()){
+        // payment的id集合
+        // List<Long> paymentReconciliationIdList =
+        // paymentReconciliations.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
+
+        // 查询详情表数据
+        List<PaymentRecDetail> paymentRecDetailList = iPaymentRecDetailService
+            .list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getPayTransText, settlementIdList)
+                .ne(PaymentRecDetail::getPayTransNo, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentRecDetail::getPayTransText, CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_ALI_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VX_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_UNION_VALUE.getValue())
+                .ne(PaymentRecDetail::getPayEnum, YbPayment.SELF_CASH_VALUE.getValue())
+                .isNotNull(PaymentRecDetail::getPayTransText));
+        if (paymentRecDetailList.isEmpty()) {
             throw new ServiceException("该时间内无付款明细记录");
         }
         // 该部分代码为辅助调试时使用，无任何业务处理 start
         for (PaymentRecDetail paymentRecDetail : paymentRecDetailList) {
-            if(StringUtils.isEmpty(paymentRecDetail.getPayTransNo())){
+            if (StringUtils.isEmpty(paymentRecDetail.getPayTransNo())) {
                 System.out.println(JSON.toJSONString(paymentRecDetail));
                 throw new ServiceException("paymentDetail无返回交易码");
             }
         }
-        //end
+        // end
 
-        Map<String, List<PaymentRecDetail>> paymentRecDetailMapBySettleId = paymentRecDetailList.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransText));
+        Map<String, List<PaymentRecDetail>> paymentRecDetailMapBySettleId =
+            paymentRecDetailList.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransText));
 
-        //List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
-        //Financial3202FileParam financial3202FileParam;
+        // List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
+        // Financial3202FileParam financial3202FileParam;
         for (Map.Entry<String, List<PaymentRecDetail>> stringListEntry : paymentRecDetailMapBySettleId.entrySet()) {
-            //获取settleId
+            // 获取settleId
             String settleId = stringListEntry.getKey();
-            if("0000".equals(settleId)){
+            if (CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(settleId)) {
                 continue;
             }
-            Optional<ClinicSettle> settleOptional = clinicSettles.stream().filter(e -> settleId.equals(e.getSetlId())).findAny();
-            Optional<ClinicUnSettle> unSettleOptional = clinicUnSettles.stream().filter(e -> settleId.equals(e.getSettleId())).findAny();
-            if(!settleOptional.isPresent()&&!unSettleOptional.isPresent()){
-                throw new ServiceException("付款详情中结算id在医保记录中不存在，错误信息：paymentId："+stringListEntry.getValue().get(0).getReconciliationId()+"；医保结算id"+settleId);
+            Optional<ClinicSettle> settleOptional =
+                clinicSettles.stream().filter(e -> settleId.equals(e.getSetlId())).findAny();
+            Optional<ClinicUnSettle> unSettleOptional =
+                clinicUnSettles.stream().filter(e -> settleId.equals(e.getSettleId())).findAny();
+            if (!settleOptional.isPresent() && !unSettleOptional.isPresent()) {
+                throw new ServiceException("付款详情中结算id在医保记录中不存在，错误信息：paymentId："
+                    + stringListEntry.getValue().get(0).getReconciliationId() + "；医保结算id" + settleId);
             }
-            if(settleOptional.isPresent()&&unSettleOptional.isPresent()){
-                throw new ServiceException("付款详情中结算id在医保记录中同时存在正结和反结，错误信息：paymentId："+stringListEntry.getValue().get(0).getReconciliationId()+"；医保结算id"+settleId);
+            if (settleOptional.isPresent() && unSettleOptional.isPresent()) {
+                throw new ServiceException("付款详情中结算id在医保记录中同时存在正结和反结，错误信息：paymentId："
+                    + stringListEntry.getValue().get(0).getReconciliationId() + "；医保结算id" + settleId);
             }
-            //校对金额
+            // 校对金额
             for (PaymentRecDetail paymentRecDetail : stringListEntry.getValue()) {
-                if(YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())&&!"0000".equals(paymentRecDetail.getPayTransNo())&&!"0000".equals(paymentRecDetail.getPayTransText())){
+                if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())
+                    && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(paymentRecDetail.getPayTransNo())
+                    && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(paymentRecDetail.getPayTransText())) {
                     cashPay = cashPay.add(paymentRecDetail.getAmount());
                 }
             }
         }
 
-
         FinancialSettlement3202Param financialSettlement3202Param = new FinancialSettlement3202Param();
-        financialSettlement3202Param.setCashPayamt(cashPay).setMedfeeSumamt(a)
-                .setFundPaySumamt(b).setStmtBegndate(stmtBegndate).setStmtEnddate(stmtEnddate);
+        financialSettlement3202Param.setCashPayamt(cashPay).setMedfeeSumamt(a).setFundPaySumamt(b)
+            .setStmtBegndate(stmtBegndate).setStmtEnddate(stmtEnddate);
 
         return financialSettlement3202Param;
     }
 
     public void uploadFinancialSettlement3202Param(FinancialSettlement3202Param financialSettlement3202Param) {
 
+    }
+
+    public Page<FinancialApplyRecord> getFinancial3203APage(String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request) {
+
+        QueryWrapper<FinancialApplyRecord> queryWrapper = HisQueryUtils.buildQueryWrapper(new FinancialApplyRecord(),
+            searchKey, new HashSet<>(Arrays.asList("out_result")), null);
+        // 设置排序
+        queryWrapper.orderByDesc("create_time");
+
+        // 申请信息
+        Page<FinancialApplyRecord> financialApplyRecordPage = HisPageUtils.selectPage(
+            iFinancialApplyRecordService.getBaseMapper(), queryWrapper, pageNo, pageSize, FinancialApplyRecord.class);
+
+        return financialApplyRecordPage;
+    }
+
+    /**
+     * 根据申请结算ID查找申请结算记录
+     *
+     * @param clrAppyEvtId
+     * @return
+     */
+    public FinancialApplyRecord getFinancial3204ParamByClrAppyEvtId(String clrAppyEvtId) {
+
+        FinancialApplyRecord financialApplyRecord = iFinancialApplyRecordService
+            .getOne(new LambdaQueryWrapper<FinancialApplyRecord>().eq(FinancialApplyRecord::getOutResult, clrAppyEvtId)
+                .orderByDesc(FinancialApplyRecord::getId).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (financialApplyRecord == null) {
+            throw new ServiceException("未查询到申请记录");
+        }
+        return financialApplyRecord;
+    }
+
+    /**
+     * 【2301】住院费用明细上传
+     *
+     * @param encounterId 就诊id
+     * @return 2301入参
+     */
+    public Yb2301InputFeeDetailModel getYb2301FeeDetailParam(Long encounterId, List<Long> chargeItemIds) {
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊记录");
+        }
+
+        InpatientReg inpatientReg = iInpatientRegService
+            .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
+                .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保就诊记录");
+        }
+
+        // 获取今天和昨天的上午10点时间
+        // LocalDateTime today10AM = LocalDateTime.of(LocalDate.now(), LocalTime.of(10, 0)); // 今天10点
+        // LocalDateTime yesterday10AM = today10AM.minusDays(1); // 昨天10点（自动处理跨月/年）
+
+        // List<ChargeItem> chargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .eq(ChargeItem::getEncounterId, encounterId).between(ChargeItem::getEnteredDate, yesterday10AM, today10AM));
+        // List<ChargeItem> chargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .eq(ChargeItem::getEncounterId, encounterId).in(ChargeItem::getId, chargeItemIds));
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtos =
+            iChargeItemService.getChargeItemBaseInfoByIds(chargeItemIds);
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtosList = new ArrayList<>();
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtos) {
+            if (chargeItemBaseInfoDto.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+                continue;
+            }
+            if (!StringUtils.isEmpty(chargeItemBaseInfoDto.getChildrenJson())) {
+                // 反序列化：将JSON数组字符串转为List<>
+                List<ChargeItemBaseInfoDto> chargeItemBaseInfoList =
+                    JSON.parseArray(chargeItemBaseInfoDto.getChildrenJson(), ChargeItemBaseInfoDto.class);
+                chargeItemBaseInfoDtosList.addAll(chargeItemBaseInfoList);
+            } else {
+                chargeItemBaseInfoDtosList.add(chargeItemBaseInfoDto);
+            }
+        }
+        Yb2301InputFeeDetail yb2301InputFeeDetail;
+        List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList();
+        // int i = 1;
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtosList) {
+            yb2301InputFeeDetail = new Yb2301InputFeeDetail();
+            yb2301InputFeeDetail.setFeedetlSn(chargeItemBaseInfoDto.getBusNo()).setMdtrtId(inpatientReg.getMdtrtId())
+                .setPsnNo(inpatientReg.getPsnNo()).setMedType(String.valueOf(encounter.getYbClassEnum()))
+                .setFeeOcurTime(chargeItemBaseInfoDto.getEnteredDate()).setMedListCodg(chargeItemBaseInfoDto.getYbNo())
+                .setMedinsListCodg(chargeItemBaseInfoDto.getBaseBusNo())
+                .setDetItemFeeSumamt(chargeItemBaseInfoDto.getTotalPrice())
+                .setCnt(new BigDecimal(chargeItemBaseInfoDto.getQuantityValue()))
+                .setPric(chargeItemBaseInfoDto.getUnitPrice()).setBilgDeptName(chargeItemBaseInfoDto.getDeptName())
+                .setBilgDrName(chargeItemBaseInfoDto.getDoctName()).setBilgDeptCodg(chargeItemBaseInfoDto.getDeptYbNo())
+                .setBilgDrCodg(chargeItemBaseInfoDto.getDoctYbNo());
+
+            yb2301InputFeeDetailList.add(yb2301InputFeeDetail);
+        }
+
+        Yb2301InputFeeDetailModel yb2301InputFeeDetailModel = new Yb2301InputFeeDetailModel();
+        yb2301InputFeeDetailModel.setFeedetail(yb2301InputFeeDetailList)
+            .setInsuplcAdmdvs(inpatientReg.getInsuplcAdmdvs());
+        return yb2301InputFeeDetailModel;
+    }
+
+    /**
+     * 【2302】费用明细上传撤销
+     *
+     * @param chargeItemId 收费项
+     * @return 2302入参
+     */
+    public Yb2302InputInpatient getYb2302InpatientParam(Long chargeItemId) {
+        ChargeItem chargeItem = iChargeItemService.getById(chargeItemId);
+        if (chargeItem == null) {
+            throw new ServiceException("未查询到收费项信息");
+        }
+        InpatientFeeDetail inpatientFeeDetail = inpatientFeeDetailService.getOne(
+            new LambdaQueryWrapper<InpatientFeeDetail>().eq(InpatientFeeDetail::getFeedetlSn, chargeItem.getBusNo())
+                .eq(InpatientFeeDetail::getDeleteFlag, DelFlag.NO.getCode()));
+        if (inpatientFeeDetail == null) {
+            throw new ServiceException("未查询到费用上传信息");
+        }
+        Yb2302InputInpatient yb2302InputInpatient = new Yb2302InputInpatient();
+
+        return yb2302InputInpatient.setMdtrtId(inpatientFeeDetail.getMdtrtId()).setPsnNo(inpatientFeeDetail.getPsnNo())
+            .setFeedetlSn(inpatientFeeDetail.getFeedetlSn());
+
+    }
+
+    /**
+     * 【2303】住院预结算
+     * 
+     * @param encounterId 就诊id
+     * @return 2303入参
+     */
+    public Yb2303InputInpatient getYb2303InpatientPram(Long encounterId, List<Long> chargeItemIds) {
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到挂号信息");
+        }
+        InpatientReg inpatientReg = iInpatientRegService
+            .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
+                .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保就诊记录");
+        }
+        InfoPerson infoPerson = iPerinfoService.getByPsnNo(inpatientReg.getPsnNo());
+        if (infoPerson == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+        // 获取今天和昨天的上午10点时间
+        // LocalDateTime today10AM = LocalDateTime.of(LocalDate.now(), LocalTime.of(10, 0)); // 今天10点
+        // LocalDateTime yesterday10AM = today10AM.minusDays(1); // 昨天10点（自动处理跨月/年）
+
+        // List<ChargeItem> chargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .eq(ChargeItem::getEncounterId, encounterId).between(ChargeItem::getEnteredDate, yesterday10AM, today10AM));
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtos =
+            iChargeItemService.getChargeItemBaseInfoByIds(chargeItemIds);
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtosList = new ArrayList<>();
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtos) {
+            if (chargeItemBaseInfoDto.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+                continue;
+            }
+            if (!StringUtils.isEmpty(chargeItemBaseInfoDto.getChildrenJson())) {
+                // 反序列化：将JSON数组字符串转为List<>
+                List<ChargeItemBaseInfoDto> chargeItemBaseInfoList =
+                    JSON.parseArray(chargeItemBaseInfoDto.getChildrenJson(), ChargeItemBaseInfoDto.class);
+                chargeItemBaseInfoDtosList.addAll(chargeItemBaseInfoList);
+            } else {
+                chargeItemBaseInfoDtosList.add(chargeItemBaseInfoDto);
+            }
+        }
+        // 计算医疗总费用
+        BigDecimal medfee_sumamt = BigDecimal.ZERO;
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtosList) {
+            medfee_sumamt = medfee_sumamt.add(chargeItemBaseInfoDto.getTotalPrice());
+        }
+
+        Yb2303InputInpatient yb2303InputInpatient = new Yb2303InputInpatient();
+        yb2303InputInpatient.setPsnNo(infoPerson.getPsnNo())
+            .setMdtrtCertType(YbMdtrtCertType.MDTRT_CERT_TYPE02.getValue()).setMdtrtCertNo(infoPerson.getCertno())
+            .setMedfeeSumamt(medfee_sumamt).setPsnSetlway(YbPsnSetlWay.PSN_SETLWAY01.getValue())
+            .setMdtrtId(inpatientReg.getMdtrtId()).setInsutype(infoPerson.getInsutype())
+            .setInsuplcAdmdvs(infoPerson.getInsuplcAdmdvs())
+            .setMdtrtareaAdmvs(iContractService.getContractListByYb().get(0).getAdmVs());
+
+        // todo:中如结算标志需要判断一下，待2304接口开发完成后编辑
+
+        return yb2303InputInpatient;
+    }
+
+    /**
+     * 【2304】住院结算
+     * 
+     * @param paymentDto 预结算参数
+     * @return 2304入参
+     */
+    public Yb2304InputInpatient getYb2304InpatientParam(PaymentInpatientDto paymentDto) {
+        Encounter encounter = iEncounterService.getById(paymentDto.getEncounterId());
+        if (encounter == null) {
+            throw new ServiceException("未查询到挂号信息");
+        }
+        // 查询挂号信息
+        InpatientReg inpatientReg = iInpatientRegService
+            .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
+                .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保就诊记录");
+        }
+        InfoPerson infoPerson = iPerinfoService.getByPsnNo(inpatientReg.getPsnNo());
+        if (infoPerson == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+
+        // List<ChargeItem> chargeItemList =
+        // iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, encounterId)
+        // .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtos =
+            iChargeItemService.getChargeItemBaseInfoByIds(paymentDto.getChargeItemIds());
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtosList = new ArrayList<>();
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtos) {
+            if (chargeItemBaseInfoDto.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+                continue;
+            }
+            if (!StringUtils.isEmpty(chargeItemBaseInfoDto.getChildrenJson())) {
+                // 反序列化：将JSON数组字符串转为List<>
+                List<ChargeItemBaseInfoDto> chargeItemBaseInfoList =
+                    JSON.parseArray(chargeItemBaseInfoDto.getChildrenJson(), ChargeItemBaseInfoDto.class);
+                chargeItemBaseInfoDtosList.addAll(chargeItemBaseInfoList);
+            } else {
+                chargeItemBaseInfoDtosList.add(chargeItemBaseInfoDto);
+            }
+        }
+        // 计算医疗总费用
+        BigDecimal medfee_sumamt = BigDecimal.ZERO;
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtosList) {
+            medfee_sumamt = medfee_sumamt.add(chargeItemBaseInfoDto.getTotalPrice());
+        }
+
+        Yb2304InputInpatient yb2304InputInpatient = new Yb2304InputInpatient();
+        yb2304InputInpatient.setPsnNo(infoPerson.getPsnNo())
+            .setMdtrtCertType(YbMdtrtCertType.getByValue(paymentDto.getYbMdtrtCertType()).getValue())
+            .setMdtrtCertNo(paymentDto.getBusiCardInfo()).setMedfeeSumamt(medfee_sumamt)
+            .setPsnSetlway(YbPsnSetlWay.PSN_SETLWAY01.getValue()).setMdtrtId(inpatientReg.getMdtrtId())
+            .setInsutype(infoPerson.getInsutype()).setInsuplcAdmdvs(infoPerson.getInsuplcAdmdvs())
+            .setMdtrtareaAdmvs(iContractService.getContractListByYb().get(0).getAdmVs())
+            .setAcctUsedFlag(Whether.YES.getCode());
+
+        // todo:中如结算标志需要判断一下，待2304接口开发完成后编辑
+
+        return yb2304InputInpatient;
+    }
+
+    /**
+     * 【2305】撤销结算
+     * 
+     * @param inpatientSettle 结算实体
+     * @return 2305入参
+     */
+    public Yb2305InputInpatient getYb2305InpatientParam(InpatientSettle inpatientSettle) {
+
+        // inpatientSettle = inpatientSettleService.getBySettleId(ybSettleId);
+        Yb2305InputInpatient yb2305InputInpatient = new Yb2305InputInpatient();
+        return yb2305InputInpatient.setMdtrtId(inpatientSettle.getMdtrtId()).setPsnNo(inpatientSettle.getPsnNo())
+            .setSetlId(inpatientSettle.getSetlId());
 
     }
+
+    /**
+     * 【2401】 办理入院
+     * 
+     * @param encounterId 就诊id
+     * @return 2401参数
+     */
+    public Yb2401InputInpatientMdtrtInfo getYb2401InputInpatientMdtrtInfo(Long encounterId) {
+
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+
+        Account account = iAccountService.getYbAccount(encounterId);
+        if (account == null) {
+            throw new ServiceException("未查询到医保账户信息");
+        }
+        // if (account.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+        // throw new ServiceException("挂号账户为自费账户，无法办理医保住院登记");
+        // }
+
+        Contract contract = iContractService.getContract(account.getContractNo());
+        if (contract == null) {
+            throw new ServiceException("未查询到对应合同信息");
+        }
+
+        Patient patient = iPatientService.getById(encounter.getPatientId());
+        if (patient == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+
+        InfoPerson infoPerson =
+            iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
+        if (infoPerson == null) {
+            throw new ServiceException("未查询到患者的医保信息");
+        }
+
+        List<EncounterDiagnosis> diagnosisList = iEncounterDiagnosisService.getDiagnosisList(encounterId);
+        if (diagnosisList.isEmpty()) {
+            throw new ServiceException("未查询到诊断信息");
+        }
+
+        EncounterDiagnosis mainDiagnosis = iEncounterDiagnosisService.getMainDiagnosis(diagnosisList);
+        if (mainDiagnosis == null) {
+            throw new ServiceException("未查询到主诊断信息");
+        }
+
+        Condition condition = iConditionService.getById(mainDiagnosis.getConditionId());
+        if (condition == null) {
+            throw new ServiceException("未查询到主诊断信息");
+        }
+
+        ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(condition.getDefinitionId());
+        if (conditionDefinition == null) {
+            throw new ServiceException("未查询到主诊断定义信息");
+        }
+
+        List<EncounterParticipant> encounterParticipantListByTypeCode = iEncounterParticipantService
+            .getEncounterParticipantListByTypeCode(encounterId, ParticipantType.ADMITTING_DOCTOR);
+        if (encounterParticipantListByTypeCode.isEmpty()) {
+            throw new ServiceException("未查询到住院医生信息");
+        }
+
+        Practitioner practitioner =
+            iPractitionerService.getById(encounterParticipantListByTypeCode.get(0).getPractitionerId());
+        if (practitioner == null) {
+            throw new ServiceException("未查询到住院医生信息");
+        }
+
+        List<EncounterLocation> encounterLocationList = iEncounterLocationService.getEncounterLocationList(encounterId,
+            LocationForm.BED, EncounterLocationStatus.ACTIVE);
+        if (encounterLocationList.isEmpty()) {
+            throw new ServiceException("未查询到床位信息");
+        }
+
+        Organization organization = iOrganizationService.getById(practitioner.getOrgId());
+        if (organization == null) {
+            throw new ServiceException("未查询到就诊科室信息");
+        }
+
+        Yb2401InputInpatientMdtrtInfo yb2401InputInpatientMdtrtInfo = new Yb2401InputInpatientMdtrtInfo();
+        yb2401InputInpatientMdtrtInfo
+            // 人员编号
+            .setPsnNo(infoPerson.getPsnNo())
+            // 险种类型
+            .setInsutype(infoPerson.getInsutype())
+            // 开始时间
+            .setBegntime(encounter.getStartTime())
+            // 就诊凭证类型
+            .setMdtrtCertType(YbMdtrtCertType.MDTRT_CERT_TYPE02.getCode())
+            // 病历号
+            .setMedrcdno(encounter.getBusNo())
+            // 医疗类别
+            .setMedType(mainDiagnosis.getMedTypeCode())
+            // 住院号
+            .setIptNo(encounter.getBusNo())
+            // 主治医生编码
+            .setAtddrNo(practitioner.getYbNo())
+            // 主诊医师姓名
+            .setChfpdrName(practitioner.getName())
+            // 入院诊断描述
+            .setAdmDiagDscr("")
+            // 入院科室编码
+            .setAdmDeptCodg(organization.getYbNo())
+            // 入院科室名称
+            .setAdmDeptName(organization.getName())
+            // 入院床位
+            .setAdmBed(encounterLocationList.get(0).getLocationId().toString())
+            // 住院主诊断代码
+            .setDscgMaindiagCode(conditionDefinition.getYbNo())
+            // 住院主诊断名称
+            .setDscgMaindiagName(conditionDefinition.getName())
+            // 参保地医保区划
+            .setInsuplcAdmdvs(infoPerson.getInsuplcAdmdvs())
+            // 就医地医保区划
+            .setMdtrtareaAdmvs(contract.getAdmVs());
+        return yb2401InputInpatientMdtrtInfo;
+    }
+
+    /**
+     * 【2402】办理出院
+     * 
+     * @param encounterId 就诊id
+     * @return 2402参数
+     */
+    public Yb2402InputParam getYb2402InputInpatientDscgInfo(Long encounterId) {
+
+        Yb2402InputParam yb2402InputParam = new Yb2402InputParam();
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+
+        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保挂号信息");
+        }
+
+        Account account = iAccountService.getAccountByEncounterFlag(encounterId);
+        if (account == null) {
+            throw new ServiceException("未查询到账户信息");
+        }
+        if (account.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+            throw new ServiceException("挂号账户为自费账户，无法办理医保住院登记");
+        }
+
+        Contract contract = iContractService.getContract(account.getContractNo());
+        if (contract == null) {
+            throw new ServiceException("未查询到对应合同信息");
+        }
+
+        Patient patient = iPatientService.getById(encounter.getPatientId());
+        if (patient == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+
+        // InfoPerson infoPerson =
+        // iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
+        // if (infoPerson == null) {
+        // throw new ServiceException("未查询到患者的医保信息");
+        // }
+
+        List<EncounterDiagnosis> diagnosisList =
+            iEncounterDiagnosisService.getDiagnosisList(encounterId, YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS);
+        if (diagnosisList.isEmpty()) {
+            throw new ServiceException("未查询到出院诊断信息");
+        }
+
+        // EncounterDiagnosis mainDiagnosis = iEncounterDiagnosisService.getMainDiagnosis(diagnosisList);
+        // if (mainDiagnosis == null) {
+        // throw new ServiceException("未查询到主诊断信息");
+        // }
+
+        List<Condition> conditionList = iConditionService.getConditionListById(
+            diagnosisList.stream().map(EncounterDiagnosis::getConditionId).collect(Collectors.toList()));
+        if (conditionList.isEmpty()) {
+            throw new ServiceException("未查询到诊断信息");
+        }
+        if (conditionList.size() != diagnosisList.size()) {
+            throw new ServiceException("数据异常：查询到诊断信息与诊断定义信息数量不相等");
+        }
+
+        List<ConditionDefinition> conditionDefinitionList = iConditionDefinitionService.getConditionDefinitionListByIds(
+            conditionList.stream().map(Condition::getDefinitionId).collect(Collectors.toList()));
+        if (conditionDefinitionList.isEmpty()) {
+            throw new ServiceException("未查询到主诊断定义信息");
+        }
+
+        List<EncounterParticipant> encounterParticipantListByTypeCode = iEncounterParticipantService
+            .getEncounterParticipantListByTypeCode(encounterId, ParticipantType.ADMITTING_DOCTOR);
+        if (encounterParticipantListByTypeCode.isEmpty()) {
+            throw new ServiceException("未查询到住院医生信息");
+        }
+
+        List<Practitioner> practitionerList =
+            iPractitionerService.getPractitionerListById(encounterParticipantListByTypeCode.stream()
+                .map(EncounterParticipant::getPractitionerId).collect(Collectors.toList()));// 20250730被告知一个住院患者只有一套门诊医生住院医生护士等（主治医生和主任医生不一定会有），不存在一个患者多个医生
+        if (practitionerList.isEmpty()) {
+            throw new ServiceException("未查询到住院医生信息");
+        }
+
+        List<EncounterLocation> encounterLocationList = iEncounterLocationService.getEncounterLocationList(encounterId,
+            LocationForm.BED, EncounterLocationStatus.ACTIVE);
+        if (encounterLocationList.isEmpty()) {
+            throw new ServiceException("未查询到床位信息");
+        }
+
+        List<Organization> organizationList = iOrganizationService.getOrganizationListById(
+            practitionerList.stream().map(Practitioner::getOrgId).collect(Collectors.toList()));
+        if (organizationList.isEmpty()) {
+            throw new ServiceException("未查询到就诊科室信息");
+        }
+
+        Yb2402InputInpatientDscgInfo yb2402InputInpatientDscgInfo = new Yb2402InputInpatientDscgInfo();
+        yb2402InputInpatientDscgInfo
+            // 就诊ID
+            .setMdtrtId(inpatientReg.getMdtrtId())
+            // 人员编号
+            .setPsnNo(inpatientReg.getPsnNo())
+            // 险种类型
+            .setInsutype(inpatientReg.getInsutype())
+            // 结束时间
+            .setEndtime(encounter.getEndTime())
+            // 出院科室编码
+            .setDscgDeptCodg(organizationList.get(0).getYbNo())
+            // 出院科室名称
+            .setDscgDeptName(organizationList.get(0).getName())
+            // 离院方式
+            .setDscgWay("");// todo:离院方式待办
+
+        Map<Long, Condition> mapById =
+            conditionList.stream().collect(Collectors.toMap(Condition::getId, Function.identity()));
+        Map<Long, EncounterParticipant> encounterParticipantMapById = encounterParticipantListByTypeCode.stream()
+            .collect(Collectors.toMap(EncounterParticipant::getId, Function.identity()));
+        Map<Long, ConditionDefinition> conditionDefinitionMapById =
+            conditionDefinitionList.stream().collect(Collectors.toMap(ConditionDefinition::getId, Function.identity()));
+        Map<Long, Organization> organizationMapById =
+            organizationList.stream().collect(Collectors.toMap(Organization::getId, Function.identity()));
+        Map<Long, Practitioner> practitionerMapById =
+            practitionerList.stream().collect(Collectors.toMap(Practitioner::getId, Function.identity()));
+        Yb2402InputInpatientDiseInfo yb2402InputInpatientDiseInfo;
+        List<Yb2402InputInpatientDiseInfo> yb2402InputInpatientDiseInfos = new ArrayList<>();
+        for (EncounterDiagnosis encounterDiagnosis : diagnosisList) {
+            Condition condition = mapById.get(encounterDiagnosis.getConditionId());
+            if (condition == null) {
+                throw new ServiceException(
+                    "数据异常：就诊诊断信息无法关联到诊断信息；异常数据encounterDiagnosisId：" + encounterDiagnosis.getId());
+            }
+            EncounterParticipant encounterParticipant = encounterParticipantMapById.get(condition.getRecorderId());
+            if (encounterParticipant == null) {
+                throw new ServiceException("数据异常：就诊诊断信息无法关联到医生信息；异常数据condition：" + condition.getId());
+            }
+            Practitioner practitioner = practitionerMapById.get(encounterParticipant.getPractitionerId());
+            if (practitioner == null) {
+                throw new ServiceException(
+                    "数据异常：就诊诊断信息无法关联到医生信息；异常数据encounterParticipant：" + encounterParticipant.getId());
+            }
+            ConditionDefinition conditionDefinition = conditionDefinitionMapById.get(condition.getDefinitionId());
+            if (conditionDefinition == null) {
+                throw new ServiceException("数据异常：就诊诊断信息无法关联到诊断定义；异常数据condition：" + condition.getId());
+            }
+            Organization organization = organizationMapById.get(practitioner.getOrgId());
+            if (organization == null) {
+                throw new ServiceException("数据异常：医生信息无法关联到科室；异常数据practitioner：" + practitioner.getId());
+            }
+            yb2402InputInpatientDiseInfo = new Yb2402InputInpatientDiseInfo();
+            yb2402InputInpatientDiseInfo
+                // 就诊id
+                .setMdtrtId(inpatientReg.getMdtrtId())
+                // 人员编号
+                .setPsnNo(inpatientReg.getPsnNo())
+                // 诊断类别
+                .setDiagType(conditionDefinition.getSourceEnum().toString())
+                // 主诊断标志
+                .setMaindiagFlag(encounterDiagnosis.getMaindiseFlag().equals(Whether.YES.getValue())
+                    ? Whether.YES.getCode() : Whether.NO.getCode())
+                // 诊断排序号
+                .setDiagSrtNo(encounterDiagnosis.getDiagSrtNo())
+                // 诊断代码
+                .setDiagCode(conditionDefinition.getYbNo())
+                // 诊断名称
+                .setDiagName(conditionDefinition.getName())
+                // 诊断科室
+                .setDiagDept(organization.getYbNo())
+                // 诊断医生编码
+                .setDiseDorNo(practitioner.getYbNo())
+                // 诊断医生姓名
+                .setDiseDorName(practitioner.getName())
+                // 诊断时间
+                .setDiagTime(encounterDiagnosis.getCreateTime());
+
+            yb2402InputInpatientDiseInfos.add(yb2402InputInpatientDiseInfo);
+        }
+
+        // 拼装参数
+        yb2402InputParam.setYb2402InputInpatientDiseInfo(yb2402InputInpatientDiseInfos);
+        yb2402InputParam.setYb2402InputInpatientDscgInfo(yb2402InputInpatientDscgInfo);
+
+        return yb2402InputParam;
+    }
+
+    /**
+     * 【2403】接口参数
+     * 
+     * @param encounterId 就诊id
+     * @return 2403接口参数
+     */
+    public Yb2403InputParam getYb2403InputParam(Long encounterId) {
+
+        Yb2403InputParam yb24032InputParam = new Yb2403InputParam();
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+
+        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保挂号信息");
+        }
+
+        Account account = iAccountService.getAccountByEncounterFlag(encounterId);
+        if (account == null) {
+            throw new ServiceException("未查询到账户信息");
+        }
+        if (account.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+            throw new ServiceException("挂号账户为自费账户，无法办理医保住院登记");
+        }
+
+        Contract contract = iContractService.getContract(account.getContractNo());
+        if (contract == null) {
+            throw new ServiceException("未查询到对应合同信息");
+        }
+
+        Patient patient = iPatientService.getById(encounter.getPatientId());
+        if (patient == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+
+        // InfoPerson infoPerson =
+        // iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
+        // if (infoPerson == null) {
+        // throw new ServiceException("未查询到患者的医保信息");
+        // }
+
+        List<EncounterDiagnosis> diagnosisList =
+            iEncounterDiagnosisService.getDiagnosisList(encounterId, YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS);
+        if (diagnosisList.isEmpty()) {
+            throw new ServiceException("未查询到出院诊断信息");
+        }
+
+        EncounterDiagnosis mainDiagnosis = iEncounterDiagnosisService.getMainDiagnosis(diagnosisList);
+        if (mainDiagnosis == null) {
+            throw new ServiceException("未查询到主诊断信息");
+        }
+
+        List<Condition> conditionList = iConditionService.getConditionListById(
+            diagnosisList.stream().map(EncounterDiagnosis::getConditionId).collect(Collectors.toList()));
+        if (conditionList.isEmpty()) {
+            throw new ServiceException("未查询到诊断信息");
+        }
+        if (conditionList.size() != diagnosisList.size()) {
+            throw new ServiceException("数据异常：查询到诊断信息与诊断定义信息数量不相等");
+        }
+        Optional<Condition> firstOptional =
+            conditionList.stream().filter(e -> e.getId().equals(mainDiagnosis.getConditionId())).findFirst();
+        if (firstOptional.isEmpty()) {
+            throw new ServiceException("数据异常：主诊断关联不到诊断信息");
+        }
+        Condition mainCondition = firstOptional.get();
+
+        List<ConditionDefinition> conditionDefinitionList = iConditionDefinitionService.getConditionDefinitionListByIds(
+            conditionList.stream().map(Condition::getDefinitionId).collect(Collectors.toList()));
+        if (conditionDefinitionList.isEmpty()) {
+            throw new ServiceException("未查询到主诊断定义信息");
+        }
+        Optional<ConditionDefinition> optional =
+            conditionDefinitionList.stream().filter(e -> e.getId().equals(mainCondition.getDefinitionId())).findFirst();
+        if (optional.isEmpty()) {
+            throw new ServiceException("数据异常：主诊断关联不到诊断信息");
+        }
+        ConditionDefinition mainConditionDefinition = optional.get();
+
+        List<EncounterParticipant> encounterParticipantListByTypeCode = iEncounterParticipantService
+            .getEncounterParticipantListByTypeCode(encounterId, ParticipantType.ADMITTING_DOCTOR);
+        if (encounterParticipantListByTypeCode.isEmpty()) {
+            throw new ServiceException("未查询到住院医生信息");
+        }
+
+        List<Practitioner> practitionerList =
+            iPractitionerService.getPractitionerListById(encounterParticipantListByTypeCode.stream()
+                .map(EncounterParticipant::getPractitionerId).collect(Collectors.toList()));// 20250730被告知一个住院患者只有一套门诊医生住院医生护士等（主治医生和主任医生不一定会有），不存在一个患者多个医生
+        if (practitionerList.isEmpty()) {
+            throw new ServiceException("未查询到住院医生信息");
+        }
+
+        List<EncounterLocation> encounterLocationList = iEncounterLocationService.getEncounterLocationList(encounterId,
+            LocationForm.BED, EncounterLocationStatus.ACTIVE);
+        if (encounterLocationList.isEmpty()) {
+            throw new ServiceException("未查询到床位信息");
+        }
+
+        List<Organization> organizationList = iOrganizationService.getOrganizationListById(
+            practitionerList.stream().map(Practitioner::getOrgId).collect(Collectors.toList()));
+        if (organizationList.isEmpty()) {
+            throw new ServiceException("未查询到就诊科室信息");
+        }
+
+        Yb2403InputAdmInfo yb2403InputAdmInfo = new Yb2403InputAdmInfo();
+        yb2403InputAdmInfo
+            // 就诊ID
+            .setMdtrtId(inpatientReg.getMdtrtId())
+            // 人员编号
+            .setPsnNo(inpatientReg.getPsnNo())
+            // 开始时间
+            .setBegntime(encounter.getStartTime())
+            // 就诊凭证类型
+            .setMdtrtCertType(YbMdtrtCertType.MDTRT_CERT_TYPE02.getCode())
+            // 住院/门诊号
+            .setIptOtpNo(encounter.getBusNo())
+            // 医疗类别
+            .setMedType(mainDiagnosis.getMedTypeCode())
+            // 主治医生编码
+            .setAtddrNo(practitionerList.get(0).getYbNo())
+            // 主诊医师姓名
+            .setChfpdrName(practitionerList.get(0).getName())
+            // 入院诊断描述
+            .setAdmDiagDscr("")
+            // 入院科室编码
+            .setAdmDeptCodg(organizationList.get(0).getYbNo())
+            // 入院科室名称
+            .setAdmDeptName(organizationList.get(0).getName())
+            // 入院床位
+            .setAdmBed(encounterLocationList.get(0).getLocationId().toString())
+            // 住院主诊断代码
+            .setDscgMaindiagCode(mainConditionDefinition.getYbNo())
+            // 住院主诊断名称
+            .setDscgMaindiagName(mainConditionDefinition.getName());
+
+        Map<Long, Condition> mapById =
+            conditionList.stream().collect(Collectors.toMap(Condition::getId, Function.identity()));
+        Map<Long, EncounterParticipant> encounterParticipantMapById = encounterParticipantListByTypeCode.stream()
+            .collect(Collectors.toMap(EncounterParticipant::getId, Function.identity()));
+        Map<Long, ConditionDefinition> conditionDefinitionMapById =
+            conditionDefinitionList.stream().collect(Collectors.toMap(ConditionDefinition::getId, Function.identity()));
+        Map<Long, Organization> organizationMapById =
+            organizationList.stream().collect(Collectors.toMap(Organization::getId, Function.identity()));
+        Map<Long, Practitioner> practitionerMapById =
+            practitionerList.stream().collect(Collectors.toMap(Practitioner::getId, Function.identity()));
+        Yb2403InputDiseInfo yb2403InputDiseInfo;
+        List<Yb2403InputDiseInfo> yb2403InputDiseInfos = new ArrayList<>();
+        for (EncounterDiagnosis encounterDiagnosis : diagnosisList) {
+            Condition condition = mapById.get(encounterDiagnosis.getConditionId());
+            if (condition == null) {
+                throw new ServiceException(
+                    "数据异常：就诊诊断信息无法关联到诊断信息；异常数据encounterDiagnosisId：" + encounterDiagnosis.getId());
+            }
+            EncounterParticipant encounterParticipant = encounterParticipantMapById.get(condition.getRecorderId());
+            if (encounterParticipant == null) {
+                throw new ServiceException("数据异常：就诊诊断信息无法关联到医生信息；异常数据condition：" + condition.getId());
+            }
+            Practitioner practitioner = practitionerMapById.get(encounterParticipant.getPractitionerId());
+            if (practitioner == null) {
+                throw new ServiceException(
+                    "数据异常：就诊诊断信息无法关联到医生信息；异常数据encounterParticipant：" + encounterParticipant.getId());
+            }
+            ConditionDefinition conditionDefinition = conditionDefinitionMapById.get(condition.getDefinitionId());
+            if (conditionDefinition == null) {
+                throw new ServiceException("数据异常：就诊诊断信息无法关联到诊断定义；异常数据condition：" + condition.getId());
+            }
+            Organization organization = organizationMapById.get(practitioner.getOrgId());
+            if (organization == null) {
+                throw new ServiceException("数据异常：医生信息无法关联到科室；异常数据practitioner：" + practitioner.getId());
+            }
+            yb2403InputDiseInfo = new Yb2403InputDiseInfo();
+            yb2403InputDiseInfo
+                // 就诊id
+                .setMdtrtId(inpatientReg.getMdtrtId())
+                // 人员编号
+                .setPsnNo(inpatientReg.getPsnNo())
+                // 诊断类别
+                .setDiagType(conditionDefinition.getSourceEnum().toString())
+                // 主诊断标志
+                .setMaindiagFlag(encounterDiagnosis.getMaindiseFlag().equals(Whether.YES.getValue())
+                    ? Whether.YES.getCode() : Whether.NO.getCode())
+                // 诊断排序号
+                .setDiagSrtNo(encounterDiagnosis.getDiagSrtNo())
+                // 诊断代码
+                .setDiagCode(conditionDefinition.getYbNo())
+                // 诊断名称
+                .setDiagName(conditionDefinition.getName())
+                // 诊断科室
+                .setDiagDept(organization.getYbNo())
+                // 诊断医生编码
+                .setDiseDorNo(practitioner.getYbNo())
+                // 诊断医生姓名
+                .setDiseDorName(practitioner.getName())
+                // 诊断时间
+                .setDiagTime(encounterDiagnosis.getCreateTime());
+
+            yb2403InputDiseInfos.add(yb2403InputDiseInfo);
+        }
+
+        // 拼装参数
+        yb24032InputParam.setYb2403InputDiseInfo(yb2403InputDiseInfos);
+        yb24032InputParam.setYb2403InputAdmInfo(yb2403InputAdmInfo);
+
+        return yb24032InputParam;
+    }
+
+    /**
+     * 【2404】住院办理撤销
+     * 
+     * @param encounterId 就诊id
+     * @return 2404参数
+     */
+    public Yb2404InputInpatient getYb2404InputInpatient(Long encounterId) {
+
+        Yb2404InputInpatient yb2404InputInpatient = new Yb2404InputInpatient();
+
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+
+        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保挂号信息");
+        }
+        yb2404InputInpatient.setMdtrtId(inpatientReg.getMdtrtId()).setPsnNo(inpatientReg.getPsnNo());
+
+        return yb2404InputInpatient;
+    }
+
+    /**
+     * 【2405】出院办理撤销
+     * 
+     * @param encounterId 就诊id
+     * @return 2405参数
+     */
+    public Yb2405InputInpatient getYb2405InputInpatient(Long encounterId) {
+
+        Yb2405InputInpatient yb2405InputInpatient = new Yb2405InputInpatient();
+
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊信息");
+        }
+
+        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保挂号信息");
+        }
+        yb2405InputInpatient.setMdtrtId(inpatientReg.getMdtrtId()).setPsnNo(inpatientReg.getPsnNo());
+
+        return yb2405InputInpatient;
+    }
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
similarity index 55%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
index 3746663a..738f395b 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
@@ -3,7 +3,40 @@
  */
 package com.openhis.yb.service;
 
+import static com.alibaba.fastjson2.JSON.parseObject;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.SecurityUtils;
@@ -13,27 +46,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.service.IContractService;
 import com.openhis.yb.domain.ClinicReg;
 import com.openhis.yb.dto.*;
 import com.openhis.yb.model.Clinic2207OrderModel;
 import com.openhis.yb.model.Clinic2207OrderParam;
 import com.openhis.yb.util.YbParamBuilderUtil;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * http请求接口
@@ -46,21 +65,23 @@ public class YbHttpUtils {
 
     @Autowired
     YbParamBuilderUtil ybParamBuilderUtil;
+    @Autowired
+    IContractService iContractService;
 
     Logger logger = LoggerFactory.getLogger(YbHttpUtils.class);
 
-
     public Info1101Output getPerInfo(Info1101ReadcardParam readcard) {
         // 省名参数
         Result result = null;
         Info1101Output perinfo = null;
         // 发送请求
-        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/getPatinfo", readcard);
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/getPatinfo", readcard, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(resultString));
-        logger.info("【1101】返回参数:"+resultString);
+        logger.info("【1101】返回参数:" + resultString);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -73,7 +94,7 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            perinfo = JSON.parseObject(JSON.toJSONString(result.getResult()), Info1101Output.class);
+            perinfo = parseObject(JSON.toJSONString(result.getResult()), Info1101Output.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
@@ -81,18 +102,17 @@ public class YbHttpUtils {
         return perinfo;
     }
 
-
-    public ClinicReg2201Output reg(ClinicReg reg) {
+    public ClinicReg2201Output reg(ClinicReg reg, Contract contract) {
         // 声名参数
         Result result = null;
         ClinicReg2201Output clinicReg2201Output = new ClinicReg2201Output();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reg", reg);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reg", reg, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【2201】返回参数:"+s);
+        logger.info("【2201】返回参数:" + s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -104,25 +124,25 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            clinicReg2201Output = JSON.parseObject(JSON.toJSONString(result.getResult()), ClinicReg2201Output.class);
+            clinicReg2201Output = parseObject(JSON.toJSONString(result.getResult()), ClinicReg2201Output.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
         return clinicReg2201Output;
     }
 
-
-    public ClinicReg2201Output cancelReg(ClinicReg reg) {
+    public ClinicReg2201Output cancelReg(ClinicReg reg, Contract contract) {
         // 声名参数
         Result result = null;
         ClinicReg2201Output clinicReg2201Output = new ClinicReg2201Output();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancelReg", reg);
+        String s =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancelReg", reg, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【2202】返回参数:"+JSON.toJSONString(s));
+        logger.info("【2202】返回参数:" + JSON.toJSONString(s));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -134,25 +154,25 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            clinicReg2201Output = JSON.parseObject(JSON.toJSONString(result.getResult()), ClinicReg2201Output.class);
+            clinicReg2201Output = parseObject(JSON.toJSONString(result.getResult()), ClinicReg2201Output.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
         return clinicReg2201Output;
     }
 
-
-    public Clinic2204OrderResult upload2204Record(Clinic2204OrderParam clinic2204OrderParam) {
+    public Clinic2204OrderResult upload2204Record(Clinic2204OrderParam clinic2204OrderParam, Contract contract) {
         Clinic2204OrderResult clinicFeedetail2204Result = new Clinic2204OrderResult();
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload2204-record", clinic2204OrderParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload2204-record",
+            clinic2204OrderParam, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【2204】返回参数:"+s);
+        logger.info("【2204】返回参数:" + s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -165,8 +185,7 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            clinicFeedetail2204Result =
-                JSON.parseObject(JSON.toJSONString(result.getResult()), Clinic2204OrderResult.class);
+            clinicFeedetail2204Result = parseObject(JSON.toJSONString(result.getResult()), Clinic2204OrderResult.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
@@ -175,18 +194,18 @@ public class YbHttpUtils {
 
     }
 
-
-    public Clinic2206OrderOutput upload2206Record(Clinic2206OrderParam clinic2206OrderParam) {
+    public Clinic2206OrderOutput upload2206Record(Clinic2206OrderParam clinic2206OrderParam, Contract contract) {
 
         Clinic2206OrderOutput clinic2206OrderResult = new Clinic2206OrderOutput();
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/preSetl", clinic2206OrderParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/preSetl",
+            clinic2206OrderParam, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
-        System.out.println("【2206】返回参数:"+JSON.toJSONString(s));
+        System.out.println("【2206】返回参数:" + JSON.toJSONString(s));
         logger.info(s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
@@ -200,8 +219,7 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            clinic2206OrderResult =
-                JSON.parseObject(JSON.toJSONString(result.getResult()), Clinic2206OrderOutput.class);
+            clinic2206OrderResult = parseObject(JSON.toJSONString(result.getResult()), Clinic2206OrderOutput.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
@@ -209,19 +227,19 @@ public class YbHttpUtils {
         return clinic2206OrderResult;
     }
 
-
-    public Clinic2207OrderModel settle(Clinic2207OrderParam clinicOrder2207) {
+    public Clinic2207OrderModel settle(Clinic2207OrderParam clinicOrder2207, Contract contract) {
 
         Clinic2207OrderModel clinic2206OrderResult = new Clinic2207OrderModel();
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/setl", clinicOrder2207);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/setl", clinicOrder2207,
+            contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【2207】返回参数:"+s);
+        logger.info("【2207】返回参数:" + s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -234,8 +252,7 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            clinic2206OrderResult =
-                JSON.parseObject(JSON.toJSONString(result.getResult()), Clinic2207OrderModel.class);
+            clinic2206OrderResult = parseObject(JSON.toJSONString(result.getResult()), Clinic2207OrderModel.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
@@ -243,20 +260,15 @@ public class YbHttpUtils {
         return clinic2206OrderResult;
     }
 
-
-    public Sign9001Result sign(Sign signParam) {
+    public Sign9001Result sign(Sign signParam, Contract contract) {
         Sign9001Result sign = null;
-
-        //Console.error("BBB:" + signParam.getMac() + "|" + signParam.getIp() + "|" + signParam.getOpterNo());
-
-        //JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
-
-        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/signIn", signParam);
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/signIn", signParam, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(resultString));
-        logger.info("【9001】返回参数:"+resultString);
+        logger.info("【9001】返回参数:" + resultString);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -270,7 +282,7 @@ public class YbHttpUtils {
             throw new ServiceException("未接收到医保返回参数");
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
-            sign = JSON.parseObject(JSON.toJSONString(result.getResult()), Sign9001Result.class);
+            sign = parseObject(JSON.toJSONString(result.getResult()), Sign9001Result.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
@@ -278,12 +290,13 @@ public class YbHttpUtils {
         return sign;
     }
 
-    public void unPreSettle(Clinic2205OrderParam clinic2205OrderParam) {
+    public void unPreSettle(Clinic2205OrderParam clinic2205OrderParam, Contract contract) {
 
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/unPreSettle", clinic2205OrderParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/unPreSettle",
+            clinic2205OrderParam, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -306,18 +319,19 @@ public class YbHttpUtils {
         }
     }
 
-    public Clinic2208UnSetlInfoOutput unSettle(Clinic2208UnSetlInfoParam clinicOrder2208) {
+    public Clinic2208UnSetlInfoOutput unSettle(Clinic2208UnSetlInfoParam clinicOrder2208, Contract contract) {
 
         Clinic2208UnSetlInfoOutput clinicOrder2206Result = new Clinic2208UnSetlInfoOutput();
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancelSetl", clinicOrder2208);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancelSetl",
+            clinicOrder2208, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【2208】返回参数:"+s);
+        logger.info("【2208】返回参数:" + s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -331,24 +345,24 @@ public class YbHttpUtils {
         } else if (result.getCode() == 200) {
             System.out.println(JSON.toJSONString(result.getResult()));
             clinicOrder2206Result =
-                JSON.parseObject(JSON.toJSONString(result.getResult()), Clinic2208UnSetlInfoOutput.class);
+                parseObject(JSON.toJSONString(result.getResult()), Clinic2208UnSetlInfoOutput.class);
         } else {
             throw new ServiceException(result.getMessage());
         }
         return clinicOrder2206Result;
     }
 
-
     public Result directoryCheck(MedicalDirectory3301ListParam medicalDirectory3301ListParam) {
 
         Clinic2208UnSetlInfoResult clinicOrder2206Result = new Clinic2208UnSetlInfoResult();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/directoryCheck", medicalDirectory3301ListParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/directoryCheck",
+            medicalDirectory3301ListParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【3301】返回参数:"+s);
+        logger.info("【3301】返回参数:" + s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -360,15 +374,15 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result directoryUnCheck(MedicalDirectory3302Param medicalDirectory3302Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/directoryUnCheck", medicalDirectory3302Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/directoryUnCheck",
+            medicalDirectory3302Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         System.out.println(JSON.toJSONString(s));
-        logger.info("【3302】返回参数:"+s);
+        logger.info("【3302】返回参数:" + s);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
         Result result = null;
@@ -380,10 +394,26 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result reconcileGeneralLedger(Financial3201Param financial3201Param) {
+
+        // 此处先查询到合同并回填给入参对象
+        List<Contract> redisContractList = iContractService.getContractListByYb();
+        Contract contract;
+        Optional<Contract> max = redisContractList.stream().max(Comparator.comparingInt(Contract::getSort));
+        if (max.isPresent()) {
+            contract = max.get();
+        } else {
+            throw new ServiceException("没有对合同进行优先级排序");
+        }
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reconcile", financial3201Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reconcile",
+            financial3201Param, contract);
+
+        // 赋值（上述回填的两个参数医保不要，为了避免麻烦，在发送http后进行回填）
+        financial3201Param.setFixmedinsCode(contract.getFixmedinsCode());
+        financial3201Param.setFixmedinsName(contract.getFixmedinsName());
+
+        // 医保回参逻辑处理
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -400,10 +430,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public FinancialSettlement3202Result reconcileGeneralLedgerDetail(FinancialSettlement3202Param financial3202Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reconcile-detail", financial3202Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reconcile-detail",
+            financial3202Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -420,11 +450,11 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public List<FinancialSettlement3209AResult>
         threePartSearch(FinancialSettlement3209AParam financialSettlement3209AParam) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/three-part-search-err", financialSettlement3209AParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/three-part-search-err",
+            financialSettlement3209AParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -441,21 +471,21 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public String applyFinancialClearing(Financial3203AParam financial3203AParam) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/apply-clearing", financial3203AParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/apply-clearing",
+            financial3203AParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
         return s;
     }
 
-
     public Result cancelFinancialClearing(Financial3204Param financial3204Param) {
 
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancel-clearing", financial3204Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancel-clearing",
+            financial3204Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -470,10 +500,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Clearing3205AResult getFinancialClearingStatus(Clearing3205AParma clearing3205AParma) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/get-clearing-status", clearing3205AParma);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/get-clearing-status",
+            clearing3205AParma, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -488,10 +518,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result uploadInventoryCount(MedicalInventory3501Param medicalInventory3501Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload-inventory-count", medicalInventory3501Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload-inventory-count",
+            medicalInventory3501Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -506,10 +536,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result updateInventoryCount(MedicalInventory3502Param medicalInventory3502Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/update-inventory", medicalInventory3502Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/update-inventory",
+            medicalInventory3502Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -524,10 +554,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result procurement(Medical3503Param medical3503Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/procurement", medical3503Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/procurement",
+            medical3503Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -542,10 +572,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result cancelProcurement(MedicalPurchase3504Param medicalPurchase3504Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/procurement-cancel", medicalPurchase3504Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/procurement-cancel",
+            medicalPurchase3504Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -560,10 +590,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result merchandise(Medical3505Param medical3505Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/merchandise", medical3505Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/merchandise",
+            medical3505Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -578,10 +608,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result cancelMerchandise(Medical3506Param medical3506Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancel-merchandise", medical3506Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancel-merchandise",
+            medical3506Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -596,10 +626,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
     public Result deleteGoodsInfo(Medical3507Param medical3507Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/del-goods", medical3507Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/del-goods",
+            medical3507Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -614,10 +644,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
-    public Result cancelFeeDetail(Clinic2205OrderParam clinic2205OrderParam) {
+    public Result getClrOptins(Clearing3206AParam clearing3206AParam) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/cancel2205", clinic2205OrderParam);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/getclroptins",
+            clearing3206AParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -632,10 +662,10 @@ public class YbHttpUtils {
         return result;
     }
 
-
-    public Result upload2203Record(Clinic2203MedicalParam medical2203Param) {
+    public Result upload2203Record(Clinic2203MedicalParam medical2203Param, Contract contract) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload2203-record", medical2203Param);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload2203-record",
+            medical2203Param, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -657,11 +687,11 @@ public class YbHttpUtils {
      * @param o 参数
      * @return
      */
-    private String httpPost(String url, Object o) {
+    private String httpPost(String url, Object o, Contract contract) {
         String resultString = "";
         // 拼参数
         BaseParam baseParam = new BaseParam();
-        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo(JSON.parseObject(JSON.toJSONString(o)))).setData(o);
+        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo(parseObject(JSON.toJSONString(o)), contract)).setData(o);
         logger.info("【请求路径】:" + url + ";【入参】: " + JSON.toJSONString(baseParam));
         // 创建Http请求
         RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000).setConnectionRequestTimeout(30000)
@@ -675,33 +705,33 @@ public class YbHttpUtils {
             httpPost.setEntity(stringEntity);
             // 执行http请求
             response = httpClient.execute(httpPost);
-            if(response==null){
+            if (response == null) {
                 throw new ServiceException("Http请求异常，未接受返回参数");
             }
             resultString = EntityUtils.toString(response.getEntity(), "utf-8");
         } catch (Exception e) {
             e.printStackTrace();
             throw new ServiceException("Http请求异常，请稍后再试。");
-        }
-        finally {
+        } finally {
             if (response != null) {
                 try {
                     response.close();
                 } catch (IOException e) {
                     logger.error("关闭响应异常", e);
-                    throw new ServiceException("未关闭系统资源："+e.getStackTrace());
+                    throw new ServiceException("未关闭系统资源：" + e.getStackTrace());
                 }
             }
         }
         return resultString;
     }
 
-
     public List<Catalogue1312Output> queryYbCatalogue(Catalogue1312QueryParam catalogue1312QueryParam) {
         List<Catalogue1312Output> outputList = new ArrayList<>();
         try {
 
-            String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/queryYbCatalogue", catalogue1312QueryParam);
+            String resultString =
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/queryYbCatalogue",
+                    catalogue1312QueryParam, null);
             // System.out.println("--------1312resultString-------------" + resultString);
             // 1. 解析外层 JSON
             ObjectMapper mapper = new ObjectMapper();
@@ -718,4 +748,270 @@ public class YbHttpUtils {
         return outputList;
     }
 
+    public ResponseEntity<String> upload9101(MultipartFile file, String filename) {
+
+        // File9101Param file9101Param = new File9101Param();
+        // file9101Param.setFile(file);
+        // file9101Param.setFilename(filename);
+        List<Contract> contractListByYb = iContractService.getContractListByYb();
+        if (contractListByYb.isEmpty()) {
+            throw new ServiceException("未配置医保合同");
+        }
+        // file9101Param.setFixmedinsCode(contractListByYb.get(0).getFixmedinsCode());
+        // FileResult fileResult = null;
+        ResponseEntity<String> response = null;
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            // 1. 保存到临时文件
+            Path tempFile = Files.createTempFile("upload-", file.getOriginalFilename());
+            file.transferTo(tempFile);
+
+            // 2. 构建转发请求
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+            MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+            body.add("file", new FileSystemResource(tempFile.toFile()));
+            body.add("fixmedinsCode", contractListByYb.get(0).getFixmedinsCode());
+            body.add("userId", SecurityUtils.getUserId());
+            body.add("admvs", contractListByYb.get(0).getAdmVs());
+
+            // 3. 转发并删除临时文件
+            RestTemplate restTemplate = new RestTemplate();
+            response = restTemplate.postForEntity(
+                SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/file-up2",
+                new HttpEntity<>(body, headers), String.class);
+            System.out.println(JSON.toJSONString(response));
+            // 清理临时文件
+            // Files.deleteIfExists(tempFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return response;
+
+        // 2. 构建 Multipart 请求体
+        // HttpHeaders headers = new HttpHeaders();
+        // headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        //
+        // MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        // body.add("file", new ByteArrayResource(file.getBytes()) {
+        // @Override
+        // public String getFilename() {
+        // return filename; // 保持原文件名
+        // }
+        // });
+        //
+        //// 3. 发送请求到目标服务
+        // RestTemplate restTemplate = new RestTemplate();
+        // HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(body, headers);
+        // ResponseEntity<String> response =
+        // restTemplate.postForEntity(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/file-up2",
+        // requestEntity, String.class);
+
+        // try {
+        // String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/file-up2",
+        // file9101Param,null);
+        // // System.out.println("--------1312resultString-------------" + resultString);
+        // // 1. 解析外层 JSON
+        // ObjectMapper mapper = new ObjectMapper();
+        // mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); // 启用 Snake Case 自动映射
+        // Result result = null;
+        // try {
+        // result = mapper.readValue(resultString, Result.class);
+        // } catch (Exception e) {
+        // e.printStackTrace();
+        // }
+        //
+        // if (result == null) {
+        // throw new ServiceException("未接收到医保返回参数");
+        // } else if (result.getCode() == 200) {
+        // System.out.println(JSON.toJSONString(result.getResult()));
+        // fileResult = JSON.parseObject(JSON.toJSONString(result.getResult()), FileResult.class);
+        // } else {
+        // throw new ServiceException(result.getMessage());
+        // }
+        // return fileResult;
+        // }catch (Exception e){
+        // e.printStackTrace();
+        // }
+        // return fileResult;
+    }
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param data 规则分析信息
+     * @return 违规信息
+     */
+    public Yb3101OutputResult yb3101PreMidAnalysis(Yb3101InputData data) {
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/pre-mid-analysis", data, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【3101】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【3101】返回参数:" + resultString);
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(resultString, Result.class);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        if (result == null) {
+            throw new ServiceException("未接收到医保返回参数");
+        } else if (result.getCode() == 200) {
+            System.out.println(JSON.toJSONString(result.getResult()));
+            return parseObject(JSON.toJSONString(result.getResult()), Yb3101OutputResult.class);
+        } else {
+            throw new ServiceException(result.getMessage());
+        }
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param data 输入
+     */
+    public void yb3103PreMidFeedback(Yb3103InputData data) {
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/pre-mid-feedback", data, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【3103】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【3103】返回参数:" + resultString);
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(resultString, Result.class);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        if (result == null) {
+            throw new ServiceException("未接收到医保返回参数");
+        } else if (result.getCode() == 200) {
+            System.out.println(JSON.toJSONString(result.getResult()));
+        } else {
+            throw new ServiceException(result.getMessage());
+        }
+    }
+
+    public List<Yb2301OutputResult> upload2301FeeDetail(Yb2301InputFeeDetailModel yb2301InputFeeDetailModel) {
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/upload-2301-fee-detail",
+                yb2301InputFeeDetailModel, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2301】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2301】返回参数:" + resultString);
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(resultString, Result.class);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        if (result == null) {
+            throw new ServiceException("未接收到医保返回参数");
+        } else if (result.getCode() == 200) {
+            List<Yb2301OutputResult> yb2301OutputResults = new ArrayList<>();
+            JSONObject jsonObject = parseObject(String.valueOf(result.getResult()));
+            System.out.println(JSON.toJSONString(result.getResult()));
+            JSONArray jsonArray = jsonObject.getJSONArray("result");
+            for (Object o : jsonArray) {
+                yb2301OutputResults.add(JSON.parseObject(String.valueOf(o), Yb2301OutputResult.class));
+            }
+            return yb2301OutputResults;
+        } else {
+            throw new ServiceException(result.getMessage());
+        }
+    }
+
+    public Yb2303OutputSetInfo inpatientPreSettle(Yb2303InputInpatient yb2303InputInpatient) {
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/inpa-pre-setl",
+                yb2303InputInpatient, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2303】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2303】返回参数:" + resultString);
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(resultString, Result.class);
+            if (result == null) {
+                throw new ServiceException("未接收到医保返回参数");
+            } else if (result.getCode() == 200) {
+                return mapper.readValue(String.valueOf(result.getResult()), Yb2303OutputSetInfo.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    public Yb2304OutputSetlInfo inpatientSettle(Contract contract, Yb2304InputInpatient yb2304InpatientParam) {
+        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/inpa-setl",
+            yb2304InpatientParam, contract);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2304】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2304】返回参数:" + resultString);
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(resultString, Result.class);
+            if (result == null) {
+                throw new ServiceException("未接收到医保返回参数");
+            } else if (result.getCode() == 200) {
+                return mapper.readValue(String.valueOf(result.getResult()), Yb2304OutputSetlInfo.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 【取消住院结算】
+     * 
+     * @param contract 合同
+     * @param yb2305InpatientParam 2305参数
+     * @return 医保结果
+     */
+    public Yb2305OutputSetlInfo inpatientUnSettle(Contract contract, Yb2305InputInpatient yb2305InpatientParam) {
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/inpa-un-setl",
+                yb2305InpatientParam, contract);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2305】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2305】返回参数:" + resultString);
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(resultString, Result.class);
+            if (result == null) {
+                throw new ServiceException("未接收到医保返回参数");
+            } else if (result.getCode() == 200) {
+                return mapper.readValue(String.valueOf(result.getResult()), Yb2305OutputSetlInfo.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
similarity index 73%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
index 14b853e0..32978c77 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
@@ -4,12 +4,9 @@
 package com.openhis.yb.service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import com.core.web.controller.common.CommonController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -24,9 +21,16 @@ import com.core.common.core.redis.RedisCache;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
 import com.core.system.service.impl.SysUserServiceImpl;
-import com.openhis.administration.domain.*;
+import com.core.web.controller.common.CommonController;
+import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.domain.Organization;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.dto.ChargeItemBaseInfoDto;
 import com.openhis.administration.service.*;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.YbCommonConstants;
 import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.Whether;
@@ -34,6 +38,7 @@ import com.openhis.common.enums.ybenums.YbHospApprFlag;
 import com.openhis.common.enums.ybenums.YbMdtrtCertType;
 import com.openhis.common.enums.ybenums.YbMedType;
 import com.openhis.common.enums.ybenums.YbPsnSetlWay;
+import com.openhis.financial.domain.Contract;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.financial.model.PaymentResult;
 import com.openhis.financial.service.IContractService;
@@ -43,9 +48,8 @@ import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.workflow.service.IDeviceDispenseService;
 import com.openhis.workflow.service.IInventoryItemService;
 import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.domain.ClinicPreSettle;
+import com.openhis.yb.domain.*;
 import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.domain.InfoPerson;
 import com.openhis.yb.dto.*;
 import com.openhis.yb.model.CancelRegPaymentModel;
 import com.openhis.yb.model.Clinic2207OrderModel;
@@ -64,6 +68,7 @@ import com.openhis.yb.util.YbParamBuilderUtil;
 @Service
 public class YbManager {
 
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
     @Autowired
     private YbDao ybBaseService;
     @Autowired
@@ -72,7 +77,6 @@ public class YbManager {
     private RedisCache redisCache;
     @Autowired
     private AssignSeqUtil assignSeqUtil;
-
     /******************************** 业务服务 ***********************************/
     @Autowired
     private IPaymentRecDetailService iPaymentRecDetailService;
@@ -98,7 +102,6 @@ public class YbManager {
     private IOrganizationService iOrganizationService;
     @Autowired
     private IInventoryItemService inventoryItemService;
-    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
     /****************************** 基础医保服务 *********************************/
 
     @Autowired
@@ -106,6 +109,8 @@ public class YbManager {
     @Autowired
     private IRegService iRegService;
     @Autowired
+    private IInpatientRegService inpatientRegService;
+    @Autowired
     private IClinicUnRegService iClinicUnRegService;
     @Autowired
     private ISignService iSignService;
@@ -144,23 +149,6 @@ public class YbManager {
     @Autowired
     private IServiceRequestService serviceRequestService;
 
-    /**
-     * 【9001】
-     *
-     * @param userId 就诊id
-     * @param mac 加密后的mac地址
-     * @return 结果
-     */
-    public R<?> sign(String userId, String mac, String ip) {
-        Sign signParam = ybBaseService.getSignParam(userId, mac, ip);
-        Sign9001Result signResult = ybHttpService.sign(signParam);
-        if (signResult != null) {
-            ybBaseService.saveSign(signParam, signResult);
-            return R.ok(signResult);
-        }
-        return R.fail();
-    }
-
     /**
      * 【1101】
      *
@@ -181,13 +169,14 @@ public class YbManager {
      * @param encounterId 就诊id
      * @return 结果
      */
-    public ClinicReg2201Output createRegWithMedType(YbMdtrtCertType ybMdtrtCertTypeLong, String busiCardInfo,
-        Long encounterId, YbMedType medType) {
+    public ClinicReg2201Output createRegWithMedType(Contract contract, YbMdtrtCertType ybMdtrtCertTypeLong,
+        String busiCardInfo, Long encounterId, YbMedType medType) {
         ClinicReg reg = ybBaseService.getReg(ybMdtrtCertTypeLong, busiCardInfo, encounterId, medType,
             SecurityUtils.getLoginUser().getTenantId());
         reg.setMedType(medType.getValue());
-        ClinicReg2201Output regResult = ybHttpService.reg(reg);
+        ClinicReg2201Output regResult = ybHttpService.reg(reg, contract);
         if (regResult != null) {
+            regResult.setMedType(medType.getValue());
             ybBaseService.saveReg(regResult);
         }
         return regResult;
@@ -219,7 +208,11 @@ public class YbManager {
         if (clinicOrder2208 == null) {
             throw new ServiceException("未查询到医保付款信息");
         }
-        Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoOutput = ybHttpService.unSettle(clinicOrder2208);
+
+        Contract contractByInsuplcAdmdvs = iContractService.getContract(cancelRegPaymentDto.getContractNo());
+
+        Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoOutput =
+            ybHttpService.unSettle(clinicOrder2208, contractByInsuplcAdmdvs);
         if (clinic2208UnSetlInfoOutput == null) {
             throw new ServiceException("未查询到医保返回信息");
         }
@@ -229,7 +222,8 @@ public class YbManager {
 
         ClinicReg reg = ybBaseService.getUnReg(cancelRegPaymentDto.getEncounterId(), tenantId);
 
-        ClinicReg2201Output regResult = ybHttpService.cancelReg(reg);
+        ClinicReg2201Output regResult =
+            ybHttpService.cancelReg(reg, iContractService.getContract(cancelRegPaymentDto.getContractNo()));
         if (regResult != null) {
             ybBaseService.saveUnReg(regResult);
         }
@@ -239,12 +233,31 @@ public class YbManager {
     /**
      * 【2202】
      *
-     * @param clinicRegId 就诊id
+     * @param clinicReg 就诊id
      * @return 结果
      */
-    public R<?> cancelRegById(Long clinicRegId) {
-        ClinicReg clinicReg = iRegService.getById(clinicRegId);
-        ClinicReg2201Output regResult = ybHttpService.cancelReg(clinicReg);
+    public R<?> cancelRegById(ClinicReg clinicReg) {
+        Contract regContract = null;
+        // ClinicReg clinicReg = iRegService.getById(clinicRegId);
+        List<Contract> redisContractList = iContractService.getContractListByYb();
+        for (Contract contract : redisContractList) {
+            if (clinicReg.getInsuplcAdmdvs().equals(contract.getAdmVs())) {
+                regContract = contract;
+            }
+        }
+        if (regContract == null) {
+            Optional<Contract> optional = redisContractList.stream().max(Comparator.comparingInt(Contract::getSort));
+            if (optional.isPresent()) {
+                regContract = optional.get();
+            } else {
+                throw new ServiceException("未設置合同順序");
+            }
+        }
+        if (regContract == null) {
+            throw new ServiceException("無法單獨取消醫保挂號，原因：當前醫保局已挂號源沒指定到業務系統的合同對象");
+        }
+
+        ClinicReg2201Output regResult = ybHttpService.cancelReg(clinicReg, regContract);
         if (regResult != null) {
             ybBaseService.saveUnReg(regResult);
             return R.ok(regResult);
@@ -276,12 +289,17 @@ public class YbManager {
             throw new ServiceException("传参异常，未查询到就诊凭证类型");
         }
 
+        Contract contract = iContractService.getContract(cancelRegPaymentModel.getContractNo());
+        if (contract == null) {
+            throw new ServiceException("请选择费用性质");
+        }
         // 拼接医保挂号参数
         ClinicReg reg = new ClinicReg();
         reg.setPsnNo(perinfo.getPsnNo()).setInsutype(perinfo.getInsutype()).setBegntime(new Date())
             .setMdtrtCertType(mdtrtCertType.getValue()).setMdtrtCertNo(cancelRegPaymentModel.getBusiCardInfo())
-            .setIptOtpNo(assignSeqUtil.getSeq(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 8)).setAtddrNo(doctor.getYbNo())
-            .setDrName(doctor.getName()).setDeptCode(organization.getYbNo()).setDeptName(organization.getName())
+            .setIptOtpNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 4))
+            .setAtddrNo(doctor.getYbNo()).setDrName(doctor.getName()).setDeptCode(organization.getYbNo())
+            .setDeptName(organization.getName())
             .setCaty(organization.getCaty() == null ? organization.getYbNo() : organization.getCaty())
             .setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs()).setAtddrNo(doctor.getYbNo()).setPsnType("11")
             .setPsnCertType("01").setCertno(perinfo.getCertno()).setPsnName(perinfo.getPsnName());
@@ -289,7 +307,7 @@ public class YbManager {
         // reg.setAtddrNo("D220172023129").setDrName("郭建林").setCaty("B19").setDeptCode("B19");
 
         // 发送医保挂号请求
-        ClinicReg2201Output clinicReg2201Output = ybHttpService.reg(reg);
+        ClinicReg2201Output clinicReg2201Output = ybHttpService.reg(reg, contract);
         if (clinicReg2201Output == null) {
             throw new ServiceException("未接受到医保挂号接口返回参数");
         }
@@ -318,7 +336,7 @@ public class YbManager {
             .setDiseinfoList(diseinfos).setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs());
 
         // 2203接口上传就诊信息
-        ybHttpService.upload2203Record(medical2203Param);
+        ybHttpService.upload2203Record(medical2203Param, contract);
 
         YbPsnSetlWay finCategory = YbPsnSetlWay.getByValue(cancelRegPaymentModel.getPsnSetlWay());
         if (finCategory == null) {
@@ -353,7 +371,7 @@ public class YbManager {
         clinic2204OrderParam.setFeedetail(clincFeedetailList).setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs());
 
         // 接收2204接口返回参数
-        Clinic2204OrderResult clinic2204OrderResult = ybHttpService.upload2204Record(clinic2204OrderParam);
+        Clinic2204OrderResult clinic2204OrderResult = ybHttpService.upload2204Record(clinic2204OrderParam, contract);
         if (clinic2204OrderResult == null) {
             throw new ServiceException("未接收2204接口返回参数");
         }
@@ -370,7 +388,7 @@ public class YbManager {
             .setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs());
 
         // 接收2206接口返回参数
-        Clinic2206OrderOutput clinic2206OrderResult = ybHttpService.upload2206Record(clinicOrder);
+        Clinic2206OrderOutput clinic2206OrderResult = ybHttpService.upload2206Record(clinicOrder, contract);
         if (clinic2206OrderResult == null) {
             throw new ServiceException("未接收2206接口返回参数");
         }
@@ -385,8 +403,9 @@ public class YbManager {
         return clinic2206OrderResult;
     }
 
-    public Clinic2206OrderOutput preSettle(Long encounterId, YbMdtrtCertType ybMdtrtCertType, String busiCardInfo,
-        ClinicReg2201Output reg2201Output, String payWay, List<Long> chargeItemIds) {
+    public Clinic2206OrderOutput preSettle(Contract contract, Long encounterId, YbMdtrtCertType ybMdtrtCertType,
+        String busiCardInfo, ClinicReg2201Output reg2201Output, String payWay, List<Long> chargeItemIds,
+        YbMedType ybMedType) {
         YbPsnSetlWay ybPsnSetlWay = YbPsnSetlWay.getByValue(payWay);
         if (ybPsnSetlWay == null) {
             ybPsnSetlWay = YbPsnSetlWay.PSN_SETLWAY01;
@@ -395,12 +414,12 @@ public class YbManager {
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
         // 获取2203接口和2204接口参数
         Clinic2203MedicalParam clinic2203MedicalParam =
-            ybBaseService.getClinicMedical2203Param(encounterId, tenantId, reg2201Output);
+            ybBaseService.getClinicMedical2203Param(encounterId, tenantId, reg2201Output, ybMedType);
         if (clinic2203MedicalParam == null) {
             throw new ServiceException("未生成2203接口参数");
         }
 
-        Result result = ybHttpService.upload2203Record(clinic2203MedicalParam);
+        Result result = ybHttpService.upload2203Record(clinic2203MedicalParam, contract);
 
         Clinic2204OrderParam clinic2204OrderParam =
             ybBaseService.getClinicOrder2204Param(tenantId, chargeItemIds, reg2201Output);
@@ -409,7 +428,7 @@ public class YbManager {
         }
 
         // 接收2204接口返回参数
-        Clinic2204OrderResult clinic2204OrderResult = ybHttpService.upload2204Record(clinic2204OrderParam);
+        Clinic2204OrderResult clinic2204OrderResult = ybHttpService.upload2204Record(clinic2204OrderParam, contract);
         if (clinic2204OrderResult == null) {
             throw new ServiceException("未接收2204接口参数");
         }
@@ -426,7 +445,7 @@ public class YbManager {
             throw new ServiceException("未生成2206接口参数");
         }
         // 接收2206接口返回参数
-        Clinic2206OrderOutput clinic2206OrderResult = ybHttpService.upload2206Record(clinic2206OrderParam);
+        Clinic2206OrderOutput clinic2206OrderResult = ybHttpService.upload2206Record(clinic2206OrderParam, contract);
         if (clinic2206OrderResult == null) {
             throw new ServiceException("未接收2206接口参数");
         }
@@ -440,31 +459,6 @@ public class YbManager {
         return clinic2206OrderResult;
     }
 
-    /**
-     * 【2207】
-     *
-     * @param paymentNo 统一收费业务流水号
-     * @param encounterId 就诊id
-     * @param chrgBchno 付款批次号
-     * @param payWay 支付方式
-     * @return 结果
-     */
-    public Clinic2207OrderModel settle(String paymentNo, Long encounterId, String chrgBchno, String payWay) {
-        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        Clinic2207OrderParam clinicOrder2207 =
-            ybBaseService.getClinicOrder2207(encounterId, tenantId, payWay, chrgBchno, null);
-        if (clinicOrder2207 == null) {
-            throw new ServiceException("未生成2207接口参数");
-        }
-        Clinic2207OrderModel clinic2207OrderResult = ybHttpService.settle(clinicOrder2207);
-        if (clinic2207OrderResult == null) {
-            throw new ServiceException("未接收2207接口参数");
-        }
-        // 保存数据
-        ybBaseService.saveClinic2207OrderResult(paymentNo, clinicOrder2207, clinic2207OrderResult);
-        return clinic2207OrderResult;
-    }
-
     /**
      * 【2208】
      *
@@ -478,7 +472,10 @@ public class YbManager {
         if (clinicOrder2208 == null) {
             throw new ServiceException("未生成2208接口参数");
         }
-        Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoResult = ybHttpService.unSettle(clinicOrder2208);
+        Contract contractByInsuplcAdmdvs =
+            iContractService.getContractByInsuplcAdmdvs(clinicOrder2208.getInsuplcAdmdvs());
+        Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoResult =
+            ybHttpService.unSettle(clinicOrder2208, contractByInsuplcAdmdvs);
         // 业务表中进行操作
         ybBaseService.saveUnSettleRecord(settleId, clinicOrder2208, clinic2208UnSetlInfoResult);
         return R.ok(clinic2208UnSetlInfoResult);
@@ -547,7 +544,7 @@ public class YbManager {
         if (result == null) {
             throw new ServiceException("未接收3201医保返回参数");
         }
-        //ybBaseService.saveReconcileGeneralLedger(result);
+        // ybBaseService.saveReconcileGeneralLedger(result);
         return R.ok();
     }
 
@@ -745,8 +742,19 @@ public class YbManager {
         return R.fail();
     }
 
-    public Clinic2207OrderModel settle(String chrgBchno, String busiCardInfo, YbMdtrtCertType ybMdtrtCertType,
-        Integer minpacuntDrugTracCnt, Integer mcsTracCnt) {
+    /**
+     * 【门诊结算-2207结算】
+     * 
+     * @param contract 合同
+     * @param chrgBchno 支付批次号
+     * @param ybMdtrtCertType 凭证类型
+     * @param busiCardInfo 读卡获取到的凭证
+     * @param minpacuntDrugTracCnt 追溯码相关信息
+     * @param mcsTracCnt 追溯码相关信息
+     * @return 结算结果
+     */
+    public Clinic2207OrderModel settle(Contract contract, String chrgBchno, String busiCardInfo,
+        YbMdtrtCertType ybMdtrtCertType, Integer minpacuntDrugTracCnt, Integer mcsTracCnt) {
         // 分别查询2206和2201记录的参数信息
         ClinicPreSettle clinicPreSettle = iClinicPreSettleService
             .getOne(new LambdaQueryWrapper<ClinicPreSettle>().eq(ClinicPreSettle::getChrgBchno, chrgBchno));
@@ -755,7 +763,7 @@ public class YbManager {
         }
         ClinicReg clinicReg = iRegService
             .getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getMdtrtId, clinicPreSettle.getMdtrtId()));
-        if (clinicPreSettle == null) {
+        if (clinicReg == null) {
             throw new ServiceException("为查询到挂号信息");
         }
         Clinic2206OrderOutput clinic2206OrderResult =
@@ -774,7 +782,7 @@ public class YbManager {
             .setInsuplcAdmdvs(clinicReg.getInsuplcAdmdvs()).setMinpacuntDrugTracCnt(minpacuntDrugTracCnt)
             .setMcsTracCnt(mcsTracCnt);
         // 发送http请求给app
-        Clinic2207OrderModel settle = ybHttpService.settle(clinicOrder);
+        Clinic2207OrderModel settle = ybHttpService.settle(clinicOrder, contract);
         if (settle == null) {
             throw new ServiceException("未接收2207接口参数");
         }
@@ -783,19 +791,26 @@ public class YbManager {
         return settle.setChrgBchno(chrgBchno);
     }
 
-    public PaymentResult settle(String chrgBchno) {
+    /**
+     * 【门诊挂号收费-2207】
+     * 
+     * @param contract 合同
+     * @param chrgBchno 收费批次号
+     * @return 结果
+     */
+    public PaymentResult settle(Contract contract, String chrgBchno) {
 
         ClinicPreSettle clinicPreSettle = iClinicPreSettleService
             .getOne(new LambdaQueryWrapper<ClinicPreSettle>().eq(ClinicPreSettle::getChrgBchno, chrgBchno));
 
         if (clinicPreSettle == null) {
-            throw new ServiceException("为查询到预结算信息");
+            throw new ServiceException("未查询到预结算信息");
         }
         ClinicReg clinicReg = iRegService
             .getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getMdtrtId, clinicPreSettle.getMdtrtId()));
 
-        if (clinicPreSettle == null) {
-            throw new ServiceException("为查询到挂号信息");
+        if (clinicReg == null) {
+            throw new ServiceException("未查询到挂号信息");
         }
 
         Clinic2206OrderOutput clinic2206OrderResult =
@@ -814,7 +829,7 @@ public class YbManager {
             .setInscpScpAmt(clinic2206OrderResult.getInscpScpAmt().doubleValue())
             .setInsuplcAdmdvs(clinicReg.getInsuplcAdmdvs());
 
-        Clinic2207OrderModel settle = ybHttpService.settle(clinicOrder);
+        Clinic2207OrderModel settle = ybHttpService.settle(clinicOrder, contract);
 
         if (settle == null) {
             throw new ServiceException("未接收2207接口参数");
@@ -829,43 +844,6 @@ public class YbManager {
         return paymentResult;
     }
 
-    /**
-     * 医保退号
-     *
-     * @param byId 就诊实体
-     * @param account 账户实体
-     */
-    public void cancelReg(Encounter byId, Account account) {
-        PaymentReconciliation paymentReconciliation = iPaymentReconciliationService.getOne(
-            new LambdaQueryWrapper<PaymentReconciliation>().eq(PaymentReconciliation::getPatientId, byId.getPatientId())
-                .eq(PaymentReconciliation::getEncounterId, byId.getId()));
-        if (paymentReconciliation == null) {
-            throw new ServiceException("未查询到付款信息");
-        }
-        String ybSettleIds = paymentReconciliation.getYbSettleIds();
-        if (ybSettleIds.contains(",")) {
-            throw new ServiceException("付款信息异常");
-        }
-
-        // Clinic2208UnSetlInfoParam clinicOrder2208 = ybBaseService.getClinicOrder2208(byId.getId(),
-        // paymentReconciliation.getTenantId(), ybSettleIds);
-        // if(clinicOrder2208==null){
-        // throw new ServiceException("未生成2208接口参数");
-        // }
-
-        // Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoResult = ybHttpService.unSettle(clinicOrder2208);
-        // if(clinic2208UnSetlInfoResult==null){
-        // throw new ServiceException("未生成2208接口返回参数");
-        // }
-
-        // ybBaseService.saveUnSettleRecord(ybSettleIds,clinicOrder2208,clinic2208UnSetlInfoResult);
-        ClinicReg reg = ybBaseService.get2202Reg(byId.getId(), SecurityUtils.getLoginUser().getTenantId());
-        ClinicReg2201Output regResult = ybHttpService.cancelReg(reg);
-        if (regResult != null) {
-            ybBaseService.saveUnReg(regResult);
-        }
-    }
-
     public ClinicReg2201Output getClinicRegByEncounterId(Long encounterId) {
         return ybBaseService.getClinicRegByEncounterId(encounterId);
     }
@@ -875,6 +853,154 @@ public class YbManager {
         if (clinic2205OrderParam == null) {
             throw new ServiceException("未生成2205接口参数");
         }
-        ybHttpService.unPreSettle(clinic2205OrderParam);
+        Contract contract = iContractService.getContractByInsuplcAdmdvs(clinic2205OrderParam.getInsuplcAdmdvs());
+        ybHttpService.unPreSettle(clinic2205OrderParam, contract);
+    }
+
+    /**
+     * 医保预结算返回信息
+     * 
+     * @return 预结算结果
+     */
+    public Yb2303OutputSetInfo preSettleInpatient(PrePaymentDto prePaymentDto) {
+
+        Encounter encounter = iEncounterService.getById(prePaymentDto.getEncounterId());
+        if (encounter == null) {
+            throw new ServiceException("未查询到就诊记录");
+        }
+
+        InpatientReg inpatientReg = inpatientRegService
+            .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
+                .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (inpatientReg == null) {
+            throw new ServiceException("未查询到医保就诊记录");
+        }
+
+        InfoPerson infoPerson = iPerinfoService.getByPsnNo(inpatientReg.getPsnNo());
+        if (infoPerson == null) {
+            throw new ServiceException("未查询到患者信息");
+        }
+
+        // 获取今天和昨天的上午10点时间
+        // LocalDateTime today10AM = LocalDateTime.of(LocalDate.now(), LocalTime.of(10, 0)); // 今天10点
+        // LocalDateTime yesterday10AM = today10AM.minusDays(1); // 昨天10点（自动处理跨月/年）
+
+        // List<ChargeItem> chargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .eq(ChargeItem::getEncounterId, encounterId).between(ChargeItem::getEnteredDate, yesterday10AM, today10AM));
+        // List<ChargeItem> chargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .eq(ChargeItem::getEncounterId, encounterId).in(ChargeItem::getId, chargeItemIds));
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtos =
+            iChargeItemService.getChargeItemBaseInfoByIds(prePaymentDto.getChargeItemIds());
+        List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtosList = new ArrayList<>();
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtos) {
+            if (chargeItemBaseInfoDto.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+                continue;
+            }
+            if (!StringUtils.isEmpty(chargeItemBaseInfoDto.getChildrenJson())) {
+                // 反序列化：将JSON数组字符串转为List<>
+                List<ChargeItemBaseInfoDto> chargeItemBaseInfoList =
+                    JSON.parseArray(chargeItemBaseInfoDto.getChildrenJson(), ChargeItemBaseInfoDto.class);
+                chargeItemBaseInfoDtosList.addAll(chargeItemBaseInfoList);
+            } else {
+                chargeItemBaseInfoDtosList.add(chargeItemBaseInfoDto);
+            }
+        }
+        Yb2301InputFeeDetail yb2301InputFeeDetail;
+        List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList();
+        // int i = 1;
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtosList) {
+            yb2301InputFeeDetail = new Yb2301InputFeeDetail();
+            yb2301InputFeeDetail.setFeedetlSn(chargeItemBaseInfoDto.getBusNo()).setMdtrtId(inpatientReg.getMdtrtId())
+                .setPsnNo(inpatientReg.getPsnNo()).setMedType(String.valueOf(encounter.getYbClassEnum()))
+                .setFeeOcurTime(chargeItemBaseInfoDto.getEnteredDate()).setMedListCodg(chargeItemBaseInfoDto.getYbNo())
+                .setMedinsListCodg(chargeItemBaseInfoDto.getBaseBusNo())
+                .setDetItemFeeSumamt(chargeItemBaseInfoDto.getTotalPrice())
+                .setCnt(new BigDecimal(chargeItemBaseInfoDto.getQuantityValue()))
+                .setPric(chargeItemBaseInfoDto.getUnitPrice()).setBilgDeptName(chargeItemBaseInfoDto.getDeptName())
+                .setBilgDrName(chargeItemBaseInfoDto.getDoctName()).setBilgDeptCodg(chargeItemBaseInfoDto.getDeptYbNo())
+                .setBilgDrCodg(chargeItemBaseInfoDto.getDoctYbNo());
+
+            yb2301InputFeeDetailList.add(yb2301InputFeeDetail);
+        }
+
+        Yb2301InputFeeDetailModel yb2301InputFeeDetailModel = new Yb2301InputFeeDetailModel();
+        yb2301InputFeeDetailModel.setFeedetail(yb2301InputFeeDetailList)
+            .setInsuplcAdmdvs(inpatientReg.getInsuplcAdmdvs());
+
+        List<Yb2301OutputResult> yb2301OutputResults = ybHttpService.upload2301FeeDetail(yb2301InputFeeDetailModel);
+        // todo :数据保存
+
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtos) {
+            if (chargeItemBaseInfoDto.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
+                continue;
+            }
+            if (!StringUtils.isEmpty(chargeItemBaseInfoDto.getChildrenJson())) {
+                // 反序列化：将JSON数组字符串转为List<>
+                List<ChargeItemBaseInfoDto> chargeItemBaseInfoList =
+                    JSON.parseArray(chargeItemBaseInfoDto.getChildrenJson(), ChargeItemBaseInfoDto.class);
+                chargeItemBaseInfoDtosList.addAll(chargeItemBaseInfoList);
+            } else {
+                chargeItemBaseInfoDtosList.add(chargeItemBaseInfoDto);
+            }
+        }
+        // 计算医疗总费用
+        BigDecimal medfeeSumamt = BigDecimal.ZERO;
+        for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtosList) {
+            medfeeSumamt = medfeeSumamt.add(chargeItemBaseInfoDto.getTotalPrice());
+        }
+
+        Yb2303InputInpatient yb2303InputInpatient = new Yb2303InputInpatient();
+        yb2303InputInpatient.setPsnNo(infoPerson.getPsnNo())
+            .setMdtrtCertType(YbMdtrtCertType.getByValue(prePaymentDto.getYbMdtrtCertType()) == null ? null
+                : YbMdtrtCertType.getByValue(prePaymentDto.getYbMdtrtCertType()).getValue())
+            .setMdtrtCertNo(prePaymentDto.getBusiCardInfo()).setMedfeeSumamt(medfeeSumamt)
+            .setPsnSetlway(YbPsnSetlWay.PSN_SETLWAY01.getValue()).setMdtrtId(inpatientReg.getMdtrtId())
+            .setInsutype(infoPerson.getInsutype()).setInsuplcAdmdvs(infoPerson.getInsuplcAdmdvs())
+            .setMdtrtareaAdmvs(iContractService.getContractListByYb().get(0).getAdmVs());
+
+        // todo:中如结算标志需要判断一下，待2304接口开发完成后编辑
+
+        Yb2303OutputSetInfo yb2303OutputSetInfo = ybHttpService.inpatientPreSettle(yb2303InputInpatient);
+
+        if (yb2303OutputSetInfo == null) {
+            throw new ServiceException("医保预结算失败");
+        }
+        // todo：数据保存
+
+        return yb2303OutputSetInfo;
+    }
+
+    /**
+     * 【住院结算】
+     * 
+     * @param contract 合同
+     * @param paymentDto 结算参数
+     * @return 结果
+     */
+    public Yb2304OutputSetlInfo inpatientSettle(Contract contract, PaymentInpatientDto paymentDto) {
+
+        Yb2304InputInpatient yb2304InpatientParam = ybBaseService.getYb2304InpatientParam(paymentDto);
+
+        Yb2304OutputSetlInfo yb2304OutputSetlInfo = ybHttpService.inpatientSettle(contract, yb2304InpatientParam);
+        if (yb2304OutputSetlInfo == null) {
+            throw new ServiceException("医保结算失败，请稍后重试");
+        }
+        return yb2304OutputSetlInfo;
+    }
+
+    /**
+     * 【取消住院结算】
+     *
+     * @param contract 合同
+     * @param inpatientSettle 医保结算实体
+     * @return 医保结果
+     */
+    public Yb2305OutputSetlInfo inpatientUnSettle(Contract contract, InpatientSettle inpatientSettle) {
+
+        Yb2305InputInpatient yb2305InpatientParam = ybBaseService.getYb2305InpatientParam(inpatientSettle);
+
+        Yb2305OutputSetlInfo yb2305OutputSetlInfo = ybHttpService.inpatientUnSettle(contract, yb2305InpatientParam);
+
+        return yb2305OutputSetlInfo;
     }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
similarity index 44%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
index adda8512..933831a2 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
@@ -1,11 +1,15 @@
 package com.openhis.yb.service.impl;
 
-import com.openhis.yb.domain.ClinicUnSettle;
-import com.openhis.yb.mapper.ClinicUnSettleMapper;
-import com.openhis.yb.service.IClinicUnSettleService;
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.yb.domain.ClinicUnSettle;
+import com.openhis.yb.mapper.ClinicUnSettleMapper;
+import com.openhis.yb.service.IClinicUnSettleService;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -14,6 +18,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @date 2025-04-20
  */
 @Service
-public class ClinicUnSettleServiceImpl extends ServiceImpl<ClinicUnSettleMapper, ClinicUnSettle> implements IClinicUnSettleService {
+public class ClinicUnSettleServiceImpl extends ServiceImpl<ClinicUnSettleMapper, ClinicUnSettle>
+    implements IClinicUnSettleService {
 
+    /**
+     * 根据settleId查询集合
+     * 
+     * @param settleIds 集合
+     * @return 集合
+     */
+    @Override
+    public List<ClinicUnSettle> getBySettleIds(List<String> settleIds) {
+        return baseMapper.selectList(new LambdaQueryWrapper<ClinicUnSettle>().in(ClinicUnSettle::getSettleId, settleIds)
+            .eq(ClinicUnSettle::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java
new file mode 100644
index 00000000..88ac2528
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java
@@ -0,0 +1,11 @@
+package com.openhis.yb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.yb.domain.InpatientFeeDetail;
+import com.openhis.yb.mapper.InpatientFeeDetailMapper;
+import com.openhis.yb.service.IInpatientFeeDetailService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InpatientFeeDetailServiceImpl extends ServiceImpl<InpatientFeeDetailMapper, InpatientFeeDetail> implements IInpatientFeeDetailService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java
new file mode 100644
index 00000000..0ba8e4e8
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.yb.domain.InpatientReg;
+import com.openhis.yb.mapper.InpatientRegMapper;
+import com.openhis.yb.service.IInpatientRegService;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Service
+public class InpatientRegServiceImpl extends ServiceImpl<InpatientRegMapper, InpatientReg>
+    implements IInpatientRegService {
+
+    @Override
+    public InpatientReg getInpatientRegByIptNo(String busNo) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, busNo)
+            .eq(InpatientReg::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java
new file mode 100644
index 00000000..3646a739
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java
@@ -0,0 +1,18 @@
+package com.openhis.yb.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.Whether;
+import com.openhis.yb.domain.InpatientSettle;
+import com.openhis.yb.mapper.InpatientSettleMapper;
+import com.openhis.yb.service.IInpatientSettleService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InpatientSettleServiceImpl extends ServiceImpl<InpatientSettleMapper, InpatientSettle> implements IInpatientSettleService {
+    @Override
+    public InpatientSettle getBySettleId(String ybSettleIds) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<InpatientSettle>().eq(InpatientSettle::getSetlId,ybSettleIds).eq(InpatientSettle::getDeleteFlag, Whether.NO.getValue()).last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+}
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
similarity index 38%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
index d7814625..29412e3e 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
@@ -2,7 +2,10 @@ package com.openhis.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.StringUtils;
 import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.financial.domain.Contract;
 import com.openhis.yb.domain.InfoPerson;
 import com.openhis.yb.service.IPerinfoService;
 import com.openhis.yb.mapper.PerinfoMapper;
@@ -23,4 +26,40 @@ public class PerinfoServiceImpl extends ServiceImpl<PerinfoMapper, InfoPerson> i
                 .eq(InfoPerson::getCertno, idCard).eq(InfoPerson::getTenantId, tenantId)
                 .orderByDesc(InfoPerson::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
     }
+
+    @Override
+    public InfoPerson getByPsnNo(String psnNo) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<InfoPerson>()
+                .eq(InfoPerson::getPsnNo, psnNo).orderByDesc(InfoPerson::getCreateTime)
+                .last(YbCommonConstants.sqlConst.LIMIT1));
+    }
+
+    @Override
+    public boolean assessInterCrossRegionalSettlement(String psnNo, String admVs) {
+        InfoPerson infoPerson = getByPsnNo(psnNo);
+        if(infoPerson==null){
+            throw new ServiceException("未查询到身份信息");
+        }
+        //参保地
+        String insuplcAdmdvs = infoPerson.getInsuplcAdmdvs();
+        return admVs.equals(insuplcAdmdvs);
+    }
+
+    @Override
+    public boolean assessIntraCrossRegionalSettlement(String psnNo, String admVs){
+        InfoPerson infoPerson = getByPsnNo(psnNo);
+        if(infoPerson==null){
+            throw new ServiceException("未查询到身份信息");
+        }
+        //参保地
+        String insuplcAdmdvs = infoPerson.getInsuplcAdmdvs();
+        if(StringUtils.isEmpty(insuplcAdmdvs)){
+            throw new ServiceException("该患者查询不到参保地信息");
+        }
+        return insuplcAdmdvs.startsWith(admVs.substring(0,2));
+    }
+
+    public boolean assessCrossRegionalSettlement(String psnNo, String admVs){
+        return assessIntraCrossRegionalSettlement(psnNo,admVs)||assessIntraCrossRegionalSettlement(psnNo,admVs);
+    }
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
similarity index 94%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
index d28251e1..5efc4211 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
@@ -261,19 +261,24 @@ public class YbParamBuilderUtil {
      * @return
      */
     public Clinic2203MedicalParam getClinicMedical2203Param(Long encounterId, Integer tenantId,
-        ClinicReg2201Output reg2201Output) {
+        ClinicReg2201Output reg2201Output, YbMedType ybMedType) {
 
         // 查询诊断信息
         EncounterDiagnosis mainEncounterDiagnosis = null;
         List<EncounterDiagnosis> encounterDiagnosis =
             iEncounterDiagnosisService.list(new LambdaQueryWrapper<EncounterDiagnosis>()
-                .eq(EncounterDiagnosis::getEncounterId, encounterId).eq(EncounterDiagnosis::getTenantId, tenantId));
+                .eq(EncounterDiagnosis::getEncounterId, encounterId).eq(EncounterDiagnosis::getTenantId, tenantId)
+                .eq(EncounterDiagnosis::getMedTypeCode, ybMedType.getValue()));// 2025/08/05 农大患者结算慢病时会上传普通门诊的疾病，医保回复该参保人未做该病种的门慢门特备案，故此修正根据门诊类型去上传
         for (EncounterDiagnosis diagnosis : encounterDiagnosis) {
             if (Objects.equals(Whether.YES.getValue(), diagnosis.getMaindiseFlag())) {
                 mainEncounterDiagnosis = diagnosis;
                 break;
             }
         }
+        if (mainEncounterDiagnosis == null && (ybMedType == YbMedType.CHRONIC_DISEASE_OUTPATIENT
+            || ybMedType == YbMedType.SPECIAL_DISEASE_OUTPATIENT)) {
+            mainEncounterDiagnosis = encounterDiagnosis.get(0);
+        }
         if (encounterDiagnosis.isEmpty()) {
             throw new ServiceException("未查询到诊断信息");
         }
@@ -287,6 +292,9 @@ public class YbParamBuilderUtil {
         }
         // 查询诊断定义信息
         ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(mainCondition.getDefinitionId());
+        if (conditionDefinition == null) {
+            throw new ServiceException("未查询到诊断定义信息");
+        }
 
         // 组装诊断信息参数
         List<Clinic2203DiseInfoParam> diseinfo = getDiseinfo(encounterDiagnosis);
@@ -368,7 +376,7 @@ public class YbParamBuilderUtil {
                 if (device == null) {
                     throw new ServiceException("未查询到药品信息");
                 }
-                clinicFeedetail.setMedListCodg(device.getYbNo()).setMedinsListCodg(device.getBusNo());
+                clinicFeedetail.setMedListCodg(device.getYbNo()).setMedinsListCodg(device.getYbOrgNo());
             } else {
                 ActivityDefinition activity = iActivityDefinitionService.getById(chargeItem.getProductId());
                 if (activity == null) {
@@ -553,7 +561,8 @@ public class YbParamBuilderUtil {
      *
      * @return
      */
-    public Financial3201Param getFinancial3201Param(Settlement3201WebParam settlement3201WebParam, Settlement3201DetailDto reconciliation) {
+    public Financial3201Param getFinancial3201Param(Settlement3201WebParam settlement3201WebParam,
+        Settlement3201DetailDto reconciliation) {
 
         // 查询合同信息
         Contract contract = iContractService.getByContractNo(settlement3201WebParam.getContractNo());
@@ -576,7 +585,8 @@ public class YbParamBuilderUtil {
             .setMedfeeSumamt(reconciliation.getMedFeeSumAmt().doubleValue())
             .setFundPaySumamt(reconciliation.getFundPaySumAmt().doubleValue())
             .setAcctPay(reconciliation.getAcctPay().add(reconciliation.getAcctGjPay()).doubleValue())
-            .setFixmedinsSetlCnt(reconciliation.getFixMedInsSetlCnt()).setInsuplcAdmdvs(SecurityUtils.getLoginUser().getOptionJson().getString("admvs"));
+            .setFixmedinsSetlCnt(reconciliation.getFixMedInsSetlCnt())
+            .setInsuplcAdmdvs(SecurityUtils.getLoginUser().getOptionJson().getString("admvs"));
 
         return financial3201Param;
     }
@@ -642,52 +652,53 @@ public class YbParamBuilderUtil {
      * @param financial3203AWebParam
      * @return
      */
-    //public Financial3203AParam getFinancial3203AParam(Financial3203AWebParam financial3203AWebParam) {
+    // public Financial3203AParam getFinancial3203AParam(Financial3203AWebParam financial3203AWebParam) {
     //
-    //    YbClrType clrType = YbClrType.getByValue(financial3203AWebParam.getClrType());
-    //    if (clrType == null) {
-    //        clrType = YbClrType.OUTPATIENT_CLINIC;
-    //    }
+    // YbClrType clrType = YbClrType.getByValue(financial3203AWebParam.getClrType());
+    // if (clrType == null) {
+    // clrType = YbClrType.OUTPATIENT_CLINIC;
+    // }
     //
-    //    //Financial3203Dto financial3203VO = medicalInsuranceMapper.get3203Param(financial3203AWebParam.getStmtBegnDate(),
-    //    //    financial3203AWebParam.getStmtEndDate(), SecurityUtils.getLoginUser().getTenantId(), clrType.getValue(),
-    //    //    YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_YB_ZH_GJ_VALUE.getValue(),
-    //    //    YbPayment.SELF_CASH_VALUE.getValue(), YbPayment.SELF_CASH_VX_VALUE.getValue(),
-    //    //    YbPayment.SELF_CASH_ALI_VALUE.getValue(), YbPayment.SELF_CASH_UNION_VALUE.getValue(),
-    //    //    YbPayment.YB_FUND_PAY.getValue());
+    // //Financial3203Dto financial3203VO =
+    // medicalInsuranceMapper.get3203Param(financial3203AWebParam.getStmtBegnDate(),
+    // // financial3203AWebParam.getStmtEndDate(), SecurityUtils.getLoginUser().getTenantId(), clrType.getValue(),
+    // // YbPayment.SELF_YB_ZH_PAY.getValue(), YbPayment.SELF_YB_ZH_GJ_VALUE.getValue(),
+    // // YbPayment.SELF_CASH_VALUE.getValue(), YbPayment.SELF_CASH_VX_VALUE.getValue(),
+    // // YbPayment.SELF_CASH_ALI_VALUE.getValue(), YbPayment.SELF_CASH_UNION_VALUE.getValue(),
+    // // YbPayment.YB_FUND_PAY.getValue());
     //
     //
-    //    // 数据处理
-    //    financial3203VO
-    //        .setAcctGjPay(financial3203VO.getAcctGjPay() == null ? BigDecimal.ZERO : financial3203VO.getAcctGjPay());
-    //    financial3203VO
-    //        .setAcctPay(financial3203VO.getAcctPay() == null ? BigDecimal.ZERO : financial3203VO.getAcctPay());
-    //    financial3203VO.setFundPaySumAmt(
-    //        financial3203VO.getFundPaySumAmt() == null ? BigDecimal.ZERO : financial3203VO.getFundPaySumAmt());
-    //    financial3203VO.setMedFeeSumAmt(
-    //        financial3203VO.getMedFeeSumAmt() == null ? BigDecimal.ZERO : financial3203VO.getMedFeeSumAmt());
-    //    financial3203VO.setSelfPayCash(
-    //        financial3203VO.getSelfPayCash() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayCash());
-    //    financial3203VO
-    //        .setSelfPayALI(financial3203VO.getSelfPayALI() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayALI());
-    //    financial3203VO
-    //        .setSelfPayVX(financial3203VO.getSelfPayVX() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayVX());
-    //    financial3203VO.setSelfPayUNION(
-    //        financial3203VO.getSelfPayUNION() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayUNION());
+    // // 数据处理
+    // financial3203VO
+    // .setAcctGjPay(financial3203VO.getAcctGjPay() == null ? BigDecimal.ZERO : financial3203VO.getAcctGjPay());
+    // financial3203VO
+    // .setAcctPay(financial3203VO.getAcctPay() == null ? BigDecimal.ZERO : financial3203VO.getAcctPay());
+    // financial3203VO.setFundPaySumAmt(
+    // financial3203VO.getFundPaySumAmt() == null ? BigDecimal.ZERO : financial3203VO.getFundPaySumAmt());
+    // financial3203VO.setMedFeeSumAmt(
+    // financial3203VO.getMedFeeSumAmt() == null ? BigDecimal.ZERO : financial3203VO.getMedFeeSumAmt());
+    // financial3203VO.setSelfPayCash(
+    // financial3203VO.getSelfPayCash() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayCash());
+    // financial3203VO
+    // .setSelfPayALI(financial3203VO.getSelfPayALI() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayALI());
+    // financial3203VO
+    // .setSelfPayVX(financial3203VO.getSelfPayVX() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayVX());
+    // financial3203VO.setSelfPayUNION(
+    // financial3203VO.getSelfPayUNION() == null ? BigDecimal.ZERO : financial3203VO.getSelfPayUNION());
     //
-    //    BigDecimal cashSum = financial3203VO.getSelfPayCash().add(financial3203VO.getSelfPayVX())
-    //        .add(financial3203VO.getSelfPayUNION()).add(financial3203VO.getSelfPayALI());
+    // BigDecimal cashSum = financial3203VO.getSelfPayCash().add(financial3203VO.getSelfPayVX())
+    // .add(financial3203VO.getSelfPayUNION()).add(financial3203VO.getSelfPayALI());
     //
-    //    Financial3203AParam busMonthSetlApply = new Financial3203AParam();
-    //    busMonthSetlApply.setClrType(clrType.getValue()).setMedfeeSumamt()
-    //        .setMedSumfee().setCashPayamt()
-    //        .setAcctPay()
-    //        .setBegndate(DateUtils.dateTime("yyyy-MM-dd", financial3203AWebParam.getStmtBegnDate().toString()))
-    //        .setEnddate(DateUtils.dateTime("yyyy-MM-dd", financial3203AWebParam.getStmtEndDate().toString()))
-    //        .setClrOptins(financial3203AWebParam.getClrOptins());
+    // Financial3203AParam busMonthSetlApply = new Financial3203AParam();
+    // busMonthSetlApply.setClrType(clrType.getValue()).setMedfeeSumamt()
+    // .setMedSumfee().setCashPayamt()
+    // .setAcctPay()
+    // .setBegndate(DateUtils.dateTime("yyyy-MM-dd", financial3203AWebParam.getStmtBegnDate().toString()))
+    // .setEnddate(DateUtils.dateTime("yyyy-MM-dd", financial3203AWebParam.getStmtEndDate().toString()))
+    // .setClrOptins(financial3203AWebParam.getClrOptins());
     //
-    //    return busMonthSetlApply;
-    //}
+    // return busMonthSetlApply;
+    // }
 
     /**
      * 【3101】明细审核事前分析服务参数
@@ -777,7 +788,7 @@ public class YbParamBuilderUtil {
             // 查询主治医生
             EncounterParticipant encounterParticipant = iEncounterParticipantService.getOne(
                 new LambdaQueryWrapper<EncounterParticipant>().eq(EncounterParticipant::getEncounterId, enc.getId())
-                    .eq(EncounterParticipant::getTypeCode, ParticipantType.PRINCIPAL_DOCTOR.getCode()));
+                    .eq(EncounterParticipant::getTypeCode, ParticipantType.ATTENDING_DOCTOR.getCode()));
             Practitioner doctor = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, encounterParticipant.getPractitionerId()));
             // 查询科室
@@ -1021,13 +1032,14 @@ public class YbParamBuilderUtil {
      */
     public FinancialSettlement3202Param getFinancialSettlement3202Param(Settlement3202WebParam settlement3202WebParam) {
         // 数据库查询
-        Settlement3202Dto reconciliation = medicalInsuranceMapper.get3202Param(settlement3202WebParam.getStmtBegnDate().toString(),
-            settlement3202WebParam.getStmtEndDate().toString(), SecurityUtils.getLoginUser().getTenantId(),
-            settlement3202WebParam.getOrgId(), settlement3202WebParam.getClrType(),
-            settlement3202WebParam.getSetlOptins(), YbPayment.SELF_YB_ZH_PAY.getValue(),
-            YbPayment.SELF_YB_ZH_GJ_VALUE.getValue(), YbPayment.SELF_CASH_VALUE.getValue(),
-            YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
-            YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue());
+        Settlement3202Dto reconciliation =
+            medicalInsuranceMapper.get3202Param(settlement3202WebParam.getStmtBegnDate().toString(),
+                settlement3202WebParam.getStmtEndDate().toString(), SecurityUtils.getLoginUser().getTenantId(),
+                settlement3202WebParam.getOrgId(), settlement3202WebParam.getClrType(),
+                settlement3202WebParam.getSetlOptins(), YbPayment.SELF_YB_ZH_PAY.getValue(),
+                YbPayment.SELF_YB_ZH_GJ_VALUE.getValue(), YbPayment.SELF_CASH_VALUE.getValue(),
+                YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
+                YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue());
         // 数据处理
         reconciliation
             .setAcctGjPay(reconciliation.getAcctGjPay() == null ? BigDecimal.ZERO : reconciliation.getAcctGjPay());
@@ -2295,7 +2307,7 @@ public class YbParamBuilderUtil {
      * 
      * @return 基础信息
      */
-    public BaseInfo getBaseInfo(JSONObject jsonObj) {
+    public BaseInfo getBaseInfo(JSONObject jsonObj, Contract contract) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long hospitalId = loginUser.getHospitalId();
         // Organization hospital = iOrganizationService.getById(hospitalId);
@@ -2309,18 +2321,33 @@ public class YbParamBuilderUtil {
             baseInfo.setDecryptFlag("1");
         }
         // 电子处方
-        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        // JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+
+        if (contract == null) {
+            List<Contract> redisContractList = iContractService.getContractListByYb();
+            Optional<Contract> max = redisContractList.stream().max(Comparator.comparingInt(Contract::getSort));
+            if (max.isPresent()) {
+                contract = max.get();
+            } else {
+                throw new ServiceException("没有对合同进行优先级排序");
+            }
+        }
 
         return baseInfo.setUserId(loginUser.getUserId()).setRealname(loginUser.getUsername())
-            .setFixmedinsCode(optionJson.getString("fixmedinsCode"))
-            .setFixmedinsName(optionJson.getString("fixmedinsName"))
-            .setYbClientSecret(optionJson.getString("ybClientSecret")).setYbUsername(optionJson.getString("ybUsername"))
-            .setYbPassword(optionJson.getString("ybPassword")).setYbGrantType(optionJson.getString("ybGrantType"))
-            .setYbScope(optionJson.getString("ybScope")).setYbCliPrvKey(optionJson.getString("ybCliPrvKey"))
-            .setYbClientId(optionJson.getString("ybClientId")).setAdmvs(optionJson.getString("admvs"));
+            .setFixmedinsCode(contract.getFixmedinsCode()).setFixmedinsName(contract.getFixmedinsName())
+            .setYbClientSecret(contract.getClientSecret()).setYbUsername(contract.getUsername())
+            .setYbPassword(contract.getPassword()).setYbGrantType(contract.getGrantType())
+            .setYbScope(contract.getScope()).setYbCliPrvKey(contract.getCliPrvKey())
+            .setYbClientId(contract.getClientId()).setAdmvs(contract.getAdmVs());
     }
 
-    public BaseInfo getBaseInfo() {
+    public BaseInfo getBaseInfo(String medType, String dutyDoctorName) {
+        // 随机获取一个合同
+        List<Contract> contractListByYb = iContractService.getContractListByYb();
+        if (contractListByYb.isEmpty()) {
+            throw new ServiceException("无医保配置信息");
+        }
+        Contract contract = contractListByYb.get(0);
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long hospitalId = loginUser.getHospitalId();
         Organization hospital = iOrganizationService.getById(hospitalId);
@@ -2328,14 +2355,14 @@ public class YbParamBuilderUtil {
         // 电子处方
         JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
         String prePrvKey = optionJson.getString(CommonConstants.Option.APP_PRVKEY);
-        String prePubKey = optionJson.getString(CommonConstants.Option.PLAF_PUBKEY);
-        String clientId = optionJson.getString(CommonConstants.Option.CLIENT_ID);
+        String prePubKey = contract.getCliPubKey();
+        String clientId = contract.getClientId();
         String eleAddress = optionJson.getString(CommonConstants.Option.ELE_ADDRESS);
-        String username = optionJson.getString(CommonConstants.Option.USERNAME);
-        String password = optionJson.getString(CommonConstants.Option.PASSWORD);
-        String scope = optionJson.getString(CommonConstants.Option.SCOPE);
-        String grantType = optionJson.getString(CommonConstants.Option.GRANT_TYPE);
-        String clientSecret = optionJson.getString(CommonConstants.Option.CLIENT_SECRET);
+        String username = contract.getUsername();
+        String password = contract.getPassword();
+        String scope = contract.getScope();
+        String grantType = contract.getGrantType();
+        String clientSecret = contract.getClientSecret();
         String time = optionJson.getString(CommonConstants.Option.TIME);
         String preAppId = optionJson.getString(CommonConstants.Option.PRE_APP_ID);
         String preAppSecret = optionJson.getString(CommonConstants.Option.PRE_APP_SECRET);
@@ -2344,15 +2371,12 @@ public class YbParamBuilderUtil {
         String hospitalSealPath = optionJson.getString(CommonConstants.Option.HOSPITAL_SEAL_PATH);
 
         return baseInfo.setUserId(loginUser.getUserId()).setRealname(loginUser.getUsername())
-            .setAdmvs(hospital.getMedinsAdmdvs())
-            .setFixmedinsCode(
-                SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE))
-            .setFixmedinsName(
-                SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_NAME))
-            .setPrePrvKey(prePrvKey).setPrePubKey(prePubKey).setClientId(clientId).setEleAddress(eleAddress)
-            .setUsername(username).setPassword(password).setScope(scope).setGrantType(grantType)
-            .setClientSecret(clientSecret).setTime(time).setPreAppId(preAppId).setPreAppSecret(preAppSecret)
-            .setTemplatePath(templatePath).setOutputPath(outputPath).setHospitalSealPath(hospitalSealPath);
+            .setAdmvs(contract.getAdmVs()).setFixmedinsCode(contract.getFixmedinsCode())
+            .setFixmedinsName(contract.getFixmedinsName()).setPrePrvKey(prePrvKey).setPrePubKey(prePubKey)
+            .setClientId(clientId).setEleAddress(eleAddress).setUsername(username).setPassword(password).setScope(scope)
+            .setGrantType(grantType).setClientSecret(clientSecret).setTime(time).setPreAppId(preAppId)
+            .setPreAppSecret(preAppSecret).setTemplatePath(templatePath).setOutputPath(outputPath)
+            .setHospitalSealPath(hospitalSealPath).setMedType(medType).setDutyDoctorName(dutyDoctorName);
 
     }
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java
new file mode 100644
index 00000000..bdad01c8
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java
@@ -0,0 +1,319 @@
+package com.openhis.ybcatalog.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 西药中成药目录Entity实体
+ *
+ * @author system
+ * @date 2025-07-02
+ */
+@Data
+@TableName("yb_catalog_drug_info_usual")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class CatalogDrugInfoUsual {
+
+    /** 医疗目录编码 */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String medicalCatalogCode;
+
+    /** 药品商品名 */
+    private String drugTradeName;
+
+    /** 通用名编号 */
+    private String genericNameId;
+
+    /** 药品通用名 */
+    private String drugGenericName;
+
+    /** 化学名称 */
+    private String chemicalName;
+
+    /** 别名  */
+    private String alias;
+
+    /** 英文名称 */
+    private String englishName;
+
+    /** 注册名称 */
+    private String registeredName;
+
+    /** 药监本位码 */
+    private String drugSupervisionCode;
+
+    /** 药品剂型 */
+    private String drugForm;
+
+    /** 药品剂型名称 */
+    private String drugFormName;
+
+    /** 药品类别 */
+    private String drugCategory;
+
+    /** 药品类别名称 */
+    private String drugCategoryName;
+
+    /** 药品规格 */
+    private String drugSpecification;
+
+    /** 药品规格代码 */
+    private String drugSpecCode;
+
+    /** 注册剂型 */
+    private String registeredForm;
+
+    /** 注册规格 */
+    private String registeredSpec;
+
+    /** 注册规格代码 */
+    private String registeredSpecCode;
+
+    /** 每次用量 */
+    private String dosage;
+
+    /** 使用频次 */
+    private String frequency;
+
+    /** 酸根盐基 */
+    private String acidBase;
+
+    /** 国家药品编号 */
+    private String nationalDrugCode;
+
+    /** 用法 */
+    private String usage;
+
+    /** 中成药标志 */
+    private String tcmFlag;
+
+    /** 生产地类别 */
+    private String productionAreaType;
+
+    /** 生产地类别名称 */
+    private String productionAreaName;
+
+    /** 计价单位类型 */
+    private String pricingUnitType;
+
+    /** 非处方药标志 */
+    private String otcFlag;
+
+    /** 非处方药标志名称 */
+    private String otcFlagName;
+
+    /** 包装材质 */
+    private String packagingMaterial;
+
+    /** 包装材质名称 */
+    private String packagingMaterialName;
+
+    /** 包装规格 */
+    private String packagingSpec;
+
+    /** 包装数量 */
+    private String packagingQuantity;
+
+    /** 功能主治 */
+    private String functionIndication;
+
+    /** 给药途径 */
+    private String administrationRoute;
+
+    /** 说明书 */
+    private String instructions;
+
+    /** 开始日期 */
+    private String startDate;
+
+    /** 结束日期 */
+    private String endDate;
+
+    /** 最小使用单位 */
+    private String minUseUnit;
+
+    /** 最小销售单位 */
+    private String minSaleUnit;
+
+    /** 最小计量单位 */
+    private String minMeasurementUnit;
+
+    /** 最小包装数量 */
+    private String minPackageQuantity;
+
+    /** 最小包装单位 */
+    private String minPackageUnit;
+
+    /** 最小制剂单位 */
+    private String minPreparationUnit;
+
+    /** 最小包装单位名称 */
+    private String minPackageUnitName;
+
+    /** 最小制剂单位名称 */
+    private String minPreparationUnitName;
+
+    /** 转换比 */
+    private String conversionRatio;
+
+    /** 药品有效期 */
+    private String shelfLife;
+
+    /** 最小计价单位 */
+    private String minPricingUnit;
+
+    /** 五笔助记码 */
+    private String wubiCode;
+
+    /** 拼音助记码 */
+    private String pinyinCode;
+
+    /** 分包装厂家 */
+    private String repackager;
+
+    /** 生产企业编号 */
+    private String manufacturerCode;
+
+    /** 生产企业名称 */
+    private String manufacturerName;
+
+    /** 特殊限价药品标志 */
+    private String specialPriceLimitFlag;
+
+    /** 特殊药品标志 */
+    private String specialDrugFlag;
+
+    /** 限制使用范围 */
+    private String useRestriction;
+
+    /** 限制使用标志 */
+    private String useRestrictionFlag;
+
+    /** 药品注册证号 */
+    private String registrationCertNo;
+
+    /** 药品注册证号开始日期 */
+    private String regCertStartDate;
+
+    /** 药品注册证号结束日期 */
+    private String regCertEndDate;
+
+    /** 批准文号 */
+    private String approvalNo;
+
+    /** 批准文号开始日期 */
+    private String approvalStartDate;
+
+    /** 批准文号结束日期 */
+    private String approvalEndDate;
+
+    /** 市场状态 */
+    private String marketStatus;
+
+    /** 市场状态名称 */
+    private String marketStatusName;
+
+    /** 药品注册批件电子档案 */
+    private String regDocumentArchive;
+
+    /** 药品补充申请批件电子档案 */
+    private String suppApplicationArchive;
+
+    /** 国家医保药品目录备注 */
+    private String nationalInsuranceNotes;
+
+    /** 基本药物标志名称 */
+    private String essentialDrugFlagName;
+
+    /** 基本药物标志 */
+    private String essentialDrugFlag;
+
+    /** 增值税调整药品标志 */
+    private String vatAdjustmentFlag;
+
+    /** 增值税调整药品名称 */
+    private String vatAdjustmentName;
+
+    /** 上市药品目录集药品 */
+    private String listedDrugFlag;
+
+    /** 医保谈判药品标志 */
+    private String negotiationDrugFlag;
+
+    /** 医保谈判药品名称 */
+    private String negotiationDrugName;
+
+    /** 卫健委药品编码 */
+    private String nhcDrugCode;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 有效标志 */
+    private String validFlag;
+
+    /** 唯一记录号  */
+    private String uniqueRecordId;
+
+    /** 数据创建时间 */
+    private String createdAt;
+
+    /** 数据更新时间 */
+    private String updatedAt;
+
+    /** 版本号 */
+    private String version;
+
+    /** 版本名称 */
+    private String versionName;
+
+    /** 儿童用药 */
+    private String pediatricUse;
+
+    /** 公司名称 */
+    private String companyName;
+
+    /** 仿制药一致性评价药品 */
+    private String genericEvaluationFlag;
+
+    /** 经销企业 */
+    private String distributionCompany;
+
+    /** 经销企业联系人 */
+    private String distributionContact;
+
+    /** 经销企业授权书电子档案 */
+    private String distributionAuthArchive;
+
+    /** 国家医保药品目录剂型 */
+    private String insuranceForm;
+
+    /** 国家医保药品目录甲乙类标识 */
+    private String insuranceClass;
+
+    /** 上市许可证持有人 */
+    private String marketingAuthorizationHolder;
+
+    /** 下发标志 */
+    private String releaseFlag;
+
+    /** 传输数据ID */
+    private String transmissionDataId;
+
+    /** 生效时间 */
+    private String validFrom;
+
+    /** 失效时间 */
+    private String validTo;
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
new file mode 100644
index 00000000..da48c179
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
@@ -0,0 +1,17 @@
+package com.openhis.ybcatalog.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
+
+/**
+ * 西药中成药目录Mapper接口
+ *
+ * @author system
+ * @date 2025-07-02
+ */
+@Repository
+public interface CatalogDrugInfoUsualMapper extends BaseMapper<CatalogDrugInfoUsual> {
+
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
similarity index 70%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
index b4b516b7..5c986199 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
@@ -16,13 +16,13 @@ import java.util.List;
  * @date 2025-04-09
  */
 public interface ICatalogDrugInfoService extends IService<CatalogDrugInfo> {
-    /**
-     * 获取药品信息
-     *
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
-     */
-    Page<CatalogDrugInfo> selectCatalogDrugInfo(Integer pageNo,
-        Integer pageSize, String searchKey);
+//    /**
+//     * 获取药品信息
+//     *
+//     * @param pageNo 当前页
+//     * @param pageSize 每页多少条
+//     */
+//    Page<CatalogDrugInfo> selectCatalogDrugInfo(Integer pageNo,
+//        Integer pageSize, String searchKey);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java
new file mode 100644
index 00000000..88b1ae67
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java
@@ -0,0 +1,23 @@
+package com.openhis.ybcatalog.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
+
+/**
+ * 西药中成药目录Service接口
+ *
+ * @author system
+ * @date 2025-07-02
+ */
+public interface ICatalogDrugInfoUsualService extends IService<CatalogDrugInfoUsual> {
+    /**
+     * 获取药品信息
+     *
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     */
+    Page<CatalogDrugInfoUsual> selectCatalogDrugInfoUsual(Integer pageNo,
+        Integer pageSize, String searchKey);
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
similarity index 58%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
index 8a6b6743..343dd4ce 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
@@ -18,14 +18,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class CatalogDrugInfoServiceImpl extends ServiceImpl<CatalogDrugInfoMapper, CatalogDrugInfo> implements ICatalogDrugInfoService {
-    /**
-     * 获取药品信息
-     */
-
-    @Override
-    public Page<CatalogDrugInfo> selectCatalogDrugInfo(Integer pageNo,
-                                                       Integer pageSize, String searchKey) {
-        Page<CatalogDrugInfo> page = new Page<>(pageNo, pageSize);
-        return (baseMapper.selectPage(page, new LambdaQueryWrapper<CatalogDrugInfo>().like(CatalogDrugInfo::getRegisteredName, searchKey).or().like(CatalogDrugInfo::getPinyinCode, searchKey).or().like(CatalogDrugInfo::getWubiCode, searchKey)));
-    }
+//    /**
+//     * 获取药品信息
+//     */
+//
+//    @Override
+//    public Page<CatalogDrugInfo> selectCatalogDrugInfo(Integer pageNo,
+//                                                       Integer pageSize, String searchKey) {
+//        Page<CatalogDrugInfo> page = new Page<>(pageNo, pageSize);
+//        return (baseMapper.selectPage(page, new LambdaQueryWrapper<CatalogDrugInfo>().like(CatalogDrugInfo::getRegisteredName, searchKey).or().like(CatalogDrugInfo::getPinyinCode, searchKey).or().like(CatalogDrugInfo::getWubiCode, searchKey)));
+//    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
new file mode 100644
index 00000000..74d05263
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
@@ -0,0 +1,30 @@
+package com.openhis.ybcatalog.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
+import com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper;
+import com.openhis.ybcatalog.service.ICatalogDrugInfoUsualService;
+
+/**
+ * 西药中成药目录Service业务层处理
+ *
+ * @author system
+ * @date 2025-07-02
+ */
+@Service
+public class CatalogDrugInfoUsualServiceImpl extends ServiceImpl<CatalogDrugInfoUsualMapper, CatalogDrugInfoUsual> implements ICatalogDrugInfoUsualService {
+    /**
+     * 获取药品信息
+     */
+
+    @Override
+    public Page<CatalogDrugInfoUsual> selectCatalogDrugInfoUsual(Integer pageNo,
+                                                                 Integer pageSize, String searchKey) {
+        Page<CatalogDrugInfoUsual> page = new Page<>(pageNo, pageSize);
+        return (baseMapper.selectPage(page, new LambdaQueryWrapper<CatalogDrugInfoUsual>().like(CatalogDrugInfoUsual::getRegisteredName, searchKey).or().like(CatalogDrugInfoUsual::getPinyinCode, searchKey).or().like(CatalogDrugInfoUsual::getWubiCode, searchKey).or().like(CatalogDrugInfoUsual::getApprovalNo, searchKey)));
+    }
+}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
rename to openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
new file mode 100644
index 00000000..66571042
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.administration.mapper.ChargeItemMapper">
+
+    <select id="getChargeItemBaseInfoByIds" resultType="com.openhis.administration.dto.ChargeItemBaseInfoDto">
+        SELECT
+        a.id ,
+        a.status_enum ,
+        a.bus_no ,
+        a.patient_id ,
+        a.context_enum ,
+        a.encounter_id ,
+        a.occurrence_time ,
+        a.performer_id ,
+        a.performing_org_id ,
+        a.requesting_org_id ,
+        a.cost_org_id ,
+        a.quantity_value ,
+        a.quantity_unit ,
+        a.unit_price ,
+        a.total_price ,
+        a.definition_id ,
+        a.def_detail_id ,
+        a.base_amount ,
+        a.discount_amount ,
+        a.surcharge_amount ,
+        a.override_reason_code ,
+        a.override_reason_text ,
+        a.enterer_id ,
+        a.entered_date ,
+        a.service_table ,
+        a.service_id ,
+        a.claim_state_enum ,
+        a.account_id ,
+        a.org_id ,
+        a.tenant_id ,
+        a.delete_flag ,
+        a.create_by ,
+        a.create_time ,
+        a.update_by ,
+        a.update_time ,
+        a.print_count ,
+        a.product_table ,
+        a.product_id ,
+        a.refund_id ,
+        a.prescription_no ,
+        a.generate_source_enum ,
+        a.children_json ,
+        a.condition_id ,
+        a.encounter_diagnosis_id ,
+        a.tcm_flag ,
+        COALESCE(b1.bus_no, b2.bus_no, b3.bus_no) AS request_bus_no,
+        COALESCE(b6.bus_no, b7.bus_no, b8.bus_no) AS base_bus_no,
+        COALESCE(b6.name, b7.name, b8.name) AS "name",
+        COALESCE(b6.category_code, b7.category_code, b8.category_code) AS category_code,
+        COALESCE(b6.approval_number, b7.approval_number) AS approval_number,
+        COALESCE(b6.yb_no, b7.yb_no, b8.yb_no) AS yb_no,
+        CASE WHEN b6.children_flag is NOT NULL THEN b6.children_flag ELSE '0' END AS children_flag,
+        COALESCE(b6.chrgitm_lv, b7.chrgitm_lv, b8.chrgitm_lv) AS chrgitm_lv,
+        CASE WHEN b6.rx_flag is NOT NULL THEN b6.rx_flag ELSE 0 END AS children_flag,
+        COALESCE(b1.yb_class_enum, b2.yb_class_enum, b3.yb_class_enum) AS yb_class_enum,
+        COALESCE(b1.trace_no, b2.trace_no) AS trace_no,
+        CASE WHEN b1.suffering_flag is NOT NULL THEN b1.suffering_flag ELSE 0 END AS suffering_flag,
+        b5.yb_type,
+        org."name" as dept_name,
+        org.yb_no as dept_yb_no,
+        pra."name" as doct_name,
+        pra.yb_no as doct_yb_no,
+        contract.bus_no as contract_no
+        -- 添加更多需要的字段
+        FROM
+        adm_charge_item a
+        LEFT JOIN
+        med_medication_request b1 ON a.service_id = b1.id AND a.service_table = 'med_medication_request'
+        LEFT JOIN
+        wor_device_request b2 ON a.service_id = b2.id AND a.service_table = 'wor_device_request'
+        LEFT JOIN
+        wor_service_request b3 ON a.service_id = b3.id AND a.service_table = 'wor_service_request'
+        LEFT JOIN
+        adm_healthcare_service b4 ON a.service_id = b4.id AND a.service_table = 'adm_healthcare_service'
+        LEFT JOIN
+        med_medication_definition b6 ON a.product_id = b6.id AND a.product_table = 'med_medication_definition'
+        LEFT JOIN
+        adm_device_definition b7 ON a.product_id = b7.id AND a.product_table = 'adm_device_definition'
+        LEFT JOIN
+        wor_activity_definition b8 ON a.product_id = b8.id AND a.product_table = 'wor_activity_definition'
+        LEFT JOIN
+        adm_charge_item_definition b5 ON a.definition_id = b5.id
+        LEFT JOIN
+        adm_organization org ON a.requesting_org_id = org.id
+        LEFT JOIN
+        adm_practitioner pra ON a.enterer_id = pra.id
+        LEFT JOIN
+        adm_account acc ON a.account_id = acc.id
+        LEFT JOIN
+        fin_contract contract ON acc.contract_no = contract.bus_no
+        WHERE
+        a.delete_flag = '0'
+        AND
+        a.id IN
+        <foreach collection="chargeItemIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <select id="getChargeItemDefInfoByIds" resultType="com.openhis.administration.dto.ChargeItemDefInfo">
+        SELECT
+        T1.id,
+        T1.status_enum,
+        T1.generate_source_enum,
+        T1.bus_no,
+        T1.prescription_no,
+        T1.patient_id,
+        T1.context_enum,
+        T1.encounter_id,
+        T1.occurrence_time,
+        T1.performer_id,
+        T1.performing_org_id,
+        T1.requesting_org_id,
+        T1.cost_org_id,
+        T1.quantity_value,
+        T1.quantity_unit,
+        T1.unit_price,
+        T1.total_price,
+        T1.definition_id,
+        T1.def_detail_id,
+        T1.base_amount,
+        T1.discount_amount,
+        T1.surcharge_amount,
+        T1.override_reason_code,
+        T1.override_reason_text,
+        T1.enterer_id,
+        T1.entered_date,
+        T1.service_table,
+        T1.service_id,
+        T1.product_table,
+        T1.product_id,
+        T1.claim_state_enum,
+        T1.print_count,
+        T1.account_id,
+        T1.org_id,
+        T1.refund_id,
+        T1.children_json,
+        T1.condition_id,
+        T1.encounter_diagnosis_id,
+        T1.tcm_flag,
+        T1.create_time,
+        T1.create_by,
+        T1.update_time,
+        T1.update_by,
+        T2.charge_name,
+        T2.title,
+        T2.status_enum,
+        T2.org_id,
+        T2.description,
+        T2.instance_table,
+        T2.instance_id,
+        T2.effective_start,
+        T2.effective_end,
+        T2.type_code,
+        T2.yb_type,
+        T2.condition_flag,
+        T2.price
+        FROM
+        adm_charge_item T1
+        LEFT JOIN adm_charge_item_definition T2 ON T1.definition_id = T2.ID
+        AND T2.delete_flag = '0'
+        WHERE
+        T1.id IN
+        <foreach collection="chargeItemIds" item="itemId" open="(" separator="," close=")">
+            #{itemId}
+        </foreach>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
new file mode 100644
index 00000000..2f2c2389
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.administration.mapper.EncounterMapper">
+
+    <select id="getEncounterInfoByTime" resultType="com.openhis.administration.dto.EncounterAccountDto">
+        SELECT T1.ID,
+               T1.patient_id,
+               T1.group_id,
+               T1.bus_no,
+               T1.status_enum,
+               T1.class_enum,
+               T1.yb_class_enum,
+               T1.yb_class_text,
+               T1.class_json,
+               T1.priority_enum,
+               T1.type_enum,
+               T1.service_type_id,
+               T1.subject_status_enum,
+               T1.start_time,
+               T1.end_time,
+               T1.reception_time,
+               T1.organization_id,
+               T1.display_order,
+               T1.first_enum,
+               T1.admit_source_code,
+               T1.in_way_code,
+               T1.amb_encounter_id,
+               T1.registrar_id,
+               T2.status_enum,
+               T2.billing_status_enum,
+               T2.type_code,
+               T2.NO,
+               T2.NAME,
+               T2.patient_id,
+               T2.encounter_id,
+               T2.balance_amount,
+               T2.yb_area_no,
+               T2.contract_no,
+               T2.limit_account,
+               T2.encounter_flag
+        FROM adm_encounter T1
+                 LEFT JOIN adm_account T2 ON T1.ID = T2.encounter_id
+            AND T2.encounter_flag = 1
+            AND T2.delete_flag = '0'
+        WHERE T1.create_time &gt;
+              #{startDate}
+          AND T1.create_time &lt;
+              #{endDate};
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
new file mode 100644
index 00000000..9b7345f3
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.administration.mapper.FrequencyMapper">
+
+    <resultMap id="BaseResultMap" type="com.openhis.administration.domain.Frequency">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="rateCode" column="rate_code" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="dayCount" column="day_count" jdbcType="INTEGER"/>
+            <result property="dayInterval" column="day_interval" jdbcType="INTEGER"/>
+            <result property="dayTimes" column="day_times" jdbcType="VARCHAR"/>
+            <result property="weekCycleFlag" column="week_cycle_flag" jdbcType="INTEGER"/>
+            <result property="weekInterval" column="week_interval" jdbcType="INTEGER"/>
+            <result property="weekTimes" column="week_times" jdbcType="INTEGER"/>
+            <result property="continueFlag" column="continue_flag" jdbcType="INTEGER"/>
+            <result property="totalExecutionCount" column="total_execution_count" jdbcType="INTEGER"/>
+            <result property="executionPeriod" column="execution_period" jdbcType="INTEGER"/>
+            <result property="executionPeriodUnit" column="execution_period_unit" jdbcType="VARCHAR"/>
+            <result property="thirdCode" column="third_code" jdbcType="VARCHAR"/>
+            <result property="memo" column="memo" jdbcType="VARCHAR"/>
+            <result property="concurrencyStamp" column="concurrency_stamp" jdbcType="INTEGER"/>
+            <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
+            <result property="deleteFlag" column="delete_flag" jdbcType="CHAR"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,rate_code,name,
+        day_count,day_interval,day_times,
+        week_cycle_flag,week_interval,week_times,
+        continue_flag,total_execution_count,execution_period,
+        execution_period_unit,third_code,memo,
+        concurrency_stamp,tenant_id,delete_flag,
+        create_by,create_time,update_by,
+        update_time
+    </sql>
+</mapper>
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
new file mode 100644
index 00000000..f5c3d077
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.administration.mapper.TraceNoManageMapper">
+    <select id="getItemTraceNoInfo" resultType="com.openhis.administration.domain.TraceNoManage">
+        SELECT item_table,
+               item_id,
+               location_id,
+               lot_number,
+               trace_no,
+               MAX(create_time)
+        FROM adm_trace_no_manage
+        WHERE item_table = #{itemTable}
+          AND item_id = #{itemId}
+          AND location_id = #{locationId}
+          AND lot_number = #{lotNumber}
+          AND (trace_no) IN (
+            SELECT trace_no
+            FROM adm_trace_no_manage
+            WHERE item_table = #{itemTable}
+              AND item_id = #{itemId}
+              AND location_id = #{locationId}
+              AND lot_number = #{lotNumber}
+              AND delete_flag = '0'
+            GROUP BY trace_no
+            HAVING SUM(CASE WHEN status_enum = 1 THEN 1 ELSE 0 END) > -- 进库次数
+                   SUM(CASE WHEN status_enum = 2 THEN 1 ELSE 0 END) -- 出库次数
+        )
+          AND delete_flag = '0'
+        GROUP BY item_table,
+                 item_id,
+                 location_id,
+                 lot_number,
+                 trace_no
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
similarity index 74%
rename from openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
index 601223cc..e663bd76 100644
--- a/openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.PaymentRecDetailMapper">
+<mapper namespace="com.openhis.clinical.mapper.ReservationRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
similarity index 71%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
index 6b4aa4eb..c2b427fe 100644
--- a/openhis-server/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.EncounterMapper">
+<mapper namespace="com.openhis.document.mapper.DocDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
new file mode 100644
index 00000000..de52475c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.DocDefinitionOrganizationMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml
similarity index 70%
rename from openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml
index d2f4357e..abd4bac5 100644
--- a/openhis-server/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.ChargeItemMapper">
+<mapper namespace="com.openhis.document.mapper.DocRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
new file mode 100644
index 00000000..fc439637
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.DocStatisticsDefinitionMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
new file mode 100644
index 00000000..e79276e1
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
new file mode 100644
index 00000000..a5c5ae2c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.DocStatisticsMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
new file mode 100644
index 00000000..a72ef10f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.DocTemplateMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
new file mode 100644
index 00000000..22664aa9
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.OrderProcessMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml
new file mode 100644
index 00000000..2ef0dbb5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.document.mapper.RequestFormMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
new file mode 100644
index 00000000..de898048
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.financial.mapper.PaymentRecDetailMapper">
+
+    <select id="getListByReconciliationIds"
+            resultType="com.openhis.financial.model.PaymentRecDetailAccountResult">
+        SELECT
+        T1.ID,
+        T1.predecessor_id,
+        T1.reconciliation_id,
+        T1.target_enum,
+        T1.account_id,
+        T1.account_code,
+        T1.pay_enum,
+        T1.pay_level_enum,
+        T1.amount,
+        T1.return_amount,
+        T1.charge_amount,
+        T1.pay_trans_no,
+        T1.pay_trans_text,
+        T1.pay_trans_date,
+        T1.before_balance,
+        T1.after_balance,
+        T1.result_enum,
+        --id,
+        T2.status_enum,
+        T2.billing_status_enum,
+        T2.type_code,
+        T2.NO,
+        T2.NAME,
+        T2.patient_id,
+        T2.encounter_id,
+        T2.balance_amount,
+        T2.yb_area_no,
+        T2.contract_no,
+        T2.limit_account,
+        T2.encounter_flag
+        FROM
+        fin_payment_rec_detail T1
+        LEFT JOIN adm_account T2 ON T1.account_id = T2."id"
+        AND T2.delete_flag = '0'
+        WHERE
+        T1.reconciliation_id IN
+        <foreach collection="paymentIdList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND T1.delete_flag = '0'
+        AND T1.pay_enum NOT IN (310201,8,1,2,3,4,5,6,7,9,510100,340100,390100,390200,610100,640100,390400,620100,360100,999900,390300,9999981,360300)
+        AND T1.delete_flag = '0';
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
new file mode 100644
index 00000000..59317306
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.workflow.mapper.SupplyRequestAutoMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
similarity index 59%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
index 6f1d39f9..953bc9ce 100644
--- a/openhis-server/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
@@ -3,68 +3,68 @@
 <mapper namespace="com.openhis.yb.mapper.MedicalInsuranceMapper">
 
     <select id="get3201Param" resultType="com.openhis.web.ybmanage.vo.Settlement3201VO">
-        SELECT sum(T1.tendered_amount)    AS med_fee_sum_amt,
+        SELECT sum(T1.tendered_amount)                                           AS med_fee_sum_amt,
                sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
-               sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_Pay,
+               sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END)   AS acct_Pay,
                sum(case when T5.pay_enum = #{zhGjPay} THEN T5.amount ELSE 0 END) AS acct_gj_pay,
-               count(T1.id) AS fix_med_ins_setl_cnt
+               count(T1.id)                                                      AS fix_med_ins_setl_cnt
         FROM fin_payment_reconciliation T1
                  INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
                  INNER JOIN yb_clinc_reg T2 ON T4.bus_no = T2.ipt_otp_no
                  INNER JOIN yb_clinc_settle T3 ON T1.payment_no = T3.payment_no AND T2.mdtrt_id = T3.mdtrt_id
                  LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
         WHERE t1.bill_date &gt; #{startTime}
-        AND t1.bill_date &lt; #{endTime}
-        AND T2.insutype = #{InsuType}
-        AND T4.yb_class_enum = #{clrType}
-        AND T3.clr_optins = #{admVs}
-        AND T1.tenant_id = #{tenantId}
+          AND t1.bill_date &lt; #{endTime}
+          AND T2.insutype = #{InsuType}
+          AND T4.yb_class_enum = #{clrType}
+          AND T3.clr_optins = #{admVs}
+          AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
     <select id="get3202Param" resultType="com.openhis.web.ybmanage.vo.Settlement3202VO">
-        SELECT sum(T1.tendered_amount)    AS med_fee_sum_amt,
-               sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
-               sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
-               sum(case when T5.pay_enum = #{zhGjPay} THEN T5.amount ELSE 0 END) AS acct_gj_pay,
-               sum(case when T5.pay_enum = #{cash} THEN T5.amount ELSE 0 END) AS self_pay_cash,
-               sum(case when T5.pay_enum = #{cashAli} THEN T5.amount ELSE 0 END) AS self_pay_vx,
-               sum(case when T5.pay_enum = #{cashVX} THEN T5.amount ELSE 0 END) AS self_pay_ali,
+        SELECT sum(T1.tendered_amount)                                            AS med_fee_sum_amt,
+               sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)   AS fund_pay_sum_amt,
+               sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END)    AS acct_pay,
+               sum(case when T5.pay_enum = #{zhGjPay} THEN T5.amount ELSE 0 END)  AS acct_gj_pay,
+               sum(case when T5.pay_enum = #{cash} THEN T5.amount ELSE 0 END)     AS self_pay_cash,
+               sum(case when T5.pay_enum = #{cashAli} THEN T5.amount ELSE 0 END)  AS self_pay_vx,
+               sum(case when T5.pay_enum = #{cashVX} THEN T5.amount ELSE 0 END)   AS self_pay_ali,
                sum(case when T5.pay_enum = #{cashUNIN} THEN T5.amount ELSE 0 END) AS self_pay_union,
-               count(T1.id) AS fix_med_ins_setl_cnt
+               count(T1.id)                                                       AS fix_med_ins_setl_cnt
         FROM fin_payment_reconciliation T1
                  INNER JOIN yb_clinc_reg T2 ON T1.encounter_id = T2.ipt_otp_no
                  INNER JOIN yb_clinc_settle T3 ON T1.id = T3.payment_id AND T2.mdtrt_id = T3.mdtrt_id
                  INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
                  LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
         WHERE t1.bill_date &gt; #{startTime}
-        AND t1.bill_date &lt; #{endTime}
-        AND T4.yb_class_enum = #{clrType}
-        AND T3.clr_optins = #{admVs}
-        AND T1.tenant_id = #{tenantId}
+          AND t1.bill_date &lt; #{endTime}
+          AND T4.yb_class_enum = #{clrType}
+          AND T3.clr_optins = #{admVs}
+          AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
     <select id="get3203Param" resultType="com.openhis.web.ybmanage.vo.Financial3203VO">
-        SELECT sum(T1.tendered_amount)    AS med_fee_sum_amt,
-               sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
-               sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
-               sum(case when T5.pay_enum = #{zhGjPay THEN T5.amount ELSE 0 END}) AS acct_gj_pay,
-               sum(case when T5.pay_enum = #{cash} THEN T5.amount ELSE 0 END) AS self_pay_cash,
-               sum(case when T5.pay_enum = #{cashAli} THEN T5.amount ELSE 0 END) AS self_pay_vx,
-               sum(case when T5.pay_enum = #{cashVX} THEN T5.amount ELSE 0 END) AS self_pay_ali,
+        SELECT sum(T1.tendered_amount)                                            AS med_fee_sum_amt,
+               sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)   AS fund_pay_sum_amt,
+               sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END)    AS acct_pay,
+               sum(case when T5.pay_enum = #{zhGjPay THEN T5.amount ELSE 0 END})  AS acct_gj_pay,
+               sum(case when T5.pay_enum = #{cash} THEN T5.amount ELSE 0 END)     AS self_pay_cash,
+               sum(case when T5.pay_enum = #{cashAli} THEN T5.amount ELSE 0 END)  AS self_pay_vx,
+               sum(case when T5.pay_enum = #{cashVX} THEN T5.amount ELSE 0 END)   AS self_pay_ali,
                sum(case when T5.pay_enum = #{cashUNIN} THEN T5.amount ELSE 0 END) AS self_pay_union,
-               sum(T3.medfee_sumamt) AS med_sumfee,
-               count(T3.id) AS psntime,
-               count(T1.id) AS fix_med_ins_setl_cnt
+               sum(T3.medfee_sumamt)                                              AS med_sumfee,
+               count(T3.id)                                                       AS psntime,
+               count(T1.id)                                                       AS fix_med_ins_setl_cnt
         FROM fin_payment_reconciliation T1
                  INNER JOIN yb_clinc_reg T2 ON T1.encounter_id = T2.ipt_otp_no
                  INNER JOIN yb_clinc_settle T3 ON T1.id = T3.payment_id AND T2.mdtrt_id = T3.mdtrt_id
                  INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
                  LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
         WHERE t1.bill_date &gt; #{startTime}
-        AND t1.bill_date &lt; #{endTime}
-        AND T4.yb_class_enum = #{clrType}
-        AND T3.clr_optins = #{admVs}
-        AND T1.tenant_id = #{tenantId}
+          AND t1.bill_date &lt; #{endTime}
+          AND T4.yb_class_enum = #{clrType}
+          AND T3.clr_optins = #{admVs}
+          AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
 
@@ -100,45 +100,48 @@
         T4.clr_optins;
     </select>
 
-    <select id="getPaymentDecDetailUniAccountDtoListByPaymentIdList" resultType="com.openhis.yb.dto.PaymentDecDetailUniAccountDto">
+    <select id="getPaymentDecDetailUniAccountDtoListByPaymentIdList"
+            resultType="com.openhis.yb.dto.PaymentDecDetailUniAccountDto">
         SELECT
-            t1.id,
-            t1.predecessor_id,
-            t1.reconciliation_id,
-            t1.target_enum,
-            t1.account_id,
-            t1.account_code,
-            t1.pay_enum,
-            t1.pay_level_enum,
-            t1.amount,
-            t1.return_amount,
-            t1.charge_amount,
-            t1.pay_trans_no,
-            t1.pay_trans_text,
-            t1.pay_trans_date,
-            t1.before_balance,
-            t1.after_balance,
-            t1.result_enum,
-            t2.contract_no,
-            t5.insutype,
-            t5.med_type
+        t1.id,
+        t1.predecessor_id,
+        t1.reconciliation_id,
+        t1.target_enum,
+        t1.account_id,
+        t1.account_code,
+        t1.pay_enum,
+        t1.pay_level_enum,
+        t1.amount,
+        t1.return_amount,
+        t1.charge_amount,
+        t1.pay_trans_no,
+        t1.pay_trans_text,
+        t1.pay_trans_date,
+        t1.before_balance,
+        t1.after_balance,
+        t1.result_enum,
+        t2.contract_no,
+        t5.insutype,
+        t5.med_type
         FROM
-            fin_payment_rec_detail t1
-                LEFT JOIN adm_account t2 on t1.account_id = t2.id
-                LEFT JOIN fin_contract t3 on t2.contract_no = t3.bus_no
-                LEFT JOIN adm_encounter t4 on t2.encounter_id = t4.id
-                LEFT JOIN yb_clinc_reg t5 on t4.bus_no = t5.ipt_otp_no AND t4.delete_flag = '0'
-                LEFT JOIN fin_payment_reconciliation t6 on t6.id = t1.reconciliation_id AND t6.delete_flag = '0'
-                WHERE
-                      1=1
-                  AND t6.bill_date &gt; #{startTime}
-                  AND t6.bill_date &lt; #{endTime}
-            <if test="idList != null and idList.size() > 0">
-                 AND t1.reconciliation_id IN
-                <foreach collection="idList" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+        fin_payment_rec_detail t1
+        LEFT JOIN adm_account t2 on t1.account_id = t2.id
+        LEFT JOIN fin_contract t3 on t2.contract_no = t3.bus_no
+        LEFT JOIN adm_encounter t4 on t2.encounter_id = t4.id
+        LEFT JOIN yb_clinc_reg t5 on t4.bus_no = t5.ipt_otp_no AND t4.delete_flag = '0'
+        LEFT JOIN fin_payment_reconciliation t6 on t6.id = t1.reconciliation_id AND t6.delete_flag = '0'
+        WHERE
+        1=1
+        AND t6.bill_date &gt; #{startTime}
+        AND t6.bill_date &lt; #{endTime}
+        AND t6.status_enum != #{draft}
+        AND t1.account_id IS NOT NULL
+        <if test="idList != null and idList.size() > 0">
+            AND t1.reconciliation_id IN
+            <foreach collection="idList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
 
-        </select>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
new file mode 100644
index 00000000..50b3009b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
similarity index 100%
rename from openhis-server/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
diff --git a/openhis-server-new/openhis-einvoiceapp/pom.xml b/openhis-server-new/openhis-einvoiceapp/pom.xml
new file mode 100644
index 00000000..0069eb70
--- /dev/null
+++ b/openhis-server-new/openhis-einvoiceapp/pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>openhis-server</artifactId>
+        <groupId>com.openhis</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>openhis-einvoiceapp</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <!-- 领域-->
+<!--        <dependency>-->
+<!--            <groupId>com.openhis</groupId>-->
+<!--            <artifactId>openhis-domain</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>2.5.15</version> <!-- 确保版本与你的项目一致 -->
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.43</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <!-- 共通-->
+        <dependency>
+            <groupId>com.openhis</groupId>
+            <artifactId>openhis-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+        <!-- liteflow-->
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-spring-boot-starter</artifactId>
+            <version>2.12.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.69</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.43</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>kernel</artifactId>
+            <version>7.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5</version>
+        </dependency>
+
+        <!-- pdf依赖-->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext-asian</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.15</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>9</source>
+                    <target>9</target>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java b/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/OpenHisInvoiceApplication.java
similarity index 55%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
rename to openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/OpenHisInvoiceApplication.java
index cfce92ce..5da7d726 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
+++ b/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/OpenHisInvoiceApplication.java
@@ -2,8 +2,6 @@ package com.openhis;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -11,36 +9,21 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 
-import com.alibaba.fastjson.JSON;
-import com.openhis.pojo.ResultBody;
-import com.openhis.utils.EasyGmUtils;
-
 /**
  * 启动程序
  * 
  * @author system
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.openhis"})
-public class OpenHisYbApplication {
+public class OpenHisInvoiceApplication {
     public static void main(String[] args) throws UnknownHostException {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        ConfigurableApplicationContext application = SpringApplication.run(OpenHisYbApplication.class, args);
+        ConfigurableApplicationContext application = SpringApplication.run(OpenHisInvoiceApplication.class, args);
         Environment env = application.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");
         String path = env.getProperty("server.servlet.context-path");
-        System.out.println("医保启动");
-
-        String msg = "\n" +
-                "\n" +
-                "{\"cainfo\":\"0n5jVjERPVUh3stB/tmS5rH1X+Cnh3145P4e/0OFDrWAiwtYtlBa/vxMhbVWV0NBWqVP7pakLzQhVb2cmGYdAA==\",\"err_msg\":\"成功\",\"inf_refmsgid\":\"220000202505301537082844878588\",\"infcode\":\"0\",\"output\":\"PznBlnVSzpDlyl54Vk3/hg==\",\"refmsg_time\":\"20250530153708362\",\"respond_time\":\"20250530153708430\",\"signtype\":\"SM2\"}";
-        ResultBody response = JSON.parseObject(msg, ResultBody.class);
-        System.out.println(com.alibaba.fastjson2.JSON.toJSONString(response));
-        byte[] result = EasyGmUtils.sm4Decrypt("ACC10563D7382BF6".getBytes(StandardCharsets.UTF_8),
-            Base64.getDecoder().decode(response.getOutput()));
-        response.setOutput(new String(result));
-
-        System.out.println(JSON.toJSONString(response));
+        System.out.println("电子处方程序启动");
 
         System.out.println("\n----------------------------------------------------------\n\t"
             + "Application OpenHis-YB is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path
diff --git a/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/controller/YbController.java b/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/controller/YbController.java
new file mode 100644
index 00000000..9eec242f
--- /dev/null
+++ b/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/controller/YbController.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.core.common.utils.StringUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.openhis.vo.EleInvioceBillDto;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.annotation.Anonymous;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * TODO:医保控制层
+ *
+ * @author SunJQ
+ * @date 2025-03-18
+ */
+@RestController
+@RequestMapping("/eleInvoice")
+public class YbController {
+
+    Logger logger = LoggerFactory.getLogger(YbController.class);
+    // logger.debug("这是专用日志测试");
+
+    @PostMapping(value = "/forward")
+    @Anonymous
+    public JSONObject signIn(@RequestBody EleInvioceBillDto eleInvioceBillDto) {
+
+        JSONObject result = new JSONObject();
+        // 获取当前租户的option信息
+        //JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+
+        String baseUrl = eleInvioceBillDto.getBaseUrl();
+        // 拼接成完整 URL（作为路径）
+        String cleanUrl = baseUrl + "/" + eleInvioceBillDto.getEndpoint(); // 确保用 "/" 分隔
+        String url = cleanUrl.trim().replaceAll("^\"|\"$", "") // 去除首尾引号
+                .replaceAll("\\s+", "")// 去除首尾引号
+                .replaceAll("\"", ""); // 去除中间引号
+
+        //String appID = optionJson.getString(CommonConstants.Option.APP_ID);
+        String appID = eleInvioceBillDto.getAppID();
+        //String appKey = optionJson.getString(CommonConstants.Option.KEY);
+        String appKey = eleInvioceBillDto.getAppKey();
+        String data = eleInvioceBillDto.getJsonObject().toJSONString();
+        String version = "1.0";
+        // 请求随机标识 noise
+        String noise = UUID.randomUUID().toString();
+
+        data = Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8));
+
+        StringBuilder str = new StringBuilder();
+        str.append("appid=").append(appID);
+        str.append("&data=").append(data);
+        str.append("&noise=").append(noise);
+        str.append("&key=").append(appKey);
+        str.append("&version=").append(version);
+        String sign = DigestUtils.md5Hex(str.toString().getBytes(Charset.forName("UTF-8"))).toUpperCase();
+
+        Map<String, String> map = new HashMap<>();
+        map.put("appid", appID);
+        map.put("data", data);
+        map.put("noise", noise);
+        map.put("sign", sign);
+        map.put("version", version);
+
+        try {
+            HttpPost httpPost = new HttpPost(url);
+            CloseableHttpClient client = HttpClients.createDefault();
+            String respContent = null;
+            // 请求参数转JOSN字符串
+            StringEntity entity = new StringEntity(new ObjectMapper().writeValueAsString(map), "utf-8");
+            entity.setContentEncoding("UTF-8");
+            entity.setContentType("application/json");
+            httpPost.setEntity(entity);
+            HttpResponse resp = client.execute(httpPost);
+
+            if (resp.getStatusLine().getStatusCode() == 200) {
+                String rev = EntityUtils.toString(resp.getEntity());
+                // System.out.println("返回串--》"+rev);
+                Map resultData = new ObjectMapper().readValue(rev, Map.class);
+                String rdata = resultData.get("data").toString();
+                String rnoise = resultData.get("noise").toString();
+                // 1、拼接返回验签参数
+                StringBuilder str1 = new StringBuilder();
+                str1.append("appid=").append(appID);
+                str1.append("&data=").append(rdata);
+                str1.append("&noise=").append(rnoise);
+                str1.append("&key=").append(appKey);
+                str1.append("&version=").append(version);
+                // 3.MD5加密 生成sign
+                String rmd5 = DigestUtils.md5Hex(str1.toString().getBytes(Charset.forName("UTF-8"))).toUpperCase();
+                String rsign = resultData.get("sign").toString();
+                System.out.println("验签-》" + (StringUtils.equals(rsign, rmd5)));
+                String busData =
+                        new String(Base64.getDecoder().decode(resultData.get("data").toString()), StandardCharsets.UTF_8);
+                System.out.println("返回业务数据--》" + busData);
+                Map busDataMap = new ObjectMapper().readValue(busData, Map.class);
+                System.out
+                        .println("业务信息解密--》" + new String(Base64.getDecoder().decode(busDataMap.get("message").toString()),
+                                StandardCharsets.UTF_8));
+
+                JSONObject resobj = JSONObject.parseObject(busData);
+                result.put("success", true);
+                result.put("result", resobj);
+            } else {
+                result.put("msg", "web响应失败!");
+                result.put("success", false);
+            }
+        } catch (Exception e) {
+            result.put("msg", e.getMessage());
+            result.put("success", false);
+        }
+        return result;
+    }
+
+}
diff --git a/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/vo/EleInvioceBillDto.java b/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/vo/EleInvioceBillDto.java
new file mode 100644
index 00000000..c4f1c3dd
--- /dev/null
+++ b/openhis-server-new/openhis-einvoiceapp/src/main/java/com/openhis/vo/EleInvioceBillDto.java
@@ -0,0 +1,18 @@
+package com.openhis.vo;
+
+import com.alibaba.fastjson2.JSONObject;
+import lombok.Data;
+
+@Data
+public class EleInvioceBillDto {
+
+    JSONObject jsonObject;
+
+    String endpoint;
+
+    String baseUrl;
+
+    String appID;
+
+    String appKey;
+}
diff --git a/openhis-server-new/openhis-einvoiceapp/src/main/resources/application-druid.yml b/openhis-server-new/openhis-einvoiceapp/src/main/resources/application-druid.yml
new file mode 100644
index 00000000..fa3440c8
--- /dev/null
+++ b/openhis-server-new/openhis-einvoiceapp/src/main/resources/application-druid.yml
@@ -0,0 +1,63 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: org.postgresql.Driver
+    druid:
+      # 主库数据源
+      master:
+        #        url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.10.242:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        #        url: jdbc:postgresql://localhost:8020/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgres
+        password: root
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 # FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: openhis
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
\ No newline at end of file
diff --git a/openhis-server/openhis-ybapp/src/main/resources/application-prod.yml b/openhis-server-new/openhis-einvoiceapp/src/main/resources/application-prod.yml
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/application-prod.yml
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/application-prod.yml
diff --git a/openhis-server-new/openhis-einvoiceapp/src/main/resources/application.yml b/openhis-server-new/openhis-einvoiceapp/src/main/resources/application.yml
new file mode 100644
index 00000000..9ad5c9dd
--- /dev/null
+++ b/openhis-server-new/openhis-einvoiceapp/src/main/resources/application.yml
@@ -0,0 +1,159 @@
+# 项目相关配置
+core:
+  # 名称
+  name: OpenHis_eInvoice
+  # 版本
+  version: 0.0.1
+  # 版权年份
+  copyrightYear: 2025
+  # 文件路径
+  profile: D:/home/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数字计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为18080
+  port: 18078
+  servlet:
+    # 应用的访问路径
+    context-path: /openhis/eInvoice
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数，默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数，默认为200
+      max: 800
+      # Tomcat启动初始化的线程数，默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.openhis: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+# Spring配置
+spring:
+  main:
+    allow-circular-references: true
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: druid  #生产 prod #本地 druid
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    #    host: 127.0.0.1
+    host: 192.168.10.242
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 1
+    # 密码
+    password: redis
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+    # 文言
+    messages:
+      basename: i18n/general_message/messages
+      encoding: utf-8
+
+# token配置
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 30
+
+# MyBatis配置
+mybatis-plus:
+  # 搜索指定包别名
+  typeAliasesPackage: com.core.**.domain,com.openhis.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+  #helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+  # 分页插件会自动检测当前的数据库链接，自动选择合适的分页方式
+  auto-dialect: true
+  # 默认值为 false。设置为 true 时，允许在运行时根据多数据源自动识别对应方言的分页
+  auto-runtime-dialect: true
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /dev-api
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+# flowable相关表
+flowable:
+  # true 会对数据库中所有表进行更新操作。如果表不存在，则自动创建(建议开发时使用)
+  database-schema-update: false
+  # 关闭定时任务JOB
+  async-executor-activate: false
+
+## liteflow配置
+#liteflow:
+#  #规则文件路径
+#  rule-source: config/flow.el.xml
+#  #liteflow是否开启，默认为true
+#  enable: true
+#  #liteflow的banner打印是否开启，默认为true
+#  print-banner: false
+
+
+
diff --git a/openhis-server/openhis-ybapp/src/main/resources/banner.txt b/openhis-server-new/openhis-einvoiceapp/src/main/resources/banner.txt
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/banner.txt
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/banner.txt
diff --git a/openhis-server/openhis-ybapp/src/main/resources/config/flow.el.xml b/openhis-server-new/openhis-einvoiceapp/src/main/resources/config/flow.el.xml
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/config/flow.el.xml
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/config/flow.el.xml
diff --git a/openhis-server/openhis-ybapp/src/main/resources/config/hospital-config.properties b/openhis-server-new/openhis-einvoiceapp/src/main/resources/config/hospital-config.properties
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/config/hospital-config.properties
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/config/hospital-config.properties
diff --git a/openhis-server/openhis-ybapp/src/main/resources/config/sys-config.properties b/openhis-server-new/openhis-einvoiceapp/src/main/resources/config/sys-config.properties
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/config/sys-config.properties
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/config/sys-config.properties
diff --git a/openhis-server/openhis-ybapp/src/main/resources/logback.xml b/openhis-server-new/openhis-einvoiceapp/src/main/resources/logback.xml
similarity index 89%
rename from openhis-server/openhis-ybapp/src/main/resources/logback.xml
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/logback.xml
index ef23a224..d534b70b 100644
--- a/openhis-server/openhis-ybapp/src/main/resources/logback.xml
+++ b/openhis-server-new/openhis-einvoiceapp/src/main/resources/logback.xml
@@ -73,11 +73,11 @@
 
 
     <!-- 新增专用日志Appender -->
-    <appender name="YB_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/yb-app-service.log</file> <!-- 日志文件名 -->
+    <appender name="EINVOICE_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/e-invoice-service.log</file> <!-- 日志文件名 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 每天一个文件，保留60天 -->
-            <fileNamePattern>${log.path}/yb-app-service.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/e-invoice-service.%d{yyyy-MM-dd}.log</fileNamePattern>
             <maxHistory>60</maxHistory>
         </rollingPolicy>
         <encoder>
@@ -87,10 +87,7 @@
 
     <!-- 在原有logger配置下方添加 -->
     <logger name="com.openhis.controller.YbController" level="info" additivity="false">
-        <appender-ref ref="YB_LOGS" />
-    </logger>
-    <logger name="com.openhis.service.impl" level="info" additivity="false">
-        <appender-ref ref="YB_LOGS" />
+        <appender-ref ref="EINVOICE_LOGS" />
     </logger>
 
     <!-- 系统模块日志级别控制  -->
@@ -110,6 +107,6 @@
     </logger>
 
     <logger name="YB_LOGS" level="info">
-        <appender-ref ref="YB_LOGS"/>
+        <appender-ref ref="EINVOICE_LOGS"/>
     </logger>
 </configuration> 
\ No newline at end of file
diff --git a/openhis-server/openhis-miniapp/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/openhis-einvoiceapp/src/main/resources/mybatis/mybatis-config.xml
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/mybatis/mybatis-config.xml
rename to openhis-server-new/openhis-einvoiceapp/src/main/resources/mybatis/mybatis-config.xml
diff --git a/openhis-server/openhis-miniapp/pom.xml b/openhis-server-new/openhis-miniapp/pom.xml
similarity index 100%
rename from openhis-server/openhis-miniapp/pom.xml
rename to openhis-server-new/openhis-miniapp/pom.xml
diff --git a/openhis-server/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java b/openhis-server-new/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java
rename to openhis-server-new/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java
diff --git a/openhis-server/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties b/openhis-server-new/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties
rename to openhis-server-new/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties
diff --git a/openhis-server/openhis-miniapp/src/main/resources/application-druid.yml b/openhis-server-new/openhis-miniapp/src/main/resources/application-druid.yml
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/application-druid.yml
rename to openhis-server-new/openhis-miniapp/src/main/resources/application-druid.yml
diff --git a/openhis-server/openhis-miniapp/src/main/resources/application.yml b/openhis-server-new/openhis-miniapp/src/main/resources/application.yml
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/application.yml
rename to openhis-server-new/openhis-miniapp/src/main/resources/application.yml
diff --git a/openhis-server/openhis-miniapp/src/main/resources/banner.txt b/openhis-server-new/openhis-miniapp/src/main/resources/banner.txt
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/banner.txt
rename to openhis-server-new/openhis-miniapp/src/main/resources/banner.txt
diff --git a/openhis-server/openhis-miniapp/src/main/resources/i18n/messages.properties b/openhis-server-new/openhis-miniapp/src/main/resources/i18n/messages.properties
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/i18n/messages.properties
rename to openhis-server-new/openhis-miniapp/src/main/resources/i18n/messages.properties
diff --git a/openhis-server/openhis-miniapp/src/main/resources/logback.xml b/openhis-server-new/openhis-miniapp/src/main/resources/logback.xml
similarity index 100%
rename from openhis-server/openhis-miniapp/src/main/resources/logback.xml
rename to openhis-server-new/openhis-miniapp/src/main/resources/logback.xml
diff --git a/openhis-server/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/openhis-miniapp/src/main/resources/mybatis/mybatis-config.xml
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml
rename to openhis-server-new/openhis-miniapp/src/main/resources/mybatis/mybatis-config.xml
diff --git a/openhis-server/openhis-ybapp/pom.xml b/openhis-server-new/openhis-ybapp/pom.xml
similarity index 100%
rename from openhis-server/openhis-ybapp/pom.xml
rename to openhis-server-new/openhis-ybapp/pom.xml
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
new file mode 100644
index 00000000..d1d20eab
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
@@ -0,0 +1,50 @@
+package com.openhis;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.Environment;
+
+import com.alibaba.fastjson.JSON;
+import com.openhis.pojo.ResultBody;
+import com.openhis.utils.EasyGmUtils;
+
+/**
+ * 启动程序
+ * 
+ * @author system
+ */
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.openhis"})
+public class OpenHisYbApplication {
+    public static void main(String[] args) throws UnknownHostException {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        ConfigurableApplicationContext application = SpringApplication.run(OpenHisYbApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        System.out.println("医保启动");
+
+        String msg = "{\"cainfo\":\"nz6uO/SDPvEnusDW091FTX+aUO50CUE1c3zSm9BLXMWUvbfxfLvDClwa2LR2sPESmti47a+c7CVec3OaZhte0A==\",\"err_msg\":\"成功\",\"inf_refmsgid\":\"220000202506231058383283681313\",\"infcode\":\"0\",\"output\":\"wYVUH0j0Lo9hUdRpaTd/9fNss5V0kDK/qwpDGA9bWrgED86hlNPordYmAs+bre/01Ik/gO+mzsX1K4yjzaAz8ze6AwQocY9JFBIjP/JV31P2eoq0+w1ZjXnu2BekEvqD+yfpd0IB1ENBS5fxv+wZde1D3h4wk12tdMGC0AY65TREGJXcGigTot6c3L8ZJsyG1uZbDQVur4t9p1Mv/1EJaXy3VWhZjoSDR/y615yvHA2Dmvuca60XU4gXdMluHnqxvs8TC6b/fFZqEl66bkP0Ic98CTzVPMSSZu37FX+9jdvZ28Ecq0KnN0v+scyX1RYe1SDRyWWSO+J7coAdYYnLYEQS7jGPOmNVjVP68LKAEPvLTxWh/sfMTYvcEZ0e3pDYTVLb9rODmF693Khns9qKJ5mEDCdKUksSgY63jaxpC8LgIszJnp0A4198MeVNRbMe51IuXJaYvdA58UgVr6smU8VY7NfdDJ/uuGAOv+rtHgykyWYKYmV0SV94oMSomCqCzhMN3g3+mv6mA6hdFixpQAzJLWmkM5wq92fSIwYfpZEFz/wxz7LI18myTO0Mw1Kygo2DIbfbFRIElo29Un7MlTFFQZC45XcEj1oIIvnh53h9sxREpuziJjj4wubMbCj1PM+ZM07zcYef2ZNxq8VoduTP7I8HTrQ+jGls7TmZ4npKvOrPV+v6LTiSnvHbOXfK0O1heRetpUURrAbkC3xsllV1rYSa1rR8gKLI8pHBRwpKK0krxlcM4Nyq1veI1+TfBHwjcLNeh3EK51Tij8cGoMDsub6G06uNhYEoCjz++uXX1ikzWDaAe+z3bjsPzdBMR4HjTy06F4W8OjcsslUABM6WF+DPZrIH0EbXB8ZCn92RKeTLCEJ5Ybczq7u9F48sVto6NTk4z54yZ31aFgu7n4Q6AVa4LHVJElgKHt3lHq4feWhhVwTDMIgOVC/a8esAoJcXySMDeLv6aqgs5rcH0Lh4UC/OYVa3eG10QSvbbh8JIhgspApZLlYOQw7TytxSEdtjw5UZMcaY8XXhEEiRr3hUAtJjzz7++N+N6Qdv8hLbJXIYeqPRnYf/PkxZjxOoITp86SGIjsYXd4DFIOQWRlmRPyzlws6Pj8TKN5st2FAve7vk5UNP/lk4X6noc0IgEAYnOPkO1ntztGTCm3XsJCyAHDnjDjPk1gimJy79yq8FpXkRA8o8PQfE6B8I8aKhli5X1wU18r3X8zrq8f8+/z6UstXcdR2p7hyfm+cjLwukVn1/kwvMFxa/4K7BMBAIAcB4Md1TduGioGBRT2JRbF7dO5VUN0YYUk2h2XUW2C1j5DAwTQuZTK5b0r9bY70IDCOYmAq4xd3lJMUfB1qq4TQve1Mm0hn25bNE7gvS4NrZcE5WI/4y6LYDd4TET7Mu1Y/6Rx92gGNzO9eLJ+xEkmB4M6LpBbTeMUl8KIzD8QNldA0pfZ5AhAKuuKtbOgujzQM8h7owsFgfPofTWg+jmIbI3nVJCzpfTp7R9hp69svbkN3p691VGuhc7weMwGRvmVl8HMe2quRDGt0Vfg4Bnak3QWzIHtlsYSf6v63SRre33JXC9KlrR8qa/XekbEgMh2Zur2ppszhwVs5hce5UCWfJzEO8G9bMecvz/C+tizI=\",\"refmsg_time\":\"20250623105838020\",\"respond_time\":\"20250623105838288\",\"signtype\":\"SM2\"}";
+        ResultBody response = JSON.parseObject(msg, ResultBody.class);
+        System.out.println(com.alibaba.fastjson2.JSON.toJSONString(response));
+        byte[] bytes = "8E8DF30BD2420D81".getBytes(StandardCharsets.UTF_8);
+        System.out.println(bytes.length);
+        byte[] result = EasyGmUtils.sm4Decrypt("8E8DF30BD2420D81".getBytes(StandardCharsets.UTF_8),
+            Base64.getDecoder().decode(response.getOutput()));
+        response.setOutput(new String(result));
+
+        System.out.println(JSON.toJSONString(response));
+
+        System.out.println("\n----------------------------------------------------------\n\t"
+            + "Application OpenHis-YB is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path
+            + "/\n\t" + "External: \thttp://" + ip + ":" + port + path + "/\n"
+            + "----------------------------------------------------------");
+    }
+}
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
similarity index 94%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
index 9fe5533d..a71d6a4f 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
@@ -18,5 +18,6 @@ public interface InputDataTypeConst {
     String INV_INFO = "invinfo";
     String SEL_INFO = "selinfo";
     String DRUG_TRAC_INFO = "drugtracinfo";
+    String ADM_INFO = "adminfo";
 
 }
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
similarity index 61%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
index 9b77ba53..bb79d803 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
@@ -5,8 +5,6 @@ package com.openhis.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
-import cn.hutool.crypto.asymmetric.Sign;
-import com.openhis.vo.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +16,9 @@ import com.core.common.annotation.Anonymous;
 import com.openhis.config.InterfaceConfig;
 import com.openhis.service.FileService;
 import com.openhis.service.YbService;
+import com.openhis.vo.*;
+
+import cn.hutool.crypto.asymmetric.Sign;
 
 /**
  * TODO:医保控制层
@@ -29,11 +30,11 @@ import com.openhis.service.YbService;
 @RequestMapping("/yb")
 public class YbController {
 
-    Logger logger = LoggerFactory.getLogger(YbController.class);
-    // logger.debug("这是专用日志测试");
     /** 中心接口配置 */
     @Autowired
     protected InterfaceConfig interfaceConfig;
+    // logger.debug("这是专用日志测试");
+    Logger logger = LoggerFactory.getLogger(YbController.class);
     /** 医保服务 */
     @Autowired
     private YbService ybService;
@@ -84,7 +85,6 @@ public class YbController {
         return ybService.cancelFeeDetail(baseParam);
     }
 
-
     @PostMapping(value = "/upload2203-record")
     @Anonymous
     public Result<?> upload2203Record(@RequestBody BaseParam baseParam) {
@@ -154,19 +154,20 @@ public class YbController {
 
     @PostMapping(value = "/apply-clearing")
     @Anonymous
-    public Result<?> applyFinancialClearing(BaseParam baseParam, Financial3203AParam financial3203AParam) {
-        return ybService.applyFinancialClearing(baseParam, financial3203AParam);
+    public Result<?> applyFinancialClearing(@RequestBody BaseParam baseParam, Financial3203AParam financial3203AParam) {
+        return ybService.applyFinancialClearing(baseParam);
     }
 
     @PostMapping(value = "/cancel-clearing")
     @Anonymous
-    public Result<?> cancelFinancialClearing(BaseParam baseParam, Financial3204Param financial3204Param) {
+    public Result<?> cancelFinancialClearing(@RequestBody BaseParam baseParam, Financial3204Param financial3204Param) {
         return ybService.cancelFinancialClearing(baseParam, financial3204Param);
     }
 
     @PostMapping(value = "/get-clearing-status")
     @Anonymous
-    public Result<?> getFinancialClearingStatus(BaseParam baseParam, Clearing3205AParma clearing3205AParma) {
+    public Result<?> getFinancialClearingStatus(@RequestBody BaseParam baseParam,
+        Clearing3205AParma clearing3205AParma) {
         return ybService.getFinancialClearingStatus(baseParam, clearing3205AParma);
     }
 
@@ -212,10 +213,17 @@ public class YbController {
         return ybService.deleteGoodsInfo(baseParam, medical3507Param);
     }
 
-    @PostMapping(value = "/file-up")
+    @PostMapping(value = "/getclroptins")
+    @Anonymous
+    public Result<?> getClrOptins(@RequestBody BaseParam baseParam) {
+        return ybService.getClrOptins(baseParam);
+    }
+
+    @PostMapping(value = "/file-up1")
     @Anonymous
     public Result<?> uploadFile(@RequestParam("in") MultipartFile file, // 对应接口参数名"in"
         @RequestParam("filename") String filename, @RequestParam("fixmedins_code") String fixmedinsCode) {
+
         // 1. 基础校验
         if (file.isEmpty()) {
             return Result.error("文件不能为空");
@@ -226,9 +234,39 @@ public class YbController {
 
         // 2. 调用Service处理业务逻辑
         try {
-            FileResult fileResult = fileService.uploadFile(file.getInputStream(), // 改为直接传递输入流
-                filename, fixmedinsCode);
-            return Result.ok(fileResult);
+            // FileResult fileResult =
+            fileService.uploadFile(file.getInputStream(), filename, fixmedinsCode);
+            return Result.ok("");
+        } catch (Exception e) {
+            return Result.error("处理失败: " + e.getMessage());
+        }
+    }
+
+    @PostMapping(value = "/file-up2")
+    @Anonymous
+    public Result<?> upload3202File(@RequestPart("file") MultipartFile file,
+        @RequestParam("fixmedinsCode") String fixmedinsCode, @RequestParam("userId") String userId,
+        @RequestParam("admvs") String admvs) {
+
+        // File9101Param file9101Param = JSON.parseObject(JSON.toJSONString(baseParam.getData()), File9101Param.class);
+
+        // MultipartFile file = file9101Param.getFile();
+        String filename = file.getOriginalFilename();
+        // String fixmedinsCode = file9101Param.getFixmedinsCode();
+
+        // 1. 基础校验
+        if (file.isEmpty()) {
+            return Result.error("文件不能为空");
+        }
+        // if (!file.getOriginalFilename().endsWith(".zip")) {
+        // return Result.error("仅支持ZIP格式文件");
+        // }
+
+        // 2. 调用Service处理业务逻辑
+        try {
+            // FileResult fileResult =
+            // fileService.uploadFile(file,filename, fixmedinsCode);
+            return fileService.uploadFile(file, filename, fixmedinsCode, admvs, userId);
         } catch (Exception e) {
             return Result.error("处理失败: " + e.getMessage());
         }
@@ -246,4 +284,88 @@ public class YbController {
         return ybService.queryYbCatalogue(baseParam);
     }
 
+    @PostMapping(value = "/upload-2301-fee-detail")
+    @Anonymous
+    public Result<?> uploadInpatientFeeDetail(@RequestBody BaseParam baseParam) {
+        return ybService.uploadInpatientFeeDetail(baseParam);
+    }
+
+    @PostMapping(value = "/cancel-2302-fee-detail")
+    @Anonymous
+    public Result<?> cancelInpatientFeeDetail(@RequestBody BaseParam baseParam) {
+        return ybService.cancelInpatientFeeDetail(baseParam);
+    }
+
+    @PostMapping(value = "/inpa-pre-setl")
+    @Anonymous
+    public Result<?> prePayInpatient(@RequestBody BaseParam baseParam) {
+        return ybService.prePayInpatient(baseParam);
+    }
+
+    @PostMapping(value = "/inpa-setl")
+    @Anonymous
+    public Result<?> payInpatient(@RequestBody BaseParam baseParam) {
+        return ybService.payInpatient(baseParam);
+    }
+
+    @PostMapping(value = "/inpa-un-setl")
+    @Anonymous
+    public Result<?> cancelInpatientPay(@RequestBody BaseParam baseParam) {
+        return ybService.cancelInpatientPay(baseParam);
+    }
+
+    @PostMapping(value = "/inpatient-reg")
+    @Anonymous
+    public Result<?> inpatientReg(@RequestBody BaseParam baseParam) {
+        return ybService.inpatientReg(baseParam);
+    }
+
+    @PostMapping(value = "/discharge-patient")
+    @Anonymous
+    public Result<?> dischargePatient(@RequestBody BaseParam baseParam) {
+        return ybService.dischargePatient(baseParam);
+    }
+
+    @PostMapping(value = "/change-inpatient-info")
+    @Anonymous
+    public Result<?> changeInpatientInfo(@RequestBody BaseParam baseParam) {
+        return ybService.changeInpatientInfo(baseParam);
+    }
+
+    @PostMapping(value = "/cancel-inpatient-reg")
+    @Anonymous
+    public Result<?> cancelInpatientReg(@RequestBody BaseParam baseParam) {
+        return ybService.cancelInpatientReg(baseParam);
+    }
+
+    @PostMapping(value = "/cancel-discharge-patient")
+    @Anonymous
+    public Result<?> cancelDischargePatient(@RequestBody BaseParam baseParam) {
+        return ybService.cancelDischargePatient(baseParam);
+    }
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     * 
+     * @param baseParam 基础参数
+     * @return 结果
+     */
+    @PostMapping(value = "/pre-mid-analysis")
+    @Anonymous
+    public Result<?> yb3101PreMidAnalysis(@RequestBody BaseParam baseParam) {
+        return ybService.yb3101PreMidAnalysis(baseParam);
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     * 
+     * @param baseParam 基础参数
+     * @return 结果
+     */
+    @PostMapping(value = "/pre-mid-feedback")
+    @Anonymous
+    public Result<?> yb3103PreMidFeedback(@RequestBody BaseParam baseParam) {
+        return ybService.yb3103PreMidFeedback(baseParam);
+    }
+
 }
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/File.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/File.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
similarity index 96%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
index 0c5d5331..94dad6f2 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
@@ -59,6 +59,7 @@ public enum ServiceAdrEnum {
     /** 住院接口 */
     H2401("2401", "/mbs/fmi/fsi/api/callFsiService/callService", "【2401】入院办理"),
     H2402("2402", "/mbs/fmi/fsi/api/callFsiService/callService", "【2402】出院办理"),
+    H2403("2403", "/mbs/fmi/fsi/api/callFsiService/callService", "【2403】住院信息变更"),
     H2405("2405", "/mbs/fmi/fsi/api/callFsiService/callService", "【2405】出院撤销"),
     H2301("2301", "/mbs/fmi/fsi/api/callFsiService/callService", "【2301】住院费用明细上传"),
     H2302("2302", "/mbs/fmi/fsi/api/callFsiService/callService", "【2302】住院费用明细撤销"),
@@ -66,6 +67,9 @@ public enum ServiceAdrEnum {
     H2304("2304", "/mbs/fmi/fsi/api/callFsiService/callService", "【2304】住院结算"),
     H2305("2305", "/mbs/fmi/fsi/api/callFsiService/callService", "【2305】住院结算撤销"),
     H2404("2404", "/mbs/fmi/fsi/api/callFsiService/callService", "【2404】入院撤销"),
+    /** 智能审核事前提醒 */
+    A3101("3101", "/mbs/fmi/fsi/api/callFsiService/callService", "【3101】明细审核事前事中分析服务"),
+    A3103("3103", "/mbs/fmi/fsi/api/callFsiService/callService", "【3103】事前事中服务反馈服务"),
     /** 医药机构费用结算业务 */
     R3201("3201", "/mbs/fmi/fsi/api/callFsiService/callService", "【3201】医药机构费用结算对总账"),
     R3202("3202", "/mbs/fmi/fsi/api/callFsiService/callService", "【3202】医药机构费用结算对明细账"),
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
similarity index 92%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
index 733ab301..db3fef33 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
@@ -37,6 +37,8 @@ public class InputData<T, H> {
     private T invinfo;
     @JSONField(name = InputDataTypeConst.SEL_INFO)
     private T selinfo;
+    @JSONField(name = InputDataTypeConst.ADM_INFO)
+    private T adminfo;
 
     public InputData(T param, String insuplcAdmdvs, String flag) {
         this.insuplcAdmdvs = insuplcAdmdvs == null ? "" : insuplcAdmdvs;
@@ -68,6 +70,9 @@ public class InputData<T, H> {
         } else if (InputDataTypeConst.DSCG_INFO.equals(flag)) {
             this.dscginfo = param1;
             this.diSeInfo = param2;
+        } else if (InputDataTypeConst.ADM_INFO.equals(flag)) {
+            this.adminfo = param1;
+            this.diSeInfo = param2;
         }
     }
 
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
similarity index 98%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
index 143beef0..a9bc4f50 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
@@ -91,7 +91,7 @@ public class PDFInputDto {
         private String drugSpec;
 
         /** 单次用量 */
-        private BigDecimal sinDoscnt;
+        private String sinDoscnt;
 
         /** 单次剂量单位 */
         private String sinDosunt;
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/FileService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
similarity index 75%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
index d1517ee9..768533a3 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
@@ -4,9 +4,11 @@
 package com.openhis.service;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.openhis.config.InterfaceConfig;
+import com.openhis.utils.RedisUtil;
 import com.openhis.vo.FileDownload;
 import com.openhis.vo.FileResult;
 import com.openhis.vo.Result;
@@ -19,6 +21,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
@@ -30,16 +33,14 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 文件服务
@@ -52,8 +53,11 @@ public class FileService {
 
     @Autowired
     private InterfaceConfig interfaceConfig;
+    @Autowired
+    private RedisUtil redisUtil;
+
 
-    private static final String url = "http://localhost:8097/fsi/api/rsfComIfsService/callService";
+    private static final String url = "http://ddjk.jlhs.gov.cn:20215/mbs/fsi/api/fileupload";
 
     /**
      * 调用普通交易及文件下载交易
@@ -128,55 +132,55 @@ public class FileService {
     /**
      * 调用文件上传交易
      */
-    public void uploadFile(String fileName, String text, String mapping) {
-        // 例如："testUpload.txt"
-        File file = new File(fileName);
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpPost httppost = new HttpPost(url);
-        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).build();
-        httppost.setConfig(requestConfig);
-        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-        builder.setCharset(StandardCharsets.UTF_8);
-        builder.addTextBody("jsonStr", text);
-        builder.addBinaryBody("file", file, ContentType.DEFAULT_BINARY, fileName);
-        HttpEntity entity = builder.build();
-        httppost.setEntity(entity);
-        CloseableHttpResponse response = null;
+    public Result uploadFile(MultipartFile file, String text, String fixmedinsCode, String admvs, String userId) {
+        HttpEntity responseEntity = null;
         try {
-            response = httpclient.execute(httppost);
-            int statusCode = response.getStatusLine().getStatusCode();
-            if (statusCode != HttpStatus.SC_OK) {
-                httppost.abort();
-                throw new RuntimeException("HttpClient,error status code :" + statusCode);
-            }
-            HttpEntity responseEntity = response.getEntity();
-            String result;
-            if (responseEntity != null) {
-                // 返回字符串
-                result = EntityUtils.toString(responseEntity, "UTF-8");
-                System.out.println(result);
-            }
-            EntityUtils.consume(entity);
-        } catch (ClientProtocolException e) {
-            throw new RuntimeException("提交给服务器的请求，不符合HTTP协议", e);
-        } catch (IOException e) {
-            throw new RuntimeException("向服务器承保接口发起http请求,执行post请求异常", e);
-        } finally {
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
+            CloseableHttpClient httpclient = HttpClients.createDefault();
+            HttpPost httppost = new HttpPost(url);
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(10000)
+                    .setSocketTimeout(10000)
+                    .build();
+            httppost.setConfig(requestConfig);
+
+            // 设置认证头
+            httppost.setHeader("Authorization", String.valueOf(
+                    redisUtil.get("USER_TOKEN:USER_TOKEN_" + admvs + ":" + userId)
+            ));
+
+            // 创建JSON请求体 - 这是关键改变！
+            JSONObject requestBody = new JSONObject();
+            requestBody.put("fixmedins_code", fixmedinsCode);
+            requestBody.put("filename", file.getOriginalFilename());
+            requestBody.put("file", Base64.getEncoder().encodeToString(file.getBytes()));
+
+            // 设置JSON请求体
+            StringEntity entity = new StringEntity(
+                    requestBody.toJSONString(),
+                    ContentType.APPLICATION_JSON
+            );
+            httppost.setEntity(entity);
+
+            System.out.println("Sending JSON: " + requestBody.toJSONString());
+
+            try (CloseableHttpResponse response = httpclient.execute(httppost)) {
+                int statusCode = response.getStatusLine().getStatusCode();
+                if (statusCode != HttpStatus.SC_OK) {
+                    throw new RuntimeException("HTTP error, status code: " + statusCode);
                 }
-            }
-            if (httpclient != null) {
-                try {
-                    httpclient.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
+
+                responseEntity = response.getEntity();
+                if (responseEntity != null) {
+                    String result = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8);
+                    System.out.println("Response: " + result);
+                    return Result.ok(result);
+                    // 处理返回结果...
                 }
             }
+        } catch (Exception e) {
+            throw new RuntimeException("Request failed: " + e.getMessage(), e);
         }
+        return Result.ok(responseEntity);
     }
 
     public FileResult uploadFile(InputStream fileStream,
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/YbService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
similarity index 67%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
index fccc0a3a..168e47c8 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
@@ -3,12 +3,9 @@
  */
 package com.openhis.service;
 
-import cn.hutool.crypto.asymmetric.Sign;
-import com.openhis.vo.*;
-
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
+
+import com.openhis.vo.*;
 
 /**
  * TODO:医保同一服务层
@@ -31,12 +28,10 @@ public interface YbService {
      * 签到
      *
      * @param sign
-     * @param request
      * @return
      */
     Result<?> signOut(BaseParam sign);
 
-
     /**
      * 读卡获取身份信息
      *
@@ -144,7 +139,7 @@ public interface YbService {
     /**
      * 对总账
      * 
-     * @param financial3201Param
+     * @param baseParam
      * @return
      */
     Result<?> reconcileGeneralLedger(BaseParam baseParam);
@@ -168,10 +163,10 @@ public interface YbService {
     /**
      * 清算申请
      * 
-     * @param financial3203AParam
+     * @param
      * @return
      */
-    Result<?> applyFinancialClearing(BaseParam baseParam, Financial3203AParam financial3203AParam);
+    Result<?> applyFinancialClearing(BaseParam baseParam);
 
     /**
      * 清算申请状态查询
@@ -247,4 +242,107 @@ public interface YbService {
      */
     Result<?> queryYbCatalogue(BaseParam baseParam);
 
+    /**
+     * 3206A
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> getClrOptins(BaseParam baseParam);
+
+    /**
+     * 【2301】上传住院费用明细
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> uploadInpatientFeeDetail(BaseParam baseParam);
+
+    /**
+     * 【2302】住院费用明细撤销
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> cancelInpatientFeeDetail(BaseParam baseParam);
+
+    /**
+     * 【2303】住院预结算
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> prePayInpatient(BaseParam baseParam);
+
+    /**
+     * 【2304】住院结算
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> payInpatient(BaseParam baseParam);
+
+    /**
+     * 【2305】取消住院结算
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> cancelInpatientPay(BaseParam baseParam);
+
+    /**
+     * 【2401】 办理入院
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> inpatientReg(BaseParam baseParam);
+
+    /**
+     * 【2402】 办理出院
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> dischargePatient(BaseParam baseParam);
+
+    /**
+     * 【2403】 住院信息变更
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> changeInpatientInfo(BaseParam baseParam);
+
+    /**
+     * 【2404】 撤销入院
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> cancelInpatientReg(BaseParam baseParam);
+
+    /**
+     * 【2405】 撤销出院
+     * 
+     * @param baseParam
+     * @return
+     */
+    Result<?> cancelDischargePatient(BaseParam baseParam);
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param baseParam 基础参数
+     * @return 结果
+     */
+    Result<?> yb3101PreMidAnalysis(BaseParam baseParam);
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param baseParam 基础参数
+     * @return 结果
+     */
+    Result<?> yb3103PreMidFeedback(BaseParam baseParam);
 }
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
similarity index 88%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
index 8a5308ea..1e375275 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
@@ -66,6 +66,7 @@ public abstract class ElepHandlerServiceImpl implements IElepHandlerService {
 
         String sortedData = SignUtil.getValue(JSONObject.toJSONString(requestData.getData()));
         logger.info("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(sortedData));
+        System.out.println("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(sortedData));
 
         // 加密数据
         try {
@@ -73,6 +74,7 @@ public abstract class ElepHandlerServiceImpl implements IElepHandlerService {
             JSONObject inputObject = HseEncAndDecUtil.encryptMsg(appId, appSecret, prePrvKey, "", jsonObject);
 
             logger.info("【" + intNum + "】 加密后的整体入参：====" + JSONObject.toJSONString(inputObject));
+            System.out.println("【" + intNum + "】 加密后的整体入参：====" + JSONObject.toJSONString(inputObject));
             return inputObject;
         } catch (Exception e) {
             throw new ServiceException("加密数据异常");
@@ -97,6 +99,7 @@ public abstract class ElepHandlerServiceImpl implements IElepHandlerService {
         String appSecret = baseParam.getBaseInfo().getPreAppSecret();
 
         logger.info("响应URL：====" + url);
+        System.out.println("响应URL：====" + url);
 
         CloseableHttpClient client = HttpClients.createDefault();
         String encData = request.getString("encData");
@@ -143,14 +146,16 @@ public abstract class ElepHandlerServiceImpl implements IElepHandlerService {
                     logger.info("出参数据：====" + response);
                     //数据解密
                     String testdecData = null;
-                    try {
-                        testdecData = HseEncAndDecUtil.sm4Decrypt(appId, appSecret, response.getEncData());
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
+                    if (response.getCode() == 0){
+                        try {
+                            testdecData = HseEncAndDecUtil.sm4Decrypt(appId, appSecret, response.getEncData());
+                            System.out.println("解密后的数据" + testdecData);
+                            logger.info("解密后的出参数据：====" + testdecData);
+                            response.setEncData(testdecData);
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
                     }
-                    System.out.println("解密后的数据" + testdecData);
-                    logger.info("解密后的出参数据：====" + testdecData);
-                    response.setEncData(testdecData);
                     return response;
                 }
             } else {
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
similarity index 80%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
index 6cf279ae..d10826f6 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.openhis.config.InterfaceConfig;
-import com.openhis.config.Tenant;
 import com.openhis.enums.ServiceAdrEnum;
 import com.openhis.pojo.InputData;
 import com.openhis.pojo.ResultBody;
@@ -53,8 +52,6 @@ public abstract class HandlerServiceImpl implements HandlerService {
      * 多租户服务
      */
     @Autowired
-    private Tenant tenant;
-    @Autowired
     private BusnessIdUtil busnessIdUtil;
 
     Logger logger = LoggerFactory.getLogger(HandlerServiceImpl.class);
@@ -69,8 +66,8 @@ public abstract class HandlerServiceImpl implements HandlerService {
         // com.openhis.vo.LoginUser sysUser = loginUserUtil.getLoginUser();
         // 从缓存中获取签到编号
         String signNo = "";
-        if (redisUtil.hasKey("USER_SIGNNO:USER_SIGNNO_" + baseParam.getBaseInfo().getUserId())) {
-            signNo = redisUtil.get("USER_SIGNNO:USER_SIGNNO_" + baseParam.getBaseInfo().getUserId()).toString();
+        if (redisUtil.hasKey("USER_SIGNNO:"+ baseParam.getBaseInfo().getAdmvs()+ ":" + baseParam.getBaseInfo().getUserId())) {
+            signNo = redisUtil.get("USER_SIGNNO:"+ baseParam.getBaseInfo().getAdmvs()+ ":" + baseParam.getBaseInfo().getUserId()).toString();
         }
         if("9001".equals(intNum)){
             signNo = "";
@@ -81,16 +78,16 @@ public abstract class HandlerServiceImpl implements HandlerService {
         TransBody transBody = TransBody.builder().infno(intNum)
             .msgid(busnessIdUtil.getMsgid(baseParam.getBaseInfo().getFixmedinsCode()))
             .mdtrtareaAdmvs(baseParam.getBaseInfo().getAdmvs())
-            .insuplcAdmdvs(intNum.equals("9001") || intNum.equals("1101") || intNum.equals("3301") || intNum.equals("3302")  ? baseParam.getBaseInfo().getAdmvs()
+            .insuplcAdmdvs(intNum.equals("9001") || intNum.equals("1101") || intNum.equals("3206A") || intNum.equals("3301") || intNum.equals("3302")|| intNum.equals("3203A")  ? baseParam.getBaseInfo().getAdmvs()
                 : baseParam.getBaseInfo().getInsuplcAdmdvs())
             .recerSysCode("sys01").devNo("").devSafeInfo("")
-            .cainfo(interfaceConfig.getIsEncrypt() ? sign(JSONObject.toJSONString(inputData)) : "")
+            .cainfo(interfaceConfig.getIsEncrypt() ? sign(JSONObject.toJSONString(inputData),baseParam) : "")
             .signtype(interfaceConfig.getIsEncrypt() ? "SM2" : "").infver("V1.0").opterType("1").encType("SM4")
             .opter(baseParam.getBaseInfo().getUserId().toString()).opterName(baseParam.getBaseInfo().getRealname())
             .infTime(DateUtil.now()).fixmedinsCode(baseParam.getBaseInfo().getFixmedinsCode())
             .fixmedinsName(baseParam.getBaseInfo().getFixmedinsName()).signNo(signNo)
             // .fixmedinsName(baseParam.getBaseInfo().getFixmedinsName()).signNo("220000202505210958500117447359")
-            .input(interfaceConfig.getIsEncrypt() ? encrypt(JSONObject.toJSONString(inputData)) : inputData).build();
+            .input(interfaceConfig.getIsEncrypt() ? encrypt(JSONObject.toJSONString(inputData),baseParam) : inputData).build();
         System.out.println("【" + intNum + "】" + " 整体入参：====" + JSONObject.toJSONString(transBody));
         logger.info("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(transBody));
         return JSONObject.toJSONString(transBody);
@@ -116,7 +113,7 @@ public abstract class HandlerServiceImpl implements HandlerService {
         // 判断返回值是否需要解密
         String decryptFlag = baseParam.getBaseInfo().getDecryptFlag();
         if (interfaceConfig.getIsEncrypt()&&"1".equals(decryptFlag)) {
-            decrypt(resultBody);
+            decrypt(resultBody,baseParam);
         }
         System.out.println("解密之后出参：====" + resultBody);
         logger.info("解密之后出参：====" + resultBody);
@@ -128,23 +125,17 @@ public abstract class HandlerServiceImpl implements HandlerService {
     public String getToken(BaseParam baseParam) {
         String accessToken = "";
         Long userId = baseParam.getBaseInfo().getUserId();
-        if (redisUtil.hasKey("USER_TOKEN:USER_TOKEN_" + userId)) {
+        if (redisUtil.hasKey("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId)) {
             // 获取缓存
-            accessToken = String.valueOf(redisUtil.get("USER_TOKEN:USER_TOKEN_" + userId));
+            accessToken = String.valueOf(redisUtil.get("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId));
         } else {
             Map parmap = new HashMap<String, String>();
-            //parmap.put("username", tenant.getUsername());
-            //parmap.put("password", tenant.getPassword());
-            //parmap.put("scope", tenant.getScope());
-            //parmap.put("grant_type", tenant.getGrantType());
             parmap.put("username", baseParam.getBaseInfo().getYbUsername());
             parmap.put("password", baseParam.getBaseInfo().getYbPassword());
             parmap.put("scope", baseParam.getBaseInfo().getYbScope());
             parmap.put("grant_type", baseParam.getBaseInfo().getYbGrantType());
             System.out.println(parmap);
             Map headermap = new HashMap<String, String>();
-            //headermap.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(
-            //    (tenant.getClientId() + ":" + tenant.getClientSecret()).getBytes(StandardCharsets.UTF_8)));
             headermap.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(
                     (baseParam.getBaseInfo().getYbClientId() + ":" + baseParam.getBaseInfo().getYbClientSecret()).getBytes(StandardCharsets.UTF_8)));
             headermap.put(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded");
@@ -154,33 +145,34 @@ public abstract class HandlerServiceImpl implements HandlerService {
             System.out.println(result);
             accessToken = JSON.parseObject(result).getString("access_token");
             // 数据插入缓存（set中的参数含义：key值，user对象，缓存存在时间10（long类型），时间单位）
-            redisUtil.set("USER_TOKEN:USER_TOKEN_" + userId, accessToken, interfaceConfig.getTime());
+            System.out.println("token:"+accessToken);
+            redisUtil.set("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId, accessToken, interfaceConfig.getTime());
             log.info("数据插入缓存" + accessToken);
         }
         return accessToken;
     }
 
 
-    private String sign(String signBody) {
-        byte[] prvKey = Base64.getDecoder().decode(tenant.getCliPrvKey());
+    private String sign(String signBody,BaseParam baseParam) {
+        byte[] prvKey = Base64.getDecoder().decode(baseParam.getBaseInfo().getYbCliPrvKey());
         byte[] asig = EasyGmUtils.signSm3WithSm2(signBody.getBytes(StandardCharsets.UTF_8),
-            tenant.getClientId().getBytes(StandardCharsets.UTF_8), prvKey);
+                baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), prvKey);
         String signStr = new String(Base64.getEncoder().encode(asig));
         return signStr;
     }
 
 
-    private String encrypt(String param) {
+    private String encrypt(String param,BaseParam baseParam) {
         byte[] encrypt = param.getBytes();
-        byte[] bs = EasyGmUtils.sm4Encrypt(tenant.getClientId().getBytes(StandardCharsets.UTF_8), encrypt);
+        byte[] bs = EasyGmUtils.sm4Encrypt(baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), encrypt);
         String result = new String(Base64.getEncoder().encode(bs));
         return result;
     }
 
 
-    private void decrypt(ResultBody resultBody) {
+    private void decrypt(ResultBody resultBody, BaseParam baseParam) {
         System.out.println(JSON.toJSONString(resultBody));
-        byte[] result = EasyGmUtils.sm4Decrypt(tenant.getClientId().getBytes(StandardCharsets.UTF_8),
+        byte[] result = EasyGmUtils.sm4Decrypt(baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8),
             Base64.getDecoder().decode(resultBody.getOutput()));
         resultBody.setOutput(new String(result));
     }
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
similarity index 90%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
index 400c66c2..2b4c807a 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
@@ -19,6 +19,9 @@ import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.itextpdf.text.DocumentException;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.ybenums.YbDrugMedWay;
+import com.openhis.common.enums.ybenums.YbGender;
+import com.openhis.common.enums.ybenums.YbUsedFrqu;
 import com.openhis.component.ElepHandlerIntDispatcher;
 import com.openhis.config.InterfaceConfig;
 import com.openhis.config.Tenant;
@@ -88,20 +91,22 @@ public class YbElepServiceImpl implements IYbElepService {
             }
             // 做成PDF
             List<PDFInputDto.MedDetail> medDetailList = new ArrayList<>();
-            PDFInputDto.MedDetail medDetail = new PDFInputDto.MedDetail();
+            PDFInputDto.MedDetail medDetail;
+            String pattern = "\\s*\\([^)]*\\)$";
             for (ElepVeriPrescriptionDetail item : prescriptioninfo.getRxdrugdetail()) {
+                medDetail = new PDFInputDto.MedDetail();
                 // 药品名字
                 medDetail.setMedName(item.getDrugGenname());
                 // 药品规格
-                medDetail.setDrugSpec(item.getDrugSpec());
+                medDetail.setDrugSpec(item.getDrugSpec() + "  *  " + item.getDrugCnt() + item.getDrugDosunt());
                 // 单次用量
-                medDetail.setSinDoscnt(new BigDecimal(item.getSinDoscnt()));
+                medDetail.setSinDoscnt("每次" + item.getSinDoscnt());
                 // 单次剂量单
                 medDetail.setSinDosunt(item.getSinDosunt());
                 // 使用频次编码
-                medDetail.setUsedFrquCodg(item.getUsedFrquCodg());
+                medDetail.setUsedFrquCodg(YbUsedFrqu.getByValue(item.getUsedFrquCodg()).getDescription().replaceAll(pattern, ""));
                 // 用药途径
-                medDetail.setMedWay(item.getMedcWayCodg());
+                medDetail.setMedWay(YbDrugMedWay.getByValue(item.getMedcWayCodg()).getDescription());
                 medDetailList.add(medDetail);
             }
             // 主诊断名称
@@ -122,11 +127,11 @@ public class YbElepServiceImpl implements IYbElepService {
                     // 姓名
                     .setPatnName(prescriptioninfo.getMdtrtinfo().getPatnName())
                     // 性别
-                    .setGender(prescriptioninfo.getMdtrtinfo().getGend())
+                    .setGender(YbGender.getByValue(prescriptioninfo.getMdtrtinfo().getGend()).getDescription())
                     // 年龄
                     .setPatnAge(new BigDecimal(prescriptioninfo.getMdtrtinfo().getPatnAge()))
                     // 费别
-                    .setHiFeesetlType(prescriptioninfo.getMdtrtinfo().getHiFeesetlName())
+                    .setHiFeesetlType(baseInfo.getMedType())
                     // 开具日期
                     .setPrscTime(prescriptioninfo.getPrscTime())
                     // 临床诊断
@@ -136,7 +141,7 @@ public class YbElepServiceImpl implements IYbElepService {
                     // 开方医师
                     .setPrscDrName(prescriptioninfo.getMdtrtinfo().getPrscDrName())
                     // 审核药师
-                    .setPharName(prescriptioninfo.getMdtrtinfo().getPrscDrName())
+                    .setPharName(baseInfo.getDutyDoctorName())
                     // 调配、复核药师
                     .setDisRevPharName(null)
                     // 核对、发药药师
@@ -152,9 +157,16 @@ public class YbElepServiceImpl implements IYbElepService {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
             // 格式化日期
             String formattedDate = currentDate.format(formatter);
-
+            //创建日期文件夹
+            Boolean pathFlg = PDFTemplateFillerUtil.makePath(baseInfo.getOutputPath(), formattedDate);
+            if (!pathFlg) {
+                return Result.error("创建文件夹时发生错误");
+            }
+            //pdf模板文件全路径
             String templatePath = baseInfo.getTemplatePath();
+            //生成的pdf模板文件全路径
             String outputPath = baseInfo.getOutputPath() + formattedDate + "\\" + prescriptioninfo.getHospRxno() + ".pdf";
+            //盖章全路径
             String hospitalSealPath = baseInfo.getHospitalSealPath();
             try {
                 PDFTemplateFillerUtil.fillPdfTemplate(templatePath, outputPath, hospitalSealPath, pdfInputDto);
@@ -162,6 +174,7 @@ public class YbElepServiceImpl implements IYbElepService {
             } catch (IOException | DocumentException e) {
                 e.printStackTrace();
                 System.err.println("填充 PDF 时发生错误：" + e.getMessage());
+                return Result.error("填充 PDF 时发生错误：" + e.getMessage());
             }
             // 将pdf的名字保存
             redisUtil.set("RxFileName", outputPath);
@@ -267,7 +280,6 @@ public class YbElepServiceImpl implements IYbElepService {
             // 返回成功响应
             return Result.ok("电子处方撤销成功！", output);
         }
-
         return Result.error(result.getMessage());
     }
 
@@ -295,7 +307,6 @@ public class YbElepServiceImpl implements IYbElepService {
             // 返回成功响应
             return Result.ok("电子处方信息查询成功！", output);
         }
-
         return Result.error(result.getMessage());
     }
 
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
similarity index 77%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
index a4fc0e64..55aa6c77 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
@@ -7,7 +7,6 @@ import static com.alibaba.fastjson.JSON.parseObject;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -20,8 +19,9 @@ import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.core.common.exception.ServiceException;
 import com.core.common.utils.DateUtils;
-import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.openhis.component.HandlerIntDispatcher;
 import com.openhis.config.InterfaceConfig;
@@ -88,12 +88,13 @@ public class YbServiceImpl implements YbService {
         // sign.setIp(request.getRemoteAddr());
         ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P9001.toString(),
             new InputData(sign, null, InputDataTypeConst.SIGN_IN), baseParam);
-        if ("0".equals(result.getInfcode())) {
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
             Sign param = parseObject(parseObject(result.getOutput()).getString("signinoutb"), Sign.class);
             param.setOpterNo(sign.getOpterNo());
             param.setStatus("1");
-            redisUtil.set("USER_SIGNNO:USER_SIGNNO_" + baseParam.getBaseInfo().getUserId(), param.getSignNo(),
-                24 * 3600);
+            redisUtil.set(
+                "USER_SIGNNO:" + baseParam.getBaseInfo().getAdmvs() + ":" + baseParam.getBaseInfo().getUserId(),
+                param.getSignNo(), 24 * 3600);
             return Result.ok("签到成功！", param);
         }
         return Result.error(result.getErrMsg());
@@ -115,7 +116,7 @@ public class YbServiceImpl implements YbService {
         inputData.setSignNo(signInfo.getSignNo());
         ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P9002.toString(),
             new InputData(inputData, null, InputDataTypeConst.SIGN_OUT), baseParam);
-        if ("0".equals(result.getInfcode())) {
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
             Sign param = parseObject(parseObject(result.getOutput()).getString("signoutoutb"), Sign.class);
             signInfo.setSignOutTime(param.getSignTime());
             signInfo.setStatus("2");
@@ -139,7 +140,7 @@ public class YbServiceImpl implements YbService {
         // .setFixmedinsName(tenant.getFixmedinsName());
         ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P1101.toString(),
             new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        if ("0".equals(result.getInfcode())) {
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
             JSONObject resultObj = parseObject(result.getOutput());
             InfoPerson perinfo = parseObject(resultObj.getString("baseinfo"), InfoPerson.class);
             JSONArray insuinfo = resultObj.getJSONArray("insuinfo");
@@ -152,18 +153,33 @@ public class YbServiceImpl implements YbService {
             // }
             for (int i = 0, size = insuinfo.size(); i < size; i++) {
                 JSONObject obj = insuinfo.getJSONObject(i);
-                // 职工
-                if ("310".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) {
-                    perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
-                    perinfo.setInsutype(obj.getString("insutype"));
-                    perinfo.setBalc(obj.getString("balc"));
-                    perinfo.setCvlservFlag(obj.getString("cvlserv_flag"));
-                    perinfo.setPsnType(obj.getString("psn_type"));
-                    perinfo.setPsnInsuDate(obj.getString("psn_insu_date"));
-                    perinfo.setEmpName(obj.getString("emp_name"));
+                String insuplc_admdvs = obj.getString("insuplc_admdvs");// 获取参保地
+                if (StringUtils.isEmpty(insuplc_admdvs)) {
+                    throw new ServiceException("查询不到参保地信息");
                 }
-                // 居民
-                if ("390".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) {
+                if (insuplc_admdvs.equals(baseInfo.getAdmvs())) {
+                    // 职工
+                    if ("310".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) {
+                        perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
+                        perinfo.setInsutype(obj.getString("insutype"));
+                        perinfo.setBalc(obj.getString("balc"));
+                        perinfo.setCvlservFlag(obj.getString("cvlserv_flag"));
+                        perinfo.setPsnType(obj.getString("psn_type"));
+                        perinfo.setPsnInsuDate(obj.getString("psn_insu_date"));
+                        perinfo.setEmpName(obj.getString("emp_name"));
+                    }
+                    // 居民
+                    if ("390".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) {
+                        perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
+                        perinfo.setInsutype(obj.getString("insutype"));
+                        perinfo.setBalc(obj.getString("balc"));
+                        perinfo.setCvlservFlag(obj.getString("cvlserv_flag"));
+                        perinfo.setPsnType(obj.getString("psn_type"));
+                        perinfo.setPsnInsuDate(obj.getString("psn_insu_date"));
+                        perinfo.setEmpName(obj.getString("emp_name"));
+                    }
+                } else {
+                    // 2025.06.25 同关确认异地默认是参保状态
                     perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
                     perinfo.setInsutype(obj.getString("insutype"));
                     perinfo.setBalc(obj.getString("balc"));
@@ -619,8 +635,9 @@ public class YbServiceImpl implements YbService {
                 parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3302ParamDto.class);
             MedicalDirectory3302Param medicalDirectory3302Param = new MedicalDirectory3302Param();
             medicalDirectory3302Param.setFixmedinsCode(medicalDirectory3302ParamDto.getFixmedinsCode())
-                    .setFixmedinsHilistId(medicalDirectory3302ParamDto.getFixmedinsHilistId())
-                    .setListType(medicalDirectory3302ParamDto.getListType()).setMedListCodg(medicalDirectory3302ParamDto.getMedListCodg());
+                .setFixmedinsHilistId(medicalDirectory3302ParamDto.getFixmedinsHilistId())
+                .setListType(medicalDirectory3302ParamDto.getListType())
+                .setMedListCodg(medicalDirectory3302ParamDto.getMedListCodg());
             ResultBody resultInfo = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P3302.toString(),
                 new InputData(medicalDirectory3302ParamDto, null, InputDataTypeConst.DATA), baseParam);
             if (InterFaceResultConst.SUCCESS.equals(resultInfo.getInfcode())) {
@@ -646,19 +663,20 @@ public class YbServiceImpl implements YbService {
         Result result;
         Financial3201Output financial3201Output = new Financial3201Output();
         try {
-            //com.core.common.core.domain.model.LoginUser loginUser = SecurityUtils.getLoginUser();
+            // com.core.common.core.domain.model.LoginUser loginUser = SecurityUtils.getLoginUser();
             // LoginUser sysUser = loginUserUtil.getLoginUser();
             // reconciliation.setFixmedinsCode(sysUser.getFixmedinsCode());
             // reconciliation.setFixmedinsName(sysUser.getFixmedinsName());
             // reconciliation.setAdmvs(sysUser.getAdmvs());
             // reconciliation.setSetlOptins(sysUser.getAdmvs());
-            Financial3201Param financial3201Param = parseObject(JSON.toJSONString(baseParam.getData()), Financial3201Param.class);
+            Financial3201Param financial3201Param =
+                parseObject(JSON.toJSONString(baseParam.getData()), Financial3201Param.class);
             // 调用接口
             ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3201.toString(),
                 new InputData(financial3201Param, financial3201Param.getAdmvs(), InputDataTypeConst.DATA), baseParam);
             if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
                 JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                //reconciliation.setCreateTime(new Date());
+                // reconciliation.setCreateTime(new Date());
                 financial3201Output.setSetlOptins(financial3201Param.getSetlOptins());
                 financial3201Output.setStmtRslt(resultObj.getJSONObject("stmtinfo").getString("stmt_rslt"));
                 financial3201Output.setStmtRsltDscr(resultObj.getJSONObject("stmtinfo").getString("stmt_rslt_dscr"));
@@ -723,11 +741,14 @@ public class YbServiceImpl implements YbService {
     }
 
     @Override
-    public Result<?> applyFinancialClearing(BaseParam baseParam, Financial3203AParam financial3203AParam) {
+    public Result<?> applyFinancialClearing(BaseParam baseParam) {
         Result result;
+        Financial3203AParam financial3203AParam =
+            parseObject(JSON.toJSONString(baseParam.getData()), Financial3203AParam.class);
+
         try {
             ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3203A.toString(),
-                new InputData(financial3203AParam, financial3203AParam.getClrOptins(), InputDataTypeConst.DATA),
+                new InputData(baseParam.getData(), financial3203AParam.getClrOptins(), InputDataTypeConst.DATA),
                 baseParam);
             if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
                 JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
@@ -923,7 +944,25 @@ public class YbServiceImpl implements YbService {
         Result result;
         try {
             ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3507.toString(),
-                new InputData(medical3507Param, null, InputDataTypeConst.DATA), baseParam);
+                new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
+                result = Result.ok(resultBody);
+            } else {
+                result = Result.error(resultBody.getErrMsg());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            result = Result.error("网络异常");
+        }
+        return result;
+    }
+
+    @Override
+    public Result<?> getClrOptins(BaseParam baseParam) {
+        Result result;
+        try {
+            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3206A.toString(),
+                new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
             if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
                 result = Result.ok(resultBody);
             } else {
@@ -945,10 +984,213 @@ public class YbServiceImpl implements YbService {
             new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
         // System.out.println("---------1312result---------------" + result);
         String data = "";
-        if ("0".equals(result.getInfcode())) {
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
             JSONObject resultObj = parseObject(result.getOutput());
             data = resultObj.getString("data");
         }
         return Result.ok("获取成功", data);
     }
+
+    /**
+     * 2301 住院费用明细上传
+     * 
+     * @param baseParam
+     * @return
+     */
+    @Override
+    public Result<?> uploadInpatientFeeDetail(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2301.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            data = resultObj.getString("result");
+        }
+        return Result.ok("获取成功", data);
+    }
+
+    /**
+     * 2302 住院费用明细撤销
+     * 
+     * @param baseParam
+     * @return
+     */
+    @Override
+    public Result<?> cancelInpatientFeeDetail(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2302.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            data = resultObj.getString("result");
+        }
+        return Result.ok("获取成功", data);
+    }
+
+    /**
+     * 2303 住院预结算
+     * 
+     * @param baseParam
+     * @return
+     */
+    @Override
+    public Result<?> prePayInpatient(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2303.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            data = resultObj.getString("result");
+        }
+        return Result.ok("获取成功", data);
+    }
+
+    /**
+     * 2304 住院结算
+     * 
+     * @param baseParam
+     * @return
+     */
+    @Override
+    public Result<?> payInpatient(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2304.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            data = resultObj.getString("result");
+        }
+        return Result.ok("获取成功", data);
+    }
+
+    /**
+     * 2305 住院结算撤销
+     * 
+     * @param baseParam
+     * @return
+     */
+    @Override
+    public Result<?> cancelInpatientPay(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2305.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            data = resultObj.getString("result");
+        }
+        return Result.ok("获取成功", data);
+    }
+
+    @Override
+    public Result<?> inpatientReg(BaseParam baseParam) {
+        JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2401.toString(),
+            new InputData(resultObj.getString("mdtrtinfo"), resultObj.getString("diseinfo"), null,
+                InputDataTypeConst.MD_TRT_INFO),
+            baseParam);
+        String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObject = parseObject(result.getOutput());
+            data = resultObject.getString("result");
+        }
+        return Result.ok("获取成功", data);
+    }
+
+    @Override
+    public Result<?> dischargePatient(BaseParam baseParam) {
+        JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2402.toString(),
+            new InputData(resultObj.getString("dscginfo"), resultObj.getString("diseinfo"), null,
+                InputDataTypeConst.DSCG_INFO),
+            baseParam);
+        // String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObject = parseObject(result.getOutput());
+            // data = resultObject.getString("result");
+            return Result.ok("获取成功");
+        }
+        return Result.error("上传失败");
+    }
+
+    @Override
+    public Result<?> changeInpatientInfo(BaseParam baseParam) {
+        JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2403.toString(),
+            new InputData(resultObj.getString("adminfo"), resultObj.getString("diseinfo"), null,
+                InputDataTypeConst.ADM_INFO),
+            baseParam);
+        // String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObject = parseObject(result.getOutput());
+            // data = resultObject.getString("result");
+            return Result.ok("获取成功");
+        }
+        return Result.error("上传失败");
+    }
+
+    @Override
+    public Result<?> cancelInpatientReg(BaseParam baseParam) {
+        // JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2404.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        // String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObject = parseObject(result.getOutput());
+            // data = resultObject.getString("result");
+            return Result.ok("获取成功");
+        }
+        return Result.error("上传失败");
+    }
+
+    @Override
+    public Result<?> cancelDischargePatient(BaseParam baseParam) {
+        // JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2405.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        // String data = "";
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObject = parseObject(result.getOutput());
+            // data = resultObject.getString("result");
+            return Result.ok("获取成功");
+        }
+        return Result.error("上传失败");
+    }
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param baseParam 基础参数
+     * @return 结果
+     */
+    @Override
+    public Result<?> yb3101PreMidAnalysis(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.A3101.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            String data = resultObj.getString("result");
+            return Result.ok("获取成功", data);
+        } else {
+            return Result.error("获取失败");
+        }
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param baseParam 基础参数
+     * @return 结果
+     */
+    @Override
+    public Result<?> yb3103PreMidFeedback(BaseParam baseParam) {
+        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.A3103.toString(),
+            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
+        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
+            JSONObject resultObj = parseObject(result.getOutput());
+            String data = resultObj.getString("result");
+            return Result.ok("获取成功", data);
+        } else {
+            return Result.error("获取失败");
+        }
+    }
 }
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java
new file mode 100644
index 00000000..3cc5cdfa
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java
@@ -0,0 +1,29 @@
+package com.openhis.service.impl.inhospital;
+
+import org.springframework.stereotype.Service;
+
+import com.openhis.annotation.HandlerInt;
+import com.openhis.enums.ServiceAdrEnum;
+import com.openhis.pojo.InputData;
+import com.openhis.pojo.ResultBody;
+import com.openhis.service.impl.HandlerServiceImpl;
+import com.openhis.vo.BaseParam;
+
+/**
+ * 住院信息变更
+ */
+@Service
+@HandlerInt(ServiceAdrEnum.H2403)
+public class ChHospitalizedServiceImpl extends HandlerServiceImpl {
+
+    /**
+     * 处理交易
+     * @param inputData
+     * @return
+     */
+    @Override
+    public ResultBody handle(InputData inputData, BaseParam baseParam){
+        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2403.getAddress(),initTransBody(ServiceAdrEnum.H2403.getNum(),inputData, baseParam),baseParam);
+    }
+
+}
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
similarity index 83%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
index 1a57ccd8..4086e66d 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
@@ -32,18 +32,18 @@ public final class PDFTemplateFillerUtil {
 
     // "--"分隔处方结束
     public static final String DASH_LINE =
-        "-------------------------------------------------------------------------------------------------------";
+            "-------------------------------------------------------------------------------------------------------";
 
     /**
      * 根据模板pdf文件，替换生成新的pdf
      *
-     * @param templatePath 模板pdf文件
-     * @param outputPath 替换后的pdf文件
+     * @param templatePath     模板pdf文件
+     * @param outputPath       替换后的pdf文件
      * @param hospitalSealPath 医院盖章路径
-     * @param dto 替换内容
+     * @param dto              替换内容
      */
     public static void fillPdfTemplate(String templatePath, String outputPath, String hospitalSealPath, PDFInputDto dto)
-        throws IOException, DocumentException {
+            throws IOException, DocumentException {
         PdfReader reader = new PdfReader(templatePath);
         PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(outputPath));
 
@@ -59,7 +59,7 @@ public final class PDFTemplateFillerUtil {
         stamper.getAcroFields().setFieldProperty("$P_NO", "textfont", baseFont, null);
         stamper.getAcroFields().setFieldProperty("$P_NO", "textsize", 10f, null);
         stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textsize", 7f, null);
+        stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textsize", 10f, null);
         stamper.getAcroFields().setFieldProperty("$GENDER", "textfont", baseFont, null);
         stamper.getAcroFields().setFieldProperty("$GENDER", "textsize", 10f, null);
         stamper.getAcroFields().setFieldProperty("$AGE", "textfont", baseFont, null);
@@ -70,6 +70,8 @@ public final class PDFTemplateFillerUtil {
         stamper.getAcroFields().setFieldProperty("$DATE", "textsize", 10f, null);
         stamper.getAcroFields().setFieldProperty("$DAYS", "textfont", baseFont, null);
         stamper.getAcroFields().setFieldProperty("$DAYS", "textsize", 10f, null);
+        stamper.getAcroFields().setFieldProperty("$DIAG_NAME", "textfont", baseFont, null);
+        stamper.getAcroFields().setFieldProperty("$DIAG_NAME", "textsize", 10f, null);
 
         // 替换文本内容
         stamper.getAcroFields().setField("$QR_NUMBER", dto.getRxTraceCode());
@@ -79,13 +81,13 @@ public final class PDFTemplateFillerUtil {
         stamper.getAcroFields().setField("$LOCATION_NAME", dto.getLocationName());
         stamper.getAcroFields().setField("$PATIENT_NAME", dto.getPatnName());
         stamper.getAcroFields().setField("$GENDER", dto.getGender());
-        stamper.getAcroFields().setField("$AGE", dto.getPatnAge().toString());
+        stamper.getAcroFields().setField("$AGE", dto.getPatnAge().toString()+ "岁");
         stamper.getAcroFields().setField("$CONTRACT", dto.getHiFeesetlType());
         // 设置时间格式为 "yyyy-MM-dd HH:mm:ss"
         // 设置时间格式为中文格式 "xx年xx月xx日"
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
         stamper.getAcroFields().setField("$DATE", sdf.format(dto.getPrscTime()));
-        stamper.getAcroFields().setField("$DIAG_NAME", dto.getDiagName());
+        stamper.getAcroFields().setField("$DIAG_NAME", " " + dto.getDiagName());
         stamper.getAcroFields().setField("$DAYS", dto.getValiDays().toString() + "天");
         stamper.getAcroFields().setField("$REASON", dto.getReason());
         stamper.getAcroFields().setField("$P1_NAME", dto.getPrscDrName());
@@ -164,8 +166,8 @@ public final class PDFTemplateFillerUtil {
                 float pageSizeWidth = reader.getPageSize(1).getWidth();
                 float pageSizeHeight = reader.getPageSize(1).getHeight();
                 // 计算右下角的位置（留出一些边距）
-                int sealX = (int)(pageSizeWidth - hospitalSeal.getScaledWidth() - 80); // X坐标（右下角）
-                int sealY = (int)(pageSizeHeight - hospitalSeal.getScaledHeight() - 550); // Y坐标（右下角）
+                int sealX = (int) (pageSizeWidth - hospitalSeal.getScaledWidth() - 80); // X坐标（右下角）
+                int sealY = (int) (pageSizeHeight - hospitalSeal.getScaledHeight() - 550); // Y坐标（右下角）
                 hospitalSeal.setAbsolutePosition(sealX, sealY);
                 cb.addImage(hospitalSeal);
             } catch (Exception e) {
@@ -193,7 +195,7 @@ public final class PDFTemplateFillerUtil {
         }
         try (FileInputStream fis = new FileInputStream(file)) {
             // 读取文件字节数组
-            byte[] fileBytes = new byte[(int)file.length()];
+            byte[] fileBytes = new byte[(int) file.length()];
             int bytesRead = fis.read(fileBytes);
             if (bytesRead != fileBytes.length) {
                 return null;
@@ -210,9 +212,9 @@ public final class PDFTemplateFillerUtil {
      * 做成PDF
      *
      * @param rxFileString pdf信息
-     * @param fileName pdf文件名路径
+     * @param fileName     pdf文件名路径
      */
-    public static Boolean makePDF(String rxFileString,String fileName) {
+    public static Boolean makePDF(String rxFileString, String fileName) {
         try {
             // 验证Base64字符串格式
             if (rxFileString == null || rxFileString.isEmpty()) {
@@ -242,4 +244,36 @@ public final class PDFTemplateFillerUtil {
 
         return true;
     }
+
+    /**
+     * 创建当天日期的文件夹
+     *
+     * @param outputPath   父文件夹
+     * @param datePathName 日期文件夹名
+     */
+    public static Boolean makePath(String outputPath, String datePathName) {
+        try {
+            // 构建代表新文件夹的File对象
+            File newDir = new File(outputPath, datePathName);
+
+            // 检查新文件夹是否已存在
+            if (!newDir.exists()) {
+                // 创建新文件夹
+                boolean created = newDir.mkdir();
+
+                if (created) {
+                    System.out.println("文件夹创建成功：" + newDir.getAbsolutePath());
+                    return true;
+                } else {
+                    System.out.println("文件夹创建失败，可能是父文件夹不存在或者没有写入权限：" + newDir.getAbsolutePath());
+                    return false;
+                }
+            } else {
+                System.out.println("文件夹已存在,不创建新的文件夹：" + newDir.getAbsolutePath());
+                return true;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
similarity index 97%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
index ef6c3af2..26c00c38 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
@@ -85,6 +85,8 @@ public class BaseInfo {
     private String templatePath;
     private String outputPath;
     private String hospitalSealPath;
+    private String medType;
+    private String dutyDoctorName;
     /********************共通参数********************/
     //是否解密
     private String decryptFlag;
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
similarity index 77%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
index 19f08a8e..99b72c73 100644
--- a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
@@ -19,23 +19,23 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class Clinic2206FundPaymentResult {
     // 主键字段（根据Y标识判断）
-    @JSONField(name = "fund_pay_type")
+    //@JSONField(name = "fund_pay_type")
     private String fundPayType; // 基金支付类型
 
     // 数值型字段使用BigDecimal保证精度
-    @JSONField(name = "inscp_scp_amt")
+    //@JSONField(name = "inscp_scp_amt")
     private BigDecimal inscpScpAmt; // 符合政策范围金额
 
-    @JSONField(name = "crt_payb_lmt_amt")
+    //@JSONField(name = "crt_payb_lmt_amt")
     private BigDecimal crtPaybLmtAmt; // 本次可支付限额金额
 
-    @JSONField(name = "fund_payamt")
+    //@JSONField(name = "fund_payamt")
     private BigDecimal fundPayamt; // 基金支付金额
 
     // 字符型字段
-    @JSONField(name = "fund_pay_type_name")
+    //@JSONField(name = "fund_pay_type_name")
     private String fundPayTypeName; // 基金支付类型名称
 
-    @JSONField(name = "setl_proc_info")
+    //@JSONField(name = "setl_proc_info")
     private String setlProcInfo; // 结算过程信息
 }
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java
new file mode 100644
index 00000000..460d7e96
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java
@@ -0,0 +1,14 @@
+package com.openhis.vo;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class File9101Param {
+
+    private MultipartFile file;
+
+    private String filename;
+
+    private String fixmedinsCode;
+}
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java
diff --git a/openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/extData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/java/com/openhis/vo/extData.java
rename to openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml
new file mode 100644
index 00000000..e9db5da4
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml
@@ -0,0 +1,64 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: org.postgresql.Driver
+    druid:
+      # 主库数据源
+      master:
+        #        url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        #url: jdbc:postgresql://192.168.10.240:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        #        url: jdbc:postgresql://localhost:8020/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.30.199:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgres
+        password: root
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 # FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: openhis
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
\ No newline at end of file
diff --git a/openhis-server/openhis-ybapp/src/main/resources/application-druid.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml
similarity index 93%
rename from openhis-server/openhis-ybapp/src/main/resources/application-druid.yml
rename to openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml
index e68db5ca..59aa507d 100644
--- a/openhis-server/openhis-ybapp/src/main/resources/application-druid.yml
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml
@@ -7,7 +7,6 @@ spring:
       # 主库数据源
       master:
         url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-#        url: jdbc:postgresql://localhost:8020/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgres
         password: root
       # 从库数据源
diff --git a/openhis-server/openhis-ybapp/src/main/resources/application.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application.yml
similarity index 98%
rename from openhis-server/openhis-ybapp/src/main/resources/application.yml
rename to openhis-server-new/openhis-ybapp/src/main/resources/application.yml
index 5332acaa..30217665 100644
--- a/openhis-server/openhis-ybapp/src/main/resources/application.yml
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/application.yml
@@ -54,7 +54,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid  #生产 prod #本地 druid
+    active: prod  #生产 prod #本地 druid
   # 文件上传
   servlet:
     multipart:
@@ -70,6 +70,7 @@ spring:
   # redis 配置
   redis:
     # 地址
+    #    host: 127.0.0.1
     host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt b/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt
new file mode 100644
index 00000000..f95701d8
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+
+      ::::::::  :::::::::  :::::::::: ::::    :::    :::    ::: ::::::::::: ::::::::
+    :+:    :+: :+:    :+: :+:        :+:+:   :+:    :+:    :+:     :+:    :+:    :+:
+   +:+    +:+ +:+    +:+ +:+        :+:+:+  +:+    +:+    +:+     +:+    +:+
+  +#+    +:+ +#++:++#+  +#++:++#   +#+ +:+ +#+    +#++:++#++     +#+    +#++:++#++
+ +#+    +#+ +#+        +#+        +#+  +#+#+#    +#+    +#+     +#+           +#+
+#+#    #+# #+#        #+#        #+#   #+#+#    #+#    #+#     #+#    #+#    #+#
+########  ###        ########## ###    ####    ###    ### ########### ########
+
+Application Version: ${core.version}
diff --git a/openhis-server/openhis-ybapp/src/main/resources/config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config.properties
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/config.properties
rename to openhis-server-new/openhis-ybapp/src/main/resources/config.properties
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml b/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml
new file mode 100644
index 00000000..049210cf
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flow>
+    <chain name="chain1">
+        THEN(a, b, c);
+    </chain>
+</flow>
\ No newline at end of file
diff --git a/vue3/README.md b/openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties
similarity index 100%
rename from vue3/README.md
rename to openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties
new file mode 100644
index 00000000..b57fd4e8
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties
@@ -0,0 +1,21 @@
+# ????????
+dev.address=http://88.9.0.126:8080
+dev.time=600
+dev.isEncrypt=false
+
+# ????????
+prod.address=http://ddjk.jlhs.gov.cn:20215
+prod.time=600
+prod.isEncrypt=true
+
+
+dev.cliPubKey=PubKey
+dev.cliPrvKey=PrvKey
+dev.clientId=Id
+dev.filePath="C:/Users/user/Desktop/"
+
+prod.cliPubKey=PubKey2
+prod.cliPrvKey=PrvKey2
+prod.clientId=Id2
+prod.filePath="C:/Users/user/Desktop/"
+prod.eleAddress=http://10.49.24.194:8080/epc/api/
diff --git a/openhis-server/openhis-ybapp/src/main/resources/config/tenant-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties
similarity index 100%
rename from openhis-server/openhis-ybapp/src/main/resources/config/tenant-config.properties
rename to openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml b/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml
new file mode 100644
index 00000000..3f9706f1
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="/home/openhis/logs"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 用户访问日志输出  -->
+    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-user.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+
+    <!-- 新增专用日志Appender -->
+    <appender name="YB_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/yb-app-service.log</file> <!-- 日志文件名 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天一个文件，保留60天 -->
+            <fileNamePattern>${log.path}/yb-app-service.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern> <!-- 使用统一日志格式 -->
+        </encoder>
+    </appender>
+
+    <!-- 在原有logger配置下方添加 -->
+    <logger name="com.openhis.controller.YbController" level="info" additivity="false">
+        <appender-ref ref="YB_LOGS" />
+    </logger>
+    <logger name="com.openhis.service.impl.HandlerServiceImpl" level="info" additivity="false">
+        <appender-ref ref="YB_LOGS" />
+    </logger>
+
+    <!-- 新增专用日志Appender -->
+    <appender name="YB_ELE_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/yb-app-ele-service.log</file> <!-- 日志文件名 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天一个文件，保留60天 -->
+            <fileNamePattern>${log.path}/yb-app-ele-service.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern> <!-- 使用统一日志格式 -->
+        </encoder>
+    </appender>
+
+    <logger name="com.openhis.service.impl.ElepHandlerServiceImpl" level="info" additivity="false">
+        <appender-ref ref="YB_ELE_LOGS" />
+    </logger>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.core" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+
+    <!--系统用户操作日志-->
+    <logger name="sys-user" level="info">
+        <appender-ref ref="sys-user"/>
+    </logger>
+
+    <logger name="YB_LOGS" level="info">
+        <appender-ref ref="YB_LOGS"/>
+        <appender-ref ref="YB_ELE_LOGS"/>
+    </logger>
+</configuration> 
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml
new file mode 100644
index 00000000..c39d4382
--- /dev/null
+++ b/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 全局参数 -->
+    <settings>
+        <!-- 使全局的映射器启用或禁用缓存 -->
+        <setting name="cacheEnabled" value="true"/>
+        <!-- 允许JDBC 支持自动生成主键 -->
+        <setting name="useGeneratedKeys" value="true"/>
+        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
+        <setting name="defaultExecutorType" value="SIMPLE"/>
+        <!-- 指定 MyBatis 所用日志的具体实现 -->
+                <setting name="logImpl" value="SLF4J"/>
+<!--        <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl"/>-->
+        <!-- 使用驼峰命名法转换字段 -->
+        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+    </settings>
+
+</configuration>
diff --git a/openhis-server/pom.xml b/openhis-server-new/pom.xml
similarity index 100%
rename from openhis-server/pom.xml
rename to openhis-server-new/pom.xml
diff --git a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java b/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java
deleted file mode 100644
index a2421dd3..00000000
--- a/openhis-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.core.web.controller.system;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.core.common.core.controller.BaseController;
-import com.core.common.core.domain.R;
-import com.core.common.enums.TenantOptionDict;
-import com.core.system.domain.SysTenantOption;
-import com.core.system.domain.dto.SysTenantOptionDto;
-import com.core.system.service.ISysTenantOptionService;
-
-/**
- * 租户配置项信息controller
- * 
- * @author system
- */
-@RestController
-@RequestMapping("/system/tenant-option")
-public class SysTenantOptionController extends BaseController {
-    @Autowired
-    private ISysTenantOptionService sysTenantOptionService;
-
-    /**
-     * 查询租户配置项分页列表
-     *
-     * @param tenantId 租户ID查询
-     * @param pageNum 当前页
-     * @param pageSize 每页多少条
-     * @return 租户配置项分页列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
-    @GetMapping("/page")
-    public R<IPage<SysTenantOption>> getTenantOptionPage(@RequestParam Integer tenantId,
-        @RequestParam(required = false) String optionCode, @RequestParam(defaultValue = "1") Integer pageNum,
-        @RequestParam(defaultValue = "10") Integer pageSize) {
-        return sysTenantOptionService.getTenantOptionPage(tenantId, optionCode, pageNum, pageSize);
-    }
-
-    /**
-     * 查询租户配置项详情
-     *
-     * @param id ID
-     * @return 租户配置项详情
-     */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
-    @GetMapping("/{id}")
-    public R<?> getTenantOptionDetail(@PathVariable Long id) {
-        return R.ok(sysTenantOptionService.getById(id));
-    }
-
-    /**
-     * 新增租户配置项
-     * 
-     * @param sysTenantOption 租户配置项实体
-     * @return 结果
-     */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
-    @PostMapping
-    public R<?> addTenantOption(@RequestBody SysTenantOption sysTenantOption) {
-        return sysTenantOptionService.addTenantOption(sysTenantOption);
-    }
-
-    /**
-     * 修改租户配置项
-     *
-     * @param sysTenantOption 租户配置项实体
-     * @return 结果
-     */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
-    @PutMapping
-    public R<?> editTenantOption(@RequestBody SysTenantOption sysTenantOption) {
-        sysTenantOptionService.updateById(sysTenantOption);
-        return R.ok("修改成功");
-    }
-
-    /**
-     * 删除租户配置项
-     *
-     * @param tenantIdList 租户配置项ID列表
-     * @return 结果
-     */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
-    @DeleteMapping
-    public R<?> delTenantOption(@RequestBody List<Integer> tenantIdList) {
-        sysTenantOptionService.removeBatchByIds(tenantIdList);
-        return R.ok("删除成功");
-    }
-
-    /**
-     * 查询租户配置项下拉列表
-     * 
-     * @return 租户配置项下拉列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
-    @GetMapping("/dropdown")
-    public R<List<SysTenantOptionDto>> getDropdown() {
-        return R.ok(sysTenantOptionService.getTenantOptionDropdown());
-    }
-
-    // TODO: 出于安全性考虑，下面两项配置接口是否开放再议
-
-    /**
-     * 查询全部租户配置项
-     *
-     * @param tenantId 租户ID
-     * @return 全部租户配置项
-     */
-    // @GetMapping("/all")
-    public R<List<SysTenantOptionDto>> getAllTenantOption(@RequestParam Integer tenantId) {
-        return R.ok(sysTenantOptionService.getAllTenantOption(tenantId));
-    }
-
-    /**
-     * 查询指定的租户配置项内容
-     *
-     * @param tenantId 租户ID
-     * @param optionCode 配置项编码
-     * @return 指定的租户配置项内容（不存在返回NULL）
-     */
-    // @GetMapping("/content")
-    public R<SysTenantOptionDto> getTenantOptionContent(@RequestParam Integer tenantId,
-        @RequestParam String optionCode) {
-        TenantOptionDict tenantOptionDict = TenantOptionDict.getByCode(optionCode);
-        if (tenantOptionDict == null) {
-            return R.fail("未知配置项");
-        }
-        SysTenantOptionDto sysTenantOptionDto =
-            sysTenantOptionService.getTenantOptionContent(tenantId, tenantOptionDict);
-        if (sysTenantOptionDto == null) {
-            return R.fail("此项未配置");
-        }
-        return R.ok(sysTenantOptionDto);
-    }
-}
diff --git a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java b/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java
deleted file mode 100644
index 5fd09cf2..00000000
--- a/openhis-server/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.core.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.core.common.core.domain.R;
-import com.core.common.enums.TenantOptionDict;
-import com.core.common.utils.StringUtils;
-import com.core.system.domain.SysTenantOption;
-import com.core.system.domain.dto.SysTenantOptionDto;
-import com.core.system.mapper.SysTenantOptionMapper;
-import com.core.system.service.ISysTenantOptionService;
-
-/**
- * 租户配置项表Service业务层处理
- * 
- * @author system
- */
-@Service
-public class SysTenantOptionServiceImpl extends ServiceImpl<SysTenantOptionMapper, SysTenantOption>
-    implements ISysTenantOptionService {
-
-    /**
-     * 查询租户配置项分页列表
-     *
-     * @param tenantId 租户ID查询
-     * @param optionCode 配置项编码查询
-     * @param pageNum 当前页
-     * @param pageSize 每页多少条
-     * @return 租户配置项分页列表
-     */
-    @Override
-    public R<IPage<SysTenantOption>> getTenantOptionPage(Integer tenantId, String optionCode, Integer pageNum,
-        Integer pageSize) {
-        LambdaQueryWrapper<SysTenantOption> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        // 指定租户ID
-        if (tenantId != null) {
-            lambdaQueryWrapper.eq(SysTenantOption::getTenantId, tenantId);
-        }
-        // 指定配置项编码
-        if (StringUtils.isNotEmpty(optionCode)) {
-            lambdaQueryWrapper.eq(SysTenantOption::getOptionCode, optionCode);
-        }
-        IPage<SysTenantOption> page = baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQueryWrapper);
-        // 获取配置项名称
-        for (SysTenantOption record : page.getRecords()) {
-            TenantOptionDict tenantOptionDict = TenantOptionDict.getByCode(record.getOptionCode());
-            if (tenantOptionDict != null) {
-                record.setOptionName(tenantOptionDict.getName());
-            }
-        }
-        return R.ok(page);
-    }
-
-    /**
-     * 新增租户配置项
-     *
-     * @param sysTenantOption 租户配置项实体
-     * @return 结果
-     */
-    @Override
-    public R<?> addTenantOption(SysTenantOption sysTenantOption) {
-        List<SysTenantOption> existOptionCodeList = baseMapper.selectList(
-            new LambdaQueryWrapper<SysTenantOption>().eq(SysTenantOption::getTenantId, sysTenantOption.getTenantId())
-                .eq(SysTenantOption::getOptionCode, sysTenantOption.getOptionCode()));
-        if (!existOptionCodeList.isEmpty()) {
-            return R.fail("当前租户已存在该配置项");
-        }
-        baseMapper.insert(sysTenantOption);
-        return R.ok();
-    }
-
-    /**
-     * 查询租户配置项下拉列表
-     *
-     * @return 租户配置项下拉列表
-     */
-    @Override
-    public List<SysTenantOptionDto> getTenantOptionDropdown() {
-        List<SysTenantOptionDto> optionDtoList = new ArrayList<>();
-        SysTenantOptionDto optionDto;
-        // 遍历租户配置项字典枚举类
-        for (TenantOptionDict dict : TenantOptionDict.values()) {
-            optionDto = new SysTenantOptionDto();
-            optionDto.setCode(dict.getCode());
-            optionDto.setName(dict.getName());
-            optionDtoList.add(optionDto);
-        }
-        return optionDtoList;
-    }
-
-    /**
-     * 查询全部租户配置项
-     *
-     * @param tenantId 租户ID
-     * @return 全部租户配置项
-     */
-    @Override
-    public List<SysTenantOptionDto> getAllTenantOption(Integer tenantId) {
-        List<SysTenantOption> sysTenantOptionList =
-            baseMapper.selectList(new LambdaQueryWrapper<SysTenantOption>().eq(SysTenantOption::getTenantId, tenantId));
-        List<SysTenantOptionDto> optionDtoList = new ArrayList<>();
-        SysTenantOptionDto optionDto;
-        // 遍历该租户的所有配置
-        for (SysTenantOption option : sysTenantOptionList) {
-            optionDto = new SysTenantOptionDto();
-            // 获取配置项名称
-            TenantOptionDict tenantOptionDict = TenantOptionDict.getByCode(option.getOptionCode());
-            if (tenantOptionDict != null) {
-                optionDto.setName(tenantOptionDict.getName());
-            }
-            optionDto.setCode(option.getOptionCode());
-            optionDto.setContent(option.getOptionContent());
-            optionDtoList.add(optionDto);
-        }
-        return optionDtoList;
-    }
-
-    /**
-     * 查询指定的租户配置项内容
-     *
-     * @param tenantId 租户ID
-     * @param tenantOptionDict 配置项字典枚举
-     * @return 指定的租户配置项内容（不存在返回NULL）
-     */
-    @Override
-    public SysTenantOptionDto getTenantOptionContent(Integer tenantId, TenantOptionDict tenantOptionDict) {
-        List<SysTenantOption> sysTenantOptionList = baseMapper.selectList(new LambdaQueryWrapper<SysTenantOption>()
-            .eq(SysTenantOption::getTenantId, tenantId).eq(SysTenantOption::getOptionCode, tenantOptionDict.getCode()));
-        if (sysTenantOptionList.isEmpty()) {
-            return null;
-        }
-        SysTenantOption sysTenantOption = sysTenantOptionList.get(0);
-        return new SysTenantOptionDto().setCode(sysTenantOption.getOptionCode())
-            .setName(sysTenantOption.getOptionName()).setContent(sysTenantOption.getOptionContent());
-    }
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
deleted file mode 100644
index 09fe480f..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.openhis.web.doctorstation.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.openhis.web.doctorstation.dto.DiagnosisQueryDto;
-
-/**
- * 医生站-中医 应用Mapper
- */
-@Repository
-public interface DoctorStationChineseMedicalAppMapper {
-
-    /**
-     * 查询中医就诊诊断信息
-     *
-     * @param encounterId 就诊id
-     * @return 中医就诊诊断信息
-     */
-    List<DiagnosisQueryDto> getTcmEncounterDiagnosis(@Param("encounterId") Long encounterId);
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
deleted file mode 100644
index d6c60849..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.openhis.web.doctorstation.utils;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.web.doctorstation.dto.AdviceInventoryDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
-import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
-
-/**
- * 医嘱工具类
- */
-@Component
-public class AdviceUtils {
-
-    @Resource
-    DoctorStationAdviceAppMapper doctorStationAdviceAppMapper;
-
-    /**
-     * 校验库存
-     *
-     * @param adviceSaveList 医嘱信息
-     * @return 提示信息
-     */
-    public String checkInventory(List<AdviceSaveDto> adviceSaveList) {
-        // 医嘱定义ID集合
-        List<Long> adviceDefinitionIdList =
-            adviceSaveList.stream().map(AdviceSaveDto::getAdviceDefinitionId).collect(Collectors.toList());
-        // 医嘱库存集合
-        List<AdviceInventoryDto> adviceInventoryList =
-            doctorStationAdviceAppMapper.getAdviceInventory(null, adviceDefinitionIdList,
-                CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
-        // 待发放个数信息
-        List<AdviceInventoryDto> adviceDraftInventoryList =
-            doctorStationAdviceAppMapper.getAdviceDraftInventory(CommonConstants.TableName.MED_MEDICATION_DEFINITION,
-                CommonConstants.TableName.ADM_DEVICE_DEFINITION, DispenseStatus.DRAFT.getValue());
-        // 预减库存
-        List<AdviceInventoryDto> adviceInventory =
-            this.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
-        // 检查库存
-        for (AdviceSaveDto saveDto : adviceSaveList) {
-            boolean matched = false;
-            for (AdviceInventoryDto inventoryDto : adviceInventory) {
-                // 匹配条件：adviceDefinitionId, adviceTableName, locationId, lotNumber 同时相等
-                if (saveDto.getAdviceDefinitionId().equals(inventoryDto.getItemId())
-                    && saveDto.getAdviceTableName().equals(inventoryDto.getItemTable())
-                    && saveDto.getLocationId().equals(inventoryDto.getLocationId())
-                    && saveDto.getLotNumber().equals(inventoryDto.getLotNumber())) {
-                    matched = true;
-                    // 检查库存是否充足
-                    BigDecimal minUnitQuantity = saveDto.getMinUnitQuantity();
-                    Integer chineseHerbsDoseQuantity = saveDto.getChineseHerbsDoseQuantity(); // 中药付数
-                    // 中草药医嘱的情况
-                    if (chineseHerbsDoseQuantity != null && chineseHerbsDoseQuantity > 0) {
-                        minUnitQuantity =
-                            minUnitQuantity.multiply(BigDecimal.valueOf(chineseHerbsDoseQuantity.longValue()));
-                    }
-                    if (minUnitQuantity.compareTo(inventoryDto.getQuantity()) > 0) {
-                        return saveDto.getAdviceName() + "在" + inventoryDto.getLocationName() + "库存不足";
-                    }
-                    break;
-                }
-            }
-            // 如果没有匹配到库存
-            if (!matched) {
-                return saveDto.getAdviceName() + "未匹配到库存信息";
-            }
-        }
-        return null; // 校验通过
-    }
-
-    /**
-     * 预减库存
-     *
-     * @param adviceInventoryList 库存表数据
-     * @param adviceDraftInventoryList 待发放数据
-     * @return 预减库存
-     */
-    public List<AdviceInventoryDto> subtractInventory(List<AdviceInventoryDto> adviceInventoryList,
-        List<AdviceInventoryDto> adviceDraftInventoryList) {
-        // 1. 将 draft 列表转换为 Map，合并重复键的 quantity
-        Map<String,
-            AdviceInventoryDto> draftMap = adviceDraftInventoryList.stream()
-                .collect(Collectors.toMap(
-                    draft -> String.format(CommonConstants.Common.SS_DD_FORMAT, draft.getItemTable(),
-                        draft.getLotNumber(), draft.getItemId(), draft.getLocationId()),
-                    draft -> draft, (existing, replacement) -> {
-                        // 合并重复键的 quantity
-                        BigDecimal existingQty =
-                            existing.getQuantity() != null ? existing.getQuantity() : BigDecimal.ZERO;
-                        BigDecimal replacementQty =
-                            replacement.getQuantity() != null ? replacement.getQuantity() : BigDecimal.ZERO;
-                        existing.setQuantity(existingQty.add(replacementQty));
-                        return existing;
-                    }));
-        // 2. 遍历原始库存列表，匹配并扣减
-        return adviceInventoryList.stream().map(inventory -> {
-            String key = String.format(CommonConstants.Common.SS_DD_FORMAT, inventory.getItemTable(),
-                inventory.getLotNumber(), inventory.getItemId(), inventory.getLocationId());
-            AdviceInventoryDto draft = draftMap.get(key);
-            if (draft != null) {
-                BigDecimal draftQty = draft.getQuantity() != null ? draft.getQuantity() : BigDecimal.ZERO;
-                BigDecimal newQty = inventory.getQuantity().subtract(draftQty);
-                inventory.setQuantity(newQty.compareTo(BigDecimal.ZERO) >= 0 ? newQty : BigDecimal.ZERO);
-            }
-            return inventory;
-        }).collect(Collectors.toList());
-    }
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
deleted file mode 100644
index f9eb336e..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.inventorymanage.controller;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService;
-import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 库存相关明细查询 controller
- *
- * @author
- * @date 2025-03-10
- */
-@RestController
-@RequestMapping("/inventory-manage-details")
-@Slf4j
-public class InventoryDetailsController {
-
-    @Autowired
-    private IInventoryDetailsAppService inventoryDetailsAppService;
-
-    /**
-     * 采购入库明细查询
-     *
-     * @param inventoryDetailsSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 采购入库分页列表
-     */
-    @GetMapping(value = "/purchase-in")
-    public R<?> purchaseInGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return inventoryDetailsAppService.purchaseInGetPage(inventoryDetailsSearchParam, pageNo, pageSize, searchKey,
-            request);
-    }
-
-    /**
-     * 商品调拨明细查询
-     *
-     * @param inventoryDetailsSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 商品调拨分页列表
-     */
-    @GetMapping(value = "/inventory-transfer")
-    public R<?> transferGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return inventoryDetailsAppService.transferGetPage(inventoryDetailsSearchParam, pageNo, pageSize, searchKey,
-            request);
-    }
-
-    /**
-     * 领用出库明细查询
-     *
-     * @param inventoryDetailsSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 领用出库明细分页列表
-     */
-    @GetMapping(value = "/requisition-out")
-    public R<?> requisitionOutGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return inventoryDetailsAppService.requisitionOutGetPage(inventoryDetailsSearchParam, pageNo, pageSize,
-            searchKey, request);
-    }
-
-    /**
-     * 商品盘点明细查询
-     *
-     * @param inventoryDetailsSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 商品盘点分页列表
-     */
-    @GetMapping(value = "/inventory-stock-take")
-    public R<?> inventoryStockGetPage(InventoryDetailsSearchParam inventoryDetailsSearchParam,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return inventoryDetailsAppService.inventoryStockGetPage(inventoryDetailsSearchParam, pageNo, pageSize,
-            searchKey, request);
-    }
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/INurseStationPendAdmAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/INurseStationPendAdmAppService.java
deleted file mode 100644
index 97609e5d..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/INurseStationPendAdmAppService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.openhis.web.nursestation.appservice;
-
-import com.core.common.core.domain.R;
-import com.openhis.web.nursestation.dto.BedForAdmissionDto;
-import com.openhis.web.nursestation.dto.PendingAdmissionDto;
-
-/**
- * 待入科 应用接口
- *
- * @author liuhr
- * @date 2025/4/14
- */
-public interface INurseStationPendAdmAppService {
-
-    /**
-     * 待入科的初始化数据
-     *
-     * @return
-     */
-    R<?> getPendAdmInit();
-
-    /**
-     * 选择科室后，查询科室对应病区列表
-     *
-     * @return 病区列表
-     */
-    R<?> getWardLocationList(Long orgId);
-
-    /**
-     * 查询待入科的患者列表
-     *
-     * @return 待入科的患者列表
-     */
-    R<?> getPendAdmInfo();
-
-    /**
-     * 病区的病床信息
-     *
-     * @param wardLocationId 病区ID
-     * @return 病床列表
-     */
-    R<?> getBedList(Long wardLocationId);
-
-    /**
-     * 患者选床入科
-     * 
-     * @param bedInfoDto 病床信息
-     * @return 选床入科
-     */
-    R<?> selectBedForAdmission(BedForAdmissionDto bedInfoDto);
-
-    /**
-     * 根据入院科室查询医生列表
-     *
-     * @param orgId 入院科室Id
-     * @return 医生列表
-     */
-    R<?> getDoctorList(Long orgId);
-
-    /**
-     * 根据入院科室查询护士列表
-     *
-     * @param orgId 入院科室Id
-     * @return 护士列表
-     */
-    R<?> getNurseList(Long orgId);
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/impl/NurseStationPendAdmAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/impl/NurseStationPendAdmAppServiceImpl.java
deleted file mode 100644
index 4c009d98..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/appservice/impl/NurseStationPendAdmAppServiceImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package com.openhis.web.nursestation.appservice.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.core.common.core.domain.R;
-import com.core.common.utils.AgeCalculatorUtil;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.service.*;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.nursestation.appservice.INurseStationPendAdmAppService;
-import com.openhis.web.nursestation.dto.BedForAdmissionDto;
-import com.openhis.web.nursestation.dto.BedForAdmissionInitDto;
-import com.openhis.web.nursestation.dto.PendingAdmissionDto;
-import com.openhis.web.nursestation.mapper.NurseStationPendAdmAppMapper;
-
-/**
- * 待入科 应用接口实现
- *
- * @author liuhr
- * @date 2025/4/14
- */
-@Service
-public class NurseStationPendAdmAppServiceImpl implements INurseStationPendAdmAppService {
-
-    @Autowired
-    private NurseStationPendAdmAppMapper nsPendAdmAppMapper;
-
-    @Autowired
-    private IEncounterLocationService encounterLocationService;
-
-    @Autowired
-    private IPractitionerRoleService practitionerRoleService;
-
-    @Autowired
-    private ILocationService locationService;
-
-    @Autowired
-    private IEncounterService encounterService;
-    @Autowired
-    private IEncounterParticipantService encounterParticipantService;
-
-    /**
-     * 待入科的初始化数据
-     *
-     * @return
-     */
-    @Override
-    public R<?> getPendAdmInit() {
-
-        BedForAdmissionInitDto initDto = new BedForAdmissionInitDto();
-
-        // 获取当前登录账号的参与者id
-        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
-        // 当前id权限下可以切换科室的列表
-        List<Long> orgIds = practitionerRoleService.getOrgIdsByPractitionerId(practitionerId);
-        // 查询该账号权限可以切换的科室列表
-        List<Location> locationList = locationService.getLocationList(orgIds);
-
-        List<BedForAdmissionInitDto.exeOrganization> locationListOptions = locationList.stream()
-            .map(location -> new BedForAdmissionInitDto.exeOrganization(location.getId(), location.getName()))
-            .collect(Collectors.toList());
-        initDto.setLocationListOptions(locationListOptions);
-
-        // 获取患者病情列表
-        List<BedForAdmissionInitDto.statusEnumOption> statusEnumOptions = Stream.of(PriorityLevel.values())
-            .map(status -> new BedForAdmissionInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
-        initDto.setPriorityListOptions(statusEnumOptions);
-
-        return R.ok(initDto);
-
-    }
-
-    /**
-     * 选择科室后，查询科室对应病区列表
-     *
-     * @return 病区列表
-     */
-    @Override
-    public R<?> getWardLocationList(Long orgId) {
-
-        List<Location> locationList = locationService.getWardList(orgId);
-        List<BedForAdmissionInitDto.exeOrganization> wardList = locationList.stream()
-            .map(location -> new BedForAdmissionInitDto.exeOrganization(location.getId(), location.getName()))
-            .collect(Collectors.toList());
-
-        return R.ok(wardList);
-
-    }
-
-    /**
-     * 查询待入科的患者列表
-     *
-     * @return 待入科的患者列表
-     */
-    @Override
-    public R<?> getPendAdmInfo() {
-
-        List<PendingAdmissionDto> pendingAdmissionList =
-            nsPendAdmAppMapper.getPendAdmInfo(EncounterClass.IMP.getValue(), EncounterLocationStatus.ACTIVE.getValue(),
-                LocationForm.WARD.getValue(), LocationForm.BED.getValue());
-
-        pendingAdmissionList.forEach(e -> {
-            // 计算年龄
-            e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate()));
-            // 取病区对应的科室
-            Location location = locationService.getLocationById(e.getWardLocationId());
-            Long orgId = null;
-            if (location != null) {
-                orgId = location.getOrganizationId();
-            }
-
-            // 判断是否跨科
-            if (orgId == e.getOrganizationId()) {
-                e.setCrossDeptStatus(Whether.NO.getValue());
-            } else {
-                e.setCrossDeptStatus(Whether.YES.getValue());
-            }
-            // 是否跨科 回显赋值
-            e.setCrossDeptStatus_enumText(EnumUtils.getInfoByValue(Whether.class, e.getCrossDeptStatus()));
-
-            List<String> descriptionList = nsPendAdmAppMapper.getDescriptionList(e.getId());
-            // 过滤掉 null 值
-            List<String> filteredList = descriptionList.stream().filter(Objects::nonNull).collect(Collectors.toList());
-            // 诊断病情拼接
-            if (descriptionList != null && !descriptionList.isEmpty()) {
-                // 拼接字符串
-                if (!filteredList.isEmpty()) {
-                    e.setDescriptions(String.join(CommonConstants.Common.COMMA, filteredList));
-                }
-            }
-
-        });
-
-        return R.ok(pendingAdmissionList);
-    }
-
-    /**
-     * 病区的病床信息
-     *
-     * @param wardLocationId 病区的ID
-     * @return 病床列表
-     */
-    @Override
-    public R<?> getBedList(Long wardLocationId) {
-
-        List<Location> locationList = locationService.getBedList(wardLocationId);
-        List<BedForAdmissionInitDto.exeOrganization> bedList = locationList.stream()
-            .map(location -> new BedForAdmissionInitDto.exeOrganization(location.getId(), location.getName()))
-            .collect(Collectors.toList());
-
-        return R.ok(bedList);
-
-    }
-
-    /**
-     * 根据入院科室查询医生列表
-     *
-     * @param orgId 入院科室Id
-     * @return 医生列表
-     */
-    @Override
-    public R<?> getDoctorList(Long orgId) {
-
-        List<PractitionerRole> practitionerRoleList = practitionerRoleService.getDoctorList(orgId);
-        List<BedForAdmissionInitDto.exeOrganization> doctorList = practitionerRoleList.stream()
-            .map(practitionerRole -> new BedForAdmissionInitDto.exeOrganization(practitionerRole.getPractitionerId(),
-                practitionerRole.getName()))
-            .collect(Collectors.toList());
-
-        return R.ok(doctorList);
-    }
-
-    /**
-     * 根据入院科室查询护士列表
-     *
-     * @param orgId 入院科室Id
-     * @return 护士列表
-     */
-    @Override
-    public R<?> getNurseList(Long orgId) {
-
-        List<PractitionerRole> practitionerRoleList = practitionerRoleService.getNurseList(orgId);
-        List<BedForAdmissionInitDto.exeOrganization> nurseList = practitionerRoleList.stream()
-            .map(practitionerRole -> new BedForAdmissionInitDto.exeOrganization(practitionerRole.getPractitionerId(),
-                practitionerRole.getName()))
-            .collect(Collectors.toList());
-
-        return R.ok(nurseList);
-    }
-
-    /**
-     * 患者选床入科
-     *
-     * @param bedInfoDto 病床信息
-     * @return 选床入科
-     */
-    @Override
-    public R<?> selectBedForAdmission(BedForAdmissionDto bedInfoDto) {
-
-        // 1.更新就诊表得患者病情(优先级编码)
-        Encounter encounter = new Encounter();
-        boolean encounterSuccess =
-            encounterService.updatePriorityEnumById(bedInfoDto.getId(), bedInfoDto.getPriorityEnum());
-
-        // 2-1.添加就诊病床location
-        EncounterLocation encounterLocation = new EncounterLocation();
-        encounterLocation.setLocationId(bedInfoDto.getBedLocationId()).setEncounterId(bedInfoDto.getId())
-            // 设置物理枚举为 8:病床
-            .setFormEnum(LocationForm.BED.getValue())
-            // 状态为使用中
-            .setStatusEnum(EncounterLocationStatus.ACTIVE.getValue())
-            // 入科时间
-            .setStartTime(bedInfoDto.getStartTime());
-        boolean encounterLocationSuccess = encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);
-
-        // 2-2.如果病区更改了，把之前的病区状态修改为已完成，并插入该就诊号的一个病区记录
-        // todo：分床的选的病区，科室，需要存吗，还是只需要存病床号？？
-
-        // 3.更新location表中病床状态
-        boolean updateLocationSuccess =
-            locationService.updateStatusById(bedInfoDto.getBedLocationId(), LocationBedStatus.O.getValue());
-
-        // 4.添加就诊参与者信息
-        List<EncounterParticipant> encounterParticipants = new ArrayList<>();
-        // 4-1 住院医生
-        EncounterParticipant ep1 = new EncounterParticipant();
-        ep1.setTypeCode(ParticipantType.ATTENDING_DOCTOR.getCode()).setEncounterId(bedInfoDto.getId())
-            .setPractitionerId(bedInfoDto.getAttendingDoctorId()).setStartTime(DateUtils.getNowDate());
-
-        // 4-2 主任医生
-        EncounterParticipant ep2 = new EncounterParticipant();
-        ep2.setTypeCode(ParticipantType.CHIEF_DOCTOR.getCode()).setEncounterId(bedInfoDto.getId())
-            .setPractitionerId(bedInfoDto.getChiefDoctorId()).setStartTime(DateUtils.getNowDate());
-
-        // 4-3 主治医生
-        EncounterParticipant ep3 = new EncounterParticipant();
-        ep3.setTypeCode(ParticipantType.PRINCIPAL_DOCTOR.getCode()).setEncounterId(bedInfoDto.getId())
-            .setPractitionerId(bedInfoDto.getPrincipalDoctorId()).setStartTime(DateUtils.getNowDate());
-
-        // 4-4 责任护士
-        EncounterParticipant ep4 = new EncounterParticipant();
-        ep4.setTypeCode(ParticipantType.ATTENDER.getCode()).setEncounterId(bedInfoDto.getId())
-            .setPractitionerId(bedInfoDto.getAttenderId()).setStartTime(DateUtils.getNowDate());
-
-        encounterParticipants.add(ep1);
-        encounterParticipants.add(ep2);
-        encounterParticipants.add(ep3);
-        encounterParticipants.add(ep4);
-        boolean epSaveSuccess = encounterParticipantService.saveBatch(encounterParticipants);
-
-        return encounterSuccess && epSaveSuccess && updateLocationSuccess && encounterLocationSuccess
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"选床入科"}))
-            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00003, new Object[] {"选床入科"}));
-
-    }
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/controller/NurseStationPendAdmController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/controller/NurseStationPendAdmController.java
deleted file mode 100644
index 31378966..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/controller/NurseStationPendAdmController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.openhis.web.nursestation.controller;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.core.common.core.domain.R;
-import com.openhis.web.nursestation.appservice.INurseStationPendAdmAppService;
-import com.openhis.web.nursestation.dto.BedForAdmissionDto;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 护士站——住院待入科
- *
- * @author liuhr
- * @date 2025/4/14
- */
-@RestController
-@RequestMapping("/nurse-station/pending-admission")
-@Slf4j
-@AllArgsConstructor
-public class NurseStationPendAdmController {
-
-    @Autowired
-    private INurseStationPendAdmAppService nsPendAdmAppService;
-
-    /**
-     * 待入科数据初始化
-     *
-     * @return 基础数据
-     */
-    @GetMapping(value = "/init")
-    public R<?> init() {
-
-        return nsPendAdmAppService.getPendAdmInit();
-    }
-
-    /**
-     * 选择科室后，查询科室对应病区列表
-     *
-     * @param orgId 科室id
-     * @return 病区列表
-     */
-    @GetMapping(value = "/ward-location-list")
-    public R<?> getWardLocationList(@RequestParam Long orgId) {
-
-        return nsPendAdmAppService.getWardLocationList(orgId);
-    }
-
-    /**
-     * 根据病区查询该病区下的病床信息
-     *
-     * @param wardLocationId 病区ID
-     * @return 病床列表
-     */
-    @GetMapping(value = "/bed-info")
-    public R<?> getBedList(@RequestParam @NotNull(message = "病区ID不能为空") Long wardLocationId) {
-
-        return nsPendAdmAppService.getBedList(wardLocationId);
-    }
-
-    /**
-     * 根据入院科室,查询医生列表
-     *
-     * @param orgId 科室id
-     * @return 医生列表
-     */
-    @GetMapping(value = "/doctor-list")
-    public R<?> getDoctorList(@RequestParam Long orgId) {
-
-        return nsPendAdmAppService.getDoctorList(orgId);
-    }
-
-    /**
-     * 根据入院科室,查询护士列表
-     *
-     * @param orgId 科室id
-     * @return 护士列表
-     */
-    @GetMapping(value = "/nurse-list")
-    public R<?> getNurseList(@RequestParam Long orgId) {
-
-        return nsPendAdmAppService.getNurseList(orgId);
-    }
-
-    /**
-     * 查询待入科的患者列表
-     *
-     * @return 待入科的患者列表
-     */
-    @GetMapping(value = "/pending-admission-info")
-    public R<?> getPendAdmInfo() {
-
-        return nsPendAdmAppService.getPendAdmInfo();
-    }
-
-    /**
-     * 患者选床入科
-     *
-     * @param bedInfoDto 选床信息
-     * @return 选床入科
-     */
-    @PutMapping(value = "/select-bed")
-    public R<?> selectBedForAdmission(@Valid @RequestBody BedForAdmissionDto bedInfoDto) {
-        return nsPendAdmAppService.selectBedForAdmission(bedInfoDto);
-    }
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/mapper/NurseStationPendAdmAppMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/mapper/NurseStationPendAdmAppMapper.java
deleted file mode 100644
index cf881c25..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/nursestation/mapper/NurseStationPendAdmAppMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.openhis.web.nursestation.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.openhis.web.nursestation.dto.PendingAdmissionDto;
-
-/**
- * 待入科 应用Mapper
- *
- * @author liuhr
- * @date 2025/4/14
- */
-@Repository
-public interface NurseStationPendAdmAppMapper {
-
-    /**
-     * 住院待入科病人信息查询
-     *
-     * @param classEnum 类别编码(1:住院类型)
-     * @param status location的状态可用
-     * @param wardForm 病区:4
-     * @param bedForm 病床:8
-     * @return
-     */
-    List<PendingAdmissionDto> getPendAdmInfo(@Param("classEnum") Integer classEnum, @Param("status") Integer status,
-        @Param("wardForm") Integer wardForm, @Param("bedForm") Integer bedForm);
-
-    /**
-     * 病区床位信息查询
-     *
-     * @param encounterId 就诊Id
-     * @return
-     */
-    List<String> getDescriptionList(@Param("encounterId") Long encounterId);
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientDisposalServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientDisposalServiceImpl.java
deleted file mode 100644
index d0a68d15..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientDisposalServiceImpl.java
+++ /dev/null
@@ -1,598 +0,0 @@
-package com.openhis.web.outpatientmanage.appservice.impl;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.core.common.core.domain.R;
-import com.core.common.core.domain.model.LoginUser;
-import com.core.common.utils.AgeCalculatorUtil;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.outpatientmanage.appservice.IOutpatientDisposalService;
-import com.openhis.web.outpatientmanage.dto.*;
-import com.openhis.web.outpatientmanage.mapper.OutpatientDisposalMapper;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.IServiceRequestService;
-
-/**
- * 门诊处置
- *
- * @author yuxj
- * @date 2025/4/10
- */
-@Service
-public class OutpatientDisposalServiceImpl implements IOutpatientDisposalService {
-
-    @Resource
-    OutpatientDisposalMapper outpatientDisposalMapper;
-
-    @Resource
-    IOrganizationService iOrganizationService;
-
-    @Resource
-    private IServiceRequestService serviceRequestService;
-
-    @Resource
-    private IDeviceDispenseService deviceDispenseService;
-
-    @Resource
-    private IDeviceRequestService deviceRequestService;
-
-    @Resource
-    private IInventoryItemService inventoryItemService;
-    @Resource
-    IPractitionerService practitionerService;
-
-    /**
-     * 获取门诊处置初期数据列表
-     *
-     * @return 获取门诊处置初期数据列表
-     */
-    @Override
-    public R<?> init() {
-        OutpatientDisposalInitDto initDto = new OutpatientDisposalInitDto();
-
-        // 获取科室下拉选列表
-        List<Organization> organizationList =
-            iOrganizationService.getList(OrganizationType.DEPARTMENT.getValue(), OrganizationClass.CLINIC.getValue());
-        List<OutpatientDisposalInitDto.DepartmentOption> organizationOptions = organizationList.stream()
-            .map(organization -> new OutpatientDisposalInitDto.DepartmentOption(organization.getId(),
-                organization.getName()))
-            .collect(Collectors.toList());
-
-        initDto.setDepartmentOptions(organizationOptions);
-
-        return R.ok(initDto);
-    }
-
-    /**
-     * 分页查询就诊病人列表
-     *
-     * @param encounterInfoSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 就诊病人列表
-     */
-    @Override
-    public R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam, Integer pageNo,
-        Integer pageSize, String searchKey, HttpServletRequest request) {
-
-        // 设置模糊查询的字段名
-        HashSet<String> searchFields = new HashSet<>();
-        searchFields.add(CommonConstants.FieldName.PatientName);
-        searchFields.add(CommonConstants.FieldName.idCard);
-        // 构建查询条件
-        QueryWrapper<EncounterInfoSearchParam> queryWrapper =
-            HisQueryUtils.buildQueryWrapper(encounterInfoSearchParam, searchKey, searchFields, request);
-
-        // 查询就诊病人列表
-        Page<OutpatientDisposalEncounterInfoPageDto> encounterInfoPageDto =
-            outpatientDisposalMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper);
-
-        // 个别项目设定
-        encounterInfoPageDto.getRecords().forEach(prescriptionPatientInfoDto -> {
-            // 性别
-            prescriptionPatientInfoDto.setGenderEnum_enumText(
-                EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.getGenderEnum()));
-        });
-        return R.ok(encounterInfoPageDto);
-    }
-
-    /**
-     * 查询诊疗单列表
-     *
-     * @param encounterId 就诊号
-     * @return 诊疗单列表
-     */
-    @Override
-    public R<?> getDisposalInfoList(Long encounterId) {
-
-        // 患者基本信息查询
-        OutpatientDisposalPatientInfoDto outpatientDisposalPatientInfoDto =
-            outpatientDisposalMapper.selectEncounterPatientInfo(encounterId);
-        // 年龄
-        outpatientDisposalPatientInfoDto
-            .setAge(AgeCalculatorUtil.getAge(outpatientDisposalPatientInfoDto.getBirthDate()));
-        // 性别
-        outpatientDisposalPatientInfoDto.setGenderEnum_enumText(
-            EnumUtils.getInfoByValue(AdministrativeGender.class, outpatientDisposalPatientInfoDto.getGenderEnum()));
-
-        // 信息查询
-        List<OutpatientDisposalTempInfoDto> outpatientDisposalTempInfoList = outpatientDisposalMapper
-            .selectEncounterActivityInfoList(encounterId, CommonConstants.TableName.WOR_SERVICE_REQUEST,
-                CommonConstants.TableName.WOR_DEVICE_REQUEST, ItemType.DEVICE.getValue(), ItemType.ACTIVITY.getValue());
-
-        // 诊疗信息
-        List<OutpatientDisposalActivityInfoDto> outpatientDisposalActivityInfoList = new ArrayList<>();
-        OutpatientDisposalActivityInfoDto activityInfoDto;
-        // 耗材信息
-        List<OutpatientDisposalDeviceInfoDto> outpatientDisposalDeviceInfoList = new ArrayList<>();
-        OutpatientDisposalDeviceInfoDto deviceInfoDto;
-        Long tempID = null;
-        // 诊疗信息,耗材信息列表做成
-        if (!outpatientDisposalTempInfoList.isEmpty()) {
-            BigDecimal totalPrice = BigDecimal.ZERO;
-            for (OutpatientDisposalTempInfoDto item : outpatientDisposalTempInfoList) {
-                if (!Objects.equals(tempID, item.getId())) {
-                    // 诊疗信息
-                    activityInfoDto = new OutpatientDisposalActivityInfoDto();
-                    activityInfoDto.setId(item.getId());
-                    activityInfoDto.setType(item.getType());
-                    activityInfoDto.setStatusEnum(item.getStatusEnum());
-                    activityInfoDto.setStatusEnum_enumText(item.getStatusEnum_enumText());
-                    activityInfoDto.setBusNo(item.getBusNo());
-                    activityInfoDto.setActivityId(item.getActivityId());
-                    activityInfoDto.setLotNumber(item.getLotNumber());
-                    activityInfoDto.setUnitCode(item.getUnitCode());
-                    activityInfoDto.setPartPercent(item.getPartPercent());
-                    activityInfoDto.setLocationId(item.getLocationId());
-                    activityInfoDto.setGroupNo(item.getGroupNo());
-                    activityInfoDto.setItemName(item.getItemName());
-                    activityInfoDto.setUnitPrice(item.getUnitPrice());
-                    activityInfoDto.setTotalPrice(item.getTotalPrice());
-                    activityInfoDto.setQuantity(item.getQuantity());
-                    activityInfoDto.setFrequency(item.getFrequency());
-                    activityInfoDto.setChargeStatusEnum(item.getChargeStatusEnum());
-                    activityInfoDto.setChargeStatusEnum_enumText(item.getChargeStatusEnum_enumText());
-                    activityInfoDto.setQuantityUnit(item.getQuantityUnit());
-                    activityInfoDto.setQuantityUnit_dictText(item.getQuantityUnit_dictText());
-                    for (OutpatientDisposalTempInfoDto itemAssist : outpatientDisposalTempInfoList) {
-                        if ((Objects.equals(item.getId(), itemAssist.getId()))
-                            && (itemAssist.getGroupNo() != null && !itemAssist.getGroupNo().isEmpty())) {
-                            // 耗材信息
-                            deviceInfoDto = new OutpatientDisposalDeviceInfoDto();
-                            deviceInfoDto.setDeviceRequestId(itemAssist.getDeviceRequestId());
-                            deviceInfoDto.setDeviceDispenseId(itemAssist.getDeviceDispenseId());
-                            deviceInfoDto.setBusNo(itemAssist.getDeviceBusNo());
-                            deviceInfoDto.setDeviceId(itemAssist.getDeviceId());
-                            deviceInfoDto.setLotNumber(itemAssist.getDeviceLotNumber());
-                            deviceInfoDto.setUnitCode(itemAssist.getDeviceUnitCode());
-                            deviceInfoDto.setPartPercent(itemAssist.getDevicePartPercent());
-                            deviceInfoDto.setLocationId(itemAssist.getDeviceLocationId());
-                            deviceInfoDto.setGroupNo(itemAssist.getDeviceGroupNo());
-                            deviceInfoDto.setItemName(itemAssist.getDeviceItemName());
-                            deviceInfoDto.setUnitPrice(itemAssist.getDeviceUnitPrice());
-                            deviceInfoDto.setTotalPrice(itemAssist.getDeviceTotalPrice());
-                            deviceInfoDto.setQuantity(itemAssist.getDeviceQuantity());
-                            deviceInfoDto.setFrequency(itemAssist.getDeviceFrequency());
-                            deviceInfoDto.setStatusEnum(itemAssist.getDeviceStatusEnum());
-                            deviceInfoDto.setStatusEnum_enumText(itemAssist.getDeviceStatusEnum_enumText());
-                            deviceInfoDto.setQuantityUnit(itemAssist.getDeviceQuantityUnit());
-                            deviceInfoDto.setQuantityUnit_dictText(itemAssist.getDeviceQuantityUnit_dictText());
-                            outpatientDisposalDeviceInfoList.add(deviceInfoDto);
-                        }
-                    }
-                    activityInfoDto.setOutpatientDisposalDeviceInfoList(outpatientDisposalDeviceInfoList);
-                    outpatientDisposalActivityInfoList.add(activityInfoDto);
-                    // 合计金额
-                    if (item.getStatusEnum().equals(ChargeItemStatus.PLANNED.getValue())
-                        || item.getStatusEnum().equals(ChargeItemStatus.BILLABLE.getValue())
-                        || item.getStatusEnum().equals(ChargeItemStatus.BILLED.getValue())) {
-                        totalPrice = totalPrice.add(item.getTotalPrice());
-                    }
-                }
-                tempID = item.getId();
-            }
-            outpatientDisposalPatientInfoDto.setTotalPrice(totalPrice);
-        }
-
-        OutpatientDisposalInfoDto outpatientDisposalInfoDto = new OutpatientDisposalInfoDto();
-        outpatientDisposalInfoDto.setOutpatientDisposalPatientInfoDto(outpatientDisposalPatientInfoDto);
-        outpatientDisposalInfoDto.setOutpatientDisposalActivityInfoDtoList(outpatientDisposalActivityInfoList);
-        return R.ok(outpatientDisposalInfoDto);
-    }
-
-    /**
-     * 查询执行列表
-     *
-     * @param busNo 编码
-     * @param activityId 诊疗Id
-     * @param type 类型
-     * @return 执行列表
-     */
-    @Override
-    public R<?> getExecuteInfoList(String busNo, Long activityId, Integer type) {
-        List<OutpatientDisposalExecuteInfoDto> outpatientDisposalExecuteInfoList = new ArrayList<>();
-        if (Objects.equals(type, ItemType.ACTIVITY.getValue())) {
-            outpatientDisposalExecuteInfoList = outpatientDisposalMapper.selectActivityExecuteInfo(type, busNo,
-                activityId, RequestStatus.COMPLETED.getValue());
-        } else if (Objects.equals(type, ItemType.DEVICE.getValue())) {
-            outpatientDisposalMapper.selectDeviceExecuteInfo(type, busNo, activityId,
-                DispenseStatus.COMPLETED.getValue());
-        }
-        return R.ok(outpatientDisposalExecuteInfoList);
-    }
-
-    /**
-     * 执行
-     *
-     * @param itemId 诊疗id
-     * @param type 诊疗类型
-     * @return 执行结果
-     */
-    @Override
-    public R<?> execute(Long itemId, Integer type) {
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 当前登录账号
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
-
-        if (type.equals(ItemType.ACTIVITY.getValue())) {
-
-            // 获取服务申请数据
-            ServiceRequest serviceRequest = serviceRequestService.getById(itemId);
-            if (serviceRequest == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 诊疗信息查询
-            OutpatientDisposalActivityInfoDto infoDto = outpatientDisposalMapper.selectEncounterActivityInfo(itemId,
-                CommonConstants.TableName.WOR_SERVICE_REQUEST, ItemType.ACTIVITY.getValue());
-            // 耗材信息
-            List<OutpatientDisposalDeviceInfoDto> outpatientDisposalDeviceInfoList;
-            // 耗材信息查询
-            if (infoDto.getGroupNo() != null && !infoDto.getGroupNo().isEmpty()) {
-                outpatientDisposalDeviceInfoList =
-                    outpatientDisposalMapper.selectEncounterDeviceInfoList(infoDto.getGroupNo(),
-                        serviceRequest.getEncounterId(), CommonConstants.TableName.WOR_DEVICE_REQUEST);
-                infoDto.setOutpatientDisposalDeviceInfoList(outpatientDisposalDeviceInfoList);
-            }
-
-            // 获取执行过的诊疗数据
-            List<ServiceRequest> serviceRequestItem =
-                serviceRequestService.selectServiceRequestByBasedOnId(infoDto.getId());
-            // 获取执行诊疗最大数
-            int step = serviceRequestItem.size();
-            step += 1;
-
-            // 执行诊疗
-            ServiceRequest serviceRequestAddItem = serviceRequestService.createCompletedServiceRequest(serviceRequest,
-                now, user, String.format("%03d", step));
-            if (serviceRequestAddItem == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 发放数量
-            Integer quantity;
-            // 获取器材发放数据，执行器材发放
-            for (OutpatientDisposalDeviceInfoDto item : infoDto.getOutpatientDisposalDeviceInfoList()) {
-                // 获取器材发放数据
-                DeviceDispense deviceDispense = deviceDispenseService.getById(item.getDeviceDispenseId());
-                if (deviceDispense == null) {
-                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-                // 发放数量
-                try {
-                    quantity = deviceDispense.getQuantity() / serviceRequest.getQuantity();
-                    // 检查余数
-                    if (deviceDispense.getQuantity() % serviceRequest.getQuantity() != 0) {
-                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00012, null));
-                    }
-                } catch (ArithmeticException e) {
-                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00012, null));
-                }
-
-                // 执行器材发放
-                DeviceDispense deviceDispenseAddItem = deviceDispenseService
-                    .createCompletedDeviceDispense(deviceDispense, now, user, String.format("%03d", step), quantity);
-                if (deviceDispenseAddItem == null) {
-                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-            }
-
-            // 判断所有诊疗是否都执行完毕
-            if (step == infoDto.getFrequency()) {
-                // 修改服务申请状态
-                boolean serviceRequestResult = serviceRequestService.completedStatusEnum(infoDto.getId(), now, user);
-                if (!serviceRequestResult) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-                for (OutpatientDisposalDeviceInfoDto item : infoDto.getOutpatientDisposalDeviceInfoList()) {
-                    // 修改器材发放状态
-                    boolean deviceDispenseResult =
-                        deviceDispenseService.completedStatusEnum(item.getDeviceDispenseId(), now, user);
-                    if (!deviceDispenseResult) {
-                        R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                    }
-                    // 修改器材申请状态
-                    boolean deviceRequestResult =
-                        deviceRequestService.completedStatusEnum(item.getDeviceRequestId(), user);
-                    if (!deviceRequestResult) {
-                        R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                    }
-                }
-            }
-
-            // 更新库存
-            for (OutpatientDisposalDeviceInfoDto item : infoDto.getOutpatientDisposalDeviceInfoList()) {
-
-                Boolean updateBool = this.updateInventoryQuantity(item.getDeviceId(), item.getLotNumber(),
-                    item.getLocationId(), item.getUnitCode(), item.getQuantity(), item.getPartPercent(), "subtract");
-                if (!updateBool) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-            }
-
-        } else {
-
-            // 诊疗信息查询
-            OutpatientDisposalActivityInfoDto infoDto = outpatientDisposalMapper.selectEncounterActivityDeviceInfo(
-                itemId, CommonConstants.TableName.WOR_DEVICE_REQUEST, ItemType.DEVICE.getValue());
-
-            // 获取器材发放数据
-            DeviceDispense deviceDispense = deviceDispenseService.getById(infoDto.getId());
-            if (deviceDispense == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-
-            // 获取执行过的诊疗数据
-            List<DeviceDispense> deviceDispenseItem =
-                deviceDispenseService.selectDeviceDispenseByBasedOnId(infoDto.getId());
-            // 获取执行诊疗最大数
-            int step = deviceDispenseItem.size();
-            step += 1;
-
-            // 执行器材发放
-            DeviceDispense deviceDispenseAddItem = deviceDispenseService.createCompletedDeviceDispense(deviceDispense,
-                now, user, String.format("%03d", step), 1);
-            if (deviceDispenseAddItem == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 判断所有器材是否都执行完毕
-            if (step == infoDto.getFrequency()) {
-                // 修改器材发放状态
-                boolean deviceDispenseResult = deviceDispenseService.completedStatusEnum(infoDto.getId(), now, user);
-                if (!deviceDispenseResult) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-                // 修改器材申请状态
-                boolean deviceRequestResult = deviceRequestService.completedStatusEnum(infoDto.getId(), user);
-                if (!deviceRequestResult) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-            }
-            // 更新库存
-            Boolean updateBool =
-                this.updateInventoryQuantity(infoDto.getActivityId(), infoDto.getLotNumber(), infoDto.getLocationId(),
-                    infoDto.getUnitCode(), infoDto.getQuantity(), infoDto.getPartPercent(), "subtract");
-            if (!updateBool) {
-                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-        }
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
-    }
-
-    /**
-     * 更新库存
-     *
-     * @param itemId 器材id
-     * @param lotNumber 产品批号
-     * @param locationId 仓库id
-     * @param unitCode 单位
-     * @param quantity 数量
-     * @param partPercent 拆零比
-     * @param type 类型
-     * @return 执行结果
-     */
-    public Boolean updateInventoryQuantity(Long itemId, String lotNumber, Long locationId, String unitCode,
-        Integer quantity, BigDecimal partPercent, String type) {
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 根据耗材的id，产品批号，仓库 查询库存表信息
-        List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(itemId, lotNumber,
-            locationId, SecurityUtils.getLoginUser().getTenantId());
-        InventoryItem inventoryItem = new InventoryItem();
-        if (!inventoryItemList.isEmpty()) {
-            inventoryItem = inventoryItemList.get(0);
-        }
-        if (inventoryItem == null) {
-            return false;
-        }
-        // 包装数量（常规单位库存数量） 更新库存数量方法中没用到
-        BigDecimal baseQuantity = inventoryItem.getQuantity();
-        // 最小数量（最小单位库存数量）
-        BigDecimal minQuantity = inventoryItem.getQuantity();
-        if (Objects.equals(type, "subtract")) {
-            // 计算盘点后库存数量，结果取小单位
-            if (unitCode.equals(inventoryItem.getUnitCode())) {
-                minQuantity = minQuantity.subtract(BigDecimal.valueOf(quantity));
-                // 供应申请的物品计量单位与最小单位相同
-            } else {
-                minQuantity = minQuantity.subtract(partPercent.multiply(BigDecimal.valueOf(quantity)));
-            }
-        } else if (Objects.equals(type, "add")) {
-            // 计算盘点后库存数量，结果取小单位
-            if (unitCode.equals(inventoryItem.getUnitCode())) {
-                minQuantity = minQuantity.add(BigDecimal.valueOf(quantity));
-                // 供应申请的物品计量单位与最小单位相同
-            } else {
-                minQuantity = minQuantity.add(partPercent.multiply(BigDecimal.valueOf(quantity)));
-            }
-        }
-
-        // 更新库存数量
-        return inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), baseQuantity, minQuantity, now);
-    }
-
-    /**
-     * 取消
-     *
-     * @param busNo 编码
-     * @param activityId 诊疗Id
-     * @param type 类型
-     * @return 执行结果
-     */
-    @Override
-    public R<?> cancel(String busNo, Long activityId, Integer type) {
-
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 当前登录账号
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
-
-        if (Objects.equals(type, ItemType.ACTIVITY.getValue())) {
-            // 获取执行列表
-            List<OutpatientDisposalExecuteInfoDto> infoList = outpatientDisposalMapper.selectActivityExecuteInfo(type,
-                busNo, activityId, RequestStatus.COMPLETED.getValue());
-
-            // 修改执行过的服务申请状态
-            boolean serviceRequestResult = serviceRequestService.updateCancelledStatus(
-                infoList.get(0).getServiceRequestId(), now, loginUser.getPractitionerId(), loginUser.getDeptId());
-            if (!serviceRequestResult) {
-                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-
-            for (OutpatientDisposalExecuteInfoDto item : infoList) {
-                // 修改执行过的器材发放状态
-                boolean deviceDispenseResult =
-                    deviceDispenseService.cancelledStatusEnum(item.getDeviceDispenseId(), now, user);
-                if (!deviceDispenseResult) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-            }
-
-            // 获取执行过的服务申请数据
-            ServiceRequest serviceRequest = serviceRequestService.getById(infoList.get(0).getServiceRequestId());
-            if (serviceRequest == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 获取总服务申请数据
-            ServiceRequest serviceRequestFather = serviceRequestService.getById(serviceRequest.getBasedOnId());
-            if (serviceRequestFather == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-
-            // 总服务申请数据已完成时
-            if (Objects.equals(serviceRequestFather.getStatusEnum(), RequestStatus.COMPLETED.getValue())) {
-                // 修改总服务申请状态
-                boolean serviceRequestResultFather =
-                    serviceRequestService.activeStatusEnum(serviceRequestFather.getId(), now, user);
-                if (!serviceRequestResultFather) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-                for (OutpatientDisposalExecuteInfoDto item : infoList) {
-                    // 获取器材发放数据
-                    DeviceDispense deviceDispense = deviceDispenseService.getById(item.getDeviceDispenseId());
-                    if (deviceDispense == null) {
-                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                    }
-                    // 获取总器材发放数据
-                    DeviceDispense deviceDispenseFather = deviceDispenseService.getById(deviceDispense.getBasedOnId());
-                    if (deviceDispenseFather == null) {
-                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                    }
-                    // 修改执行过的器材发放状态
-                    boolean deviceDispenseResultFather =
-                        deviceDispenseService.inProgressStatusEnum(item.getDeviceDispenseId(), now, user);
-                    if (!deviceDispenseResultFather) {
-                        R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                    }
-                    // 修改执行过的器材申请状态
-                    boolean deviceRequestResultFather =
-                        deviceRequestService.activeStatusEnum(item.getDeviceRequestId(), user);
-                    if (!deviceRequestResultFather) {
-                        R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                    }
-                }
-            }
-            // 更新库存
-            for (OutpatientDisposalExecuteInfoDto item : infoList) {
-                Boolean updateBool = this.updateInventoryQuantity(item.getDeviceId(), item.getLotNumber(),
-                    item.getLocationId(), item.getUnitCode(), item.getQuantity(), item.getPartPercent(), "add");
-                if (!updateBool) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-            }
-        } else {
-            // 获取执行列表
-            List<OutpatientDisposalExecuteInfoDto> infoList = outpatientDisposalMapper.selectDeviceExecuteInfo(type,
-                busNo, activityId, DispenseStatus.COMPLETED.getValue());
-
-            // 修改执行过的器材发放状态
-            boolean deviceDispenseResult =
-                deviceDispenseService.cancelledStatusEnum(infoList.get(0).getDeviceDispenseId(), now, user);
-            if (!deviceDispenseResult) {
-                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 获取器材发放数据
-            DeviceDispense deviceDispense = deviceDispenseService.getById(infoList.get(0).getDeviceDispenseId());
-            if (deviceDispense == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 获总取器材发放数据
-            DeviceDispense deviceDispenseFather = deviceDispenseService.getById(deviceDispense.getBasedOnId());
-            if (deviceDispenseFather == null) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-            // 总服务申请数据已完成时
-            if (Objects.equals(deviceDispenseFather.getStatusEnum(), DispenseStatus.COMPLETED.getValue())) {
-                // 修改执行过的器材发放状态
-                boolean deviceDispenseResultFather =
-                    deviceDispenseService.inProgressStatusEnum(infoList.get(0).getDeviceDispenseId(), now, user);
-                if (!deviceDispenseResultFather) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-                // 修改执行过的器材申请状态
-                boolean deviceRequestResultFather =
-                    deviceRequestService.activeStatusEnum(infoList.get(0).getDeviceRequestId(), user);
-                if (!deviceRequestResultFather) {
-                    R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-                }
-            }
-            // 更新库存
-            Boolean updateBool = this.updateInventoryQuantity(infoList.get(0).getDeviceId(),
-                infoList.get(0).getLotNumber(), infoList.get(0).getLocationId(), infoList.get(0).getUnitCode(),
-                infoList.get(0).getQuantity(), infoList.get(0).getPartPercent(), "add");
-            if (!updateBool) {
-                R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-        }
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
-    }
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalDeviceInfoDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalDeviceInfoDto.java
deleted file mode 100644
index 08ad9db7..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalDeviceInfoDto.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.outpatientmanage.dto;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 诊疗耗材列表
- *
- * @author yuxj
- * @date 2025-04-11
- */
-@Data
-@Accessors(chain = true)
-public class OutpatientDisposalDeviceInfoDto {
-
-    /** 器材请求id */
-    private Long deviceRequestId;
-
-    /** 器材发放Id */
-    private Long deviceDispenseId;
-
-    /** 编码 */
-    private String busNo;
-
-    /** 耗材id */
-    private Long deviceId;
-
-    /** 产品批号 */
-    private String lotNumber;
-
-    /** 单位 */
-    private String unitCode;
-
-    /** 拆零比 */
-    private BigDecimal partPercent;
-
-    /** 仓库 */
-    private Long locationId;
-
-    /** 分组编号 */
-    private String groupNo;
-
-    /** 项目名称 */
-    private String itemName;
-
-    /** 单价 */
-    private BigDecimal unitPrice;
-
-    /** 总价 */
-    private BigDecimal totalPrice;
-
-    /** 数量 */
-    private Integer quantity;
-
-    /** 次数 */
-    private Integer frequency;
-
-    /** 收费状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-
-    /** 单位 */
-    @Dict(dictCode = "unit_code")
-    private String quantityUnit;
-    private String quantityUnit_dictText;
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalExecuteInfoDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalExecuteInfoDto.java
deleted file mode 100644
index 10f823d2..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalExecuteInfoDto.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.outpatientmanage.dto;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-
-import liquibase.pro.packaged.S;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 执行列表
- *
- * @author yuxj
- * @date 2025-04-11
- */
-@Data
-@Accessors(chain = true)
-public class OutpatientDisposalExecuteInfoDto {
-
-    /** 类型*/
-    private Integer type;
-
-    /** 服务申请Id */
-    private Long serviceRequestId;
-
-    /** 器材发放Id */
-    private Long deviceDispenseId;
-
-    /** 器材请求id */
-    private Long deviceRequestId;
-
-    /** 器材id */
-    private Long deviceId;
-
-    /** 服务请求编码 */
-    private String busNo;
-
-    /** 执行人 */
-    private String performerName;
-
-    /** 执行科室 */
-    private String locationName;
-
-    /** 耗材名 */
-    private String deviceName;
-
-    /** 耗材数量 */
-    private Integer quantity;
-
-    /** 执行时间 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date occurrenceTime;
-
-    /** 产品批号 */
-    private String lotNumber;
-
-    /** 单位 */
-    private String unitCode;
-
-    /** 拆零比 */
-    private BigDecimal partPercent;
-
-    /** 仓库 */
-    private Long locationId;
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInfoDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInfoDto.java
deleted file mode 100644
index b27de0ac..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientDisposalInfoDto.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.outpatientmanage.dto;
-
-import java.util.List;
-
-import com.openhis.web.pharmacymanage.dto.PrescriptionMedicineInfoDto;
-import com.openhis.web.pharmacymanage.dto.PrescriptionPatientInfoDto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 处方信息
- *
- * @author yuxj
- * @date 2025-04-11
- */
-@Data
-@Accessors(chain = true)
-public class OutpatientDisposalInfoDto {
-
-    /** 患者基本信息 */
-    private OutpatientDisposalPatientInfoDto outpatientDisposalPatientInfoDto;
-
-    /** 诊疗信息 */
-    List<OutpatientDisposalActivityInfoDto> outpatientDisposalActivityInfoDtoList;
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientDisposalMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientDisposalMapper.java
deleted file mode 100644
index 6b55fa07..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientDisposalMapper.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.outpatientmanage.mapper;
-
-import java.util.List;
-
-import com.openhis.web.outpatientmanage.dto.*;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.web.pharmacymanage.dto.*;
-
-@Repository
-public interface OutpatientDisposalMapper {
-
-    /**
-     * 就诊病人列表分页查询
-     *
-     * @param page 分页
-     * @param queryWrapper 查询条件
-     * @return 就诊病人列表
-     */
-    Page<OutpatientDisposalEncounterInfoPageDto> selectEncounterInfoListPage(@Param("page") Page<EncounterInfoPageDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoSearchParam> queryWrapper);
-
-    /**
-     * 患者基本信息查询
-     *
-     * @param encounterId 就诊号
-     * @return 患者基本信息
-     */
-    OutpatientDisposalPatientInfoDto selectEncounterPatientInfo(@Param("encounterId") Long encounterId);
-
-    /**
-     * 诊疗查询
-     *
-     * @param encounterId 就诊号
-     * @param serviceTableName 服务申请表名
-     * @param requestTableName 器材请求表名
-     * @param device 耗材
-     * @param activity 诊疗
-     * @return 诊疗单列表
-     */
-    List<OutpatientDisposalTempInfoDto> selectEncounterActivityInfoList(@Param("encounterId") Long encounterId,
-        @Param("serviceTableName") String serviceTableName, @Param("requestTableName") String requestTableName,
-        @Param("DEVICE") Integer device, @Param("activity") Integer activity);
-
-    /**
-     * 耗材查询
-     *
-     * @param groupNo 分组编号
-     * @param encounterId 就诊号
-     * @param requestTableName 器材请求表名
-     * @return 耗材列表
-     */
-    List<OutpatientDisposalDeviceInfoDto> selectEncounterDeviceInfoList(@Param("groupNo") String groupNo,
-        @Param("encounterId") Long encounterId, @Param("requestTableName") String requestTableName);
-
-    /**
-     * 执行查询
-     *
-     * @param type 类型
-     * @param busNo 编码
-     * @param activityId 诊疗ID
-     * @param status 状态
-     * @return 耗材列表
-     */
-    List<OutpatientDisposalExecuteInfoDto> selectActivityExecuteInfo(@Param("type") Integer type,
-        @Param("busNo") String busNo, @Param("activityId") Long activityId, @Param("status") Integer status);
-
-    /**
-     * 执行查询
-     *
-     * @param type 类型
-     * @param busNo 编码
-     * @param activityId 诊疗ID
-     * @param status 状态
-     * @return 耗材列表
-     */
-    List<OutpatientDisposalExecuteInfoDto> selectDeviceExecuteInfo(@Param("type") Integer type,
-        @Param("busNo") String busNo, @Param("activityId") Long activityId, @Param("status") Integer status);
-
-    /**
-     * 诊疗查询
-     *
-     * @param itemId 诊疗号
-     * @param serviceTableName 服务申请表名
-     * @param activity 诊疗
-     * @return 诊疗单列表
-     */
-    OutpatientDisposalActivityInfoDto selectEncounterActivityInfo(@Param("itemId") Long itemId,
-        @Param("serviceTableName") String serviceTableName, @Param("activity") Integer activity);
-
-    /**
-     * 诊疗查询
-     *
-     * @param itemId 诊疗号
-     * @param requestTableName 器材请求表名
-     * @param device 耗材
-     * @return 诊疗单列表
-     */
-    OutpatientDisposalActivityInfoDto selectEncounterActivityDeviceInfo(@Param("itemId") Long itemId,
-        @Param("requestTableName") String requestTableName, @Param("DEVICE") Integer device);
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
deleted file mode 100644
index 99306b01..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
+++ /dev/null
@@ -1,569 +0,0 @@
-package com.openhis.web.paymentmanage.appservice.impl;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.SecurityUtils;
-import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.DelFlag;
-import com.openhis.common.enums.InvoiceStatus;
-import com.openhis.common.enums.PaymentType;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbMedChrgItmType;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.dto.ReportVo;
-import com.openhis.web.paymentmanage.dto.ReturnBillVO;
-import com.openhis.web.paymentmanage.mapper.ChargeBillMapper;
-import com.openhis.web.paymentmanage.dto.ChargeItemDetailVO;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.domain.ClinicUnSettle;
-import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Component
-@Slf4j
-public class IChargeBillServiceImpl implements IChargeBillService {
-
-    @Resource
-    private IAccountService iAccountService;
-    @Resource
-    private IEncounterService iEncounterService;
-    @Resource
-    private IInvoiceService iInvoiceService;
-    @Resource
-    private IPaymentReconciliationService paymentReconciliationService;
-    @Resource
-    private IPaymentRecDetailService paymentRecDetailService;
-    @Resource
-    private IContractService contractService;
-    @Resource
-    private IChargeItemService chargeItemService;
-    @Resource
-    private IPatientService iPatientService;
-    @Autowired
-    private IChargeItemDefinitionService iChargeItemDefinitionService;
-    @Autowired
-    private IPerinfoService iPerinfoService;
-    @Autowired
-    private IEncounterDiagnosisService iEncounterDiagnosisService;
-    @Autowired
-    private IConditionDefinitionService iConditionDefinitionService;
-    @Autowired
-    private IConditionService iConditionService;
-    @Autowired
-    private ChargeBillMapper chargeBillMapper;
-    @Autowired
-    private IMedicationDefinitionService iMedicationDefinitionService;
-    @Autowired
-    private IDeviceDefinitionService iDeviceDefinitionService;
-    @Autowired
-    private IActivityDefinitionService iActivityDefinitionService;
-    @Autowired
-    private IPractitionerService iPractitionerService;
-    @Autowired
-    private IHealthcareServiceService iHealthcareServiceService;
-    @Autowired
-    private IClinicSettleService iClinicSettleService;
-    @Autowired
-    private IClinicUnRegService iClinicUnRegService;
-    @Autowired
-    private IRegService iRegService;
-    @Autowired
-    private IClinicUnSettleService iClinicUnSettleService;
-
-
-    @Override
-    public Map getDetail(Long paymentId) {
-
-        Map<String, Object> map = new HashMap<>();
-        //查询
-        PaymentReconciliation paymentReconciliation = paymentReconciliationService.getById(paymentId);
-        if(paymentReconciliation==null){
-            throw new ServiceException("未查询到付款信息");
-        }
-        map.put("paymentId",paymentReconciliation.getPaymentNo());//结算id
-        map.put("paymentAmount",paymentReconciliation.getTenderedAmount());//应收金额
-        Practitioner practitioner = iPractitionerService.getById(paymentReconciliation.getEntererId());
-        map.put("paymentAmount",practitioner==null?"":practitioner.getName());//收费员
-        map.put("chargeTime",paymentReconciliation.getBillDate());//收费时间
-        Patient patient = iPatientService.getById(paymentReconciliation.getPatientId());
-        if(patient==null){
-            throw new ServiceException("未查询到患者信息");
-        }
-        map.put("patientName",patient.getName());//患者姓名
-
-        map.put("sex",patient.getGenderEnum());//性别
-        map.put("idCardNo",patient.getIdCard());//身份证号
-        map.put("birthDay",patient.getBirthDate());//出生日期
-
-        List<PaymentRecDetail> paymentRecDetails = paymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().eq(PaymentRecDetail::getReconciliationId, paymentId));
-        paymentRecDetails.stream()
-                .collect(Collectors.groupingBy(
-                        PaymentRecDetail::getPayEnum, // 替换为实际的分类属性getter方法
-                        Collectors.reducing(
-                                BigDecimal.ZERO,
-                                PaymentRecDetail::getAmount, // 替换为实际的amount getter方法
-                                BigDecimal::add
-                        )
-                ));
-        if(paymentRecDetails.isEmpty()){
-            throw new ServiceException("未查询到付款信息");
-        }
-        map.put("detail",paymentRecDetails);//支付详细
-
-        Invoice invoice = iInvoiceService.getOne(new LambdaQueryWrapper<Invoice>().eq(Invoice::getReconciliationId, paymentId).eq(Invoice::getStatusEnum, InvoiceStatus.ISSUED.getValue()).orderByDesc(Invoice::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-        if(invoice==null){
-            throw new ServiceException("未查询到发票信息");
-        }
-        map.put("invoiceNo",invoice.getBillNo());//支付详细
-        map.put("pictureUrl",invoice.getPictureUrl());//图片
-        List<Long> chargeItemIdList = Arrays.stream(paymentReconciliation.getChargeItemIds().split(","))
-                .map(Long::parseLong)
-                .collect(Collectors.toList());
-
-        List<ChargeItem> chargeItemList = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>().in(ChargeItem::getId, chargeItemIdList));
-        List<ChargeItemDetailVO> chargeItemDetailList = new ArrayList<>();
-        ChargeItemDetailVO chargeItemDetailVO;
-        for (ChargeItem chargeItem : chargeItemList) {
-            chargeItemDetailVO = new ChargeItemDetailVO();
-            BeanUtils.copyProperties(chargeItem,chargeItemDetailVO);
-            if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(chargeItem.getProductTable())) {
-                MedicationDefinition medication = iMedicationDefinitionService.getById(chargeItem.getProductId());
-                chargeItemDetailVO.setDirClass(medication.getYbNo()).setChargeItemName(medication.getName())
-                        .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
-                        .setQuantityValue(chargeItem.getQuantityValue());
-            } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(chargeItem.getProductTable())) {
-                DeviceDefinition device = iDeviceDefinitionService.getById(chargeItem.getProductId());
-                chargeItemDetailVO.setDirClass(device.getYbNo()).setChargeItemName(device.getName())
-                        .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
-                        .setQuantityValue(chargeItem.getQuantityValue());
-            } else if(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(chargeItem.getProductTable())){
-                ActivityDefinition activity = iActivityDefinitionService.getById(chargeItem.getProductId());
-                chargeItemDetailVO.setDirClass(activity.getYbNo()).setChargeItemName(activity.getName())
-                        .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
-                        .setQuantityValue(chargeItem.getQuantityValue());
-            }else{
-                HealthcareService healthcareService = iHealthcareServiceService.getById(chargeItem.getServiceId());
-                chargeItemDetailVO.setDirClass(healthcareService.getYbNo()).setChargeItemName(healthcareService.getName())
-                        .setTotalPrice(chargeItem.getTotalPrice()).setQuantityUnit(chargeItem.getQuantityUnit())
-                        .setQuantityValue(chargeItem.getQuantityValue());
-            }
-            chargeItemDetailList.add(chargeItemDetailVO);
-        }
-        map.put("chargeItem",chargeItemDetailList);//收费项
-
-        if(chargeItemList.isEmpty()){
-            throw new ServiceException("未查询到收费项");
-        }
-        Encounter encounter = iEncounterService.getById(paymentReconciliation.getEncounterId());
-        if(encounter==null){
-            throw new ServiceException("未查询到就诊信息");
-        }
-        map.put("classEnum",encounter.getYbClassEnum());//门诊/住院
-        map.put("regNo",encounter.getBusNo());//门诊号
-
-        Account account = iAccountService.getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, encounter.getId()).eq(Account::getEncounterFlag,Whether.YES.getValue()));
-        if(account==null){
-            throw new ServiceException("未查询到就诊信息");
-        }
-
-        InfoPerson perinfo = iPerinfoService.getOne(new LambdaQueryWrapper<InfoPerson>()
-                .eq(InfoPerson::getCertno, patient.getIdCard()).eq(InfoPerson::getTenantId, patient.getTenantId())
-                .orderByDesc(InfoPerson::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-        if(perinfo!=null){
-            map.put("personType",perinfo.getInsutype());//人员类别：职工医保，居民医保等；如果为空显示自费或其他
-            map.put("insuplcAdmdvs",perinfo.getInsuplcAdmdvs());//患者参保地区划
-        }
-
-        Contract contract = contractService.getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getBusNo, account.getContractNo()));
-        if(contract==null){
-            throw new ServiceException("未查询到合同信息");
-        }
-        //查询主诊断信息
-        EncounterDiagnosis encounterDiagnosis = iEncounterDiagnosisService.getOne(new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getEncounterId, encounter.getId()).eq(EncounterDiagnosis::getMaindiseFlag, Whether.YES.getValue()).eq(EncounterDiagnosis::getDeleteFlag, DelFlag.NO.getCode()).orderByDesc(EncounterDiagnosis::getDiagSrtNo).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if(encounterDiagnosis!=null){
-            Condition condition = iConditionService.getById(encounterDiagnosis.getConditionId());
-            if(condition!=null){
-                ConditionDefinition conditionDefinition = iConditionDefinitionService.getOne(new LambdaQueryWrapper<ConditionDefinition>().eq(ConditionDefinition::getId, condition.getDefinitionId()));
-                if(conditionDefinition!=null){
-                    map.put("conditionDefinition",conditionDefinition.getName());//诊断名
-                }
-            }
-        }
-
-        BigDecimal sum01 = BigDecimal.ZERO;
-        BigDecimal sum02 = BigDecimal.ZERO;
-        BigDecimal sum03 = BigDecimal.ZERO;
-        BigDecimal sum04 = BigDecimal.ZERO;
-        BigDecimal sum05 = BigDecimal.ZERO;
-        BigDecimal sum06 = BigDecimal.ZERO;
-        BigDecimal sum07 = BigDecimal.ZERO;
-        BigDecimal sum08 = BigDecimal.ZERO;
-        BigDecimal sum09 = BigDecimal.ZERO;
-        BigDecimal sum10 = BigDecimal.ZERO;
-        BigDecimal sum11 = BigDecimal.ZERO;
-        BigDecimal sum12 = BigDecimal.ZERO;
-        BigDecimal sum13 = BigDecimal.ZERO;
-        BigDecimal sum14 = BigDecimal.ZERO;
-
-        for (ChargeItem chargeItem : chargeItemList) {
-
-            Long definitionId = chargeItem.getDefinitionId();
-
-            ChargeItemDefinition chargeItemDefinition = iChargeItemDefinitionService.getById(definitionId);
-
-            YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));
-
-            switch (medChrgItmType){
-                case BED_FEE:
-                    sum01 = sum01.add(chargeItem.getTotalPrice());
-                    break;
-                case DIAGNOSTIC_FEE:
-                    sum02 = sum02.add(chargeItem.getTotalPrice());
-                    break;
-                case CHECK_FEE:
-                    sum03 = sum03.add(chargeItem.getTotalPrice());
-                    break;
-                case DIAGNOSTIC_TEST_FEE:
-                    sum04 = sum04.add(chargeItem.getTotalPrice());
-                    break;
-                case MEDICAL_EXPENSE_FEE:
-                    sum05 = sum05.add(chargeItem.getTotalPrice());
-                    break;
-                case OPERATION_FEE:
-                    sum06 = sum06.add(chargeItem.getTotalPrice());
-                    break;
-                case NURSING_FEE:
-                    sum07 = sum07.add(chargeItem.getTotalPrice());
-                    break;
-                case SANITARY_MATERIALS_FEE:
-                    sum08 = sum08.add(chargeItem.getTotalPrice());
-                    break;
-                case WEST_MEDICINE:
-                    sum09 = sum09.add(chargeItem.getTotalPrice());
-                    break;
-                case CHINESE_MEDICINE_SLICES_FEE:
-                    sum10 = sum10.add(chargeItem.getTotalPrice());
-                    break;
-                case CHINESE_MEDICINE_FEE:
-                    sum11 = sum11.add(chargeItem.getTotalPrice());
-                    break;
-                case GENERAL_CONSULTATION_FEE:
-                    sum12 = sum12.add(chargeItem.getTotalPrice());
-                    break;
-                case REGISTRATION_FEE:
-                    sum13 = sum13.add(chargeItem.getTotalPrice());
-                    break;
-                default:
-                    sum14 = sum14.add(chargeItem.getTotalPrice());
-                    break;
-            }
-        }
-        map.put("BED_FEE",sum01);//床位费
-        map.put("DIAGNOSTIC_FEE",sum02);//诊察费
-        map.put("CHECK_FEE",sum03);//检查费
-        map.put("DIAGNOSTIC_TEST_FEE",sum04);//化验费
-        map.put("MEDICAL_EXPENSE_FEE",sum05);//治疗费
-        map.put("OPERATION_FEE",sum06);//手术费
-        map.put("NURSING_FEE",sum07);//护理费
-        map.put("SANITARY_MATERIALS_FEE",sum08);//卫生材料费
-        map.put("WEST_MEDICINE",sum09);//西药费
-        map.put("CHINESE_MEDICINE_SLICES_FEE",sum10);//中药饮片费
-        map.put("CHINESE_MEDICINE_FEE",sum11);//中成药费
-        map.put("GENERAL_CONSULTATION_FEE",sum12);//一般诊疗费
-        map.put("REGISTRATION_FEE",sum13);//挂号费
-        map.put("OTHER_FEE",sum14);//其他费用
-
-        //String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
-        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
-        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
-
-        map.put("fixmedinsName",fixmedinsName);
-        map.put("fixmedinsCode",fixmedinsCode);
-
-        return map;
-    }
-
-
-    /**
-     * 农大版本
-     * @param reportVo
-     * @return
-     */
-    @Override
-    public Map getTotal(String startTime, String endTime, Long entererId) {
-
-        Map<String, Object> map = new HashMap<>();
-
-        //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
-        Date startDate = DateUtils.parseDate(startTime);
-        Date endDate = DateUtils.parseDate(endTime);
-
-        //查询所有的支付
-        LambdaQueryWrapper<PaymentReconciliation> queryWrapper = new LambdaQueryWrapper<PaymentReconciliation>().between(PaymentReconciliation::getBillDate, startDate, endDate).eq(PaymentReconciliation::getDeleteFlag,DelFlag.NO.getCode());
-        if(entererId!=null){
-            queryWrapper.eq(PaymentReconciliation::getEntererId,entererId);
-        }
-        List<PaymentReconciliation> paymentReconciliationList = paymentReconciliationService.list(queryWrapper);
-        if(paymentReconciliationList.isEmpty()){
-            throw new ServiceException("该时间段内未收费");
-        }
-        //查询所有的支付详情
-        List<Long> paymentIdList = paymentReconciliationList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
-        List<PaymentRecDetail> paymentDetails = paymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>().in(PaymentRecDetail::getReconciliationId, paymentIdList).eq(PaymentRecDetail::getDeleteFlag, DelFlag.NO.getCode()));
-        if(paymentDetails.isEmpty()){
-            throw new ServiceException("该时间段内未收费");
-        }
-        Map<Long, List<PaymentRecDetail>> paymentDetailsKV = paymentDetails.stream().collect(Collectors.groupingBy(PaymentRecDetail::getReconciliationId));
-
-        //查询所有的收费项
-        List<String> chargeItemIdStrs = paymentReconciliationList.stream().map(PaymentReconciliation::getChargeItemIds).collect(Collectors.toList());
-        List<Long> chargeItemIds = new ArrayList<>();
-        for (String chargeItemIdStr : chargeItemIdStrs) {
-            List<String> strings = Arrays.asList(chargeItemIdStr.split(","));
-            for (String string : strings) {
-                Long id = Long.parseLong(string);
-                chargeItemIds.add(id);
-            }
-        }
-        List<ChargeItem> chargeItemList = chargeItemService.list(new LambdaQueryWrapper<ChargeItem>().in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getDeleteFlag,DelFlag.NO.getCode()));
-        if(paymentDetails.isEmpty()){
-            throw new ServiceException("该时间段内未收费");
-        }
-
-        //查询收费定义列表
-        List<Long>  chargeItemDefinitionIdList= chargeItemList.stream().map(ChargeItem::getDefinitionId).collect(Collectors.toList());
-        List<ChargeItemDefinition> chargeItemDefinitions = iChargeItemDefinitionService.listByIds(chargeItemDefinitionIdList);
-        Map<Long, List<ChargeItemDefinition>> chargeItemDefKV = chargeItemDefinitions.stream().collect(Collectors.groupingBy(ChargeItemDefinition::getId));
-
-        //查询医保结算id
-        List<String> settleIds = new ArrayList<>();
-        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
-            if(!StringUtils.isEmpty(paymentReconciliation.getYbSettleIds())){
-                List<String> strings = Arrays.asList(paymentReconciliation.getYbSettleIds().split(","));
-                settleIds.addAll(strings);
-            }
-        }
-        List<ClinicSettle> clinicSettle = new ArrayList<>();
-        if (!settleIds.isEmpty()){
-            clinicSettle = iClinicSettleService.getBySettleIds(settleIds);
-            //List<String> collect = clinicSettle.stream().map(ClinicSettle::getInsutype).collect(Collectors.toList());
-        }
-
-        BigDecimal cashSum = BigDecimal.ZERO;//现金总数 = rmbCashSum + vxCashSum + aliCashSum + uniCashSum
-        BigDecimal rmbCashSum = BigDecimal.ZERO;//现金总数
-        BigDecimal vxCashSum = BigDecimal.ZERO;//现金总数（）
-        BigDecimal aliCashSum = BigDecimal.ZERO;//现金总数（）
-        BigDecimal uniCashSum = BigDecimal.ZERO;//现金总数（）
-        BigDecimal vxSum = BigDecimal.ZERO;//微信总数
-        BigDecimal aliSum = BigDecimal.ZERO;//支付宝总数
-        BigDecimal uniSum = BigDecimal.ZERO;//银行卡总数
-        BigDecimal tcSum = BigDecimal.ZERO;//基本统筹
-        BigDecimal zhSum = BigDecimal.ZERO;//医保账户
-        BigDecimal fundSum = BigDecimal.ZERO;//基金支总额
-        //农大版本只查询收款员，日期，现金多少钱，挂号费多少钱
-        for (PaymentRecDetail paymentDetail : paymentDetails) {
-            if(YbPayment.SELF_CASH_PAY.getValue().equals(paymentDetail.getPayEnum())){
-                cashSum = cashSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.SELF_CASH_VALUE.getValue().equals(paymentDetail.getPayEnum())){
-                rmbCashSum = rmbCashSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.SELF_CASH_VX_VALUE.getValue().equals(paymentDetail.getPayEnum())){
-                vxCashSum = vxCashSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.SELF_CASH_ALI_VALUE.getValue().equals(paymentDetail.getPayEnum())){
-                aliCashSum = aliCashSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.SELF_CASH_UNION_VALUE.getValue().equals(paymentDetail.getPayEnum())){
-                uniCashSum = uniCashSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.YB_TC_FUND_AMOUNT.getValue().equals(paymentDetail.getPayEnum())){
-                tcSum = tcSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.YB_FUND_PAY.getValue().equals(paymentDetail.getPayEnum())){
-                fundSum = fundSum.add(paymentDetail.getAmount());
-            }
-            if(YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentDetail.getPayEnum())){
-                zhSum = zhSum.add(paymentDetail.getAmount());
-            }
-        }
-
-        //处理退费单
-        List<ReturnBillVO> returnList = new ArrayList<>();
-        List<PaymentReconciliation> returnPaymentList = new ArrayList<>();
-        ReturnBillVO returnBillVO;
-        for (PaymentReconciliation paymentReconciliation : paymentReconciliationList) {
-            if(PaymentType.UN_PAY.getValue().equals(paymentReconciliation.getPaymentEnum())){
-                returnPaymentList.add(paymentReconciliation);
-            }
-        }
-        if(!returnPaymentList.isEmpty()) {
-            List<Long> returnIds = returnPaymentList.stream().map(PaymentReconciliation::getId).collect(Collectors.toList());
-
-            List<Invoice> invoiceList = iInvoiceService.list(new LambdaUpdateWrapper<Invoice>().in(Invoice::getReconciliationId, returnIds).eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()));
-            if (!invoiceList.isEmpty()) {
-                Map<Long, List<Invoice>> invoiceKV = invoiceList.stream().collect(Collectors.groupingBy(Invoice::getReconciliationId));
-                for (PaymentReconciliation paymentReconciliation : returnPaymentList) {
-                    returnBillVO = new ReturnBillVO();
-                    returnBillVO.setTotalAmount(paymentReconciliation.getTenderedAmount());
-                    List<PaymentRecDetail> paymentRecDetails = paymentDetailsKV.get(paymentReconciliation.getId());
-                    for (PaymentRecDetail paymentRecDetail : paymentRecDetails) {
-                        if (YbPayment.SELF_CASH_PAY.getValue().equals(paymentRecDetail.getPayEnum())) {
-                            returnBillVO.setPaidAmount(paymentRecDetail.getAmount());
-                        }
-                    }
-
-                    Optional<Invoice> max = invoiceKV.get(paymentReconciliation.getId()).stream().max(Comparator.comparing(Invoice::getCreateTime));
-
-                    if (max.isPresent()) {
-                        returnBillVO.setInvoiceNo(max.get().getBillNo());
-                    } else {
-                        returnBillVO.setInvoiceNo("");
-                    }
-
-                    returnBillVO.setPaymentNo(paymentReconciliation.getPaymentNo());
-                    returnList.add(returnBillVO);
-                }
-                map.put("returnList", returnList);//退费单
-            }
-        }
-
-        map.put("cashSum",cashSum);//现金支付
-        map.put("rmbCashSum",rmbCashSum);//现金支付
-        map.put("vxCashSum",vxCashSum);//现金支付（）
-        map.put("aliCashSum",aliCashSum);//现金支付（）
-        map.put("uniCashSum",uniCashSum);//现金支付（）
-        map.put("tcSum",tcSum);//基本统筹
-        map.put("zhSum",zhSum);//账户支付
-        map.put("fundSum",fundSum);//基金支付总额
-
-
-        BigDecimal sum01 = BigDecimal.ZERO;
-        BigDecimal sum02 = BigDecimal.ZERO;
-        BigDecimal sum03 = BigDecimal.ZERO;
-        BigDecimal sum04 = BigDecimal.ZERO;
-        BigDecimal sum05 = BigDecimal.ZERO;
-        BigDecimal sum06 = BigDecimal.ZERO;
-        BigDecimal sum07 = BigDecimal.ZERO;
-        BigDecimal sum08 = BigDecimal.ZERO;
-        BigDecimal sum09 = BigDecimal.ZERO;
-        BigDecimal sum10 = BigDecimal.ZERO;
-        BigDecimal sum11 = BigDecimal.ZERO;
-        BigDecimal sum12 = BigDecimal.ZERO;
-        BigDecimal sum13 = BigDecimal.ZERO;
-        BigDecimal sum14 = BigDecimal.ZERO;
-
-        for (ChargeItem chargeItem : chargeItemList) {
-
-            Long definitionId = chargeItem.getDefinitionId();
-
-            ChargeItemDefinition chargeItemDefinition = chargeItemDefKV.get(definitionId).get(0);
-
-            YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));
-
-            switch (medChrgItmType){
-                case BED_FEE:
-                    sum01 = sum01.add(chargeItem.getTotalPrice());
-                    break;
-                case DIAGNOSTIC_FEE:
-                    sum02 = sum02.add(chargeItem.getTotalPrice());
-                    break;
-                case CHECK_FEE:
-                    sum03 = sum03.add(chargeItem.getTotalPrice());
-                    break;
-                case DIAGNOSTIC_TEST_FEE:
-                    sum04 = sum04.add(chargeItem.getTotalPrice());
-                    break;
-                case MEDICAL_EXPENSE_FEE:
-                    sum05 = sum05.add(chargeItem.getTotalPrice());
-                    break;
-                case OPERATION_FEE:
-                    sum06 = sum06.add(chargeItem.getTotalPrice());
-                    break;
-                case NURSING_FEE:
-                    sum07 = sum07.add(chargeItem.getTotalPrice());
-                    break;
-                case SANITARY_MATERIALS_FEE:
-                    sum08 = sum08.add(chargeItem.getTotalPrice());
-                    break;
-                case WEST_MEDICINE:
-                    sum09 = sum09.add(chargeItem.getTotalPrice());
-                    break;
-                case CHINESE_MEDICINE_SLICES_FEE:
-                    sum10 = sum10.add(chargeItem.getTotalPrice());
-                    break;
-                case CHINESE_MEDICINE_FEE:
-                    sum11 = sum11.add(chargeItem.getTotalPrice());
-                    break;
-                case GENERAL_CONSULTATION_FEE:
-                    sum12 = sum12.add(chargeItem.getTotalPrice());
-                    break;
-                case REGISTRATION_FEE:
-                    sum13 = sum13.add(chargeItem.getTotalPrice());
-                    break;
-                default:
-                    sum14 = sum14.add(chargeItem.getTotalPrice());
-                    break;
-            }
-        }
-        map.put("BED_FEE",sum01);//床位费
-        map.put("DIAGNOSTIC_FEE",sum02);//诊察费
-        map.put("CHECK_FEE",sum03);//检查费
-        map.put("DIAGNOSTIC_TEST_FEE",sum04);//化验费
-        map.put("MEDICAL_EXPENSE_FEE",sum05);//治疗费
-        map.put("OPERATION_FEE",sum06);//手术费
-        map.put("NURSING_FEE",sum07);//护理费
-        map.put("SANITARY_MATERIALS_FEE",sum08);//卫生材料费
-        map.put("WEST_MEDICINE",sum09);//西药费
-        map.put("CHINESE_MEDICINE_SLICES_FEE",sum10);//中药饮片费
-        map.put("CHINESE_MEDICINE_FEE",sum11);//中成药费
-        map.put("GENERAL_CONSULTATION_FEE",sum12);//一般诊疗费
-        map.put("REGISTRATION_FEE",sum13);//挂号费
-        map.put("OTHER_FEE",sum14);//其他费用
-
-        //String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
-        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
-        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
-
-        map.put("fixmedinsName",fixmedinsName);
-        map.put("fixmedinsCode",fixmedinsCode);
-
-        return map;
-    }
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicineConsumablesDispenseAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicineConsumablesDispenseAppService.java
deleted file mode 100644
index ff10f7f1..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicineConsumablesDispenseAppService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-//package com.openhis.web.pharmacymanage.appservice;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import com.core.common.core.domain.R;
-//import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-//
-///**
-// * 处方管理 应用实现接口
-// *
-// * @author wangyang
-// * @date 2025/3/18
-// */
-//public interface IMedicineConsumablesDispenseAppService {
-//
-//    /**
-//     * 页面初始化
-//     *
-//     * @return 初始化信息
-//     */
-//    R<?> init();
-//
-//    /**
-//     * 分页查询就诊病人列表
-//     *
-//     * @param encounterInfoSearchParam 查询条件
-//     * @param pageNo 当前页码
-//     * @param pageSize 查询条数
-//     * @param request 请求数据
-//     * @return 就诊病人分页列表
-//     */
-//    R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam, Integer pageNo, Integer pageSize,
-//        HttpServletRequest request);
-//
-//    /**
-//     * 查询处方单列表
-//     *
-//     * @param encounterId 就诊号
-//     * @return 处方单列表
-//     */
-//    R<?> getPrescriptionInfo(Long encounterId);
-//
-//
-//    /**
-//     * 配药
-//     *
-//     * @param prescriptionNo 处方号
-//     * @param preparerId 配药人
-//     * @return 处理结果
-//     */
-//    R<?> prepare(String prescriptionNo, Long preparerId);
-//
-//    /**
-//     * 处方单核对发药
-//     *
-//     * @param prescriptionNo 处方号
-//     * @return 处理结果
-//     */
-//    R<?> consumablesDispense(String prescriptionNo);
-//
-//    /**
-//     * 处方单作废
-//     *
-//     * @param prescriptionNo 处方号
-//     * @param notPerformedReasonEnum 未发药原因
-//     * @return 处理结果
-//     */
-//    R<?> consumablesCancel(String prescriptionNo, Integer notPerformedReasonEnum);
-//}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicineConsumablesDispenseAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicineConsumablesDispenseAppServiceImpl.java
deleted file mode 100644
index ab9726d1..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IMedicineConsumablesDispenseAppServiceImpl.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-package com.openhis.web.pharmacymanage.appservice.impl;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.core.common.core.domain.R;
-import com.core.common.utils.*;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.pharmacymanage.appservice.IMedicineConsumablesDispenseAppService;
-import com.openhis.web.pharmacymanage.dto.*;
-import com.openhis.web.pharmacymanage.mapper.MedicineConsumablesDispenseMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IInventoryItemService;
-
-*/
-/**
- * 耗材发放 应用实现类
- *
- * @author wangyang
- * @date 2025/3/14
- *//*
-
-@Service
-public class IMedicineConsumablesDispenseAppServiceImpl implements IMedicineConsumablesDispenseAppService {
-
-    @Autowired
-    private IOrganizationService iOrganizationService;
-
-    @Autowired
-    IConsumablesDispenseService iConsumablesDispenseService;
-
-    @Autowired
-    IInventoryItemService iInventoryItemService;
-
-    @Autowired
-    MedicineConsumablesDispenseMapper medicineConsumablesDispenseMapper;
-
-    */
-/**
-     * 获取页面初始化信息
-     *
-     * @return 初始化信息
-     *//*
-
-    @Override
-    public R<?> init() {
-
-        DispenseInitDto initDto = new DispenseInitDto();
-
-        // 获取科室下拉选列表
-        List<Organization> organizationList =
-            iOrganizationService.getList(OrganizationType.DEPARTMENT.getValue(), OrganizationClass.CLINIC.getValue());
-        List<DispenseInitDto.DepartmentOption> organizationOptions = organizationList.stream()
-            .map(organization -> new DispenseInitDto.DepartmentOption(organization.getId(), organization.getName()))
-            .collect(Collectors.toList());
-
-        // 未发药原因下拉选列表
-        List<DispenseInitDto.NotPerformedReasonOption> notPerformedReasonOptions =
-            Stream.of(NotPerformedReasonEnum.values())
-                .map(notPerformedReason -> new DispenseInitDto.NotPerformedReasonOption(notPerformedReason.getValue(),
-                    notPerformedReason.getInfo()))
-                .collect(Collectors.toList());
-
-        initDto.setDepartmentOptions(organizationOptions).setNotPerformedReasonOptions(notPerformedReasonOptions);
-        return R.ok(initDto);
-    }
-
-    */
-/**
-     * 分页查询就诊病人列表
-     *
-     * @param encounterInfoSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 就诊病人列表
-     *//*
-
-    @Override
-    public R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam, Integer pageNo,
-        Integer pageSize, HttpServletRequest request) {
-        // 构建查询条件
-        QueryWrapper<EncounterInfoSearchParam> queryWrapper =
-            HisQueryUtils.buildQueryWrapper(encounterInfoSearchParam, null, null, request);
-
-        // 查询就诊病人列表
-        Page<EncounterInfoPageDto> encounterInfoPageDto =
-            medicineConsumablesDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper);
-
-        // 个别项目设定
-        encounterInfoPageDto.getRecords().forEach(prescriptionPatientInfoDto -> {
-            // 性别
-            prescriptionPatientInfoDto.setGenderEnum_enumText(
-                EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.getGenderEnum()));
-        });
-        return R.ok(encounterInfoPageDto);
-    }
-
-    */
-/**
-     * 查询处方单列表
-     *
-     * @param encounterId 就诊号
-     * @return 处方单列表
-     *//*
-
-    @Override
-    public R<?> getPrescriptionInfo(Long encounterId) {
-
-        // 患者基本信息查询
-        PrescriptionPatientInfoDto prescriptionPatientInfoDto =
-            medicineConsumablesDispenseMapper.selectPrescriptionPatientInfo(encounterId);
-        // 年龄
-        prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirthDate()));
-        // 性别
-        prescriptionPatientInfoDto.setGenderEnum_enumText(
-            EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.getGenderEnum()));
-        // 合同类型
-        if (StringUtils.isNotNull(prescriptionPatientInfoDto.getCategoryEnum())) {
-            prescriptionPatientInfoDto.setCategoryEnum_enumText(
-                EnumUtils.getInfoByValue(FinCategory.class, prescriptionPatientInfoDto.getCategoryEnum()));
-        }
-        // 处方单信息查询
-        List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoList =
-            medicineConsumablesDispenseMapper.selectPrescriptionConsumablesInfoList(encounterId);
-        // 计算合计金额
-        if (!prescriptionMedicineInfoList.isEmpty()) {
-            double totalPrice = 0d;
-            for (PrescriptionMedicineInfoDto item : prescriptionMedicineInfoList) {
-                totalPrice += item.getTotalPrice().doubleValue();
-            }
-            prescriptionPatientInfoDto.setTotalPrice(totalPrice);
-        }
-
-        PrescriptionInfoDto prescriptionInfoDto = new PrescriptionInfoDto();
-        prescriptionInfoDto.setPrescriptionPatientInfoDto(prescriptionPatientInfoDto);
-        prescriptionInfoDto.setPrescriptionMedicineInfoDtoList(prescriptionMedicineInfoList);
-        return R.ok(prescriptionInfoDto);
-    }
-
-    */
-/**
-     * 配药
-     *
-     * @param prescriptionNo 处方号
-     * @param preparerId 配药人
-     * @return 处理结果
-     *//*
-
-    @Override
-    public R<?> prepare(String prescriptionNo, Long preparerId) {
-
-        List<ConsumablesDispense> consumablesDispenseList = new ArrayList<>();
-        boolean iConsumablesDispenseUpdFlg = true;
-
-        // 配药人检查
-        if (!preparerId.equals(SecurityUtils.getLoginUser().getPractitionerId())) {
-            // 获取器材待发放信息
-            List<DispenseInventoryDto> dispenseInventoryList =
-                medicineConsumablesDispenseMapper.selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo,
-                    CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-            if (!dispenseInventoryList.isEmpty()) {
-
-                ConsumablesDispense consumablesDispense;
-
-                for (DispenseInventoryDto dispenseInventoryDto : dispenseInventoryList) {
-
-                    // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                    BigDecimal quantity = dispenseInventoryDto.getInventoryQuantity().subtract(dispenseInventoryDto
-                        .getPartPercent().multiply(new BigDecimal(dispenseInventoryDto.getDispenseQuantity())));
-                    // 库存数量判定
-                    if (quantity.compareTo(BigDecimal.ZERO) < 0) {
-                        // 库存数量不足
-                        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Inventory.M00002, null));
-                    }
-
-                    // 器材发放表项目设定
-                    consumablesDispense = new ConsumablesDispense();
-                    // id
-                    consumablesDispense.setId(dispenseInventoryDto.getDispenseId());
-                    // 器材发放状态
-                    consumablesDispense.setStatusEnum(DispenseStatus.PREPARED.getValue());
-                    // 配药时间
-                    consumablesDispense.setPrepareTime(DateUtils.getNowDate());
-                    consumablesDispenseList.add(consumablesDispense);
-
-                }
-                // 药品发放更新
-                iConsumablesDispenseUpdFlg = iConsumablesDispenseService.updateBatchById(consumablesDispenseList);
-
-                return iConsumablesDispenseUpdFlg
-                    ? R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
-                    : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
-            }
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-        }
-
-        return R.fail(MessageUtils.createMessage(PromptMsgConstant.MedicationDispense.M00001, null));
-    }
-
-    */
-/**
-     * 处方单核对发药
-     *
-     * @param prescriptionNo 处方号
-     * @return 处理结果
-     *//*
-
-    @Override
-    public R<?> consumablesDispense(String prescriptionNo) {
-
-        List<ConsumablesDispense> consumablesDispenseList = new ArrayList<>();
-        List<InventoryItem> inventoryItemList = new ArrayList<>();
-        boolean iConsumablesDispenseUpdFlg = true;
-        boolean iInventoryItemUpdFlg = true;
-
-        // 获取器材待发放和库存信息
-        List<DispenseInventoryDto> dispenseInventoryList =
-            medicineConsumablesDispenseMapper.selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo,
-                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-        if (!dispenseInventoryList.isEmpty()) {
-
-            ConsumablesDispense consumablesDispense;
-            InventoryItem inventoryItem;
-
-            for (DispenseInventoryDto dispenseInventoryDto : dispenseInventoryList) {
-
-                // 器材发放表项目设定
-                consumablesDispense = new ConsumablesDispense();
-                // id
-                consumablesDispense.setId(dispenseInventoryDto.getDispenseId());
-                // 器材发放状态
-                consumablesDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
-                // 发药人
-                consumablesDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId());
-                // 已发药数量
-                consumablesDispense.setDispenseQuantity(dispenseInventoryDto.getDispenseQuantity());
-                // 发药时间
-                consumablesDispense.setDispenseTime(DateUtils.getNowDate());
-                consumablesDispenseList.add(consumablesDispense);
-
-                // 库存表项目设定
-                inventoryItem = new InventoryItem();
-
-                // id
-                inventoryItem.setId(dispenseInventoryDto.getInventoryId());
-                // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                inventoryItem.setQuantity(dispenseInventoryDto.getInventoryQuantity().subtract(dispenseInventoryDto
-                    .getPartPercent().multiply(new BigDecimal(dispenseInventoryDto.getDispenseQuantity()))));
-
-                inventoryItemList.add(inventoryItem);
-            }
-            // 药品发放更新
-            iConsumablesDispenseUpdFlg = iConsumablesDispenseService.updateBatchById(consumablesDispenseList);
-            // 库存更新
-            iInventoryItemUpdFlg = iInventoryItemService.updateBatchById(inventoryItemList);
-
-            return iConsumablesDispenseUpdFlg && iInventoryItemUpdFlg
-                ? R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
-                : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00011, null));
-        }
-
-        return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-    }
-
-    */
-/**
-     * 作废
-     *
-     * @param prescriptionNo 处方号
-     * @param notPerformedReasonEnum 未发药原因
-     * @return 处理结果
-     *//*
-
-    @Override
-    public R<?> consumablesCancel(String prescriptionNo, Integer notPerformedReasonEnum) {
-
-        List<ConsumablesDispense> consumablesDispenseList = new ArrayList<>();
-        boolean iConsumablesDispenseUpdFlg = true;
-
-        // 获取器材待发放记录
-        List<DispenseInventoryDto> dispenseInventoryList =
-            medicineConsumablesDispenseMapper.selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo,
-                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-        if (!dispenseInventoryList.isEmpty()) {
-            ConsumablesDispense consumablesDispense;
-            for (DispenseInventoryDto dispenseInventoryDto : dispenseInventoryList) {
-
-                // 器材发放表项目设定
-                consumablesDispense = new ConsumablesDispense();
-                // id
-                consumablesDispense.setId(dispenseInventoryDto.getDispenseId());
-                // 器材发放状态
-                consumablesDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
-                // 未发药原因
-                consumablesDispense.setNotPerformedReasonEnum(notPerformedReasonEnum);
-                // 发药人
-                consumablesDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId());
-                consumablesDispenseList.add(consumablesDispense);
-            }
-            // 药品发放更新
-            iConsumablesDispenseUpdFlg = iConsumablesDispenseService.updateBatchById(consumablesDispenseList);
-        }
-        return iConsumablesDispenseUpdFlg
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
-            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-    }
-}
-*/
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicineConsumablesDispenseController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicineConsumablesDispenseController.java
deleted file mode 100644
index e14948fb..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicineConsumablesDispenseController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-//package com.openhis.web.pharmacymanage.controller;
-//
-//import com.core.common.core.domain.R;
-//import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//import com.openhis.web.pharmacymanage.appservice.IMedicineConsumablesDispenseAppService;
-//
-//
-//import lombok.AllArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//
-//@RestController
-//@Slf4j
-//@AllArgsConstructor
-//@RequestMapping("/pharmacy-manage/medicine-consumables-dispense")
-//public class MedicineConsumablesDispenseController {
-//
-//    @Autowired
-//    public IMedicineConsumablesDispenseAppService iMedicineConsumablesDispenseService;
-//
-//    /**
-//     * 获取页面初始化信息
-//     *
-//     * @return 初始化信息
-//     */
-//    @GetMapping(value = "/init")
-//    public R<?> consumablesDispenseInit() {
-//        return iMedicineConsumablesDispenseService.init();
-//    }
-//
-//    /**
-//     * 分页查询就诊病人列表
-//     *
-//     * @param encounterInfoSearchParam 查询条件
-//     * @param pageNo 当前页码
-//     * @param pageSize 查询条数
-//     * @param request 请求数据
-//     * @return 就诊病人列表
-//     */
-//    @GetMapping("/encounter-list")
-//    public R<?> getEncounterInfoList(EncounterInfoSearchParam encounterInfoSearchParam,
-//                                     @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-//                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-//        return iMedicineConsumablesDispenseService.getEncounterInfoListPage(encounterInfoSearchParam, pageNo, pageSize,
-//                request);
-//    }
-//
-//    /**
-//     * 处方单查询
-//     *
-//     * @param encounterId 就诊Id
-//     */
-//    @GetMapping("/prescription-list")
-//    public R<?> getPatientInfoList(@RequestParam(value = "encounterId") Long encounterId) {
-//        return iMedicineConsumablesDispenseService.getPrescriptionInfo(encounterId);
-//    }
-//
-//    /**
-//     * 配药
-//     *
-//     * @param prescriptionNo 处方号
-//     * @param preparerId 配药人
-//     */
-//    @PutMapping("/prepare")
-//    public R<?> prepare(@RequestParam(value = "prescriptionNo") String prescriptionNo,
-//                        @RequestParam(value = "preparerId") Long preparerId) {
-//        return iMedicineConsumablesDispenseService.prepare(prescriptionNo, preparerId);
-//    }
-//
-//    /**
-//     * 核对发药
-//     *
-//     * @param prescriptionNo 处方号
-//     */
-//    @PutMapping("/consumables-dispense")
-//    public R<?> consumablesDispense(@RequestParam(value = "prescriptionNo") String prescriptionNo) {
-//        return iMedicineConsumablesDispenseService.consumablesDispense(prescriptionNo);
-//    }
-//
-//    /**
-//     * 作废
-//     *
-//     * @param prescriptionNo 处方号
-//     * @param notPerformedReasonEnum 未发药原因
-//     */
-//    @PutMapping("/consumables-cancel")
-//    public R<?> medicineCancel(@RequestParam(value = "prescriptionNo") String prescriptionNo,
-//                               @RequestParam(value = "notPerformedReasonEnum") Integer notPerformedReasonEnum) {
-//        return iMedicineConsumablesDispenseService.consumablesCancel(prescriptionNo, notPerformedReasonEnum);
-//    }
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
deleted file mode 100644
index 5926cd09..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.openhis.web.reportmanage.appservice.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.enums.*;
-import com.openhis.web.inventorymanage.dto.PurchaseInventoryInitDto;
-import com.openhis.web.reportmanage.dto.OutboundReportInitDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.core.common.core.domain.R;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IOutboundReportAppService;
-import com.openhis.web.reportmanage.dto.OutboundReportPageDto;
-import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
-import com.openhis.web.reportmanage.mapper.OutboundReportMapper;
-
-/**
- * 入库明细 应用实现类
- *
- * @author yuanzs
- * @date 2025/4/21
- */
-@Service
-public class OutboundReportAppServiceImpl implements IOutboundReportAppService {
-
-    @Autowired
-    OutboundReportMapper outboundReportMapper;
-
-    @Resource
-    private ISupplierService supplierService;
-
-    /**
-     * 出库明细页面初始化
-     *
-     * @return 初始化信息
-     */
-    @Override
-    public R<?> init() {
-
-        OutboundReportInitDto initDto = new OutboundReportInitDto();
-        // 查询供应商列表
-        List<Supplier> supplierList = supplierService.getList();
-
-        // 供应商信息
-        List<OutboundReportInitDto.supplierListOption> supplierListOptions = supplierList.stream()
-                .map(supplier -> new OutboundReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
-                .collect(Collectors.toList());
-
-        initDto.setSupplierListOptions(supplierListOptions);
-
-        return R.ok(initDto);
-    }
-
-    /**
-     * 出库明细
-     *
-     * @param outboundReportSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 出库明细分页列表
-     */
-    @Override
-    public R<?> getPage(OutboundReportSearchParam outboundReportSearchParam, Integer pageNo, Integer pageSize,
-        String searchKey, HttpServletRequest request) {
-
-        // 构建查询条件
-        QueryWrapper<OutboundReportSearchParam> queryWrapper =
-            HisQueryUtils.buildQueryWrapper(outboundReportSearchParam, searchKey,
-                new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
-
-        // 查询出库明细分页列表
-        Page<OutboundReportPageDto> medDetailsPage =
-            outboundReportMapper.selectOutboundReportPage(new Page<>(pageNo, pageSize), queryWrapper,
-                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
-                SupplyType.ISSUE_INVENTORY.getValue(), SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
-
-        return R.ok(medDetailsPage);
-    }
-
-}
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
deleted file mode 100644
index 3a707498..00000000
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.reportmanage.appservice.impl;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService;
-import com.openhis.web.reportmanage.dto.*;
-import com.openhis.web.reportmanage.mapper.PurchaseReturnReportMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.EventStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-
-/**
- * 采购退货明细报表 impl
- *
- * @author ym
- * @date 2025-05-23
- */
-@Service
-public class PurchaseReturnReportAppServiceImpl implements PurchaseReturnReportAppService {
-
-    @Autowired
-    private PurchaseReturnReportMapper purchaseReturnReportMapper;
-
-    @Resource
-    private ISupplierService supplierService;
-
-    /**
-     * 采购退货明细页面初始化
-     *
-     * @return 初始化信息
-     */
-    @Override
-    public R<?> init() {
-
-        PurchaseReturnReportInitDto initDto = new PurchaseReturnReportInitDto();
-        // 查询供应商列表
-        List<Supplier> supplierList = supplierService.getList();
-
-        // 供应商信息
-        List<PurchaseReturnReportInitDto.supplierListOption> supplierListOptions = supplierList.stream()
-                .map(supplier -> new PurchaseReturnReportInitDto.supplierListOption(supplier.getId(), supplier.getName()))
-                .collect(Collectors.toList());
-
-        initDto.setSupplierListOptions(supplierListOptions);
-
-        return R.ok(initDto);
-    }
-
-    /**
-     * 采购退货明细列表
-     *
-     * @param purchaseReturnReportSearchParam 采购退货明细查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 采购退货明细
-     */
-    @Override
-    public R<?> getPage(PurchaseReturnReportSearchParam purchaseReturnReportSearchParam, Integer pageNo, Integer pageSize,
-                        String searchKey, HttpServletRequest request) {
-
-        // 构建查询条件
-        QueryWrapper<PurchaseReturnReportSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(purchaseReturnReportSearchParam,
-            searchKey, new HashSet<>(Arrays.asList("supply_bus_no", "name", "bus_no")), request);
-
-        // 查询采购退货明细分页列表
-        Page<PurchaseReturnReportPageDto> purchaseReturnReportPageDto = purchaseReturnReportMapper.selectPurchaseReturnReportPage(
-            new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
-            CommonConstants.TableName.ADM_DEVICE_DEFINITION, SupplyType.PRODUCT_RETURN.getValue(),
-            SupplyStatus.AGREE.getValue(), EventStatus.COMPLETED.getValue());
-
-        return R.ok(purchaseReturnReportPageDto);
-    }
-}
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
deleted file mode 100644
index 033b8506..00000000
--- a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.ProductDetailsMapper">
-
-    <select id="selectProductDetailsPage"
-            resultType="com.openhis.web.inventorymanage.dto.ProductDetailsPageDto">
-        select T6.id,                    --库存项目管理ID（停供用）
-               T6.bus_no,                --药品编码
-               T6.medicine_name,         --药品名称
-               T6.total_volume,          --规格
-               T6.chrgitm_lv,            --医保等级
-               T6.manufacturer_text,     --厂家
-               T6.lot_number,            --批次号
-               T6.category_code,         --药品类型
-               T6.item_type,             --药品类型区分
-               T6.part_percent,          --拆零比
-               T6.unit_code,             --采购单位
-               T6.quantity,              --库存（小单位）
-               T6.min_unit_code,         --库存单位
-               T6.price,                 --采购单价
-               T6.production_date,       --生产日期
-               T6.expiration_date,       --失效日期
-               T6.remaining_days,        --剩余天数
-               T6.trace_no,              --追溯码
-               T6.status_enum,           --药品状态（药品停用）
-               T6.location_id,
-               T6.location_name,         --仓库
-               T6.location_store_id,
-               T6.location_store_name,   --货位
-               T6.form_enum,             --仓库类型
-               T6.supply_id,             --供应商
-               T6.inventory_status_enum, --停供状态
-               T6.tenant_id
-        from (select T1.id,                                                                               --库存项目管理ID（停供用）
-                     T2.bus_no,                                                                           --药品编码
-                     T2."name"                                                    as medicine_name,       --药品名称
-                     T3.total_volume,                                                                     --规格
-                     T2.chrgitm_lv,                                                                       --医保等级
-                     T2.manufacturer_text,                                                                --厂家
-                     T1.lot_number,                                                                       --批次号
-                     T2.category_code,                                                                    --药品类型
-                     '0'                                                          as item_type,           --药品类型区分
-                     T2.part_percent,                                                                     --拆零比
-                     T2.unit_code,                                                                        --采购单位
-                     T1.quantity,                                                                         --库存（小单位）
-                     T2.min_unit_code,                                                                    --库存单位
-                     T1.price,                                                                            --采购单价
-                     T1.production_date,                                                                  --生产日期
-                     T1.expiration_date,                                                                  --失效日期
-                     (T1.expiration_date::date - CURRENT_DATE)                    as remaining_days,      --剩余天数
-                     T1.trace_no,                                                                         --追溯码
-                     T3.status_enum,                                                                      --药品状态（药品停用）
-                     T1.location_id,
-                     T5."name"                                                    as location_name,       --仓库
-                     T1.location_store_id,
-                     T4."name"                                                    as location_store_name, --货位
-                     T5.form_enum,                                                                        --仓库类型
-                     T2.supply_id,                                                                        --供应商
-                     T1.inventory_status_enum,                                                            --停供状态
-                     T1.tenant_id
-              from wor_inventory_item T1
-                       inner join med_medication_definition T2
-                                  on T1.item_id = T2.id
-                                      and T2.delete_flag = '0'
-                       left join med_medication T3
-                                 on T2.id = T3.medication_def_id
-                                     and T3.delete_flag = '0'
-                       left join adm_location T4
-                                 on T1.location_store_id = T4.id
-                                     and T4.delete_flag = '0'
-                       left join adm_location T5
-                                 on T1.location_id = T5.id
-                                     and T5.delete_flag = '0'
-              where T1.delete_flag = '0'
-              order by T2.bus_no ASC, --药品编码
-                       T2."name" ASC --药品名称
-             ) as T6
-        ${ew.customSqlSegment}
-        union all
-        select T7.id,                    --库存项目管理ID（停供用）
-               T7.bus_no,                --药品编码
-               T7.medicine_name,         --药品名称
-               T7.total_volume,          --规格
-               T7.chrgitm_lv,            --医保等级
-               T7.manufacturer_text,     --厂家
-               T7.lot_number,            --批次号
-               T7.category_code,         --药品类型
-               T7.item_type,             --药品类型区分
-               T7.part_percent,          --拆零比
-               T7.unit_code,             --采购单位
-               T7.quantity,              --库存（小单位）
-               T7.min_unit_code,         --库存单位
-               T7.price,                 --采购单价
-               T7.production_date,       --生产日期
-               T7.expiration_date,       --失效日期
-               T7.remaining_days,        --剩余天数
-               T7.trace_no,              --追溯码
-               T7.status_enum,           --药品状态（药品停用）
-               T7.location_id,
-               T7.location_name,         --仓库
-               T7.location_store_id,
-               T7.location_store_name,   --货位
-               T7.form_enum,             --仓库类型
-               T7.supply_id,             --供应商
-               T7.inventory_status_enum, --停供状态
-               T7.tenant_id
-        from (select T1.id,                                                                               --库存项目管理ID（停供用）
-                     T2.bus_no,                                                                           --药品编码
-                     T2."name"                                                    as medicine_name,       --药品名称
-                     T2.size                                                      as total_volume,        --规格
-                     T2.chrgitm_lv,                                                                       --医保等级
-                     T2.manufacturer_text,                                                                --厂家
-                     T1.lot_number,                                                                       --批次号
-                     T2.category_code,                                                                    --药品类型
-                     '9'                                                          as item_type,           --药品类型区分
-                     T2.part_percent,                                                                     --拆零比
-                     T2.unit_code,                                                                        --采购单位
-                     T1.quantity,                                                                         --库存（小单位）
-                     T2.min_unit_code,                                                                    --库存单位
-                     T1.price,                                                                            --采购单价
-                     T1.production_date,                                                                  --生产日期
-                     T1.expiration_date,                                                                  --失效日期
-                     (T1.expiration_date::date - CURRENT_DATE)                    as remaining_days,      --剩余天数
-                     T1.trace_no,                                                                         --追溯码
-                     T2.status_enum,                                                                      --药品状态（药品停用）
-                     T1.location_id,
-                     T5."name"                                                    as location_name,       --仓库
-                     T1.location_store_id,
-                     T4."name"                                                    as location_store_name, --货位
-                     T5.form_enum,                                                                        --仓库类型
-                     T2.supply_id,                                                                        --供应商
-                     T1.inventory_status_enum,                                                            --停供状态
-                     T1.tenant_id
-              from wor_inventory_item T1
-                       inner join adm_device_definition T2
-                                  on T1.item_id = T2.id
-                                      and T2.delete_flag = '0'
-                       left join adm_location T4
-                                 on T1.location_store_id = T4.id
-                                     and T4.delete_flag = '0'
-                       left join adm_location T5
-                                 on T1.location_id = T5.id
-                                     and T5.delete_flag = '0'
-              where T1.delete_flag = '0'
-              order by T2.bus_no ASC, --药品编码
-                       T2."name" ASC --药品名称
-             ) as T7
-            ${ew.customSqlSegment}
-    </select>
-</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
deleted file mode 100644
index 24320189..00000000
--- a/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper">
-
-    <select id="getHealthcareServicePage" resultType="com.openhis.web.basicservice.dto.HealthcareServiceDto">
-        SELECT
-            T3.id,
-            T3.tenant_id,
-            T3.active_flag,
-            T3.offered_org_id,
-            T3.category_code,
-            T3.type_code,
-            T3.specialty_code,
-            T3.location_id,
-            T3.NAME,
-            T3.COMMENT,
-            T3.extra_details,
-            T3.contact,
-            T3.appointment_required_flag,
-            T3.definition_id,
-            T3.charge_name,
-            T3.price,
-            T3.activity_price
-        FROM
-            (
-                SELECT
-                    T1.ID,
-                    T1.tenant_id,
-                    T1.active_flag,
-                    T1.offered_org_id,
-                    T1.category_code,
-                    T1.type_code,
-                    T1.specialty_code,
-                    T1.location_id,
-                    T1.NAME,
-                    T1.COMMENT,
-                    T1.extra_details,
-                    T1.contact,
-                    T1.appointment_required_flag,
-                    T2.ID AS definition_id,
-                    T2.charge_name,
-                    T2.price,
-                    COALESCE ( activity_sum.price_sum, 0 ) AS activity_price
-                FROM
-                    adm_healthcare_service AS T1
-                        LEFT JOIN adm_charge_item_definition AS T2 ON T2.instance_id = T1.ID
-                        AND T2.instance_table = #{tableName}
-                        LEFT JOIN (
-                        SELECT
-                            tad.item_no,
-                            SUM ( acid.price ) AS price_sum
-                        FROM
-                            tmp_activity_device AS tad
-                                JOIN adm_charge_item_definition AS acid ON acid.instance_id = tad.dev_act_id
-                                AND acid.delete_flag = '0'
-                        WHERE
-                            tad.delete_flag = '0'
-                          AND tad.dev_act_table = #{activityTableName}
-                        GROUP BY
-                            tad.item_no
-                    ) AS activity_sum ON activity_sum.item_no = CAST ( T1.ID AS TEXT )
-                WHERE
-                    T1.delete_flag = '0'
-                ORDER BY
-                    T1.create_time DESC
-            ) AS T3
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
deleted file mode 100644
index c0d78f76..00000000
--- a/openhis-server/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.common.mapper.CommonAppMapper">
-
-    <select id="selectInventoryItemList" resultType="com.openhis.web.common.dto.InventoryItemDto">
-        SELECT ii.tenant_id,
-               ii.item_type,
-               ii.category_code,
-               ii.part_percent,
-               ii.definition_id,
-               ii.name,
-               ii.item_bus_no,
-               ii.py_str,
-               ii.wb_str,
-               ii.yb_no,
-               ii.product_name,
-               ii.unit_code,
-               ii.min_unit_code,
-               ii.manufacturer,
-               ii.volume,
-               ii.supplier,
-               ii.item_table_name,
-               ii.lot_number,
-               ii.org_location_id,
-               ii.purchase_amount
-        FROM ( SELECT T1.tenant_id,
-                      #{medicine}         AS item_type,
-                      T1.category_code    AS category_code,
-                      T1.part_percent     AS part_percent,
-                      T1.id               AS definition_id,
-                      T1."name"           AS "name",
-                      T1.bus_no           AS item_bus_no,
-                      T1.py_str           AS py_str,
-                      T1.wb_str           AS wb_str,
-                      T1.yb_no            AS yb_no,
-                      T1.merchandise_name AS product_name,
-                      T1.unit_code        AS unit_code,
-                      T1.min_unit_code    AS min_unit_code,
-                      T1.manufacturer_text AS manufacturer,
-                      T2.total_volume     AS volume,
-                      T3."name"           AS supplier,
-                      <choose>
-                          <when test="purchaseFlag != 1">
-                              T7.item_table   AS item_table_name,
-                              T7.lot_number,
-                              T7.location_id AS org_location_id,
-                              NULL AS purchase_amount
-                          </when>
-                          <otherwise>
-                              NULL AS item_table_name,
-                              NULL AS lot_number,
-                              NULL AS org_location_id,
-                              T9.amount AS purchase_amount
-                          </otherwise>
-                      </choose>
-            FROM med_medication_definition AS T1
-                LEFT JOIN med_medication AS T2
-                    ON T2.medication_def_id = T1.ID
-                        AND T2.delete_flag = '0'
-            LEFT JOIN adm_supplier AS T3
-                ON T3.ID = T1.supply_id
-                    AND T3.delete_flag = '0'
-            <if test="purchaseFlag != 1">
-                LEFT JOIN wor_inventory_item AS T7
-                    ON T7.item_id = T1.id
-                        AND T7.delete_flag = '0'
-            </if>
-            <if test="purchaseFlag != 0">
-                LEFT JOIN adm_charge_item_definition AS T8
-                    ON T8.instance_id = T1.id
-                        AND T8.delete_flag = '0'
-                LEFT JOIN adm_charge_item_def_detail AS T9
-                    ON T9.definition_id = T8.id
-                        AND T9.delete_flag = '0'
-            </if>
-            WHERE T1.delete_flag = '0'
-                AND T2.status_enum != #{retired}
-            <if test="purchaseFlag != 1">
-                AND T7.item_id IS NOT NULL  -- 确保连接有效性
-                AND T7.item_table = #{medicationTableName}
-            </if>
-            <if test="purchaseFlag != 0">
-                AND T9.condition_code = #{purchase}
-            </if>
-        UNION ALL
-            SELECT T1.tenant_id,
-                   #{device}         AS item_type,
-                   T1.category_code  AS category_code,
-                   T1.part_percent   AS part_percent,
-                   T1.id             AS definition_id,
-                   T1."name"         AS "name",
-                   T1.bus_no         AS item_bus_no,
-                   T1.py_str         AS py_str,
-                   T1.wb_str         AS wb_str,
-                   T1.yb_no          AS yb_no,
-                   ''                AS product_name,
-                   T1.unit_code      AS unit_code,
-                   T1.min_unit_code  AS min_unit_code,
-                   T1.manufacturer_text AS manufacturer,
-                   T1."size"         AS volume,
-                   T2."name"         AS supplier,
-                   <choose>
-                       <when test="purchaseFlag != 1">
-                           T7.item_table   AS item_table_name,
-                           T7.lot_number,
-                           T7.location_id AS org_location_id,
-                           NULL AS purchase_amount
-                       </when>
-                       <otherwise>
-                           NULL AS item_table_name,
-                           NULL AS lot_number,
-                           NULL AS org_location_id,
-                           T9.amount AS purchase_amount
-                       </otherwise>
-                   </choose>
-            FROM adm_device_definition AS T1
-                 LEFT JOIN adm_supplier AS T2
-                     ON T2.ID = T1.supply_id
-                         AND T2.delete_flag = '0'
-            <if test="purchaseFlag != 1">
-                LEFT JOIN wor_inventory_item AS T7
-                     ON T7.item_id = T1.id
-                         AND T7.delete_flag = '0'
-            </if>
-            <if test="purchaseFlag != 0">
-                LEFT JOIN adm_charge_item_definition AS T8
-                ON T8.instance_id = T1.id
-                AND T8.delete_flag = '0'
-                LEFT JOIN adm_charge_item_def_detail AS T9
-                ON T9.definition_id = T8.id
-                AND T9.delete_flag = '0'
-            </if>
-            WHERE T1.delete_flag = '0'
-                AND T1.status_enum != #{retired}
-            <if test="purchaseFlag != 1">
-                AND T7.item_id IS NOT NULL  -- 确保连接有效性
-                AND T7.item_table = #{deviceTableName}
-            </if>
-            <if test="purchaseFlag != 0">
-                AND T9.condition_code = #{purchase}
-            </if>
-        ) AS ii
-    ${ew.customSqlSegment}
-    </select>
-    <select id="selectInventoryItemInfo" resultType="com.openhis.web.common.dto.LocationInventoryDto">
-        SELECT T1.item_id,
-               T1.item_table,
-               SUM(CASE WHEN T1.location_id = #{objLocationId} THEN T1.quantity ELSE 0 END) AS obj_quantity,
-               SUM(CASE WHEN T1.location_id = #{orgLocationId} THEN T1.quantity ELSE 0 END) AS org_quantity,
-               T1.unit_code,
-               T1.production_date,
-               T1.lot_number,
-               T1.expiration_date,
-               MAX(T2."name") AS location_name,
-               MAX(T3."name") AS location_store_name,
-               T5.amount AS price,
-               T1.supplier_id,
-               CASE
-                   WHEN T1.item_table = #{medicationTableName}
-                       THEN (
-                           SELECT T7.yb_no
-                           FROM med_medication_definition AS T7
-                           WHERE T1.item_id = T7.id
-                             AND T7.delete_flag = '0'
-                           )
-                   WHEN T1.item_table = #{deviceTableName}
-                       THEN (
-                           SELECT T8.yb_no
-                           FROM adm_device_definition AS T8
-                           WHERE T1.item_id = T8.id
-                             AND T8.delete_flag = '0'
-                           )
-                   ELSE null
-                   END   AS  yb_no,              --医保编码
-               CASE
-                   WHEN T1.item_table = #{medicationTableName}
-                       THEN (
-                           SELECT T7.manufacturer_text
-                           FROM med_medication_definition AS T7
-                           WHERE T1.item_id = T7.id
-                             AND T7.delete_flag = '0'
-                           )
-                   WHEN T1.item_table = #{deviceTableName}
-                       THEN (
-                           SELECT T8.manufacturer_text
-                           FROM adm_device_definition AS T8
-                           WHERE T1.item_id = T8.id
-                             AND T8.delete_flag = '0'
-                           )
-                   ELSE null
-                   END   AS  manufacturer,             --生产厂家
-               T6.name AS supplier_name
-        FROM wor_inventory_item AS T1
-            LEFT JOIN adm_location AS T2
-                ON T2.id = T1.location_id
-                    AND T2.delete_flag = '0'
-        LEFT JOIN adm_location AS T3
-            ON T3.id = T1.location_store_id
-                AND T3.delete_flag = '0'
-        LEFT JOIN adm_charge_item_definition AS T4
-            ON T4.instance_id = T1.item_id
-                AND T4.delete_flag = '0'
-        LEFT JOIN adm_charge_item_def_detail AS T5
-            ON T5.definition_id = T4.id
-                AND T5.delete_flag = '0'
-        LEFT JOIN adm_supplier AS T6
-            ON T6.id = T1.supplier_id
-                AND T6.delete_flag = '0'
-        WHERE T1.item_id = #{itemId}
-            <choose>
-                <when test="lotNumber != null">
-                    AND T1.lot_number = #{lotNumber}
-                    AND T5.condition_value = #{lotNumber}
-                </when>
-                <otherwise>
-                    AND T5.condition_code = #{purchase}
-                </otherwise>
-            </choose>
-            <choose>
-                <when test="objLocationId != null and objLocationId != ''">
-                    AND T1.location_id IN (#{orgLocationId}, #{objLocationId})
-                </when>
-                <otherwise>
-                    AND T1.location_id = #{orgLocationId}
-                </otherwise>
-            </choose>
-        GROUP BY T1.item_id,
-                 T1.item_table,
-                 T1.unit_code,
-                 T1.production_date,
-                 T1.expiration_date,
-                 T1.lot_number,
-                 T5.amount,
-                 T1.supplier_id,
-                 T6.name
-        ORDER BY T1.lot_number DESC
-    </select>
-</mapper>
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
deleted file mode 100644
index 94593982..00000000
--- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper">
-
-    <select id="getTcmEncounterDiagnosis" resultType="com.openhis.web.doctorstation.dto.DiagnosisQueryDto">
-        SELECT T1.id AS encounter_diagnosis_id,
-               T1.condition_id,
-               T1.syndrome_group_no,
-               T2.definition_id,
-               T3.source_enum,
-               T3.NAME,
-               T1.maindise_flag,
-               T1.diag_srt_no,
-               T1.med_type_code,
-               T2.verification_status_enum,
-               T2.yb_no
-        FROM adm_encounter_diagnosis AS T1
-                 LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
-            AND T2.delete_flag = '0' AND T2.tcm_flag = 1
-                 LEFT JOIN cli_condition_definition AS T3 ON t3.ID = T2.definition_id
-            AND T3.delete_flag = '0'
-        WHERE T1.delete_flag = '0'
-          AND T1.tcm_flag = 1
-          AND T1.encounter_id = #{encounterId}
-        ORDER BY T1.diag_srt_no
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/nursestation/NurseStationPendAdmAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/nursestation/NurseStationPendAdmAppMapper.xml
deleted file mode 100644
index 5edefdb1..00000000
--- a/openhis-server/openhis-application/src/main/resources/mapper/nursestation/NurseStationPendAdmAppMapper.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.nursestation.mapper.NurseStationPendAdmAppMapper">
-
-    <!-- 住院待入科病人信息查询-->
-    <select id="getPendAdmInfo" parameterType="java.util.Map"
-            resultType="com.openhis.web.nursestation.dto.PendingAdmissionDto">
-
-        SELECT e.id,
-               e.patient_id,
-               e.group_id,
-               e.bus_no,
-               e.status_enum,
-               e.class_enum,
-               e.yb_class_enum,
-               e.class_json,
-               e.priority_enum,
-               e.type_enum,
-               e.service_type_id,
-               e.subject_status_enum,
-               e.start_time,
-               e.end_time,
-               e.organization_id,--入院科室
-               e.display_order,
-               e.admit_source_code,
-               e.in_way_code,
-               e.first_enum,
-               p.name,
-               p.birth_date,
-               p.gender_enum,
-               p.id_card,
-               (SELECT el.location_id
-                FROM adm_encounter_location el
-                WHERE el.encounter_id = e.id
-                  AND el.status_enum = #{status}
-                  AND el.form_enum = #{wardForm}-- 4:病区
-               ) AS ward_location_id--入院病区ID
-        FROM adm_encounter e
-                 LEFT JOIN adm_patient p ON e.patient_id = p.id AND p.delete_flag = '0'
-        WHERE (
-            SELECT el.location_id
-            FROM adm_encounter_location el
-            WHERE el.encounter_id = e.id
-              AND el.form_enum = #{bedForm} -- 8:病床
-              AND el.status_enum = #{status} -- 状态是可用的
-            LIMIT 1
-            ) IS NULL
-          AND e.delete_flag = '0'
-          AND e.class_enum = #{classEnum}    --1:住院
-        ORDER BY e.create_time
-
-    </select>
-
-    <!-- 诊断病情列表-->
-    <select id="getDescriptionList" resultType="string">
-        SELECT c.description
-        FROM adm_encounter_diagnosis ed
-                 LEFT JOIN cli_condition c ON ed.condition_id = c.id
-        WHERE ed.encounter_id = #{encounterId}
-        ORDER BY ed.create_time DESC
-    </select>
-
-   </mapper>
\ No newline at end of file
diff --git a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientDisposalMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientDisposalMapper.xml
deleted file mode 100644
index 56972d7b..00000000
--- a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientDisposalMapper.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.outpatientmanage.mapper.OutpatientDisposalMapper">
-    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalEncounterInfoPageDto">
-        SELECT
-            tenant_id,
-            encounter_id,
-            department_name,
-            patient_name,
-            gender_enum,
-            encounter_date,
-            department_id,
-            id_card,
-            start_time
-        FROM (
-                 SELECT T1.tenant_id,
-                        T1.id AS encounter_id,
-                        T1.start_time,
-                        TO_CHAR(T1.start_time, 'YYYY-MM-DD') AS encounter_date,
-                        T1.organization_id AS department_id,
-                        T2.gender_enum,
-                        T2.name AS patient_name,
-                        T2.id_card,
-                        T3.name AS department_name
-                 FROM adm_encounter AS T1
-                          INNER JOIN adm_patient AS T2
-                                     ON T1.patient_id = T2.id
-                          LEFT JOIN adm_organization AS T3
-                                    ON T1.organization_id = T3.id
-                 GROUP BY T1.tenant_id,
-                          T1.id,
-                          T1.start_time,
-                          T1.organization_id,
-                          T2.gender_enum,
-                          T2.name,
-                          T2.id_card,
-                          T3.name
-                 ORDER BY T1.start_time desc,
-                          T1.organization_id,
-                          T1.patient_id
-             ) ${ew.customSqlSegment}
-    </select>
-    <select id="selectEncounterPatientInfo" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalPatientInfoDto">
-        SELECT T2.name                              AS patient_name,      --姓名
-               T2.gender_enum,                                            --性别
-               T2.birth_date,                                             --出生日期
-               T2.id_card,                                                --证件号
-               T3.name                              AS organization_name, --就诊科室
-               TO_CHAR(T1.start_time, 'YYYY-MM-DD') AS encounter_date,    --就诊日期
-               T5.name                              AS condition_name     --门诊诊断
-        FROM adm_encounter AS T1
-                 INNER JOIN adm_patient AS T2
-                            ON T1.patient_id = T2.id
-                                AND T2.delete_flag = '0'
-                 LEFT JOIN adm_organization AS T3
-                           ON T1.organization_id = T3.id
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN adm_encounter_diagnosis AS T4
-                           ON T1.id = T4.encounter_id
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN cli_condition_definition AS T5
-                           ON T4.condition_id = T5.id
-                               AND T5.delete_flag = '0'
-        WHERE T1.id = #{encounterId}
-          AND T1.delete_flag = '0'
-        GROUP BY T2.name,
-                 T2.gender_enum,
-                 T2.birth_date,
-                 T2.id_card,
-                 T3.name,
-                 T1.start_time,
-                 T5.name
-    </select>
-    <select id="selectEncounterActivityInfoList" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalTempInfoDto">
-        SELECT T1.id,
-               T1.bus_no,
-               T1.status_enum,                             --申请状态
-               #{activity}         AS type,                --类型
-               T3.id               AS activity_id,         --诊疗id
-               ''                  AS lot_number,          --产品批号
-               ''                  AS unit_code,           --单位
-               0                   AS part_percent,        --拆零比
-               0                   AS location_id,         --仓库
-               T1.group_no,                                --分组编号
-               T3.name             AS item_name,           --项目名称
-               T4.unit_price,                              --单价
-               T4.total_price,                             --总价
-               0                   AS quantity,            --数量
-               T4.quantity_value   AS frequency,           --次数
-               T4.status_enum      AS charge_status_enum,  --收费状态
-               T4.quantity_unit,                           --单位
-               T5.id               AS device_request_id,   --器材请求
-               T8.id               AS device_dispense_id,  --器材发放
-               T5.bus_no           AS device_bus_no,       --器材请求单据号
-               T6.id               AS device_id,           --耗材id
-               T5.lot_number       AS device_lot_number,   --产品批号
-               T5.unit_code        AS device_unit_code,    --单位
-               T6.part_percent     AS device_part_percent, --拆零比
-               T5.perform_location AS device_location_id,  --仓库
-               T5.group_no         AS device_group_no,     --分组编号
-               T6.name             AS device_item_name,    --项目名称
-               T7.unit_price       AS device_unit_price,   --单价
-               T7.total_price      AS device_total_price,  --总价
-               T7.quantity_value   AS device_quantity,     --数量
-               0                   AS device_frequency,    --次数
-               T7.status_enum      AS device_status_enum,  --收费状态
-               T7.quantity_unit    AS device_quantity_unit --单位
-        FROM wor_service_request AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 LEFT JOIN wor_activity_definition AS T3
-                           ON T1.activity_id = T3.id
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN adm_charge_item AS T4
-                           ON T4.service_id = T1.id
-                               AND T4.service_table = #{serviceTableName}
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN wor_device_request AS T5
-                           ON T5.group_no = T1.group_no
-                               AND T5.encounter_id = T1.encounter_id
-                               AND T5.delete_flag = '0'
-                 LEFT JOIN adm_device_definition AS T6
-                           ON T5.device_def_id = T6.id
-                               AND T6.delete_flag = '0'
-                 LEFT JOIN adm_charge_item AS T7
-                           ON T7.service_id = T5.id
-                               AND T7.service_table = #{requestTableName}
-                               AND T7.delete_flag = '0'
-                 LEFT JOIN wor_device_dispense AS T8
-                           ON T8.device_req_id = T5.id
-                               AND T8.based_on_id IS NULL
-                               AND T8.delete_flag = '0'
-        WHERE T1.encounter_id = #{encounterId}
-          AND T1.based_on_id IS NULL
-          AND T1.delete_flag = '0'
-        UNION
-        SELECT T1.id,
-               T1.bus_no,
-               T1.status_enum,                             --申请状态
-               #{DEVICE}           AS type,                --类型
-               T3.id               AS activity_id,         --耗材id
-               T1.lot_number,                              --产品批号
-               T1.unit_code,                               --单位
-               T3.part_percent,                            --拆零比
-               T1.perform_location AS location_id,         --仓库
-               T1.group_no,                                --分组编号
-               T3.name             AS item_name,           --项目名称
-               T4.unit_price,                              --单价
-               T4.total_price,                             --总价
-               T4.quantity_value   AS quantity,            --数量
-               0                   AS frequency,           --次数
-               T4.status_enum      AS charge_status_enum,  --收费状态
-               T4.quantity_unit,                           --单位
-               0                   AS device_request_id,   --器材请求
-               0                   AS device_dispense_id,  --器材发放
-               ''                  AS device_bus_no,       --器材请求单据号
-               0                   AS device_id,           --耗材id
-               ''                  AS device_lot_number,   --产品批号
-               ''                  AS device_unit_code,    --单位
-               0                   AS device_part_percent, --拆零比
-               0                   AS device_location_id,  --仓库
-               ''                  AS device_group_no,     --分组编号
-               ''                  AS device_item_name,    --项目名称
-               0                   AS device_unit_price,   --单价
-               0                   AS device_total_price,  --总价
-               0                   AS device_quantity,     --数量
-               0                   AS device_frequency,    --次数
-               0                   AS device_status_enum,  --收费状态
-               ''                  AS device_quantity_unit --单位
-        FROM wor_device_request AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 INNER JOIN adm_device_definition AS T3
-                            ON T1.device_def_id = T3.id
-                                AND T3.delete_flag = '0'
-                 LEFT JOIN adm_charge_item AS T4
-                           ON T4.service_id = T1.id
-                               AND T4.service_table = #{requestTableName}
-                               AND T4.delete_flag = '0'
-        WHERE T1.group_no IS NULL
-          AND T1.encounter_id = #{encounterId}
-          AND T1.delete_flag = '0'
-        ORDER BY type, id
-    </select>
-    <select id="selectEncounterDeviceInfoList" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalDeviceInfoDto">
-        SELECT T1.id               AS device_request_id,  --器材请求
-               T5.id               AS device_dispense_id, --器材发放
-               T1.bus_no,
-               T3.id               AS device_id,          --耗材id
-               T1.lot_number,                             --产品批号
-               T1.unit_code,                              --单位
-               T3.part_percent,                           --拆零比
-               T1.perform_location AS location_id,        --仓库
-               T1.group_no,                               --分组编号
-               T3.name             AS item_name,          --项目名称
-               T4.unit_price,                             --单价
-               T4.total_price,                            --总价
-               T4.quantity_value   AS quantity,           --数量
-               0                   AS frequency,          --次数
-               T4.status_enum,                            --收费状态
-               T4.quantity_unit                           --单位
-        FROM wor_device_request AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 INNER JOIN adm_device_definition AS T3
-                            ON T1.device_def_id = T3.id
-                                AND T3.delete_flag = '0'
-                 LEFT JOIN adm_charge_item AS T4
-                           ON T4.service_id = T1.id
-                               AND T4.service_table = #{requestTableName}
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN wor_device_dispense AS T5
-                           ON T5.device_req_id = T1.id
-                               AND T5.based_on_id IS NULL
-                               AND T5.delete_flag = '0'
-        WHERE T1.group_no = #{groupNo}
-          AND T1.encounter_id = #{encounterId}
-          AND T1.delete_flag = '0'
-        ORDER BY T3.id
-    </select>
-    <select id="selectActivityExecuteInfo" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalExecuteInfoDto">
-        SELECT #{type}                  AS type,
-               T1.id                    AS service_request_id,      --服务申请Id
-               T5.id                    AS device_request_id,       --器材请求Id
-               T7.id                    AS device_dispense_id,      --器材发放Id
-               T1.bus_no,                                  --服务请求编码
-               T6.id                    AS device_id,      --器材Id
-               T3.name                  AS performer_name, --执行人
-               T4.name                  AS location_name,  --执行科室
-               T6.name                  AS deviceName,     --耗材名
-               T7.dispense_quantity     AS quantity,       --耗材数
-               T1.occurrence_start_time AS occurrence_time, --执行时间
-               T7.lot_number,                               --产品批号
-               T7.unit_code,                                --单位
-               T6.part_percent,                             -- 拆零比
-               T7.location_id                               --仓库
-        FROM wor_service_request AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T3
-                           ON T1.performer_id = T3.id
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN adm_organization AS T4
-                           ON T1.location_id = T4.id
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN wor_device_request AS T5
-                           ON T1.group_no = T5.group_no
-                               AND T5.delete_flag = '0'
-                 LEFT JOIN adm_device_definition AS T6
-                           ON T5.device_def_id = T6.id
-                               AND T6.delete_flag = '0'
-                 LEFT JOIN wor_device_dispense AS T7
-                           ON T7.device_req_id = T5.id
-                               AND RIGHT (T7.bus_no, 3) = RIGHT (T1.bus_no, 3)
-            AND T7.delete_flag = '0'
-        WHERE T1.activity_id = #{activityId}
-          AND LEFT (T1.bus_no
-            , 10) = #{busNo}
-          AND T1.status_enum = #{status}
-          AND T1.based_on_id IS NOT NULL
-          AND T7.based_on_id IS NOT NULL
-          AND T1.delete_flag = '0'
-        ORDER BY T1.occurrence_start_time
-    </select>
-    <select id="selectDeviceExecuteInfo" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalExecuteInfoDto">
-        SELECT #{type}              AS type,
-               ''                   AS service_request_id, --服务申请Id
-               T6.id                AS device_request_id,  --器材请求Id
-               T1.id                AS device_dispense_id, --器材发放Id
-               T1.bus_no,                                  --服务请求编码
-               T1.device_def_id     AS device_id,          --器材Id
-               T3.name              AS performer_name,     --执行人
-               T4.name              AS location_name,      --执行科室
-               T5.name              AS deviceName,         --耗材名
-               T1.dispense_quantity AS quantity,           --耗材数
-               T1.dispense_time     AS occurrence_time,    --执行时间
-               T1.lot_number,                              --产品批号
-               T1.unit_code,                               --单位
-               T5.part_percent,                            -- 拆零比
-               T1.location_id                              --仓库
-        FROM wor_device_dispense AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T3
-                           ON T1.performer_id = T3.id
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN adm_organization AS T4
-                           ON T1.location_id = T4.id
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN adm_device_definition AS T5
-                           ON T1.device_def_id = T5.id
-                               AND T5.delete_flag = '0'
-                 LEFT JOIN wor_device_request AS T6
-                           ON T1.device_req_id = T6.id
-                               AND T6.delete_flag = '0'
-        WHERE T1.device_def_id = #{activityId}
-          AND LEFT (T1.bus_no
-            , 10) = #{busNo}
-          AND T1.status_enum = #{status}
-          AND T1.based_on_id IS NOT NULL
-          AND T1.delete_flag = '0'
-        ORDER BY T1.dispense_time
-    </select>
-    <select id="selectEncounterActivityInfo" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalActivityInfoDto">
-        SELECT T1.id,
-               T1.bus_no,
-               T1.status_enum,                          --申请状态
-               #{activity}       AS type,               --类型
-               T3.id             AS activity_id,        --诊疗id
-               ''                AS lot_number,         --产品批号
-               ''                AS unit_code,          --单位
-               0                 AS part_percent,       --拆零比
-               0                 AS location_id,        --仓库
-               T1.group_no,                             --分组编号
-               T3.name           AS item_name,          --项目名称
-               T4.unit_price,                           --单价
-               T4.total_price,                          --总价
-               0                 AS quantity,           --数量
-               T4.quantity_value AS frequency,          --次数
-               T4.status_enum    AS charge_status_enum, --收费状态
-               T4.quantity_unit                         --单位
-        FROM wor_service_request AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 LEFT JOIN wor_activity_definition AS T3
-                           ON T1.activity_id = T3.id
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN adm_charge_item AS T4
-                           ON T4.service_id = T1.id
-                               AND T4.service_table = #{serviceTableName}
-                               AND T4.delete_flag = '0'
-        WHERE T1.id = #{itemId}
-          AND T1.based_on_id IS NULL
-          AND T1.delete_flag = '0'
-    </select>
-    <select id="selectEncounterActivityDeviceInfo" resultType="com.openhis.web.outpatientmanage.dto.OutpatientDisposalActivityInfoDto">
-        SELECT T1.id,
-               T1.bus_no,
-               T1.status_enum,                            --申请状态
-               #{DEVICE}           AS type,               --类型
-               T3.id               AS activity_id,        --耗材id
-               T1.lot_number,                             --产品批号
-               T1.unit_code,                              --单位
-               T3.part_percent,                           --拆零比
-               T1.perform_location AS location_id,        --仓库
-               T1.group_no,                               --分组编号
-               T3.name             AS item_name,          --项目名称
-               T4.unit_price,                             --单价
-               T4.total_price,                            --总价
-               T4.quantity_value   AS quantity,           --数量
-               0                   AS frequency,          --次数
-               T4.status_enum      AS charge_status_enum, --收费状态
-               T4.quantity_unit                           --单位
-        FROM wor_device_request AS T1
-                 INNER JOIN adm_encounter AS T2
-                            ON T1.encounter_id = T2.id
-                                AND T2.delete_flag = '0'
-                 INNER JOIN adm_device_definition AS T3
-                            ON T1.device_def_id = T3.id
-                                AND T3.delete_flag = '0'
-                 LEFT JOIN adm_charge_item AS T4
-                           ON T4.service_id = T1.id
-                               AND T4.service_table = #{requestTableName}
-                               AND T4.delete_flag = '0'
-        WHERE T1.group_no IS NULL
-          AND T1.id = #{itemId}
-          AND T1.delete_flag = '0'
-        ORDER BY type, activity_id
-    </select>
-</mapper>
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
deleted file mode 100644
index 6f20fc71..00000000
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.openhis.administration.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.EncounterLocation;
-
-/**
- * 就诊位置管理Service接口
- *
- * @author system
- * @date 2025-02-20
- */
-public interface IEncounterLocationService extends IService<EncounterLocation> {
-
-    /**
-     * 门诊挂号时保存就诊位置信息
-     * 
-     * @param encounterLocation 就诊位置信息
-     */
-    void saveEncounterLocationByRegister(EncounterLocation encounterLocation);
-
-    /**
-     * 自定义插入或更新方法,根据就诊id，病区,判断是更新还是插入
-     * @param encounterLocation 实体对象
-     * @return 是否成功
-     */
-    boolean saveOrUpdateEncounterLocation(EncounterLocation encounterLocation);
-
-}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
deleted file mode 100644
index b41d3130..00000000
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.openhis.administration.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.EncounterParticipant;
-
-/**
- * 就诊参与者管理Service接口
- *
- * @author system
- * @date 2025-02-20
- */
-public interface IEncounterParticipantService extends IService<EncounterParticipant> {
-
-    /**
-     * 门诊挂号时保存就诊参与者
-     * 
-     * @param encounterParticipant 就诊参与者信息
-     */
-    void saveEncounterParticipantByRegister(EncounterParticipant encounterParticipant);
-
-}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
deleted file mode 100644
index 667b919e..00000000
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.openhis.administration.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.administration.mapper.EncounterParticipantMapper;
-import com.openhis.administration.service.IEncounterParticipantService;
-
-/**
- * 就诊参与者管理Service业务层处理
- *
- * @author system
- * @date 2025-02-20
- */
-@Service
-public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterParticipantMapper, EncounterParticipant>
-    implements IEncounterParticipantService {
-
-    /**
-     * 门诊挂号时保存就诊参与者
-     *
-     * @param encounterParticipant 就诊参与者信息
-     */
-    @Override
-    public void saveEncounterParticipantByRegister(EncounterParticipant encounterParticipant) {
-        baseMapper.insert(encounterParticipant);
-    }
-
-}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
deleted file mode 100644
index 90ad3188..00000000
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.openhis.financial.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.Contract;
-
-/**
- * 合同管理Service接口
- *
- * @author system
- * @date 2025-02-20
- */
-public interface IContractService extends IService<Contract> {
-
-    /**
-     * 根据医保码找合同信息
-     * @param contractNo 医保码
-     * @return 合同实体
-     */
-    Contract getByContractNo(String contractNo);
-}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
deleted file mode 100644
index 78efa4c1..00000000
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.financial.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.openhis.common.constant.YbCommonConstants;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.mapper.ContractMapper;
-import com.openhis.financial.service.IContractService;
-
-/**
- * 合同管理Service业务层处理
- *
- * @author system
- * @date 2025-02-20
- */
-@Service
-public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> implements IContractService {
-    /**
-     *
-     * @param contractNo 医保码
-     * @return
-     */
-    @Override
-    public Contract getByContractNo(String contractNo) {
-        return baseMapper.selectOne(new LambdaUpdateWrapper<Contract>().eq(Contract::getBusNo,contractNo).last(YbCommonConstants.sqlConst.LIMIT1));
-    }
-}
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/yb/YbElepMapper.xml b/openhis-server/openhis-domain/src/main/resources/mapper/yb/YbElepMapper.xml
deleted file mode 100644
index 92a1fe04..00000000
--- a/openhis-server/openhis-domain/src/main/resources/mapper/yb/YbElepMapper.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.ybmanage.mapper.YbElepMapper">
-    <select id="getVeriPrescriptionInfo" resultType="com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto">
-        SELECT tenant_id,
-               prescription_no, --处方号
-               ipt_otp_no,      --门诊号
-               patient_name,    --姓名
-               certno,          --身份证号
-               med_status,      --取药状态
-               status_enum,     --状态
-               prsc_dept_name,  --开单科室
-               mdtrt_time,      --挂号日期
-               prsc_time,       --处方开立日期
-               hi_rxno          --医保处方编号
-        FROM (SELECT T1.tenant_id,
-                     T1.prescription_no,               --处方号
-                     T1.ipt_otp_no,                    --门诊号
-                     T2.name        AS patient_name,   --姓名
-                     T2.id_card     AS certno,         --身份证号
-                     CASE
-                         WHEN (T5.rx_used_stas_codg IN ('1', '2')) THEN T5.rx_used_stas_name
-                         ELSE '未使用'
-                         END        AS med_status,     --取药状态
-                     T1.status_enum AS status_enum,    --状态
-                     T4.name        AS prsc_dept_name, --开单科室
-                     T3.start_time  AS mdtrt_time,     --挂号日期
-                     T1.issue_time  AS prsc_time,      --处方开立日期
-                     T1.hi_rxno                        --医保处方编号
-              --todo 不确定怎么取，应该是用不到了
---                      T6.auth_no,                        --电子凭证线上身份核验流水号
---                      T6.ec_token                        --电子凭证令牌
-              FROM elep_medication_request AS T1
-                       LEFT JOIN adm_patient AS T2
-                                 ON T1.patient_id = T2.id
-                                     AND T2.delete_flag = '0'
-                       LEFT JOIN adm_encounter AS T3
-                                 ON T1.encounter_id = T3.id
-                                     AND T3.delete_flag = '0'
-                       LEFT JOIN adm_organization AS T4
-                                 ON T1.org_id = T4.id
-                                     AND T4.delete_flag = '0'
-                       LEFT JOIN yb_elep_medresult_info AS T5
-                                 ON T1.hi_rxno = T5.hi_rxno
-                       LEFT JOIN adm_account AS T6
-                                 ON T1.encounter_id = T6.encounter_id
-                                     AND T6.delete_flag = '0') ${ew.customSqlSegment}
-        GROUP BY tenant_id,
-                 prescription_no,
-                 ipt_otp_no,
-                 patient_name,
-                 certno,
-                 med_status,
-                 status_enum,
-                 prsc_dept_name,
-                 mdtrt_time,
-                 prsc_time,
-                 hi_rxno
-        ORDER BY prsc_time DESC
-    </select>
-    <select id="getVeriPrescriptionDetailInfo" resultType="com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto">
-        SELECT T1.prescription_no,                        --处方号
-               T1.ipt_otp_no,                             --门诊号
-               T1.quantity,                               --请求数量
-               T1.unit_code,                              --请求单位
-               T1.status_enum     AS status_enum,         --药品请求状态
-               --处方信息
-               T2.drug_generic_name AS medication_name,     --药品名
-               T2.drug_specification,                     --药品规格
-               T1.med_dosage,                             --药品剂量
-               T1.med_dosage_unit_code,                   --药品剂量单位
-               T1.med_frequency,                          --使用频次
-               T1.med_route,                              --途径
-               CASE
-                   WHEN (T9.rx_used_stas_codg IN ('1', '2')) THEN T9.rx_used_stas_name
-                   ELSE '未使用'
-                   END            AS med_status,          --取药状态
-               CASE
-                   WHEN (T10.rx_stas_codg IN ('1', '2', '3', '4')) THEN T10.rx_stas_name
-                   ELSE '未上传'
-                   END            AS prescription_status, --处方状态
-               T1.rx_type_code,                           --处方类别
-               T1.support_info,                           --支持用药信息
-               T1.effective_dose_start,                   -- 服药时间(开始)
-               T1.effective_dose_end,                     -- 服药时间(结束)
-               T1.dispense_interval,                      -- 给药间隔
-               T1.dispense_per_quantity,                  -- 单次发药数
-               T1.dispense_per_duration,                  -- 每次发药供应天数
-               --就诊信息
-               T3.name            AS patn_name,           --患者名
-               T3.id_card         AS certno,              --身份证号
-               T4.name            AS practitioner_name,   --开方医生名
-               T6.name            AS mdtrt_dept_name,     --挂号科室
-               T7.name            AS prsc_dept_name,      --开单科室
-               T5.create_time      AS mdtrt_time,          --挂号日期
-               T1.issue_time      AS prsc_time,           --处方开立日期
-               --诊断信息
-               T8.name            AS condition_name       --诊断名
-        FROM elep_medication_request AS T1
-                 LEFT JOIN yb_catalog_drug_info AS T2
-                           ON T1.medication_id = T2.medical_catalog_code
-                 LEFT JOIN adm_patient AS T3
-                           ON T1.patient_id = T3.id
-                               AND T3.delete_flag = '0'
-                 LEFT JOIN adm_practitioner AS T4
-                           ON T1.prescribing_dr_id = T4.id
-                               AND T4.delete_flag = '0'
-                 LEFT JOIN adm_encounter AS T5
-                           ON T1.encounter_id = T5.id
-                               AND T5.delete_flag = '0'
-                 LEFT JOIN adm_organization AS T6
-                           ON T5.organization_id = T6.id
-                               AND T6.delete_flag = '0'
-                 LEFT JOIN adm_organization AS T7
-                           ON T1.org_id = T7.id
-                               AND T7.delete_flag = '0'
-                 LEFT JOIN cli_condition_definition AS T8
-                           ON T1.condition_id = T8.id
-                               AND T8.delete_flag = '0'
-                 LEFT JOIN yb_elep_medresult_info AS T9
-                           ON T1.hi_rxno = T9.hi_rxno
-                 LEFT JOIN (SELECT hi_rxno, rx_stas_codg, rx_stas_name
-                            FROM (SELECT hi_rxno, rx_stas_codg, rx_stas_name, create_time
-                                  FROM yb_elep_upload_output
-                                  UNION ALL
-                                  SELECT hi_rxno, rx_stas_codg, rx_stas_name, create_time
-                                  FROM yb_elep_revoke_output
-                                  UNION ALL
-                                  SELECT hi_rxno, rx_stas_codg, rx_stas_name, create_time
-                                  FROM yb_elep_quer_prescription_info
-                                  UNION ALL
-                                  SELECT hi_rxno, rx_stas_codg, rx_stas_name, create_time
-                                  FROM yb_elep_medresult_info) combined_tables
-                            ORDER BY create_time DESC LIMIT 1) AS T10
-                           ON T1.hi_rxno = T10.hi_rxno
-        WHERE T1.prescription_no = #{prescriptionNo}
-          AND T1.delete_flag = '0'
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/vue3/.env.development b/openhis-ui-vue3/.env.development
similarity index 68%
rename from vue3/.env.development
rename to openhis-ui-vue3/.env.development
index 4bcab7d0..ed0aec06 100644
--- a/vue3/.env.development
+++ b/openhis-ui-vue3/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 吉林农业大学医院信息管理系统
+VITE_APP_TITLE = 医院信息管理系统
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
diff --git a/vue3/.env.production b/openhis-ui-vue3/.env.production
similarity index 80%
rename from vue3/.env.production
rename to openhis-ui-vue3/.env.production
index c43c69cf..76b80a7c 100644
--- a/vue3/.env.production
+++ b/openhis-ui-vue3/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = his管理系统
+VITE_APP_TITLE = 长春大学医院信息管理系统
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/vue3/.env.staging b/openhis-ui-vue3/.env.staging
similarity index 100%
rename from vue3/.env.staging
rename to openhis-ui-vue3/.env.staging
diff --git a/vue3/.prettierrc.cjs b/openhis-ui-vue3/.prettierrc.cjs
similarity index 100%
rename from vue3/.prettierrc.cjs
rename to openhis-ui-vue3/.prettierrc.cjs
diff --git a/vue3/.stylelintrc.cjs b/openhis-ui-vue3/.stylelintrc.cjs
similarity index 100%
rename from vue3/.stylelintrc.cjs
rename to openhis-ui-vue3/.stylelintrc.cjs
diff --git a/vue3/LICENSE b/openhis-ui-vue3/LICENSE
similarity index 100%
rename from vue3/LICENSE
rename to openhis-ui-vue3/LICENSE
diff --git a/openhis-ui-vue3/README.md b/openhis-ui-vue3/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/vue3/html/ie.html b/openhis-ui-vue3/html/ie.html
similarity index 100%
rename from vue3/html/ie.html
rename to openhis-ui-vue3/html/ie.html
diff --git a/vue3/index.html b/openhis-ui-vue3/index.html
similarity index 92%
rename from vue3/index.html
rename to openhis-ui-vue3/index.html
index 41c7ccd9..02154634 100644
--- a/vue3/index.html
+++ b/openhis-ui-vue3/index.html
@@ -8,8 +8,9 @@
       name="viewport"
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
-    <!-- <link rel="icon" href="src/assets/images/ODLS.png" /> -->
-    <title>his管理系统</title>
+    <!-- <link rel="icon" href="src/assets/images/ccu.png" /> -->
+    <link rel="stylesheet" type="text/css" media="print" href="/public/print-lock.css">
+    <title>医院信息管理系统</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = '/html/ie.html';
diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json
new file mode 100644
index 00000000..e8b1fcb0
--- /dev/null
+++ b/openhis-ui-vue3/package-lock.json
@@ -0,0 +1,12724 @@
+{
+  "name": "openhis",
+  "version": "3.8.7",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "openhis",
+      "version": "3.8.7",
+      "license": "MIT",
+      "dependencies": {
+        "@element-plus/icons-vue": "2.3.1",
+        "@vueup/vue-quill": "1.2.0",
+        "@vueuse/core": "10.6.1",
+        "axios": "0.27.2",
+        "d3": "^7.9.0",
+        "decimal.js": "^10.5.0",
+        "echarts": "5.4.3",
+        "element-china-area-data": "^6.1.0",
+        "element-plus": "2.9.11",
+        "file-saver": "2.0.5",
+        "fuse.js": "6.6.2",
+        "html2pdf.js": "^0.10.3",
+        "js-cookie": "3.0.5",
+        "jsencrypt": "3.3.2",
+        "lodash": "^4.17.21",
+        "moment": "^2.30.1",
+        "nprogress": "0.2.0",
+        "pinia": "2.1.7",
+        "pinyin": "^4.0.0-alpha.2",
+        "province-city-china": "^8.5.8",
+        "segmentit": "^2.0.3",
+        "v-region": "^3.3.0",
+        "vue": "^3.5.13",
+        "vue-area-linkage": "^5.1.0",
+        "vue-cropper": "1.1.1",
+        "vue-plugin-hiprint": "^0.0.60",
+        "vue-router": "4.2.5"
+      },
+      "devDependencies": {
+        "@vitejs/plugin-vue": "4.5.0",
+        "@vue/compiler-sfc": "3.3.9",
+        "sass": "1.69.5",
+        "unplugin-auto-import": "0.17.1",
+        "unplugin-vue-setup-extend-plus": "1.0.0",
+        "vite": "5.0.4",
+        "vite-plugin-compression": "0.5.1",
+        "vite-plugin-svg-icons": "2.0.1"
+      }
+    },
+    "node_modules/@antfu/utils": {
+      "version": "0.7.10",
+      "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.10.tgz",
+      "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.27.0.tgz",
+      "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+      "dependencies": {
+        "@babel/types": "^7.27.0"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.27.0.tgz",
+      "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@claviska/jquery-minicolors": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz",
+      "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==",
+      "peerDependencies": {
+        "jquery": ">= 1.7.x"
+      }
+    },
+    "node_modules/@ctrl/tinycolor": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
+      "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@element-plus/icons-vue": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
+      "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==",
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.9.tgz",
+      "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.9"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.13",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.6.13.tgz",
+      "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+      "dependencies": {
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.9"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.9.tgz",
+      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@popperjs/core": {
+      "name": "@sxzz/popperjs-es",
+      "version": "2.11.7",
+      "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/@province-city-china/types": {
+      "version": "8.5.8",
+      "resolved": "https://registry.npmmirror.com/@province-city-china/types/-/types-8.5.8.tgz",
+      "integrity": "sha512-KZ3NyM8HsaBVcn5BRhWaOeZRhqEvm18PfB6HfRDuZfwwWhJLoTxB81mTENrBlONr2g8fy/fSbjsh44gvOj+/Lw=="
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
+      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.38.0.tgz",
+      "integrity": "sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.38.0.tgz",
+      "integrity": "sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.38.0.tgz",
+      "integrity": "sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.38.0.tgz",
+      "integrity": "sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.38.0.tgz",
+      "integrity": "sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.38.0.tgz",
+      "integrity": "sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.38.0.tgz",
+      "integrity": "sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.38.0.tgz",
+      "integrity": "sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.38.0.tgz",
+      "integrity": "sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.38.0.tgz",
+      "integrity": "sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.38.0.tgz",
+      "integrity": "sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.38.0.tgz",
+      "integrity": "sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.38.0.tgz",
+      "integrity": "sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz",
+      "integrity": "sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.38.0.tgz",
+      "integrity": "sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.38.0.tgz",
+      "integrity": "sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.38.0.tgz",
+      "integrity": "sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.38.0.tgz",
+      "integrity": "sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.38.0.tgz",
+      "integrity": "sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.38.0.tgz",
+      "integrity": "sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
+    },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "dev": true
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.16",
+      "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.16.tgz",
+      "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g=="
+    },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "22.13.15",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.13.15.tgz",
+      "integrity": "sha512-imAbQEEbVni6i6h6Bd5xkCRwLqFc8hihCsi2GbtDoAtUcAFQ6Zs4pFXTZUUbroTkXdImczWM9AI8eZUuybXE3w==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
+    },
+    "node_modules/@types/raf": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmmirror.com/@types/raf/-/raf-3.4.3.tgz",
+      "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw=="
+    },
+    "node_modules/@types/svgo": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/@types/svgo/-/svgo-2.6.4.tgz",
+      "integrity": "sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "optional": true
+    },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow=="
+    },
+    "node_modules/@vitejs/plugin-vue": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.5.0.tgz",
+      "integrity": "sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^4.0.0 || ^5.0.0",
+        "vue": "^3.2.25"
+      }
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz",
+      "integrity": "sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.23.3",
+        "@vue/shared": "3.3.9",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz",
+      "integrity": "sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg==",
+      "dev": true,
+      "dependencies": {
+        "@vue/compiler-core": "3.3.9",
+        "@vue/shared": "3.3.9"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz",
+      "integrity": "sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.23.3",
+        "@vue/compiler-core": "3.3.9",
+        "@vue/compiler-dom": "3.3.9",
+        "@vue/compiler-ssr": "3.3.9",
+        "@vue/reactivity-transform": "3.3.9",
+        "@vue/shared": "3.3.9",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.5",
+        "postcss": "^8.4.31",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz",
+      "integrity": "sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g==",
+      "dev": true,
+      "dependencies": {
+        "@vue/compiler-dom": "3.3.9",
+        "@vue/shared": "3.3.9"
+      }
+    },
+    "node_modules/@vue/devtools-api": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
+    },
+    "node_modules/@vue/reactivity": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.13.tgz",
+      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "dependencies": {
+        "@vue/shared": "3.5.13"
+      }
+    },
+    "node_modules/@vue/reactivity-transform": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz",
+      "integrity": "sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.23.3",
+        "@vue/compiler-core": "3.3.9",
+        "@vue/shared": "3.3.9",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.5"
+      }
+    },
+    "node_modules/@vue/reactivity/node_modules/@vue/shared": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+    },
+    "node_modules/@vue/runtime-core": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
+      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "dependencies": {
+        "@vue/reactivity": "3.5.13",
+        "@vue/shared": "3.5.13"
+      }
+    },
+    "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+    },
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
+      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "dependencies": {
+        "@vue/reactivity": "3.5.13",
+        "@vue/runtime-core": "3.5.13",
+        "@vue/shared": "3.5.13",
+        "csstype": "^3.1.3"
+      }
+    },
+    "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+    },
+    "node_modules/@vue/server-renderer": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
+      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "dependencies": {
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13"
+      },
+      "peerDependencies": {
+        "vue": "3.5.13"
+      }
+    },
+    "node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "dependencies": {
+        "@babel/parser": "^7.25.3",
+        "@vue/shared": "3.5.13",
+        "entities": "^4.5.0",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "dependencies": {
+        "@vue/compiler-core": "3.5.13",
+        "@vue/shared": "3.5.13"
+      }
+    },
+    "node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/shared": "3.5.13"
+      }
+    },
+    "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+    },
+    "node_modules/@vue/server-renderer/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.9.tgz",
+      "integrity": "sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA==",
+      "dev": true
+    },
+    "node_modules/@vueup/vue-quill": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@vueup/vue-quill/-/vue-quill-1.2.0.tgz",
+      "integrity": "sha512-kd5QPSHMDpycklojPXno2Kw2JSiKMYduKYQckTm1RJoVDA557MnyUXgcuuDpry4HY/Rny9nGNcK+m3AHk94wag==",
+      "dependencies": {
+        "quill": "^1.3.7",
+        "quill-delta": "^4.2.2"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.41"
+      }
+    },
+    "node_modules/@vueuse/core": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.6.1.tgz",
+      "integrity": "sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.6.1",
+        "@vueuse/shared": "10.6.1",
+        "vue-demi": ">=0.14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.6.1.tgz",
+      "integrity": "sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.6.1.tgz",
+      "integrity": "sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==",
+      "dependencies": {
+        "vue-demi": ">=0.14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wtto00/html2canvas": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmmirror.com/@wtto00/html2canvas/-/html2canvas-1.4.3.tgz",
+      "integrity": "sha512-jwsb+xL8N+gjrSNABSaFdxmWtE4c7RNFjP20lo1G7gs63Qqo1phhxVBTzxc/apDVh6LgXsU2l5bwKtXd9uz65w==",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.14.1",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/area-data": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmmirror.com/area-data/-/area-data-5.0.6.tgz",
+      "integrity": "sha512-QxLoA+823xXKyhw5S3750I9TToki0OS42HU9ol3rCOsCXfkjtl8RtQ/eoj0cK0Levn4//oEM05FmMumfw/HIlg==",
+      "peer": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/async-validator": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz",
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/axios": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "dependencies": {
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      }
+    },
+    "node_modules/babel-plugin-macros": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
+      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+      "dependencies": {
+        "@babel/runtime": "^7.7.2",
+        "cosmiconfig": "^6.0.0",
+        "resolve": "^1.12.0"
+      }
+    },
+    "node_modules/babel-plugin-preval": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-preval/-/babel-plugin-preval-4.0.0.tgz",
+      "integrity": "sha512-fZI/4cYneinlj2k/FsXw0/lTWSC5KKoepUueS1g25Gb5vx3GrRyaVwxWCshYqx11GEU4mZnbbFhee8vpquFS2w==",
+      "dependencies": {
+        "@babel/runtime": "^7.7.2",
+        "babel-plugin-macros": "^2.6.1",
+        "require-from-string": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
+      "bin": {
+        "btoa": "bin/btoa.js"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/bwip-js": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmmirror.com/bwip-js/-/bwip-js-4.7.0.tgz",
+      "integrity": "sha512-b7oQcgbWUl8rpcZayQ32SQrBCNteiZFuLkimKKBRlPwIHCeUN2VNeUE3HCMYShe04Evxd+ucS9uUAOsvNKjQbA==",
+      "bin": {
+        "bwip-js": "bin/bwip-js.js"
+      }
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cache-base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/canvg": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmmirror.com/canvg/-/canvg-3.0.11.tgz",
+      "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@types/raf": "^3.4.0",
+        "core-js": "^3.8.3",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^2.0.0",
+        "svg-pathdata": "^6.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/canvg/node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/china-division": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmmirror.com/china-division/-/china-division-2.7.0.tgz",
+      "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA=="
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/class-utils/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-1.1.1.tgz",
+      "integrity": "sha512-71Rod2AhcH3JhkBikVpNd0pA+fWsmAaVoti6OR38T76chA7vE3pSerS0Jor4wDw+tOueD2zLVvFOw5H0Rcj7rA==",
+      "dependencies": {
+        "keypress": "0.1.x"
+      },
+      "engines": {
+        "node": ">= 0.6.x"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/confbox": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+      "dev": true
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.43.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.43.0.tgz",
+      "integrity": "sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmmirror.com/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/cosmiconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.7.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-select/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/css-select/node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/css-select/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/css-select/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/css-select/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "node_modules/d3": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmmirror.com/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-contour": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "dependencies": {
+        "d3-array": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmmirror.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "dependencies": {
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "dependencies": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "bin": {
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "dependencies": {
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
+      }
+    },
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/deep-equal": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.2.tgz",
+      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+      "dependencies": {
+        "is-arguments": "^1.1.1",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.5.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delaunator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "dependencies": {
+        "robust-predicates": "^3.0.2"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "node_modules/domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/dompurify": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.6.tgz",
+      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
+      "optional": true,
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/echarts": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
+      "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+      "dependencies": {
+        "tslib": "2.3.0",
+        "zrender": "5.4.4"
+      }
+    },
+    "node_modules/element-china-area-data": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/element-china-area-data/-/element-china-area-data-6.1.0.tgz",
+      "integrity": "sha512-IkpcjwQv2A/2AxFiSoaISZ+oMw1rZCPUSOg5sOCwT5jKc96TaawmKZeY81xfxXsO0QbKxU5LLc6AirhG52hUmg==",
+      "dependencies": {
+        "china-division": "^2.7.0"
+      }
+    },
+    "node_modules/element-plus": {
+      "version": "2.9.11",
+      "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.11.tgz",
+      "integrity": "sha512-x4L/6YC8de4JtuE3vpaEugJdQIeHQaHtIYKyk67IeF6dTIiVax45aX4nWOygnh+xX+0gTvL6xO+9BZhPA3G82w==",
+      "dependencies": {
+        "@ctrl/tinycolor": "^3.4.1",
+        "@element-plus/icons-vue": "^2.3.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+        "@types/lodash": "^4.14.182",
+        "@types/lodash-es": "^4.17.6",
+        "@vueuse/core": "^9.1.0",
+        "async-validator": "^4.2.5",
+        "dayjs": "^1.11.13",
+        "escape-html": "^1.0.3",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "lodash-unified": "^1.0.2",
+        "memoize-one": "^6.0.0",
+        "normalize-wheel-es": "^1.2.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/element-plus/node_modules/@types/web-bluetooth": {
+      "version": "0.0.16",
+      "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
+      "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+    },
+    "node_modules/element-plus/node_modules/@vueuse/core": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz",
+      "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.16",
+        "@vueuse/metadata": "9.13.0",
+        "@vueuse/shared": "9.13.0",
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/element-plus/node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/element-plus/node_modules/@vueuse/metadata": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
+      "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/element-plus/node_modules/@vueuse/shared": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz",
+      "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
+      "dependencies": {
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/element-plus/node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.9",
+      "resolved": "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "node_modules/esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz",
+      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmmirror.com/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/exsolve": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/exsolve/-/exsolve-1.0.4.tgz",
+      "integrity": "sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fflate": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.8.2.tgz",
+      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="
+    },
+    "node_modules/file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/fuse.js": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz",
+      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/html2pdf.js": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmmirror.com/html2pdf.js/-/html2pdf.js-0.10.3.tgz",
+      "integrity": "sha512-RcB1sh8rs5NT3jgbN5zvvTmkmZrsUrxpZ/RI8TMbvuReNZAdJZG5TMfA2TBP6ZXxpXlWf9NB/ciLXVb6W2LbRQ==",
+      "dependencies": {
+        "es6-promise": "^4.2.5",
+        "html2canvas": "^1.0.0",
+        "jspdf": "^3.0.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
+      "dev": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.2.0.tgz",
+      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dev": true,
+      "dependencies": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
+    "node_modules/js-base64": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+      "dev": true
+    },
+    "node_modules/js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/jsbarcode": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.12.1.tgz",
+      "integrity": "sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ=="
+    },
+    "node_modules/jsencrypt": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jspdf": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-3.0.1.tgz",
+      "integrity": "sha512-qaGIxqxetdoNnFQQXxTKUD9/Z7AloLaw94fFsOiJMxbfYdBbrBuhWmbzI8TVjrw7s3jBY1PFHofBKMV/wZPapg==",
+      "dependencies": {
+        "@babel/runtime": "^7.26.7",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "fflate": "^0.8.1"
+      },
+      "optionalDependencies": {
+        "canvg": "^3.0.11",
+        "core-js": "^3.6.0",
+        "dompurify": "^3.2.4",
+        "html2canvas": "^1.0.0-rc.5"
+      }
+    },
+    "node_modules/keypress": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/keypress/-/keypress-0.1.0.tgz",
+      "integrity": "sha512-x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA=="
+    },
+    "node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "node_modules/loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/local-pkg": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.5.1.tgz",
+      "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==",
+      "dev": true,
+      "dependencies": {
+        "mlly": "^1.7.3",
+        "pkg-types": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "node_modules/lodash-unified": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz",
+      "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==",
+      "peerDependencies": {
+        "@types/lodash-es": "*",
+        "lodash": "*",
+        "lodash-es": "*"
+      }
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+    },
+    "node_modules/lodash.find": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmmirror.com/lodash.find/-/lodash.find-4.6.0.tgz",
+      "integrity": "sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg=="
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead."
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.17",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
+    "node_modules/merge-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz",
+      "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-obj": "^1.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mlly": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.7.4.tgz",
+      "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "pathe": "^2.0.1",
+        "pkg-types": "^1.3.0",
+        "ufo": "^1.5.4"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-wheel-es": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+      "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
+    },
+    "node_modules/nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nzh": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmmirror.com/nzh/-/nzh-1.0.14.tgz",
+      "integrity": "sha512-wKgaqCSZdrySvB4RWop5g+v6IDv2IErsT6rjq06Bg0yiT9hiHYZO12GMGx/xweGVLcO2lDjX5RqWD0S/Jy9z5Q=="
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.6.tgz",
+      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pinia": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz",
+      "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.5.0",
+        "vue-demi": ">=0.14.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.4.0",
+        "typescript": ">=4.4.4",
+        "vue": "^2.6.14 || ^3.3.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pinia/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pinyin": {
+      "version": "4.0.0-alpha.2",
+      "resolved": "https://registry.npmmirror.com/pinyin/-/pinyin-4.0.0-alpha.2.tgz",
+      "integrity": "sha512-SED2wWr1X0QwH6rXIDgg20zS1mAk0AVMO8eM3KomUlOYzC8mNMWZnspZWhhI0M8MBIbF2xwa+5r30jTSjAqNsg==",
+      "dependencies": {
+        "commander": "~1.1.1"
+      },
+      "bin": {
+        "pinyin": "bin/pinyin"
+      },
+      "engines": {
+        "install-node": "^18.0.0"
+      },
+      "peerDependencies": {
+        "@node-rs/jieba": "^1.6.0",
+        "nodejieba": "2.5.2",
+        "segmentit": "^2.0.3"
+      },
+      "peerDependenciesMeta": {
+        "@node-rs/jieba": {
+          "optional": true
+        },
+        "nodejieba": {
+          "optional": true
+        },
+        "segmentit": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pkg-types": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.3.1.tgz",
+      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+      "dev": true,
+      "dependencies": {
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-prefix-selector": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmmirror.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.1.tgz",
+      "integrity": "sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": ">4 <9"
+      }
+    },
+    "node_modules/posthtml": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmmirror.com/posthtml/-/posthtml-0.9.2.tgz",
+      "integrity": "sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==",
+      "dev": true,
+      "dependencies": {
+        "posthtml-parser": "^0.2.0",
+        "posthtml-render": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/posthtml-parser": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz",
+      "integrity": "sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^3.8.3",
+        "isobject": "^2.1.0"
+      }
+    },
+    "node_modules/posthtml-rename-id": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmmirror.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz",
+      "integrity": "sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "node_modules/posthtml-rename-id/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/posthtml-render": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/posthtml-render/-/posthtml-render-1.4.0.tgz",
+      "integrity": "sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/posthtml-svg-mode": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz",
+      "integrity": "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==",
+      "dev": true,
+      "dependencies": {
+        "merge-options": "1.0.1",
+        "posthtml": "^0.9.2",
+        "posthtml-parser": "^0.2.1",
+        "posthtml-render": "^1.0.6"
+      }
+    },
+    "node_modules/preval.macro": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/preval.macro/-/preval.macro-4.0.0.tgz",
+      "integrity": "sha512-sJJnE71X+MPr64CVD2AurmUj4JEDqbudYbStav3L9Xjcqm4AR0ymMm6sugw1mUmfI/7gw4JWA4JXo/k6w34crw==",
+      "dependencies": {
+        "babel-plugin-preval": "^4.0.0"
+      }
+    },
+    "node_modules/province-city-china": {
+      "version": "8.5.8",
+      "resolved": "https://registry.npmmirror.com/province-city-china/-/province-city-china-8.5.8.tgz",
+      "integrity": "sha512-gUV5kSOWHVufemkq6lygb0ngNZ4snMcONmr3QzxHuj1MYOQPphiyjHplfmywcVGWdGQgim30RXia/mYB007eLg==",
+      "dependencies": {
+        "@province-city-china/types": "8.5.8"
+      }
+    },
+    "node_modules/quansync": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.10.tgz",
+      "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/antfu"
+        },
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/sxzz"
+        }
+      ]
+    },
+    "node_modules/query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmmirror.com/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "dependencies": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      }
+    },
+    "node_modules/quill-delta": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-4.2.2.tgz",
+      "integrity": "sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==",
+      "dependencies": {
+        "fast-diff": "1.2.0",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isequal": "^4.5.0"
+      }
+    },
+    "node_modules/quill/node_modules/fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+    },
+    "node_modules/quill/node_modules/quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz",
+      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "dependencies": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "dependencies": {
+        "performance-now": "^2.1.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-not/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-not/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "dependencies": {
+        "is-core-module": "^2.16.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmmirror.com/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rgbcolor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
+      "engines": {
+        "node": ">= 0.8.15"
+      }
+    },
+    "node_modules/robust-predicates": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-3.0.2.tgz",
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+    },
+    "node_modules/rollup": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.38.0.tgz",
+      "integrity": "sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.7"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.38.0",
+        "@rollup/rollup-android-arm64": "4.38.0",
+        "@rollup/rollup-darwin-arm64": "4.38.0",
+        "@rollup/rollup-darwin-x64": "4.38.0",
+        "@rollup/rollup-freebsd-arm64": "4.38.0",
+        "@rollup/rollup-freebsd-x64": "4.38.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.38.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.38.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.38.0",
+        "@rollup/rollup-linux-arm64-musl": "4.38.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.38.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.38.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.38.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.38.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.38.0",
+        "@rollup/rollup-linux-x64-gnu": "4.38.0",
+        "@rollup/rollup-linux-x64-musl": "4.38.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.38.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.38.0",
+        "@rollup/rollup-win32-x64-msvc": "4.38.0",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-push-apply/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sass": {
+      "version": "1.69.5",
+      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.69.5.tgz",
+      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+      "dev": true
+    },
+    "node_modules/segmentit": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/segmentit/-/segmentit-2.0.3.tgz",
+      "integrity": "sha512-7mn2XL3OdTUQ+AhHz7SbgyxLTaQRzTWQNVwiK+UlTO8aePGbSwvKUzTwE4238+OUY9MoR6ksAg35zl8sfTunQQ==",
+      "dependencies": {
+        "preval.macro": "^4.0.0"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmmirror.com/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/snapdragon/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
+      "dev": true
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "dev": true
+    },
+    "node_modules/stackblur-canvas": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
+      "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==",
+      "engines": {
+        "node": ">=0.1.14"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmmirror.com/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-literal": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-2.1.1.tgz",
+      "integrity": "sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/strip-literal/node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-baker": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/svg-baker/-/svg-baker-1.7.0.tgz",
+      "integrity": "sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "clone": "^2.1.1",
+        "he": "^1.1.1",
+        "image-size": "^0.5.1",
+        "loader-utils": "^1.1.0",
+        "merge-options": "1.0.1",
+        "micromatch": "3.1.0",
+        "postcss": "^5.2.17",
+        "postcss-prefix-selector": "^1.6.0",
+        "posthtml-rename-id": "^1.0",
+        "posthtml-svg-mode": "^1.0.3",
+        "query-string": "^4.3.2",
+        "traverse": "^0.6.6"
+      }
+    },
+    "node_modules/svg-baker/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/chalk/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/micromatch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz",
+      "integrity": "sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.2.2",
+        "define-property": "^1.0.0",
+        "extend-shallow": "^2.0.1",
+        "extglob": "^2.0.2",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^5.0.2",
+        "nanomatch": "^1.2.1",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/postcss": {
+      "version": "5.2.18",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz",
+      "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "js-base64": "^2.1.9",
+        "source-map": "^0.5.6",
+        "supports-color": "^3.2.3"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/svg-baker/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/supports-color": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/svg-baker/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svg-pathdata": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+      "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/svgo": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "dev": true,
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.3",
+        "csso": "^4.2.0",
+        "picocolors": "^1.0.0",
+        "stable": "^0.1.8"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/traverse": {
+      "version": "0.6.11",
+      "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.6.11.tgz",
+      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
+      "dev": true,
+      "dependencies": {
+        "gopd": "^1.2.0",
+        "typedarray.prototype.slice": "^1.0.5",
+        "which-typed-array": "^1.1.18"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typedarray.prototype.slice": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
+      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "math-intrinsics": "^1.1.0",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ufo": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.5.4.tgz",
+      "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
+      "dev": true
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true
+    },
+    "node_modules/unimport": {
+      "version": "3.14.6",
+      "resolved": "https://registry.npmmirror.com/unimport/-/unimport-3.14.6.tgz",
+      "integrity": "sha512-CYvbDaTT04Rh8bmD8jz3WPmHYZRG/NnvYVzwD6V1YAlvvKROlAeNDUBhkBGzNav2RKaeuXvlWYaa1V4Lfi/O0g==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.4",
+        "acorn": "^8.14.0",
+        "escape-string-regexp": "^5.0.0",
+        "estree-walker": "^3.0.3",
+        "fast-glob": "^3.3.3",
+        "local-pkg": "^1.0.0",
+        "magic-string": "^0.30.17",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1",
+        "picomatch": "^4.0.2",
+        "pkg-types": "^1.3.0",
+        "scule": "^1.3.0",
+        "strip-literal": "^2.1.1",
+        "unplugin": "^1.16.1"
+      }
+    },
+    "node_modules/unimport/node_modules/confbox": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.2.1.tgz",
+      "integrity": "sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==",
+      "dev": true
+    },
+    "node_modules/unimport/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/unimport/node_modules/local-pkg": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-1.1.1.tgz",
+      "integrity": "sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==",
+      "dev": true,
+      "dependencies": {
+        "mlly": "^1.7.4",
+        "pkg-types": "^2.0.1",
+        "quansync": "^0.2.8"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/unimport/node_modules/local-pkg/node_modules/pkg-types": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-2.1.0.tgz",
+      "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==",
+      "dev": true,
+      "dependencies": {
+        "confbox": "^0.2.1",
+        "exsolve": "^1.0.1",
+        "pathe": "^2.0.3"
+      }
+    },
+    "node_modules/unimport/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unplugin": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.16.1.tgz",
+      "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "webpack-virtual-modules": "^0.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/unplugin-auto-import": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.17.1.tgz",
+      "integrity": "sha512-QvdJKtFK0COSuRXzVnwjG3ir870zVhdMg6O8GKG3UO/O5W4fmJm5h71QvzI7Gp8Sx0qfCvC3f+2v0Vm489fnqQ==",
+      "dev": true,
+      "dependencies": {
+        "@antfu/utils": "^0.7.6",
+        "@rollup/pluginutils": "^5.0.5",
+        "fast-glob": "^3.3.2",
+        "local-pkg": "^0.5.0",
+        "magic-string": "^0.30.5",
+        "minimatch": "^9.0.3",
+        "unimport": "^3.5.0",
+        "unplugin": "^1.5.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@nuxt/kit": "^3.2.2",
+        "@vueuse/core": "*"
+      },
+      "peerDependenciesMeta": {
+        "@nuxt/kit": {
+          "optional": true
+        },
+        "@vueuse/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/unplugin-vue-setup-extend-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/unplugin-vue-setup-extend-plus/-/unplugin-vue-setup-extend-plus-1.0.0.tgz",
+      "integrity": "sha512-Qb34atQ/elvkErQ12PNv6UWJPWIG4dEgjjizYKyycPeiRqQaMVNCKqRIqfxlhXntcU2l+o3VQuk1NNZN6QJ/xw==",
+      "dev": true,
+      "dependencies": {
+        "@vue/compiler-sfc": "^3.2.37",
+        "magic-string": "^0.26.2",
+        "unplugin": "^1.3.1"
+      }
+    },
+    "node_modules/unplugin-vue-setup-extend-plus/node_modules/magic-string": {
+      "version": "0.26.7",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.7.tgz",
+      "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==",
+      "dev": true,
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmmirror.com/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmmirror.com/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
+    "node_modules/v-dropdown": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/v-dropdown/-/v-dropdown-3.4.0.tgz",
+      "integrity": "sha512-wgMb9P2jNhwrCVdD4ckcuou2XivK0ac9XNUH4cXithWMi4LRdOYgNNoT/Gl9ltXaIdO0I7izxpOZG/ddRJUkow==",
+      "dependencies": {
+        "vue": "^3.5.13"
+      },
+      "peerDependencies": {
+        "vue": "^3.3.0"
+      }
+    },
+    "node_modules/v-region": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmmirror.com/v-region/-/v-region-3.4.1.tgz",
+      "integrity": "sha512-x1EMWwcTNE6HABTmSTz2+ejTFU+0ydYF+THWOmrfhy2dk7WSa0822F6ihFDJADsAL4EuHaqI+QR1ggLsOo3d+w==",
+      "dependencies": {
+        "v-dropdown": "^3.3.0",
+        "vue": "^3.5.13"
+      },
+      "peerDependencies": {
+        "vue": "^3.4.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmmirror.com/vite/-/vite-5.0.4.tgz",
+      "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.19.3",
+        "postcss": "^8.4.31",
+        "rollup": "^4.2.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite-plugin-compression": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmmirror.com/vite-plugin-compression/-/vite-plugin-compression-0.5.1.tgz",
+      "integrity": "sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "debug": "^4.3.3",
+        "fs-extra": "^10.0.0"
+      },
+      "peerDependencies": {
+        "vite": ">=2.0.0"
+      }
+    },
+    "node_modules/vite-plugin-svg-icons": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/vite-plugin-svg-icons/-/vite-plugin-svg-icons-2.0.1.tgz",
+      "integrity": "sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==",
+      "dev": true,
+      "dependencies": {
+        "@types/svgo": "^2.6.1",
+        "cors": "^2.8.5",
+        "debug": "^4.3.3",
+        "etag": "^1.8.1",
+        "fs-extra": "^10.0.0",
+        "pathe": "^0.2.0",
+        "svg-baker": "1.7.0",
+        "svgo": "^2.8.0"
+      },
+      "peerDependencies": {
+        "vite": ">=2.0.0"
+      }
+    },
+    "node_modules/vite-plugin-svg-icons/node_modules/pathe": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/pathe/-/pathe-0.2.0.tgz",
+      "integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==",
+      "dev": true
+    },
+    "node_modules/vue": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.13.tgz",
+      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-sfc": "3.5.13",
+        "@vue/runtime-dom": "3.5.13",
+        "@vue/server-renderer": "3.5.13",
+        "@vue/shared": "3.5.13"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue-area-linkage": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/vue-area-linkage/-/vue-area-linkage-5.1.0.tgz",
+      "integrity": "sha512-86WD4O6PD9e2koWZ81Zlfcyey17U1+3B3fpWoyIZlBIe2V6qfvrg9BTozWdTpdF4CmKBiz138LBRTKhawl/UWw==",
+      "dependencies": {
+        "lodash.find": "^4.6.0"
+      },
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 5.2.0"
+      },
+      "peerDependencies": {
+        "area-data": ">=5.0.6",
+        "vue": ">=2.2.0"
+      }
+    },
+    "node_modules/vue-cropper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-1.1.1.tgz",
+      "integrity": "sha512-WsqKMpaBf9Osi1LQlE/5AKdD0nHWOy1asLXocaG8NomOWO07jiZi968+/PbMmnD0QbPJOumDQaGuGa13qys85A=="
+    },
+    "node_modules/vue-plugin-hiprint": {
+      "version": "0.0.60",
+      "resolved": "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.60.tgz",
+      "integrity": "sha512-a5uOMn6Nr4qlYYaVNbQKwRZJa8UcNMTflfi6J430/NDtySJB+5ArE8I8+NLjgVV56x3/qdUBs/GWuZCX5Umv1w==",
+      "dependencies": {
+        "@claviska/jquery-minicolors": "^2.3.6",
+        "@wtto00/html2canvas": "^1.4.3",
+        "bwip-js": "^4.0.0",
+        "canvg": "^3.0.10",
+        "jquery": "^3.6.0",
+        "jsbarcode": "^3.11.5",
+        "jspdf": "^2.5.1",
+        "lodash": "^4.17.21",
+        "nzh": "^1.0.8",
+        "socket.io-client": "^4.5.1"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/vue-plugin-hiprint/node_modules/dompurify": {
+      "version": "2.5.8",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-2.5.8.tgz",
+      "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==",
+      "optional": true
+    },
+    "node_modules/vue-plugin-hiprint/node_modules/jspdf": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.2.tgz",
+      "integrity": "sha512-myeX9c+p7znDWPk0eTrujCzNjT+CXdXyk7YmJq5nD5V7uLLKmSXnlQ/Jn/kuo3X09Op70Apm0rQSnFWyGK8uEQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.23.2",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "fflate": "^0.8.1"
+      },
+      "optionalDependencies": {
+        "canvg": "^3.0.6",
+        "core-js": "^3.6.0",
+        "dompurify": "^2.5.4",
+        "html2canvas": "^1.0.0-rc.5"
+      }
+    },
+    "node_modules/vue-router": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.5.tgz",
+      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/vue/node_modules/@vue/compiler-core": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "dependencies": {
+        "@babel/parser": "^7.25.3",
+        "@vue/shared": "3.5.13",
+        "entities": "^4.5.0",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/vue/node_modules/@vue/compiler-dom": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "dependencies": {
+        "@vue/compiler-core": "3.5.13",
+        "@vue/shared": "3.5.13"
+      }
+    },
+    "node_modules/vue/node_modules/@vue/compiler-sfc": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
+      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "dependencies": {
+        "@babel/parser": "^7.25.3",
+        "@vue/compiler-core": "3.5.13",
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.11",
+        "postcss": "^8.4.48",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/vue/node_modules/@vue/compiler-ssr": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/shared": "3.5.13"
+      }
+    },
+    "node_modules/vue/node_modules/@vue/shared": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+    },
+    "node_modules/vue/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+      "dev": true
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.19",
+      "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/zrender": {
+      "version": "5.4.4",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
+      "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
+    }
+  },
+  "dependencies": {
+    "@antfu/utils": {
+      "version": "0.7.10",
+      "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.10.tgz",
+      "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
+      "dev": true
+    },
+    "@babel/code-frame": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ=="
+    },
+    "@babel/parser": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.27.0.tgz",
+      "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+      "requires": {
+        "@babel/types": "^7.27.0"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "requires": {
+        "regenerator-runtime": "^0.14.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.27.0.tgz",
+      "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+      "requires": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      }
+    },
+    "@claviska/jquery-minicolors": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz",
+      "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==",
+      "requires": {}
+    },
+    "@ctrl/tinycolor": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
+      "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA=="
+    },
+    "@element-plus/icons-vue": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
+      "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==",
+      "requires": {}
+    },
+    "@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "dev": true,
+      "optional": true
+    },
+    "@floating-ui/core": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.9.tgz",
+      "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+      "requires": {
+        "@floating-ui/utils": "^0.2.9"
+      }
+    },
+    "@floating-ui/dom": {
+      "version": "1.6.13",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.6.13.tgz",
+      "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+      "requires": {
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.9"
+      }
+    },
+    "@floating-ui/utils": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.9.tgz",
+      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@popperjs/core": {
+      "version": "npm:@sxzz/popperjs-es@2.11.7",
+      "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+    },
+    "@province-city-china/types": {
+      "version": "8.5.8",
+      "resolved": "https://registry.npmmirror.com/@province-city-china/types/-/types-8.5.8.tgz",
+      "integrity": "sha512-KZ3NyM8HsaBVcn5BRhWaOeZRhqEvm18PfB6HfRDuZfwwWhJLoTxB81mTENrBlONr2g8fy/fSbjsh44gvOj+/Lw=="
+    },
+    "@rollup/pluginutils": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
+      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "dependencies": {
+        "picomatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.2.tgz",
+          "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+          "dev": true
+        }
+      }
+    },
+    "@rollup/rollup-android-arm-eabi": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.38.0.tgz",
+      "integrity": "sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-android-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.38.0.tgz",
+      "integrity": "sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.38.0.tgz",
+      "integrity": "sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-x64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.38.0.tgz",
+      "integrity": "sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-freebsd-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.38.0.tgz",
+      "integrity": "sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-freebsd-x64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.38.0.tgz",
+      "integrity": "sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.38.0.tgz",
+      "integrity": "sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.38.0.tgz",
+      "integrity": "sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.38.0.tgz",
+      "integrity": "sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.38.0.tgz",
+      "integrity": "sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.38.0.tgz",
+      "integrity": "sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.38.0.tgz",
+      "integrity": "sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.38.0.tgz",
+      "integrity": "sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz",
+      "integrity": "sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.38.0.tgz",
+      "integrity": "sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.38.0.tgz",
+      "integrity": "sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.38.0.tgz",
+      "integrity": "sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.38.0.tgz",
+      "integrity": "sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.38.0.tgz",
+      "integrity": "sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-x64-msvc": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.38.0.tgz",
+      "integrity": "sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==",
+      "dev": true,
+      "optional": true
+    },
+    "@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
+    },
+    "@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "dev": true
+    },
+    "@types/estree": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "dev": true
+    },
+    "@types/lodash": {
+      "version": "4.17.16",
+      "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.16.tgz",
+      "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g=="
+    },
+    "@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
+    "@types/node": {
+      "version": "22.13.15",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.13.15.tgz",
+      "integrity": "sha512-imAbQEEbVni6i6h6Bd5xkCRwLqFc8hihCsi2GbtDoAtUcAFQ6Zs4pFXTZUUbroTkXdImczWM9AI8eZUuybXE3w==",
+      "dev": true,
+      "requires": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
+    },
+    "@types/raf": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmmirror.com/@types/raf/-/raf-3.4.3.tgz",
+      "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw=="
+    },
+    "@types/svgo": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/@types/svgo/-/svgo-2.6.4.tgz",
+      "integrity": "sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "optional": true
+    },
+    "@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow=="
+    },
+    "@vitejs/plugin-vue": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.5.0.tgz",
+      "integrity": "sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "@vue/compiler-core": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz",
+      "integrity": "sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.23.3",
+        "@vue/shared": "3.3.9",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "@vue/compiler-dom": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz",
+      "integrity": "sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-core": "3.3.9",
+        "@vue/shared": "3.3.9"
+      }
+    },
+    "@vue/compiler-sfc": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz",
+      "integrity": "sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.23.3",
+        "@vue/compiler-core": "3.3.9",
+        "@vue/compiler-dom": "3.3.9",
+        "@vue/compiler-ssr": "3.3.9",
+        "@vue/reactivity-transform": "3.3.9",
+        "@vue/shared": "3.3.9",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.5",
+        "postcss": "^8.4.31",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "@vue/compiler-ssr": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz",
+      "integrity": "sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-dom": "3.3.9",
+        "@vue/shared": "3.3.9"
+      }
+    },
+    "@vue/devtools-api": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
+    },
+    "@vue/reactivity": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.13.tgz",
+      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "requires": {
+        "@vue/shared": "3.5.13"
+      },
+      "dependencies": {
+        "@vue/shared": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+          "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+        }
+      }
+    },
+    "@vue/reactivity-transform": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz",
+      "integrity": "sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.23.3",
+        "@vue/compiler-core": "3.3.9",
+        "@vue/shared": "3.3.9",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.5"
+      }
+    },
+    "@vue/runtime-core": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
+      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "requires": {
+        "@vue/reactivity": "3.5.13",
+        "@vue/shared": "3.5.13"
+      },
+      "dependencies": {
+        "@vue/shared": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+          "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+        }
+      }
+    },
+    "@vue/runtime-dom": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
+      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "requires": {
+        "@vue/reactivity": "3.5.13",
+        "@vue/runtime-core": "3.5.13",
+        "@vue/shared": "3.5.13",
+        "csstype": "^3.1.3"
+      },
+      "dependencies": {
+        "@vue/shared": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+          "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+        }
+      }
+    },
+    "@vue/server-renderer": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
+      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "requires": {
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13"
+      },
+      "dependencies": {
+        "@vue/compiler-core": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+          "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+          "requires": {
+            "@babel/parser": "^7.25.3",
+            "@vue/shared": "3.5.13",
+            "entities": "^4.5.0",
+            "estree-walker": "^2.0.2",
+            "source-map-js": "^1.2.0"
+          }
+        },
+        "@vue/compiler-dom": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+          "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+          "requires": {
+            "@vue/compiler-core": "3.5.13",
+            "@vue/shared": "3.5.13"
+          }
+        },
+        "@vue/compiler-ssr": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+          "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+          "requires": {
+            "@vue/compiler-dom": "3.5.13",
+            "@vue/shared": "3.5.13"
+          }
+        },
+        "@vue/shared": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+          "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+        },
+        "entities": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
+        }
+      }
+    },
+    "@vue/shared": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.9.tgz",
+      "integrity": "sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA==",
+      "dev": true
+    },
+    "@vueup/vue-quill": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@vueup/vue-quill/-/vue-quill-1.2.0.tgz",
+      "integrity": "sha512-kd5QPSHMDpycklojPXno2Kw2JSiKMYduKYQckTm1RJoVDA557MnyUXgcuuDpry4HY/Rny9nGNcK+m3AHk94wag==",
+      "requires": {
+        "quill": "^1.3.7",
+        "quill-delta": "^4.2.2"
+      }
+    },
+    "@vueuse/core": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.6.1.tgz",
+      "integrity": "sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==",
+      "requires": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.6.1",
+        "@vueuse/shared": "10.6.1",
+        "vue-demi": ">=0.14.6"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.14.10",
+          "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+          "requires": {}
+        }
+      }
+    },
+    "@vueuse/metadata": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.6.1.tgz",
+      "integrity": "sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw=="
+    },
+    "@vueuse/shared": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.6.1.tgz",
+      "integrity": "sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==",
+      "requires": {
+        "vue-demi": ">=0.14.6"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.14.10",
+          "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+          "requires": {}
+        }
+      }
+    },
+    "@wtto00/html2canvas": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmmirror.com/@wtto00/html2canvas/-/html2canvas-1.4.3.tgz",
+      "integrity": "sha512-jwsb+xL8N+gjrSNABSaFdxmWtE4c7RNFjP20lo1G7gs63Qqo1phhxVBTzxc/apDVh6LgXsU2l5bwKtXd9uz65w==",
+      "requires": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      }
+    },
+    "acorn": {
+      "version": "8.14.1",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "area-data": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmmirror.com/area-data/-/area-data-5.0.6.tgz",
+      "integrity": "sha512-QxLoA+823xXKyhw5S3750I9TToki0OS42HU9ol3rCOsCXfkjtl8RtQ/eoj0cK0Levn4//oEM05FmMumfw/HIlg==",
+      "peer": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true
+    },
+    "array-buffer-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      }
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true
+    },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
+      }
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true
+    },
+    "async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true
+    },
+    "async-validator": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz",
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "requires": {
+        "possible-typed-array-names": "^1.0.0"
+      }
+    },
+    "axios": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "requires": {
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      }
+    },
+    "babel-plugin-macros": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
+      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "cosmiconfig": "^6.0.0",
+        "resolve": "^1.12.0"
+      }
+    },
+    "babel-plugin-preval": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-preval/-/babel-plugin-preval-4.0.0.tgz",
+      "integrity": "sha512-fZI/4cYneinlj2k/FsXw0/lTWSC5KKoepUueS1g25Gb5vx3GrRyaVwxWCshYqx11GEU4mZnbbFhee8vpquFS2w==",
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "babel-plugin-macros": "^2.6.1",
+        "require-from-string": "^2.0.2"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.1.1"
+      }
+    },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
+    "bwip-js": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmmirror.com/bwip-js/-/bwip-js-4.7.0.tgz",
+      "integrity": "sha512-b7oQcgbWUl8rpcZayQ32SQrBCNteiZFuLkimKKBRlPwIHCeUN2VNeUE3HCMYShe04Evxd+ucS9uUAOsvNKjQbA=="
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      }
+    },
+    "call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      }
+    },
+    "call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "canvg": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmmirror.com/canvg/-/canvg-3.0.11.tgz",
+      "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@types/raf": "^3.4.0",
+        "core-js": "^3.8.3",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^2.0.0",
+        "svg-pathdata": "^6.0.3"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+          "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+        }
+      }
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "china-division": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmmirror.com/china-division/-/china-division-2.7.0.tgz",
+      "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA=="
+    },
+    "chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-1.1.1.tgz",
+      "integrity": "sha512-71Rod2AhcH3JhkBikVpNd0pA+fWsmAaVoti6OR38T76chA7vE3pSerS0Jor4wDw+tOueD2zLVvFOw5H0Rcj7rA==",
+      "requires": {
+        "keypress": "0.1.x"
+      }
+    },
+    "component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true
+    },
+    "confbox": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+      "dev": true
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true
+    },
+    "core-js": {
+      "version": "3.43.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.43.0.tgz",
+      "integrity": "sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA=="
+    },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmmirror.com/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
+    "cosmiconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.7.2"
+      }
+    },
+    "css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "requires": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
+          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.0",
+            "entities": "^2.0.0"
+          }
+        },
+        "domelementtype": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+          "dev": true
+        },
+        "domhandler": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz",
+          "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.2.0"
+          }
+        },
+        "domutils": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz",
+          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.2.0"
+          }
+        },
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
+      }
+    },
+    "css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      }
+    },
+    "css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true
+    },
+    "csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "requires": {
+        "css-tree": "^1.1.2"
+      }
+    },
+    "csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "d3": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmmirror.com/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "requires": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      }
+    },
+    "d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "requires": {
+        "internmap": "1 - 2"
+      }
+    },
+    "d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="
+    },
+    "d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      }
+    },
+    "d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "requires": {
+        "d3-path": "1 - 3"
+      }
+    },
+    "d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
+    },
+    "d3-contour": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "requires": {
+        "d3-array": "^3.2.0"
+      }
+    },
+    "d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmmirror.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "requires": {
+        "delaunator": "5"
+      }
+    },
+    "d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="
+    },
+    "d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      }
+    },
+    "d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "requires": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
+        }
+      }
+    },
+    "d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="
+    },
+    "d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "requires": {
+        "d3-dsv": "1 - 3"
+      }
+    },
+    "d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      }
+    },
+    "d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
+    },
+    "d3-geo": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "requires": {
+        "d3-array": "2.5.0 - 3"
+      }
+    },
+    "d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="
+    },
+    "d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "requires": {
+        "d3-color": "1 - 3"
+      }
+    },
+    "d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="
+    },
+    "d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="
+    },
+    "d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="
+    },
+    "d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="
+    },
+    "d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "requires": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      }
+    },
+    "d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "requires": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      }
+    },
+    "d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="
+    },
+    "d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "requires": {
+        "d3-path": "^3.1.0"
+      }
+    },
+    "d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "requires": {
+        "d3-array": "2 - 3"
+      }
+    },
+    "d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "requires": {
+        "d3-time": "1 - 3"
+      }
+    },
+    "d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
+    },
+    "d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "requires": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      }
+    },
+    "d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      }
+    },
+    "data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      }
+    },
+    "data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      }
+    },
+    "data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      }
+    },
+    "dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.3"
+      }
+    },
+    "decimal.js": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
+    },
+    "decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.2.tgz",
+      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+      "requires": {
+        "is-arguments": "^1.1.1",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.5.1"
+      }
+    },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
+    "define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.0"
+      }
+    },
+    "delaunator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "requires": {
+        "robust-predicates": "^3.0.2"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+    },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+          "dev": true
+        },
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "dompurify": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.6.tgz",
+      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
+      "optional": true,
+      "requires": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      }
+    },
+    "echarts": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
+      "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.4.4"
+      }
+    },
+    "element-china-area-data": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/element-china-area-data/-/element-china-area-data-6.1.0.tgz",
+      "integrity": "sha512-IkpcjwQv2A/2AxFiSoaISZ+oMw1rZCPUSOg5sOCwT5jKc96TaawmKZeY81xfxXsO0QbKxU5LLc6AirhG52hUmg==",
+      "requires": {
+        "china-division": "^2.7.0"
+      }
+    },
+    "element-plus": {
+      "version": "2.9.11",
+      "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.11.tgz",
+      "integrity": "sha512-x4L/6YC8de4JtuE3vpaEugJdQIeHQaHtIYKyk67IeF6dTIiVax45aX4nWOygnh+xX+0gTvL6xO+9BZhPA3G82w==",
+      "requires": {
+        "@ctrl/tinycolor": "^3.4.1",
+        "@element-plus/icons-vue": "^2.3.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+        "@types/lodash": "^4.14.182",
+        "@types/lodash-es": "^4.17.6",
+        "@vueuse/core": "^9.1.0",
+        "async-validator": "^4.2.5",
+        "dayjs": "^1.11.13",
+        "escape-html": "^1.0.3",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "lodash-unified": "^1.0.2",
+        "memoize-one": "^6.0.0",
+        "normalize-wheel-es": "^1.2.0"
+      },
+      "dependencies": {
+        "@types/web-bluetooth": {
+          "version": "0.0.16",
+          "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
+          "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+        },
+        "@vueuse/core": {
+          "version": "9.13.0",
+          "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz",
+          "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==",
+          "requires": {
+            "@types/web-bluetooth": "^0.0.16",
+            "@vueuse/metadata": "9.13.0",
+            "@vueuse/shared": "9.13.0",
+            "vue-demi": "*"
+          },
+          "dependencies": {
+            "vue-demi": {
+              "version": "0.14.10",
+              "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+              "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+              "requires": {}
+            }
+          }
+        },
+        "@vueuse/metadata": {
+          "version": "9.13.0",
+          "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
+          "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ=="
+        },
+        "@vueuse/shared": {
+          "version": "9.13.0",
+          "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz",
+          "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
+          "requires": {
+            "vue-demi": "*"
+          },
+          "dependencies": {
+            "vue-demi": {
+              "version": "0.14.10",
+              "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+              "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+              "requires": {}
+            }
+          }
+        }
+      }
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true
+    },
+    "engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q=="
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.23.9",
+      "resolved": "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
+      }
+    },
+    "es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
+    "es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "requires": {
+        "es-errors": "^1.3.0"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "requires": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "requires": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true
+    },
+    "estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true
+    },
+    "eventemitter3": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz",
+      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmmirror.com/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        }
+      }
+    },
+    "exsolve": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/exsolve/-/exsolve-1.0.4.tgz",
+      "integrity": "sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "requires": {
+        "is-extendable": "^0.1.0"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
+    },
+    "fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      }
+    },
+    "fastq": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "fflate": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.8.2.tgz",
+      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="
+    },
+    "file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+    },
+    "fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="
+    },
+    "for-each": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.2.7"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true
+    },
+    "form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
+    },
+    "fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+    },
+    "fuse.js": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz",
+      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="
+    },
+    "get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      }
+    },
+    "get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "requires": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      }
+    },
+    "gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="
+    },
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-bigints": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "requires": {
+        "dunder-proto": "^1.0.0"
+      }
+    },
+    "has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "requires": {
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
+    },
+    "html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "requires": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      }
+    },
+    "html2pdf.js": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmmirror.com/html2pdf.js/-/html2pdf.js-0.10.3.tgz",
+      "integrity": "sha512-RcB1sh8rs5NT3jgbN5zvvTmkmZrsUrxpZ/RI8TMbvuReNZAdJZG5TMfA2TBP6ZXxpXlWf9NB/ciLXVb6W2LbRQ==",
+      "requires": {
+        "es6-promise": "^4.2.5",
+        "html2canvas": "^1.0.0",
+        "jspdf": "^3.0.0"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      }
+    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
+      "dev": true
+    },
+    "immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
+      }
+    },
+    "internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
+    },
+    "is-accessor-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "dev": true,
+      "requires": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "is-arguments": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.2.0.tgz",
+      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+      "requires": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "is-array-buffer": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dev": true,
+      "requires": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      }
+    },
+    "is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.2"
+      }
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "requires": {
+        "hasown": "^2.0.2"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "dev": true,
+      "requires": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "is-date-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "requires": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3"
+      }
+    },
+    "is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      }
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "requires": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      }
+    },
+    "is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3"
+      }
+    },
+    "is-string": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "is-symbol": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
+      }
+    },
+    "is-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "dev": true,
+      "requires": {
+        "which-typed-array": "^1.1.16"
+      }
+    },
+    "is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3"
+      }
+    },
+    "is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
+    "js-base64": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+      "dev": true
+    },
+    "js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "jsbarcode": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.12.1.tgz",
+      "integrity": "sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ=="
+    },
+    "jsencrypt": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
+    "jspdf": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-3.0.1.tgz",
+      "integrity": "sha512-qaGIxqxetdoNnFQQXxTKUD9/Z7AloLaw94fFsOiJMxbfYdBbrBuhWmbzI8TVjrw7s3jBY1PFHofBKMV/wZPapg==",
+      "requires": {
+        "@babel/runtime": "^7.26.7",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "canvg": "^3.0.11",
+        "core-js": "^3.6.0",
+        "dompurify": "^3.2.4",
+        "fflate": "^0.8.1",
+        "html2canvas": "^1.0.0-rc.5"
+      }
+    },
+    "keypress": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/keypress/-/keypress-0.1.0.tgz",
+      "integrity": "sha512-x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA=="
+    },
+    "kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      }
+    },
+    "local-pkg": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.5.1.tgz",
+      "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==",
+      "dev": true,
+      "requires": {
+        "mlly": "^1.7.3",
+        "pkg-types": "^1.2.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "lodash-unified": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz",
+      "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==",
+      "requires": {}
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+    },
+    "lodash.find": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmmirror.com/lodash.find/-/lodash.find-4.6.0.tgz",
+      "integrity": "sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg=="
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
+    "magic-string": {
+      "version": "0.30.17",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "requires": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="
+    },
+    "mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
+    "merge-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz",
+      "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.1"
+      }
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      }
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^2.0.1"
+      }
+    },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mlly": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.7.4.tgz",
+      "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.14.0",
+        "pathe": "^2.0.1",
+        "pkg-types": "^1.3.0",
+        "ufo": "^1.5.4"
+      }
+    },
+    "moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+    },
+    "ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "normalize-wheel-es": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+      "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
+    },
+    "nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
+    },
+    "nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0"
+      }
+    },
+    "nzh": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmmirror.com/nzh/-/nzh-1.0.14.tgz",
+      "integrity": "sha512-wKgaqCSZdrySvB4RWop5g+v6IDv2IErsT6rjq06Bg0yiT9hiHYZO12GMGx/xweGVLcO2lDjX5RqWD0S/Jy9z5Q=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "dev": true
+    },
+    "object-is": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.6.tgz",
+      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
+      }
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "object.assign": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      }
+    },
+    "parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+    },
+    "pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+    },
+    "picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
+    "pinia": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz",
+      "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==",
+      "requires": {
+        "@vue/devtools-api": "^6.5.0",
+        "vue-demi": ">=0.14.5"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.14.10",
+          "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+          "requires": {}
+        }
+      }
+    },
+    "pinyin": {
+      "version": "4.0.0-alpha.2",
+      "resolved": "https://registry.npmmirror.com/pinyin/-/pinyin-4.0.0-alpha.2.tgz",
+      "integrity": "sha512-SED2wWr1X0QwH6rXIDgg20zS1mAk0AVMO8eM3KomUlOYzC8mNMWZnspZWhhI0M8MBIbF2xwa+5r30jTSjAqNsg==",
+      "requires": {
+        "commander": "~1.1.1"
+      }
+    },
+    "pkg-types": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.3.1.tgz",
+      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+      "dev": true,
+      "requires": {
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true
+    },
+    "possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true
+    },
+    "postcss": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "requires": {
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "postcss-prefix-selector": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmmirror.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.1.tgz",
+      "integrity": "sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "posthtml": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmmirror.com/posthtml/-/posthtml-0.9.2.tgz",
+      "integrity": "sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==",
+      "dev": true,
+      "requires": {
+        "posthtml-parser": "^0.2.0",
+        "posthtml-render": "^1.0.5"
+      }
+    },
+    "posthtml-parser": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz",
+      "integrity": "sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==",
+      "dev": true,
+      "requires": {
+        "htmlparser2": "^3.8.3",
+        "isobject": "^2.1.0"
+      }
+    },
+    "posthtml-rename-id": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmmirror.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz",
+      "integrity": "sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+          "dev": true
+        }
+      }
+    },
+    "posthtml-render": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/posthtml-render/-/posthtml-render-1.4.0.tgz",
+      "integrity": "sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==",
+      "dev": true
+    },
+    "posthtml-svg-mode": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz",
+      "integrity": "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==",
+      "dev": true,
+      "requires": {
+        "merge-options": "1.0.1",
+        "posthtml": "^0.9.2",
+        "posthtml-parser": "^0.2.1",
+        "posthtml-render": "^1.0.6"
+      }
+    },
+    "preval.macro": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/preval.macro/-/preval.macro-4.0.0.tgz",
+      "integrity": "sha512-sJJnE71X+MPr64CVD2AurmUj4JEDqbudYbStav3L9Xjcqm4AR0ymMm6sugw1mUmfI/7gw4JWA4JXo/k6w34crw==",
+      "requires": {
+        "babel-plugin-preval": "^4.0.0"
+      }
+    },
+    "province-city-china": {
+      "version": "8.5.8",
+      "resolved": "https://registry.npmmirror.com/province-city-china/-/province-city-china-8.5.8.tgz",
+      "integrity": "sha512-gUV5kSOWHVufemkq6lygb0ngNZ4snMcONmr3QzxHuj1MYOQPphiyjHplfmywcVGWdGQgim30RXia/mYB007eLg==",
+      "requires": {
+        "@province-city-china/types": "8.5.8"
+      }
+    },
+    "quansync": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.10.tgz",
+      "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+      "dev": true
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmmirror.com/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "requires": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      },
+      "dependencies": {
+        "fast-diff": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz",
+          "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+        },
+        "quill-delta": {
+          "version": "3.6.3",
+          "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz",
+          "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+          "requires": {
+            "deep-equal": "^1.0.1",
+            "extend": "^3.0.2",
+            "fast-diff": "1.1.2"
+          }
+        }
+      }
+    },
+    "quill-delta": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-4.2.2.tgz",
+      "integrity": "sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==",
+      "requires": {
+        "fast-diff": "1.2.0",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isequal": "^4.5.0"
+      }
+    },
+    "raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "requires": {
+        "performance-now": "^2.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "regexp.prototype.flags": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "requires": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+    },
+    "resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "requires": {
+        "is-core-module": "^2.16.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmmirror.com/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true
+    },
+    "rgbcolor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="
+    },
+    "robust-predicates": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-3.0.2.tgz",
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+    },
+    "rollup": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.38.0.tgz",
+      "integrity": "sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==",
+      "dev": true,
+      "requires": {
+        "@rollup/rollup-android-arm-eabi": "4.38.0",
+        "@rollup/rollup-android-arm64": "4.38.0",
+        "@rollup/rollup-darwin-arm64": "4.38.0",
+        "@rollup/rollup-darwin-x64": "4.38.0",
+        "@rollup/rollup-freebsd-arm64": "4.38.0",
+        "@rollup/rollup-freebsd-x64": "4.38.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.38.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.38.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.38.0",
+        "@rollup/rollup-linux-arm64-musl": "4.38.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.38.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.38.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.38.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.38.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.38.0",
+        "@rollup/rollup-linux-x64-gnu": "4.38.0",
+        "@rollup/rollup-linux-x64-musl": "4.38.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.38.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.38.0",
+        "@rollup/rollup-win32-x64-msvc": "4.38.0",
+        "@types/estree": "1.0.7",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+    },
+    "safe-array-concat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
+        "isarray": "^2.0.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sass": {
+      "version": "1.69.5",
+      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.69.5.tgz",
+      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+      "dev": true,
+      "requires": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      }
+    },
+    "scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+      "dev": true
+    },
+    "segmentit": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/segmentit/-/segmentit-2.0.3.tgz",
+      "integrity": "sha512-7mn2XL3OdTUQ+AhHz7SbgyxLTaQRzTWQNVwiK+UlTO8aePGbSwvKUzTwE4238+OUY9MoR6ksAg35zl8sfTunQQ==",
+      "requires": {
+        "preval.macro": "^4.0.0"
+      }
+    },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
+    "set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
+    "set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "requires": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      }
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      }
+    },
+    "side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      }
+    },
+    "side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      }
+    },
+    "side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      }
+    },
+    "side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmmirror.com/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "dev": true
+    },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "stackblur-canvas": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
+      "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ=="
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmmirror.com/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
+          "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        }
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-literal": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-2.1.1.tgz",
+      "integrity": "sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^9.0.1"
+      },
+      "dependencies": {
+        "js-tokens": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-9.0.1.tgz",
+          "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+          "dev": true
+        }
+      }
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
+    "svg-baker": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/svg-baker/-/svg-baker-1.7.0.tgz",
+      "integrity": "sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.0",
+        "clone": "^2.1.1",
+        "he": "^1.1.1",
+        "image-size": "^0.5.1",
+        "loader-utils": "^1.1.0",
+        "merge-options": "1.0.1",
+        "micromatch": "3.1.0",
+        "postcss": "^5.2.17",
+        "postcss-prefix-selector": "^1.6.0",
+        "posthtml-rename-id": "^1.0",
+        "posthtml-svg-mode": "^1.0.3",
+        "query-string": "^4.3.2",
+        "traverse": "^0.6.6"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmmirror.com/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+              "dev": true
+            }
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz",
+          "integrity": "sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.2.2",
+            "define-property": "^1.0.0",
+            "extend-shallow": "^2.0.1",
+            "extglob": "^2.0.2",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^5.0.2",
+            "nanomatch": "^1.2.1",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "svg-pathdata": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+      "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="
+    },
+    "svgo": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "dev": true,
+      "requires": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.3",
+        "csso": "^4.2.0",
+        "picocolors": "^1.0.0",
+        "stable": "^0.1.8"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+          "dev": true
+        }
+      }
+    },
+    "text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "requires": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "traverse": {
+      "version": "0.6.11",
+      "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.6.11.tgz",
+      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
+      "dev": true,
+      "requires": {
+        "gopd": "^1.2.0",
+        "typedarray.prototype.slice": "^1.0.5",
+        "which-typed-array": "^1.1.18"
+      }
+    },
+    "tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
+    "typed-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.14"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
+      }
+    },
+    "typed-array-length": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      }
+    },
+    "typedarray.prototype.slice": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
+      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "math-intrinsics": "^1.1.0",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4"
+      }
+    },
+    "ufo": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.5.4.tgz",
+      "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
+      "dev": true
+    },
+    "unbox-primitive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.3",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      }
+    },
+    "undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true
+    },
+    "unimport": {
+      "version": "3.14.6",
+      "resolved": "https://registry.npmmirror.com/unimport/-/unimport-3.14.6.tgz",
+      "integrity": "sha512-CYvbDaTT04Rh8bmD8jz3WPmHYZRG/NnvYVzwD6V1YAlvvKROlAeNDUBhkBGzNav2RKaeuXvlWYaa1V4Lfi/O0g==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^5.1.4",
+        "acorn": "^8.14.0",
+        "escape-string-regexp": "^5.0.0",
+        "estree-walker": "^3.0.3",
+        "fast-glob": "^3.3.3",
+        "local-pkg": "^1.0.0",
+        "magic-string": "^0.30.17",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1",
+        "picomatch": "^4.0.2",
+        "pkg-types": "^1.3.0",
+        "scule": "^1.3.0",
+        "strip-literal": "^2.1.1",
+        "unplugin": "^1.16.1"
+      },
+      "dependencies": {
+        "confbox": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.2.1.tgz",
+          "integrity": "sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==",
+          "dev": true
+        },
+        "estree-walker": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-3.0.3.tgz",
+          "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+          "dev": true,
+          "requires": {
+            "@types/estree": "^1.0.0"
+          }
+        },
+        "local-pkg": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-1.1.1.tgz",
+          "integrity": "sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==",
+          "dev": true,
+          "requires": {
+            "mlly": "^1.7.4",
+            "pkg-types": "^2.0.1",
+            "quansync": "^0.2.8"
+          },
+          "dependencies": {
+            "pkg-types": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-2.1.0.tgz",
+              "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==",
+              "dev": true,
+              "requires": {
+                "confbox": "^0.2.1",
+                "exsolve": "^1.0.1",
+                "pathe": "^2.0.3"
+              }
+            }
+          }
+        },
+        "picomatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.2.tgz",
+          "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+          "dev": true
+        }
+      }
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true
+    },
+    "unplugin": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.16.1.tgz",
+      "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.14.0",
+        "webpack-virtual-modules": "^0.6.2"
+      }
+    },
+    "unplugin-auto-import": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.17.1.tgz",
+      "integrity": "sha512-QvdJKtFK0COSuRXzVnwjG3ir870zVhdMg6O8GKG3UO/O5W4fmJm5h71QvzI7Gp8Sx0qfCvC3f+2v0Vm489fnqQ==",
+      "dev": true,
+      "requires": {
+        "@antfu/utils": "^0.7.6",
+        "@rollup/pluginutils": "^5.0.5",
+        "fast-glob": "^3.3.2",
+        "local-pkg": "^0.5.0",
+        "magic-string": "^0.30.5",
+        "minimatch": "^9.0.3",
+        "unimport": "^3.5.0",
+        "unplugin": "^1.5.1"
+      }
+    },
+    "unplugin-vue-setup-extend-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/unplugin-vue-setup-extend-plus/-/unplugin-vue-setup-extend-plus-1.0.0.tgz",
+      "integrity": "sha512-Qb34atQ/elvkErQ12PNv6UWJPWIG4dEgjjizYKyycPeiRqQaMVNCKqRIqfxlhXntcU2l+o3VQuk1NNZN6QJ/xw==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-sfc": "^3.2.37",
+        "magic-string": "^0.26.2",
+        "unplugin": "^1.3.1"
+      },
+      "dependencies": {
+        "magic-string": {
+          "version": "0.26.7",
+          "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.7.tgz",
+          "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==",
+          "dev": true,
+          "requires": {
+            "sourcemap-codec": "^1.4.8"
+          }
+        }
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmmirror.com/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmmirror.com/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "requires": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
+    "v-dropdown": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/v-dropdown/-/v-dropdown-3.4.0.tgz",
+      "integrity": "sha512-wgMb9P2jNhwrCVdD4ckcuou2XivK0ac9XNUH4cXithWMi4LRdOYgNNoT/Gl9ltXaIdO0I7izxpOZG/ddRJUkow==",
+      "requires": {
+        "vue": "^3.5.13"
+      }
+    },
+    "v-region": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmmirror.com/v-region/-/v-region-3.4.1.tgz",
+      "integrity": "sha512-x1EMWwcTNE6HABTmSTz2+ejTFU+0ydYF+THWOmrfhy2dk7WSa0822F6ihFDJADsAL4EuHaqI+QR1ggLsOo3d+w==",
+      "requires": {
+        "v-dropdown": "^3.3.0",
+        "vue": "^3.5.13"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true
+    },
+    "vite": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmmirror.com/vite/-/vite-5.0.4.tgz",
+      "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==",
+      "dev": true,
+      "requires": {
+        "esbuild": "^0.19.3",
+        "fsevents": "~2.3.3",
+        "postcss": "^8.4.31",
+        "rollup": "^4.2.0"
+      }
+    },
+    "vite-plugin-compression": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmmirror.com/vite-plugin-compression/-/vite-plugin-compression-0.5.1.tgz",
+      "integrity": "sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.2",
+        "debug": "^4.3.3",
+        "fs-extra": "^10.0.0"
+      }
+    },
+    "vite-plugin-svg-icons": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/vite-plugin-svg-icons/-/vite-plugin-svg-icons-2.0.1.tgz",
+      "integrity": "sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==",
+      "dev": true,
+      "requires": {
+        "@types/svgo": "^2.6.1",
+        "cors": "^2.8.5",
+        "debug": "^4.3.3",
+        "etag": "^1.8.1",
+        "fs-extra": "^10.0.0",
+        "pathe": "^0.2.0",
+        "svg-baker": "1.7.0",
+        "svgo": "^2.8.0"
+      },
+      "dependencies": {
+        "pathe": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmmirror.com/pathe/-/pathe-0.2.0.tgz",
+          "integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==",
+          "dev": true
+        }
+      }
+    },
+    "vue": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.13.tgz",
+      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "requires": {
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-sfc": "3.5.13",
+        "@vue/runtime-dom": "3.5.13",
+        "@vue/server-renderer": "3.5.13",
+        "@vue/shared": "3.5.13"
+      },
+      "dependencies": {
+        "@vue/compiler-core": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+          "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+          "requires": {
+            "@babel/parser": "^7.25.3",
+            "@vue/shared": "3.5.13",
+            "entities": "^4.5.0",
+            "estree-walker": "^2.0.2",
+            "source-map-js": "^1.2.0"
+          }
+        },
+        "@vue/compiler-dom": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+          "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+          "requires": {
+            "@vue/compiler-core": "3.5.13",
+            "@vue/shared": "3.5.13"
+          }
+        },
+        "@vue/compiler-sfc": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
+          "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+          "requires": {
+            "@babel/parser": "^7.25.3",
+            "@vue/compiler-core": "3.5.13",
+            "@vue/compiler-dom": "3.5.13",
+            "@vue/compiler-ssr": "3.5.13",
+            "@vue/shared": "3.5.13",
+            "estree-walker": "^2.0.2",
+            "magic-string": "^0.30.11",
+            "postcss": "^8.4.48",
+            "source-map-js": "^1.2.0"
+          }
+        },
+        "@vue/compiler-ssr": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+          "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+          "requires": {
+            "@vue/compiler-dom": "3.5.13",
+            "@vue/shared": "3.5.13"
+          }
+        },
+        "@vue/shared": {
+          "version": "3.5.13",
+          "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz",
+          "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+        },
+        "entities": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
+        }
+      }
+    },
+    "vue-area-linkage": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/vue-area-linkage/-/vue-area-linkage-5.1.0.tgz",
+      "integrity": "sha512-86WD4O6PD9e2koWZ81Zlfcyey17U1+3B3fpWoyIZlBIe2V6qfvrg9BTozWdTpdF4CmKBiz138LBRTKhawl/UWw==",
+      "requires": {
+        "lodash.find": "^4.6.0"
+      }
+    },
+    "vue-cropper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-1.1.1.tgz",
+      "integrity": "sha512-WsqKMpaBf9Osi1LQlE/5AKdD0nHWOy1asLXocaG8NomOWO07jiZi968+/PbMmnD0QbPJOumDQaGuGa13qys85A=="
+    },
+    "vue-plugin-hiprint": {
+      "version": "0.0.60",
+      "resolved": "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.60.tgz",
+      "integrity": "sha512-a5uOMn6Nr4qlYYaVNbQKwRZJa8UcNMTflfi6J430/NDtySJB+5ArE8I8+NLjgVV56x3/qdUBs/GWuZCX5Umv1w==",
+      "requires": {
+        "@claviska/jquery-minicolors": "^2.3.6",
+        "@wtto00/html2canvas": "^1.4.3",
+        "bwip-js": "^4.0.0",
+        "canvg": "^3.0.10",
+        "jquery": "^3.6.0",
+        "jsbarcode": "^3.11.5",
+        "jspdf": "^2.5.1",
+        "lodash": "^4.17.21",
+        "nzh": "^1.0.8",
+        "socket.io-client": "^4.5.1"
+      },
+      "dependencies": {
+        "dompurify": {
+          "version": "2.5.8",
+          "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-2.5.8.tgz",
+          "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==",
+          "optional": true
+        },
+        "jspdf": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.2.tgz",
+          "integrity": "sha512-myeX9c+p7znDWPk0eTrujCzNjT+CXdXyk7YmJq5nD5V7uLLKmSXnlQ/Jn/kuo3X09Op70Apm0rQSnFWyGK8uEQ==",
+          "requires": {
+            "@babel/runtime": "^7.23.2",
+            "atob": "^2.1.2",
+            "btoa": "^1.2.1",
+            "canvg": "^3.0.6",
+            "core-js": "^3.6.0",
+            "dompurify": "^2.5.4",
+            "fflate": "^0.8.1",
+            "html2canvas": "^1.0.0-rc.5"
+          }
+        }
+      }
+    },
+    "vue-router": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.5.tgz",
+      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+      "requires": {
+        "@vue/devtools-api": "^6.5.0"
+      }
+    },
+    "webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+      "dev": true
+    },
+    "which-boxed-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      }
+    },
+    "which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
+    "which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "requires": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      }
+    },
+    "which-typed-array": {
+      "version": "1.1.19",
+      "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "requires": {}
+    },
+    "xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ=="
+    },
+    "yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+    },
+    "zrender": {
+      "version": "5.4.4",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
+      "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+      "requires": {
+        "tslib": "2.3.0"
+      }
+    }
+  }
+}
diff --git a/vue3/package.json b/openhis-ui-vue3/package.json
similarity index 95%
rename from vue3/package.json
rename to openhis-ui-vue3/package.json
index 999c5b8b..5824a057 100644
--- a/vue3/package.json
+++ b/openhis-ui-vue3/package.json
@@ -24,7 +24,7 @@
     "decimal.js": "^10.5.0",
     "echarts": "5.4.3",
     "element-china-area-data": "^6.1.0",
-    "element-plus": "2.9.5",
+    "element-plus": "2.9.11",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "html2pdf.js": "^0.10.3",
@@ -41,6 +41,7 @@
     "vue": "^3.5.13",
     "vue-area-linkage": "^5.1.0",
     "vue-cropper": "1.1.1",
+    "vue-plugin-hiprint": "^0.0.60",
     "vue-router": "4.2.5"
   },
   "devDependencies": {
diff --git a/vue3/public/favicon.ico b/openhis-ui-vue3/public/favicon.ico
similarity index 100%
rename from vue3/public/favicon.ico
rename to openhis-ui-vue3/public/favicon.ico
diff --git a/openhis-ui-vue3/public/print-lock.css b/openhis-ui-vue3/public/print-lock.css
new file mode 100644
index 00000000..82c1404c
--- /dev/null
+++ b/openhis-ui-vue3/public/print-lock.css
@@ -0,0 +1,352 @@
+@media print {
+  body {
+    margin: 0px;
+    padding: 0px;
+  }
+}
+
+@page {
+  margin: 0;
+}
+
+.hiprint-printPaper * {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box; /* Firefox */
+  -webkit-box-sizing: border-box; /* Safari */
+}
+
+.hiprint-printPaper *:focus {
+  outline: -webkit-focus-ring-color auto 0px;
+}
+
+.hiprint-printPaper {
+  position: relative;
+  padding: 0 0 0 0;
+  page-break-after: always;
+  -webkit-user-select: none; /* Chrome/Safari/Opera */
+  -moz-user-select: none; /* Firefox */
+  user-select: none;
+  overflow-x: hidden;
+  overflow: hidden;
+}
+
+.hiprint-printPaper .hiprint-printPaper-content {
+  position: relative;
+}
+
+/* 火狐浏览器打印 第一页过后 重叠问题 */
+@-moz-document url-prefix() {
+  .hiprint-printPaper .hiprint-printPaper-content {
+    position: relative;
+    margin-top: 20px;
+    top: -20px
+  }
+}
+
+.hiprint-printPaper.design {
+  overflow: visible;
+}
+
+
+.hiprint-printTemplate .hiprint-printPanel {
+  page-break-after: always;
+}
+
+.hiprint-printPaper, hiprint-printPanel {
+  box-sizing: border-box;
+  border: 0px;
+}
+
+.hiprint-printPanel .hiprint-printPaper:last-child {
+  page-break-after: avoid;
+}
+
+.hiprint-printTemplate .hiprint-printPanel:last-child {
+  page-break-after: avoid;
+}
+
+.hiprint-printPaper .hideheaderLinetarget {
+  border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper .hidefooterLinetarget {
+  border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper.design {
+  border: 1px dashed rgba(170, 170, 170, 0.7);
+}
+
+.design .hiprint-printElement-table-content, .design .hiprint-printElement-longText-content {
+  overflow: hidden;
+  box-sizing: border-box;
+}
+
+.design .resize-panel {
+  box-sizing: border-box;
+  border: 1px dotted;
+}
+
+.hiprint-printElement-text {
+  background-color: transparent;
+  background-repeat: repeat;
+  padding: 0 0 0 0;
+  border: 0.75pt none rgb(0, 0, 0);
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  line-height: 9.75pt;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+
+.design .hiprint-printElement-text-content {
+  border: 1px dashed rgb(206, 188, 188);
+  box-sizing: border-box;
+}
+
+.hiprint-printElement-longText {
+  background-color: transparent;
+  background-repeat: repeat;
+  border: 0.75pt none rgb(0, 0, 0);
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  line-height: 9.75pt;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+  /*white-space: pre-wrap*/
+}
+
+
+.hiprint-printElement-table {
+  background-color: transparent;
+  background-repeat: repeat;
+  color: rgb(0, 0, 0);
+  border-color: rgb(0, 0, 0);
+  border-style: none;
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  padding: 0 0 0 0;
+  box-sizing: border-box;
+  line-height: 9.75pt;
+}
+
+.hiprint-printElement-table thead {
+  background: #e8e8e8;
+  font-weight: 700;
+}
+
+table.hiprint-printElement-tableTarget {
+  width: 100%;
+}
+
+.hiprint-printElement-tableTarget, .hiprint-printElement-tableTarget tr, .hiprint-printElement-tableTarget td {
+  border-color: rgb(0, 0, 0);
+  /*border-style: none;*/
+  /*border: 1px solid rgb(0, 0, 0);*/
+  font-weight: normal;
+  direction: ltr;
+  padding-bottom: 0pt;
+  padding-left: 4pt;
+  padding-right: 4pt;
+  padding-top: 0pt;
+  text-decoration: none;
+  vertical-align: middle;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+  /*line-height: 9.75pt;
+  font-size: 9pt;*/
+}
+
+.hiprint-printElement-tableTarget-border-all {
+  border: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-none {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-lr {
+  border-left: 1px solid;
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-left {
+  border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-right {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-tb {
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-top {
+  border-top: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-bottom {
+  border-bottom: 1px solid;
+}
+
+.hiprint-printElement-tableTarget-border-td-none td {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:not(:nth-last-child(-n+2)) {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:not(last-child) {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:last-child {
+  border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:last-child:first-child {
+  border-left: none;
+}
+
+/*.hiprint-printElement-tableTarget tr,*/
+.hiprint-printElement-tableTarget td {
+  height: 18pt;
+}
+
+.hiprint-printPaper .hiprint-paperNumber {
+  font-size: 9pt;
+}
+
+.design .hiprint-printElement-table-handle {
+  position: absolute;
+  height: 21pt;
+  width: 21pt;
+  background: red;
+  z-index: 1;
+}
+
+.hiprint-printPaper .hiprint-paperNumber-disabled {
+  float: right !important;
+  right: 0 !important;
+  color: gainsboro !important;
+}
+
+.hiprint-printElement-vline, .hiprint-printElement-hline {
+  border: 0px none rgb(0, 0, 0);
+
+}
+
+.hiprint-printElement-vline {
+  border-left: 0.75pt solid #000;
+  border-right: 0px none rgb(0, 0, 0) !important;
+  border-bottom: 0px none rgb(0, 0, 0) !important;
+  border-top: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-hline {
+  border-top: 0.75pt solid #000;
+  border-right: 0px none rgb(0, 0, 0) !important;
+  border-bottom: 0px none rgb(0, 0, 0) !important;
+  border-left: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-oval, .hiprint-printElement-rect {
+  border: 0.75pt solid #000;
+}
+
+.hiprint-text-content-middle {
+}
+
+.hiprint-text-content-middle > div {
+  display: grid;
+  align-items: center;
+}
+
+.hiprint-text-content-bottom {
+}
+
+.hiprint-text-content-bottom > div {
+  display: grid;
+  align-items: flex-end;
+}
+
+.hiprint-text-content-wrap {
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-nowrap {
+  white-space: nowrap;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-clip {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: clip;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/*hi-grid-row */
+.hi-grid-row {
+  position: relative;
+  height: auto;
+  margin-right: 0;
+  margin-left: 0;
+  zoom: 1;
+  display: block;
+  box-sizing: border-box;
+}
+
+.hi-grid-row::after, .hi-grid-row::before {
+  display: table;
+  content: '';
+  box-sizing: border-box;
+}
+
+.hi-grid-col {
+  display: block;
+  box-sizing: border-box;
+  position: relative;
+  float: left;
+  flex: 0 0 auto;
+}
+
+.table-grid-row {
+  margin-left: -0pt;
+  margin-right: -0pt;
+}
+
+.tableGridColumnsGutterRow {
+  padding-left: 0pt;
+  padding-right: 0pt;
+}
+
+.hiprint-gridColumnsFooter {
+  text-align: left;
+  clear: both;
+}
diff --git a/vue3/src/App.vue b/openhis-ui-vue3/src/App.vue
similarity index 100%
rename from vue3/src/App.vue
rename to openhis-ui-vue3/src/App.vue
diff --git a/vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/config.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/config.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/config.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/config.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/dataProcess.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/dataProcess.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/dataProcess.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/dataProcess.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/datas.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/datas.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/datas.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/datas.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/drawfn.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/drawfn.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/index.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/index.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/index.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/index.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/line.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/line.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/line.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/line.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/template.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/template.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/template.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/template.js
diff --git a/vue3/src/action/nurseStation/temperatureSheet/utils.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/utils.js
similarity index 100%
rename from vue3/src/action/nurseStation/temperatureSheet/utils.js
rename to openhis-ui-vue3/src/action/nurseStation/temperatureSheet/utils.js
diff --git a/vue3/src/api/login.js b/openhis-ui-vue3/src/api/login.js
similarity index 100%
rename from vue3/src/api/login.js
rename to openhis-ui-vue3/src/api/login.js
diff --git a/vue3/src/api/menu.js b/openhis-ui-vue3/src/api/menu.js
similarity index 100%
rename from vue3/src/api/menu.js
rename to openhis-ui-vue3/src/api/menu.js
diff --git a/vue3/src/api/monitor/cache.js b/openhis-ui-vue3/src/api/monitor/cache.js
similarity index 100%
rename from vue3/src/api/monitor/cache.js
rename to openhis-ui-vue3/src/api/monitor/cache.js
diff --git a/vue3/src/api/monitor/job.js b/openhis-ui-vue3/src/api/monitor/job.js
similarity index 100%
rename from vue3/src/api/monitor/job.js
rename to openhis-ui-vue3/src/api/monitor/job.js
diff --git a/vue3/src/api/monitor/jobLog.js b/openhis-ui-vue3/src/api/monitor/jobLog.js
similarity index 100%
rename from vue3/src/api/monitor/jobLog.js
rename to openhis-ui-vue3/src/api/monitor/jobLog.js
diff --git a/vue3/src/api/monitor/logininfor.js b/openhis-ui-vue3/src/api/monitor/logininfor.js
similarity index 100%
rename from vue3/src/api/monitor/logininfor.js
rename to openhis-ui-vue3/src/api/monitor/logininfor.js
diff --git a/vue3/src/api/monitor/online.js b/openhis-ui-vue3/src/api/monitor/online.js
similarity index 100%
rename from vue3/src/api/monitor/online.js
rename to openhis-ui-vue3/src/api/monitor/online.js
diff --git a/vue3/src/api/monitor/operlog.js b/openhis-ui-vue3/src/api/monitor/operlog.js
similarity index 100%
rename from vue3/src/api/monitor/operlog.js
rename to openhis-ui-vue3/src/api/monitor/operlog.js
diff --git a/vue3/src/api/monitor/server.js b/openhis-ui-vue3/src/api/monitor/server.js
similarity index 100%
rename from vue3/src/api/monitor/server.js
rename to openhis-ui-vue3/src/api/monitor/server.js
diff --git a/openhis-ui-vue3/src/api/public.js b/openhis-ui-vue3/src/api/public.js
new file mode 100644
index 00000000..7d259399
--- /dev/null
+++ b/openhis-ui-vue3/src/api/public.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 获取追溯码
+export function searchTraceNo(data) {
+  return request({
+    url:'/app-common/search-trace-no', 
+    method: 'get',
+    params: data,
+  })
+}
+
+import axios from 'axios';
+
+const env = import.meta.env.MODE;
+export function invokeYbPlugin(data) {
+
+if(env == 'development'){
+  return axios.create(
+    {
+      // axios中请求配置有baseURL选项，表示请求URL公共部分
+      baseURL: '/ybplugin',
+      // 超时
+      timeout: 60000
+    }
+  ).post('/api/data/', data);
+
+} else {
+  return axios.create(
+    {
+      // axios中请求配置有baseURL选项，表示请求URL公共部分
+      baseURL: '',
+      // 超时
+      timeout: 60000
+    }
+  ).post('http://localhost:5000/api/data/', data);
+}
+}
\ No newline at end of file
diff --git a/vue3/src/api/system/config.js b/openhis-ui-vue3/src/api/system/config.js
similarity index 100%
rename from vue3/src/api/system/config.js
rename to openhis-ui-vue3/src/api/system/config.js
diff --git a/vue3/src/api/system/dept.js b/openhis-ui-vue3/src/api/system/dept.js
similarity index 100%
rename from vue3/src/api/system/dept.js
rename to openhis-ui-vue3/src/api/system/dept.js
diff --git a/vue3/src/api/system/dict/data.js b/openhis-ui-vue3/src/api/system/dict/data.js
similarity index 100%
rename from vue3/src/api/system/dict/data.js
rename to openhis-ui-vue3/src/api/system/dict/data.js
diff --git a/vue3/src/api/system/dict/type.js b/openhis-ui-vue3/src/api/system/dict/type.js
similarity index 100%
rename from vue3/src/api/system/dict/type.js
rename to openhis-ui-vue3/src/api/system/dict/type.js
diff --git a/vue3/src/api/system/menu.js b/openhis-ui-vue3/src/api/system/menu.js
similarity index 100%
rename from vue3/src/api/system/menu.js
rename to openhis-ui-vue3/src/api/system/menu.js
diff --git a/vue3/src/api/system/notice.js b/openhis-ui-vue3/src/api/system/notice.js
similarity index 100%
rename from vue3/src/api/system/notice.js
rename to openhis-ui-vue3/src/api/system/notice.js
diff --git a/vue3/src/api/system/post.js b/openhis-ui-vue3/src/api/system/post.js
similarity index 100%
rename from vue3/src/api/system/post.js
rename to openhis-ui-vue3/src/api/system/post.js
diff --git a/vue3/src/api/system/role.js b/openhis-ui-vue3/src/api/system/role.js
similarity index 100%
rename from vue3/src/api/system/role.js
rename to openhis-ui-vue3/src/api/system/role.js
diff --git a/vue3/src/api/system/tenant.js b/openhis-ui-vue3/src/api/system/tenant.js
similarity index 69%
rename from vue3/src/api/system/tenant.js
rename to openhis-ui-vue3/src/api/system/tenant.js
index cc005ebf..6be8a99e 100644
--- a/vue3/src/api/system/tenant.js
+++ b/openhis-ui-vue3/src/api/system/tenant.js
@@ -98,54 +98,70 @@ export function unbindTenantUser(tenantId, userIdList) {
   });
 }
 
-// 查询租户配置项分页列表
-export function getTenantOptionPage(query) {
+// 查询租户合同信息分页
+export function getTenantContractPage(query) {
   return request({
-    url: '/system/tenant-option/page',
+    url: '/payment/contract/page',
     method: 'get',
     params: query,
   });
 }
 
-// 查询租户配置项详情
-export function getTenantOptionDetail(id) {
+// 查询租户合同信息详情
+export function getTenantContractDetail(id) {
   return request({
-    url: `/system/tenant-option/${id}`,
+    url: `/payment/contract/${id}`,
     method: 'get',
   });
 }
 
-// 新增租户配置项
-export function addTenantOption(data) {
+// 新增租户合同信息
+export function addTenantContract(data) {
   return request({
-    url: '/system/tenant-option',
+    url: '/payment/contract',
     method: 'post',
     data,
   });
 }
 
-// 修改租户配置项
-export function editTenantOption(data) {
+// 编辑租户合同信息
+export function editTenantContract(data) {
   return request({
-    url: '/system/tenant-option',
+    url: '/payment/contract',
     method: 'put',
     data,
   });
 }
 
-// 删除租户配置项
-export function delTenantOption(data) {
+// 编辑租户合同信息
+export function delTenantContract(id) {
   return request({
-    url: '/system/tenant-option',
+    url: `/payment/contract/${id}`,
     method: 'delete',
+  });
+}
+
+// 查询租户配置项详情列表
+export function getTenantOptionDetailList(tenantId) {
+  return request({
+    url: `/system/tenant-option/detail-list/${tenantId}`,
+    method: 'get',
+  });
+}
+
+// 保存租户配置项详情列表
+export function saveTenantOptionDetailList(data) {
+  return request({
+    url: '/system/tenant-option/detail-list',
+    method: 'post',
     data,
   });
 }
 
-// 查询租户配置项下拉列表
-export function getTenantOptionDropdown() {
+// 查询租户配置项前端form表单列表
+export function getTenantOptionFormList() {
   return request({
-    url: '/system/tenant-option/dropdown',
+    url: '/system/tenant-option/form-list',
     method: 'get',
   });
 }
diff --git a/vue3/src/api/system/user copy.js b/openhis-ui-vue3/src/api/system/user copy.js
similarity index 100%
rename from vue3/src/api/system/user copy.js
rename to openhis-ui-vue3/src/api/system/user copy.js
diff --git a/vue3/src/api/system/user.js b/openhis-ui-vue3/src/api/system/user.js
similarity index 100%
rename from vue3/src/api/system/user.js
rename to openhis-ui-vue3/src/api/system/user.js
diff --git a/vue3/src/api/tool/gen.js b/openhis-ui-vue3/src/api/tool/gen.js
similarity index 100%
rename from vue3/src/api/tool/gen.js
rename to openhis-ui-vue3/src/api/tool/gen.js
diff --git a/vue3/src/assets/401_images/401.gif b/openhis-ui-vue3/src/assets/401_images/401.gif
similarity index 100%
rename from vue3/src/assets/401_images/401.gif
rename to openhis-ui-vue3/src/assets/401_images/401.gif
diff --git a/vue3/src/assets/404_images/404.png b/openhis-ui-vue3/src/assets/404_images/404.png
similarity index 100%
rename from vue3/src/assets/404_images/404.png
rename to openhis-ui-vue3/src/assets/404_images/404.png
diff --git a/vue3/src/assets/404_images/404_cloud.png b/openhis-ui-vue3/src/assets/404_images/404_cloud.png
similarity index 100%
rename from vue3/src/assets/404_images/404_cloud.png
rename to openhis-ui-vue3/src/assets/404_images/404_cloud.png
diff --git a/vue3/src/assets/fonts/HarmonyOS_Sans_Black.ttf b/openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Black.ttf
similarity index 100%
rename from vue3/src/assets/fonts/HarmonyOS_Sans_Black.ttf
rename to openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Black.ttf
diff --git a/vue3/src/assets/fonts/HarmonyOS_Sans_Bold.ttf b/openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Bold.ttf
similarity index 100%
rename from vue3/src/assets/fonts/HarmonyOS_Sans_Bold.ttf
rename to openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Bold.ttf
diff --git a/vue3/src/assets/fonts/HarmonyOS_Sans_Light.ttf b/openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Light.ttf
similarity index 100%
rename from vue3/src/assets/fonts/HarmonyOS_Sans_Light.ttf
rename to openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Light.ttf
diff --git a/vue3/src/assets/fonts/HarmonyOS_Sans_Medium.ttf b/openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Medium.ttf
similarity index 100%
rename from vue3/src/assets/fonts/HarmonyOS_Sans_Medium.ttf
rename to openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Medium.ttf
diff --git a/vue3/src/assets/fonts/HarmonyOS_Sans_Regular.ttf b/openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Regular.ttf
similarity index 100%
rename from vue3/src/assets/fonts/HarmonyOS_Sans_Regular.ttf
rename to openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Regular.ttf
diff --git a/vue3/src/assets/fonts/HarmonyOS_Sans_Thin.ttf b/openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Thin.ttf
similarity index 100%
rename from vue3/src/assets/fonts/HarmonyOS_Sans_Thin.ttf
rename to openhis-ui-vue3/src/assets/fonts/HarmonyOS_Sans_Thin.ttf
diff --git a/vue3/src/assets/icons/svg/404.svg b/openhis-ui-vue3/src/assets/icons/svg/404.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/404.svg
rename to openhis-ui-vue3/src/assets/icons/svg/404.svg
diff --git a/vue3/src/assets/icons/svg/bug.svg b/openhis-ui-vue3/src/assets/icons/svg/bug.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/bug.svg
rename to openhis-ui-vue3/src/assets/icons/svg/bug.svg
diff --git a/vue3/src/assets/icons/svg/build.svg b/openhis-ui-vue3/src/assets/icons/svg/build.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/build.svg
rename to openhis-ui-vue3/src/assets/icons/svg/build.svg
diff --git a/vue3/src/assets/icons/svg/button.svg b/openhis-ui-vue3/src/assets/icons/svg/button.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/button.svg
rename to openhis-ui-vue3/src/assets/icons/svg/button.svg
diff --git a/vue3/src/assets/icons/svg/cascader.svg b/openhis-ui-vue3/src/assets/icons/svg/cascader.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/cascader.svg
rename to openhis-ui-vue3/src/assets/icons/svg/cascader.svg
diff --git a/vue3/src/assets/icons/svg/chart.svg b/openhis-ui-vue3/src/assets/icons/svg/chart.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/chart.svg
rename to openhis-ui-vue3/src/assets/icons/svg/chart.svg
diff --git a/vue3/src/assets/icons/svg/checkbox.svg b/openhis-ui-vue3/src/assets/icons/svg/checkbox.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/checkbox.svg
rename to openhis-ui-vue3/src/assets/icons/svg/checkbox.svg
diff --git a/vue3/src/assets/icons/svg/clipboard.svg b/openhis-ui-vue3/src/assets/icons/svg/clipboard.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/clipboard.svg
rename to openhis-ui-vue3/src/assets/icons/svg/clipboard.svg
diff --git a/vue3/src/assets/icons/svg/code.svg b/openhis-ui-vue3/src/assets/icons/svg/code.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/code.svg
rename to openhis-ui-vue3/src/assets/icons/svg/code.svg
diff --git a/vue3/src/assets/icons/svg/color.svg b/openhis-ui-vue3/src/assets/icons/svg/color.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/color.svg
rename to openhis-ui-vue3/src/assets/icons/svg/color.svg
diff --git a/vue3/src/assets/icons/svg/component.svg b/openhis-ui-vue3/src/assets/icons/svg/component.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/component.svg
rename to openhis-ui-vue3/src/assets/icons/svg/component.svg
diff --git a/vue3/src/assets/icons/svg/dashboard.svg b/openhis-ui-vue3/src/assets/icons/svg/dashboard.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/dashboard.svg
rename to openhis-ui-vue3/src/assets/icons/svg/dashboard.svg
diff --git a/vue3/src/assets/icons/svg/date-range.svg b/openhis-ui-vue3/src/assets/icons/svg/date-range.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/date-range.svg
rename to openhis-ui-vue3/src/assets/icons/svg/date-range.svg
diff --git a/vue3/src/assets/icons/svg/date.svg b/openhis-ui-vue3/src/assets/icons/svg/date.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/date.svg
rename to openhis-ui-vue3/src/assets/icons/svg/date.svg
diff --git a/vue3/src/assets/icons/svg/dict.svg b/openhis-ui-vue3/src/assets/icons/svg/dict.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/dict.svg
rename to openhis-ui-vue3/src/assets/icons/svg/dict.svg
diff --git a/vue3/src/assets/icons/svg/documentation.svg b/openhis-ui-vue3/src/assets/icons/svg/documentation.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/documentation.svg
rename to openhis-ui-vue3/src/assets/icons/svg/documentation.svg
diff --git a/vue3/src/assets/icons/svg/download.svg b/openhis-ui-vue3/src/assets/icons/svg/download.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/download.svg
rename to openhis-ui-vue3/src/assets/icons/svg/download.svg
diff --git a/vue3/src/assets/icons/svg/drag.svg b/openhis-ui-vue3/src/assets/icons/svg/drag.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/drag.svg
rename to openhis-ui-vue3/src/assets/icons/svg/drag.svg
diff --git a/vue3/src/assets/icons/svg/druid.svg b/openhis-ui-vue3/src/assets/icons/svg/druid.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/druid.svg
rename to openhis-ui-vue3/src/assets/icons/svg/druid.svg
diff --git a/vue3/src/assets/icons/svg/edit.svg b/openhis-ui-vue3/src/assets/icons/svg/edit.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/edit.svg
rename to openhis-ui-vue3/src/assets/icons/svg/edit.svg
diff --git a/vue3/src/assets/icons/svg/education.svg b/openhis-ui-vue3/src/assets/icons/svg/education.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/education.svg
rename to openhis-ui-vue3/src/assets/icons/svg/education.svg
diff --git a/vue3/src/assets/icons/svg/email.svg b/openhis-ui-vue3/src/assets/icons/svg/email.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/email.svg
rename to openhis-ui-vue3/src/assets/icons/svg/email.svg
diff --git a/vue3/src/assets/icons/svg/example.svg b/openhis-ui-vue3/src/assets/icons/svg/example.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/example.svg
rename to openhis-ui-vue3/src/assets/icons/svg/example.svg
diff --git a/vue3/src/assets/icons/svg/excel.svg b/openhis-ui-vue3/src/assets/icons/svg/excel.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/excel.svg
rename to openhis-ui-vue3/src/assets/icons/svg/excel.svg
diff --git a/vue3/src/assets/icons/svg/exit-fullscreen.svg b/openhis-ui-vue3/src/assets/icons/svg/exit-fullscreen.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/exit-fullscreen.svg
rename to openhis-ui-vue3/src/assets/icons/svg/exit-fullscreen.svg
diff --git a/vue3/src/assets/icons/svg/eye-open.svg b/openhis-ui-vue3/src/assets/icons/svg/eye-open.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/eye-open.svg
rename to openhis-ui-vue3/src/assets/icons/svg/eye-open.svg
diff --git a/vue3/src/assets/icons/svg/eye.svg b/openhis-ui-vue3/src/assets/icons/svg/eye.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/eye.svg
rename to openhis-ui-vue3/src/assets/icons/svg/eye.svg
diff --git a/vue3/src/assets/icons/svg/form.svg b/openhis-ui-vue3/src/assets/icons/svg/form.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/form.svg
rename to openhis-ui-vue3/src/assets/icons/svg/form.svg
diff --git a/vue3/src/assets/icons/svg/fullscreen.svg b/openhis-ui-vue3/src/assets/icons/svg/fullscreen.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/fullscreen.svg
rename to openhis-ui-vue3/src/assets/icons/svg/fullscreen.svg
diff --git a/vue3/src/assets/icons/svg/github.svg b/openhis-ui-vue3/src/assets/icons/svg/github.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/github.svg
rename to openhis-ui-vue3/src/assets/icons/svg/github.svg
diff --git a/vue3/src/assets/icons/svg/guide.svg b/openhis-ui-vue3/src/assets/icons/svg/guide.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/guide.svg
rename to openhis-ui-vue3/src/assets/icons/svg/guide.svg
diff --git a/vue3/src/assets/icons/svg/icon.svg b/openhis-ui-vue3/src/assets/icons/svg/icon.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/icon.svg
rename to openhis-ui-vue3/src/assets/icons/svg/icon.svg
diff --git a/vue3/src/assets/icons/svg/input.svg b/openhis-ui-vue3/src/assets/icons/svg/input.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/input.svg
rename to openhis-ui-vue3/src/assets/icons/svg/input.svg
diff --git a/vue3/src/assets/icons/svg/international.svg b/openhis-ui-vue3/src/assets/icons/svg/international.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/international.svg
rename to openhis-ui-vue3/src/assets/icons/svg/international.svg
diff --git a/vue3/src/assets/icons/svg/job.svg b/openhis-ui-vue3/src/assets/icons/svg/job.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/job.svg
rename to openhis-ui-vue3/src/assets/icons/svg/job.svg
diff --git a/vue3/src/assets/icons/svg/language.svg b/openhis-ui-vue3/src/assets/icons/svg/language.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/language.svg
rename to openhis-ui-vue3/src/assets/icons/svg/language.svg
diff --git a/vue3/src/assets/icons/svg/link.svg b/openhis-ui-vue3/src/assets/icons/svg/link.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/link.svg
rename to openhis-ui-vue3/src/assets/icons/svg/link.svg
diff --git a/vue3/src/assets/icons/svg/list.svg b/openhis-ui-vue3/src/assets/icons/svg/list.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/list.svg
rename to openhis-ui-vue3/src/assets/icons/svg/list.svg
diff --git a/vue3/src/assets/icons/svg/lock.svg b/openhis-ui-vue3/src/assets/icons/svg/lock.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/lock.svg
rename to openhis-ui-vue3/src/assets/icons/svg/lock.svg
diff --git a/vue3/src/assets/icons/svg/log.svg b/openhis-ui-vue3/src/assets/icons/svg/log.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/log.svg
rename to openhis-ui-vue3/src/assets/icons/svg/log.svg
diff --git a/vue3/src/assets/icons/svg/logininfor.svg b/openhis-ui-vue3/src/assets/icons/svg/logininfor.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/logininfor.svg
rename to openhis-ui-vue3/src/assets/icons/svg/logininfor.svg
diff --git a/vue3/src/assets/icons/svg/message.svg b/openhis-ui-vue3/src/assets/icons/svg/message.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/message.svg
rename to openhis-ui-vue3/src/assets/icons/svg/message.svg
diff --git a/vue3/src/assets/icons/svg/money.svg b/openhis-ui-vue3/src/assets/icons/svg/money.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/money.svg
rename to openhis-ui-vue3/src/assets/icons/svg/money.svg
diff --git a/vue3/src/assets/icons/svg/monitor.svg b/openhis-ui-vue3/src/assets/icons/svg/monitor.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/monitor.svg
rename to openhis-ui-vue3/src/assets/icons/svg/monitor.svg
diff --git a/vue3/src/assets/icons/svg/nested.svg b/openhis-ui-vue3/src/assets/icons/svg/nested.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/nested.svg
rename to openhis-ui-vue3/src/assets/icons/svg/nested.svg
diff --git a/vue3/src/assets/icons/svg/number.svg b/openhis-ui-vue3/src/assets/icons/svg/number.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/number.svg
rename to openhis-ui-vue3/src/assets/icons/svg/number.svg
diff --git a/vue3/src/assets/icons/svg/online.svg b/openhis-ui-vue3/src/assets/icons/svg/online.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/online.svg
rename to openhis-ui-vue3/src/assets/icons/svg/online.svg
diff --git a/vue3/src/assets/icons/svg/password.svg b/openhis-ui-vue3/src/assets/icons/svg/password.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/password.svg
rename to openhis-ui-vue3/src/assets/icons/svg/password.svg
diff --git a/vue3/src/assets/icons/svg/pdf.svg b/openhis-ui-vue3/src/assets/icons/svg/pdf.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/pdf.svg
rename to openhis-ui-vue3/src/assets/icons/svg/pdf.svg
diff --git a/vue3/src/assets/icons/svg/people.svg b/openhis-ui-vue3/src/assets/icons/svg/people.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/people.svg
rename to openhis-ui-vue3/src/assets/icons/svg/people.svg
diff --git a/vue3/src/assets/icons/svg/peoples.svg b/openhis-ui-vue3/src/assets/icons/svg/peoples.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/peoples.svg
rename to openhis-ui-vue3/src/assets/icons/svg/peoples.svg
diff --git a/vue3/src/assets/icons/svg/phone.svg b/openhis-ui-vue3/src/assets/icons/svg/phone.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/phone.svg
rename to openhis-ui-vue3/src/assets/icons/svg/phone.svg
diff --git a/vue3/src/assets/icons/svg/post.svg b/openhis-ui-vue3/src/assets/icons/svg/post.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/post.svg
rename to openhis-ui-vue3/src/assets/icons/svg/post.svg
diff --git a/vue3/src/assets/icons/svg/qq.svg b/openhis-ui-vue3/src/assets/icons/svg/qq.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/qq.svg
rename to openhis-ui-vue3/src/assets/icons/svg/qq.svg
diff --git a/vue3/src/assets/icons/svg/question.svg b/openhis-ui-vue3/src/assets/icons/svg/question.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/question.svg
rename to openhis-ui-vue3/src/assets/icons/svg/question.svg
diff --git a/vue3/src/assets/icons/svg/radio.svg b/openhis-ui-vue3/src/assets/icons/svg/radio.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/radio.svg
rename to openhis-ui-vue3/src/assets/icons/svg/radio.svg
diff --git a/vue3/src/assets/icons/svg/rate.svg b/openhis-ui-vue3/src/assets/icons/svg/rate.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/rate.svg
rename to openhis-ui-vue3/src/assets/icons/svg/rate.svg
diff --git a/vue3/src/assets/icons/svg/redis-list.svg b/openhis-ui-vue3/src/assets/icons/svg/redis-list.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/redis-list.svg
rename to openhis-ui-vue3/src/assets/icons/svg/redis-list.svg
diff --git a/vue3/src/assets/icons/svg/redis.svg b/openhis-ui-vue3/src/assets/icons/svg/redis.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/redis.svg
rename to openhis-ui-vue3/src/assets/icons/svg/redis.svg
diff --git a/vue3/src/assets/icons/svg/row.svg b/openhis-ui-vue3/src/assets/icons/svg/row.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/row.svg
rename to openhis-ui-vue3/src/assets/icons/svg/row.svg
diff --git a/vue3/src/assets/icons/svg/search.svg b/openhis-ui-vue3/src/assets/icons/svg/search.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/search.svg
rename to openhis-ui-vue3/src/assets/icons/svg/search.svg
diff --git a/vue3/src/assets/icons/svg/select.svg b/openhis-ui-vue3/src/assets/icons/svg/select.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/select.svg
rename to openhis-ui-vue3/src/assets/icons/svg/select.svg
diff --git a/vue3/src/assets/icons/svg/server.svg b/openhis-ui-vue3/src/assets/icons/svg/server.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/server.svg
rename to openhis-ui-vue3/src/assets/icons/svg/server.svg
diff --git a/vue3/src/assets/icons/svg/shopping.svg b/openhis-ui-vue3/src/assets/icons/svg/shopping.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/shopping.svg
rename to openhis-ui-vue3/src/assets/icons/svg/shopping.svg
diff --git a/vue3/src/assets/icons/svg/size.svg b/openhis-ui-vue3/src/assets/icons/svg/size.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/size.svg
rename to openhis-ui-vue3/src/assets/icons/svg/size.svg
diff --git a/vue3/src/assets/icons/svg/skill.svg b/openhis-ui-vue3/src/assets/icons/svg/skill.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/skill.svg
rename to openhis-ui-vue3/src/assets/icons/svg/skill.svg
diff --git a/vue3/src/assets/icons/svg/slider.svg b/openhis-ui-vue3/src/assets/icons/svg/slider.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/slider.svg
rename to openhis-ui-vue3/src/assets/icons/svg/slider.svg
diff --git a/vue3/src/assets/icons/svg/star.svg b/openhis-ui-vue3/src/assets/icons/svg/star.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/star.svg
rename to openhis-ui-vue3/src/assets/icons/svg/star.svg
diff --git a/vue3/src/assets/icons/svg/swagger.svg b/openhis-ui-vue3/src/assets/icons/svg/swagger.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/swagger.svg
rename to openhis-ui-vue3/src/assets/icons/svg/swagger.svg
diff --git a/vue3/src/assets/icons/svg/switch.svg b/openhis-ui-vue3/src/assets/icons/svg/switch.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/switch.svg
rename to openhis-ui-vue3/src/assets/icons/svg/switch.svg
diff --git a/vue3/src/assets/icons/svg/system.svg b/openhis-ui-vue3/src/assets/icons/svg/system.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/system.svg
rename to openhis-ui-vue3/src/assets/icons/svg/system.svg
diff --git a/vue3/src/assets/icons/svg/tab.svg b/openhis-ui-vue3/src/assets/icons/svg/tab.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/tab.svg
rename to openhis-ui-vue3/src/assets/icons/svg/tab.svg
diff --git a/vue3/src/assets/icons/svg/table.svg b/openhis-ui-vue3/src/assets/icons/svg/table.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/table.svg
rename to openhis-ui-vue3/src/assets/icons/svg/table.svg
diff --git a/vue3/src/assets/icons/svg/textarea.svg b/openhis-ui-vue3/src/assets/icons/svg/textarea.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/textarea.svg
rename to openhis-ui-vue3/src/assets/icons/svg/textarea.svg
diff --git a/vue3/src/assets/icons/svg/theme.svg b/openhis-ui-vue3/src/assets/icons/svg/theme.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/theme.svg
rename to openhis-ui-vue3/src/assets/icons/svg/theme.svg
diff --git a/vue3/src/assets/icons/svg/time-range.svg b/openhis-ui-vue3/src/assets/icons/svg/time-range.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/time-range.svg
rename to openhis-ui-vue3/src/assets/icons/svg/time-range.svg
diff --git a/vue3/src/assets/icons/svg/time.svg b/openhis-ui-vue3/src/assets/icons/svg/time.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/time.svg
rename to openhis-ui-vue3/src/assets/icons/svg/time.svg
diff --git a/vue3/src/assets/icons/svg/tool.svg b/openhis-ui-vue3/src/assets/icons/svg/tool.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/tool.svg
rename to openhis-ui-vue3/src/assets/icons/svg/tool.svg
diff --git a/vue3/src/assets/icons/svg/tree-table.svg b/openhis-ui-vue3/src/assets/icons/svg/tree-table.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/tree-table.svg
rename to openhis-ui-vue3/src/assets/icons/svg/tree-table.svg
diff --git a/vue3/src/assets/icons/svg/tree.svg b/openhis-ui-vue3/src/assets/icons/svg/tree.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/tree.svg
rename to openhis-ui-vue3/src/assets/icons/svg/tree.svg
diff --git a/vue3/src/assets/icons/svg/upload.svg b/openhis-ui-vue3/src/assets/icons/svg/upload.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/upload.svg
rename to openhis-ui-vue3/src/assets/icons/svg/upload.svg
diff --git a/vue3/src/assets/icons/svg/user.svg b/openhis-ui-vue3/src/assets/icons/svg/user.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/user.svg
rename to openhis-ui-vue3/src/assets/icons/svg/user.svg
diff --git a/vue3/src/assets/icons/svg/validCode.svg b/openhis-ui-vue3/src/assets/icons/svg/validCode.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/validCode.svg
rename to openhis-ui-vue3/src/assets/icons/svg/validCode.svg
diff --git a/vue3/src/assets/icons/svg/wechat.svg b/openhis-ui-vue3/src/assets/icons/svg/wechat.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/wechat.svg
rename to openhis-ui-vue3/src/assets/icons/svg/wechat.svg
diff --git a/vue3/src/assets/icons/svg/zip.svg b/openhis-ui-vue3/src/assets/icons/svg/zip.svg
similarity index 100%
rename from vue3/src/assets/icons/svg/zip.svg
rename to openhis-ui-vue3/src/assets/icons/svg/zip.svg
diff --git a/vue3/src/assets/images/ODLS.png b/openhis-ui-vue3/src/assets/images/ODLS.png
similarity index 100%
rename from vue3/src/assets/images/ODLS.png
rename to openhis-ui-vue3/src/assets/images/ODLS.png
diff --git a/openhis-ui-vue3/src/assets/images/ccu.png b/openhis-ui-vue3/src/assets/images/ccu.png
new file mode 100644
index 0000000000000000000000000000000000000000..b382f8d552fa442b8abd20011611a3287cfc9f59
GIT binary patch
literal 1600
zcmV-G2EX}<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mm;z>k7R9Hu?mupZ}RTRhh*uxrN#F@sN
z=|eeYNe@R58>Sr7q{hmr94obSCY^W~h`<fWtEJ@wDJLyoXc}f<j-ZJRnj#N@K`=nM
z1PUU8JVik7MP94*-*<2BzV{wNt>4U=bIv|%t-a2Eti6uM-C{QHdBD^E(|M4Q0ili0
zyb()_%|8jj{m3byjp{vgrP+UH#KgrTz5IhMPrepI??-N<;rPh3lc4MA7i@v8baQ_^
z8)Qlt8)TyM<+Z|j)#V22?;oJNzb=VqBl6E)6j#`cooS-+Gh;SOclU;;Ur71kj6&f|
z5&BgUZAd&$RaY8ii!*(F{j_}D0r_O-aK<_EnjBIt-42hpU)ZBwe!<r4qDtw)L1Ae%
z<rY^_Rn2wT;-I^`hXw`)=w_!?wm5(<FaHoLe9LZz2Awyxbx2cZwro2}x2)abOSk`e
znjU{;8I5MaJvs+{{r%$VN^@JM2tsya42BBP9y?P)9UZr&se=uP>EttIDb0`G0cTD!
zKV}EN3#0YB(xtWo1h-_>UNI7$LruqopwBm_@_Z>y7g*@5Tx=(@N@-ziqFbjBv_J83
zgj?H5wow$7T&8_#xwPWDLzH@=h@PGiy+w9w2ipa!T_=JUQ~28bVz?*0x7w)#B|(c5
zsHwHX@EvS09jmvd(r6A)2YoqhQ8uust){@RW%5+`%`xsA0w%t*%J3az(wr};>_QFI
zH?<301^Pms5S>RvBtMA6VZ>0w4mnd;LACX*<P#7!*w)LVrRzZ8!wB?gHgA8(1F3TX
zXD?Sa@_zSrai-+CH{*m(bzSpd+hc*B83q7}XJ4)$W1?>nfNXQZ=cT2F&LGFLOUaaQ
zkm`5@M)Ar=+p7!K4H*D-ju9dNe%UOaoj`;}&eC~ZU^|{Ks}_3GKUhoKI1kK?{86l%
zz<J-e*}#_(ylq=OCd^tP9~}hFHoG~2yf}NMI17S4*+e@Jo{`#|A2>nTtaqr})<agl
z8re>Hd!^KN;LCk`AVGj@jW?*h)1G|BOkHN^M1gw*fG=+5ZJ3@}!h!WuCQr>ZZCZ30
zGc{6LJHSyc0_ePDqwI5kYXL;MIe;kkrsj$OT5ojGIGI1f)+EswPRmw46U>}&Ty6CL
z;x;CWs|WzYU}K|}8=chC(<fd8y!C~f1BgytLo4g|k}vOw+qZ3^ZP#yE;yUf)^=`KQ
za_8vz#&=d6@gfXs!9!Yl0ez?y97c;!QCe}8F4s1Rz)$6sQ#scOI^L5*o$T~&zUGG`
zgY^XW-R86nvGo+A47Q;nBlm*1BGZAG_!MzfxCWrMq3cO0^FXLbM4f#4A@3`Yh;%0q
zg*<twRUX^dcsg`k?KbVUCn5}gSy_#^A527%ksBXYskn{L?3Ca0#Xb19RGh>MQE@8Y
zVyFXI7`sd8bl>SElU#fNeFg__86nOC6rG3;MMH_@Dp_rJgi>W?9r^Px8##{BoJI2#
z80lb&E?ue@Iu+ISDyoL7sbY(E7y%rOPw{rbb_9i73n(yeaOCQIxBy_I&pA#+li8kg
z+>T=~en#}pBYzgtAK7K>JcY7kbqjKMh+U^c4*>W2JLu-J4LEQtpPE~4QdgI~Ry=y@
zJdK+cwOe-Uj4H{HoC-KG;keD?V^@K43uPC|uXn?@QW^&g!M&p-J0`X5yJhpwCn)yY
zL*iK!r^8jqd<0vu7C`vdzlf_^6FT4T%Me8=1ot{Uy?r!uQM^diU<qeD_=IoS&CsB9
zh9aV^zuqPslyKsCeMth@3<5Etp}Cz`eGm0=ARvc*!RK9-<qG_mV7~A*$arv8!v6)J
zt-Xsfa>_*RP*iX>#1}X4Vq43n<BpU}(GDN?^kbqkZu;^>{nxCVx8>^iWZHk^EY)%~
zq}ZBtQlwX``l5?hL>p}IYc_UT)E?>X{=jzOl`Vcw=j(-q%!aNYt3vmG`8m~Dv}pY!
yNSzR$fYA2m`NUMe=P&R*+SGgKO0!|`@c0K-{$>!E`vXq^0000<MNUMnLSTY{wf-ak

literal 0
HcmV?d00001

diff --git a/openhis-ui-vue3/src/assets/images/cculogo.png b/openhis-ui-vue3/src/assets/images/cculogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dbd677d3753ee0fbe6a225f7c80e11dafaae4e1
GIT binary patch
literal 120447
zcmeI52YeJo8^-5SAPK#92vwz}&;x|fL21$vk%SZoC5cJsEi_S(CcR1(P(V=>L`tLx
z(m_O|NC)Yi5J+<0^X%Ouo6F^LX`d+j{(k@4+1c6I*>`uJd2eoa?~`_In&)sT>Li57
z(XvI8_Cn}<k#6CT1)pXAnza-Y$B-7?!i30{kLbjLMTLcMY8}|Pal3YXg2RKu`UHnK
zw`|<lIV3bVAh5r`5JS!^?l8FP%&3B%7oz-gb#8R}!N$4$$A~gz*E#IZ-EDd9&xFtT
z+<CqBPWafVbN&K(7PaWKXYB7zEf#-#dFh*5dN-W(@q3dyy<huYsdKBpA35y)-McUU
zc)9Jyq8l+sh91ooktc738P}Kh6?NKAsONFI)U>uO_WZg%!lpori+0YruOHmi+kUSQ
z4{V1H85RCbgBab{!NNv_{9d(O-hG$!<F>Y|&_y`U5Eskjy^&2fy}j69wd4N$Vt--r
zO^5INoWv|4`VSq^sEqhBhq&{krKi0(y>{lgLgMuD;%gnm6rGs=X7h43UOx%%PGj0v
zwu#&&mag+EQ`IhVgD#@m5AMxvBDUL$K~uX<&*kMUBIY-$d`LLgwh@g><~wZb+{$*T
z>xrEg*Y*sVu%(4gL>`=dc<wtVs^#A@`&iMzj~-mST>A2^{u>+l6nZOnfaBFNi{>sY
zo3F(U+g3-i3sE%s_|I{*8%)1({pzLb0XO>Jf3kOZT)zjwWjsqiyb!nTQyV*xyUo%2
zXL??{cFHznpYEH1JNvEeF3xloeJ(`zsCL$I>3dGchDA>vT06$8<dS9W_SY*>+$meO
zyXAW=+wOX0vZub<rQnN`M?J&RxU<6^hz}Qd&0in6VqENpK0$*vw4Zw8pj{)kpr{*V
z<MvG$9Xs`{<Cm*%e7|ymNe{bzvZY;_*87J3*nUQn(!b8WocHEv_lKqC#5&F#oI|Yp
zsBL7MAF_Ubuz%#JdpeuRIlG=1B)mpFuJUQoY%@ge-qqcQMhP)<XY@3$N;+|P?#e4d
zZ2P<L`)g(uYW0hQ5KWejsrXI9tl59gzb-Q8qMu7_i!5a0lckAQ_HvQ+ayQCyHKMrF
zvchv37U>x2aoX<tZ)}S$&9mTA?oB_t)y{F_V&3=1+zu&}#k=s5U4^%O<Y?D$ze7Hs
z(jFh@={5CqnIjH`=1;XN<I|%0XAvu%Z+@Kr-7<Ukhpx0)+o<o19xci~suG&N&Xo7P
zUQ9o`-`Raq%%pA2-DZvX_FdbPHUqtWTvMv(q+gbX9S^Ubt4G9~<^7Hq-BhxE#1G3?
zAAjfXf#G80q^Z6U$K7%UeEO%)`=3s1>itRAq80WP^u5-#M(1fYd`on#HK;(b$R$4a
z9m?5Ej>vb%;e+wHcl94TeR}h*t-3Z|Q~plbO?kIEba5Ov-fh<#WoE8vyQ%!JywQ7x
z^zzs^y=${|74DTTS$awN58lX`ujkAb<#PV|+0`~qrOQuuZ<(!SzZPd(R9V?!rRRy<
zfs0yIxIKNquYX;2_%>pl^V}Jmr{|j9_OqA2?!LM?zsKH>FSl}BUatMhS$W^C;osnz
z-Kx*s8_i$(<-3R1E;;G&<;NbMzt?iW(n0N9I!s)fulm3R<qt0`*!bYeDl2|Jwji)~
zU{oKMo8em>&yOqFbndaaC;I)J_2!M6<DLx8p5vn&<My@a^=6TNMTQqyU3ha5m-(%}
zu>WoD{QVtW|8OrhzxTXc^MX5dt@y0shypVX<elv?yYuW(vu}Lau~S&52EPyeGF!*5
zI_3K6gU%zrXx8bwc30Lqo-Fv)?`unR`e|*=4M*A!Za=Nv(RX{U*wHg~><ix<-+nZq
z+0u_%tmx>w`IjP7N*Daa-Tz_NMyEnM+up9+Z(i$O-M@{#(`u0Y%VL9EhPUd_IPA-S
zbpbO17GMAHurB8>8!tYn^XH<skCZ-=<H+zTwpAKb*?6k&`hfML*4H{S?97fcz3ztI
zEqM3#nfn7n7JDtOy!ffd0FS7Fj$3PPeRu1Gt!D=wz2*6v@9m*C9iJX}n)BxQ<ISHA
zc(USYp<DM)-9KKcmTPr~n$wH)cdPCD;Lvp6zx&M#+;aTE_)BZ@9PG1o#-2Vaj<;O#
z#+C~ACicEkV@M&-fOWyed#$Vfm;bqb^?Z5-x}ROSXXW0jJKj1xtKWivt;aY07Jlf^
z{>taponH6rovC$xU(|1j&yGL0osF3?VO7&bd*7a1bMn49XXcDJXg{a*oTzp4I(v2=
z+WBecKi0K8_5SV3w+Ec+(!X7?E(^0S^jLWChc)XLuHQ3g;eZSIFXx~3)`_>Cb_hD-
zb|>bJ)13u(vfQon%;#D8X9J!cEpe!L-V&$khSwbt8b0vQp#CA-Zm+ylefQcuYj@x5
z(z{siWnqgS*C_PGJJS#5ojYi5p$-F9Pg))H`LKhtuNA$w^~CqTJzcTzr-kR%|2g2~
z`9t;hj{NFn>#7Tj{n}%9{re4{Jc#Og`NKn37O!5ode`IWH(Wj#^g*`|UT!bh_Pa$D
zmYi}Ou>b6y?iaTo9PaJmS>OM~k(;)jzj)ewKJ4>}JHFUa=0g1)Wk;PFHGfprm?bak
zzBm{=?fK42Lmw4<*v8&l_p|PrZu^*`W4^QPXIsi{zTK*<HSDL@|CGfgyJvw$*&TCq
zD-}93II_^AV$r_U&h@Um;CO)p4vP!CSL}uBp$e@^p2{=zqoWQNa*qoBBD&ShLq9lt
ze6e}|kGGTxEHb}P^vL{gRdoNd>aBM-bqN13JgV}kbyvH+?7e;J!)a?j{ju)ZzCVNx
z>b<US|MvZT?=0LBvE|DxV}?w8-t^(zyy5xEIo|!`>Ymek>VI-2%;rY_1=SW^UC?n(
zxbKE*=a&Ci==#kg2bT=4*R4jk=_6`Sn3s3%w+*h1b8ghmrEuG8tAkpX$oFXc!U=7g
z?pQu$`MVo8Z+W}kXV({Zp8c%$`MM(;zv%N(+hzlQspi<WeWjr@ihTBC*~hIrH#zm!
zx}$%7_-B<mvlh)-w4!~Ez&V>L{o%U#&CP8CDpi`9<Lc1s0}d3MIq^W$)w0oHkIxq9
zKcUs}6`R^`XqU5KE0;BuhIB97eaMy;+grSMvf71!xLeU>vyCk{V*B)O+HLvfyVF~S
zbbENQ%+97i6)ZcsL!rS{-Fmd&>Nh0t!HJOv`yBjsPHel&UE6nh)OYB)M^oF6JF#k2
z<4R+@RG+<e)~^SHHavOnN8bWIv;8{V?>qPR?wv<hEHu04x{!5iHa!2P*_P{<yR_-~
z`-rDQ2b?+c*V~&9+`Zl6_R8Bq>!P~t{QB+feH;FM?4t)c))#v?<yx_x1K$2CeA%$R
zPp2N<bojtw+ZsMK?sh-)!@9GNmepMGY}n$_Jq~t`UH{eQ9e-9hb86@L!NVWt99N=1
z-M{Y7y0h*3N<+Hz+un5K)1VXg#-5*6v{$jMJFkyAzoq%$wtJUM8@_6I)@M!c-|ib8
z-2dFyJ9mETIG}yaDJ5HYgj`z~5qxIh-35cc4|%U*&Rq?!{rtv-FGdW%((dnNM|Pjv
zefYxs(VL$-+-@<n(g}~91J_kqF<@!^W!vxn{ppIuB|a$8e8*<}sQYeLd<X8UF|Esz
zrHkLJ|1kRM*qK*W`>kHGxJ`rlC+D9V8r3Rhe!m{?_SoLL@zEs>3WeWmwYg{1uaEz_
zF|EggZ6Qy}MD;pbe)Bu)>u;#vd{jv6r50az55Damb?|PNdK<!@w7y;U`2F8TzvvtJ
zd)Ob(|ESvI^P$`C|8l3;=Aa7ai*G5v_386L&+Zl)>~ycyxgNu&4f#4|$C=n$SzqM3
zHF{IrM*qkG7oU4adLP~0E!X{=juV%}&C>ri@zROrhnoLhwprOJ(-xO1RV+u*?T`G9
z%)GSv+tvAw9vIbGKlFCkS2r%iUViz`(XKJ4A7qQ3e01lAp=%$9-v4Ut*B<-I?klzJ
z$k6%^zld3X<m|}%TkdbYuy1>*`ESN}#kG5U{Dtqn)yLXKdEOWi7vmB&{_)H5CqAzx
zMBTpvJ9Z84+Pam8Z}5PsK7PTy{HqQb5P~pNh<Xi%g!uUO^AC6K<=;CnsD7FIKkY2z
z9OzfSOqUw1U0a7V_U{weVpynuhhc3x`VQ;oTgR_V15c-VLp)Hy0RM0w=OF|72ZebI
zsb5B^*8^#0yOeQOiiG#8U#1~9=-jn+JLks1q5jS_s@AOH>sGC{bFDg6-D=dS?OwgI
zv%9NXO&8ZXE^gJUxVm|`*70z4b2eHTPbZ}6h57|}v~SYPxH-(#FViPHJjBDrW$@s^
zRR>qA8XVf&#jQ@AIxep6F7EDCP@+oM(4cUiAytCH${H$>^)&Gh^9>CQ2@eboa%R0g
zy@CgZ*Dq6s8;UpMehmnT-%wDP(Rc8o%MhOs7q_aeF6LJ9^Nn98WMF82rD=Y?F8=-f
z2lxkthhaT8v+IS(&_90lM4OCXoa}~iOj@@#zp`xafB|MV9Twhn5L{q%X`;=_HN!d%
z4e@tr?;jRCFx1z-=^*S%S#x_I9vF~ta1zzTCCRqke@I|5t8s~8HRV(=9HDyHSC7V_
z{yyQsp&f&R`+FMBvV?C>`0|9as+RMcT>^vrf(M7aRnNtAm4xG+P@8`fpKyOqcUO0u
zi8ZUZyLNP|?oqwAN3}YYTx)x{x~eKMlr*WMb+BJxz|bUh)bMb1_o!AwU5BcqX&tzJ
z{CvWFtg1y_R#lImuSY;|=m4K^&%gmbz5QK6f_m3;Nyt={j6bV98VC0e4n?#4J*(Ao
zF_&$2EqqIDXZVup8P>jeBj=V)8`pHJQxm?c>ZYznRnBZZO@e&~^73dH<m(@XgBqqf
z*f`{h05tOHoj6x6=pX25kRQKb-#|Z)gvQtK_xG<;!?#8icYi<kDsFE60abdrRj*kk
zz^6ulkE@$|?K*xn>$y+_P(?z!Sg(?sc#G=&vD99kPOV#ev<wOh_rdP8Y~qQGs)1;k
zTOHScUbSkvRjKKYM%AuUy+)NfuD&&^)T~~^J)m~4YJPR<_$udE;?)ycW~^Fn9aWp(
zasQgNYxMH<ceA|XhIXndOR}N1q4;VN<kMeOhWp}&ed*<2r<SX$TR;_G_iDAOxcOjT
zdSR1Qs{7S;b?;Tp&Ck78Ex9jds!6h`7J)qOLro3?k4*>v4-@Am9Ct;)LwrKR{3%cM
z%Se5SS9}zWw|a`qdHDEJ`aONA9{zsyToUCbG|P0gz@&%MIu{t~SFN7>HU{_c53-~_
zhN_fO$yX8<91uR(C)B@TZ(L8-2&19a#H*QBZ~iKQkCZF3e_(nJL~zg`|IpMN3LJ1B
zgc<%&iGa}H0nP@I>m3;293E_(Q54UxW2(~s$Gr;k8I-=0%Q~${&&g%dE&X#R7f&O@
z)_wc<1oig!^K_AyrOdGI$QjPk#Cjn$D5<{GV?^QsZNhcpqi6!UtR#5}TQ-#MN{#71
zP$^%_-4*8I#!us_>cyt3cC);yda>!M32Sx=3JmvjH*U=&TeTL$CPSaz0TI5xCw9#=
z%d~X6z#;zqyEX|#KO9DdtX89jaV66wX4mYNux2f^PuZHXqH2M0MZ<AY1>%an8*&lm
z;~R!c{8x-5(jPC(8JS4fql~Q8q%LhECJwPYtGUave@vEY?lN(R<yp;Lmi=S0RCAY!
zLoCl~?y~G3lck!wOdMi)R&$qS|ClV*+-2er%d?uhEc?e~spc*dhghD~+-2E6CQCJU
znK;DqtmZDu{xMmqxy!^MmS;70S@w^~Qq5f^4zWC|xy!PDOqOcyGI5CIS<PLR{bRCJ
zbC-!jEYE80vg{v|rJB1;9AbG^bC+fRm@L)YW#SOavzogs`^RLd<}MS5Sf16~W!XO_
zOEq_yIK=X-<}S<rF<Gj)%fum;XEk?O_K(R@&0QuAu{^7}%d&q=mTK-Yafszv&0UuL
zW3p6pmx)6x&uZ?n>>rb*n!8LKVtLl0yPOgp+Vu~@le&ZPNUpET<FD~Jud{E9_N|2&
zR$hpRaY97vF}*3oKvyAdc?;n&Pl!UnpY`0^Oz5WVYT2Y=$00hQM<Jb_pPFeN&^(}d
zK=Z&q>H(X7bnDv2H4kVW&^(}dK=FVk#@dOXc|h}k=7Cqh1DY7W0tZ2Bg609u1DXdk
zG1krj%>$YTG!MK29?-=26*vf56EqKK9?(3XiLrJLXdci!pn2dG@PH=9ufRdjnxJ_=
z^MK|7yR^8#rqPVFtY&E){N1Lg0qTINpg710?1AhsVv&vp55NU*6#N2?fX6^H%>#)%
z5Vs>Z(Y!XJdEiy{K$^rjgLbGO>cKxFi%tL!tB5DyJU9l{f@|O*cn)-c|E8P=lmc&o
zrl1d?9RRDrW`O^`)lBn%<^jzE|1J;w6Jq=(T=XHp6NBP5;1h(C!D(<2q{gzLup4*}
zOaYU?QZN_X1)6Cd&^(}d;9ubZIRx<kXe@^!=7HUS>F&S<M1ZRx98g%_0M;5i6N+wM
zPzj6zZNPCb5M%+GX&%r#pn2ex_rU*4jD6q<j_sBMtw39_6VND_)j<W|4sHMrOITyg
zQHT*X?HTw2)C7#Ydx3+X9?(qlfaZbM-2=~`>tpvH(CcsCj(;H!)B0n_^y0yT_`HA0
zO_?pmxv*njfsesp&;<Mn)Mk&FKfxVv7zBarz#60QZU<RS3Uix`vNwSr03&A2G!JMV
zczr#fk3Dum*vy)VUzgSh@$#i!#Kr03cH@isr&C1i-d_Y>o%W9kGQZ|$mT|b@Tfj({
zk?$2?&YmJu-YLO#b^%LwN7!OHf4pPatiTbN>r|d2e>m6zR)K1OW6Rv0W|{{y54=7e
z(2K}OgoB6&uU!-RU-v0{9#^)k(2W=&#Jzh$cjT~$jeag{-+fmvbUJIlnP;d6&52k>
zY=99fx*D+qGy=&9F%~JtsQ3n8=imt#Et@ksiEX|NiU5lJ9$@JX3Uqx+XHWpspFuvL
zndSk_1Fwk(;?CfUcSMA+fe_PlQO|{b<_w`57%p_TZV3?+qf8ZH{uvU1i20vzO=gI3
z4eSVq4yJ-Y5C<$7+t3c20US%F7{>r}Mki5(%YbEoKLRr9PRZbL;Q{^z6y!W0qm3O2
z+ojq6&ja<bsUCp7*G%(35)W`pST}aO&|kcmXqoQu6QM&yEbJ0a9h>Xdg+3%i#2z^G
zj|^F)>E-ek9{MPUJ?4*Q^TBk$yCv8iodn4lhZ!1y??E>329UzWXx0f(ggJD<==m%-
z4LGz>5>V`~f|QJH;awI#0*+-j0MQ_$tRgDHQ55~bl8ma<%6f969Q{T=Keck5e@ihP
z8rl>b1-DHay%h63!CKH2&`JRwgIjp$V=^-|dp$i6ck!bB#h5W7>&~492Ot8DH<>n0
zb;hYaHde${tSEFVmJ6E-yritYnIOLEv?dspW|U<|MHIR(!BEf!PyiYAa-26g;}8Sa
z>jEZ$FyIe(KQg^X0lo$70f#>Z0gS*ak+(CZDG4##<psuom0&J#0H1@5w411m?d3km
z$lD3&jPx<8Gix1@yB{0^6r=x=>9I3S0Ds)&IU?;XB)H$Smw?B4ESL@WEvO~X>^1d(
z5)qFWX_XL57g2~6JAPc)1oRfl@P=IYf0$;ZP*B_`nt^~9&;o$(0ZJ6g2-lo35*`S?
z2E6-$A{ziG#u0$Rxg0D7pMhbZC*U?B0f#9z02vh_8E@<WoIxYd9x#fo1Q<n*2F*Y}
zkWt3_of#2xO!{qOrJFFNKyv$;Y0r(7znPgEF;jOIGkKYj#dE1R;Q6r*<OJ+odH&Gn
z?9BIoqJZZDzeQ2JHG2&`pnvj2ubVwP{)f7hTp*)jr5ps=#>Pg(?%yxs!omfkYvcNI
zno@OXUY=26Oi`o&F;a<BwT8Eq-2oieE3e9DlI1DFyrBHR5WpYX%ze$yk9>-!G}g%<
z?|Oq#pfTV@%4kU%qf>cd?nU|{cmz&^jew#)4O9RbWlN0}NijZzd3G}E!8~9OGQ(aN
zE9L%G201cgBPMkg#Qah4kx71L%$`T3M~oGBz?9<44vwJ=zb*0nVyDjYC@-iFRszjl
zHxKZZwRP)+e(6%7dube&kV6vmg-n|no>05W26wsHZrzHzEk@#PILbZ994^aLv&(?m
z841n;eZe)8`mSUC65#kTBh-mt7Z?j%!H3{?V96Y@kV3mUnL;O#?+@MqjHKrSmTd?e
z0HdXHU=g50e*?7d0n0Jp6J&(3EtdiJjoado3XMY18!QBw5wT@Ky);IQ-+>w+Gq!_j
z<1Gp)c9KH@_xlTwS;na37^r64KyB5A3LxDF>^0``+YZmU<HmVy^165c_X)>t{YmI1
zO^P4rjVn}0*p#mj?}6Bd58~6N3ENz`Mcmml!sa(A5h$@{wRmoCCmg0t(~I1>c}??N
z<TS%ABgB}(`UhB+OzZ9;pB^|5?tsPMF?bim0!zlIc>{0(Z7mhVGKwpsCyFseg3;&&
z&<QX)U2dGmB;G=iV!Ie+aXaZXcEuDXiXl4!3f2%nv3v-)t&FxpsIZ%{(kqyD1yYE)
zT}H||!6EPjWR&q3@~q{zk`F*;iZQBJ&YiWG9srY=0kZ|%|6QQDamr3lE=N+c*TMt1
z9Zi1%4|NP5hG%h~#qY9BojQ2hV0ipIPnhIPmm`O;S%7$H>=-B%PH*EFa@G|qgg#d;
zp^J!+f}C6x>B>*97&~L@-k>2!&L|EPMqV&J;3^mmQZkAeBjRR&bx_PwvKuJS8BlmB
z^z{8sFwr=VNg}(8xe4GSuo0xxIiN_2#{H9#c6OxMmWyBsNWNRf!c<x=l<yCMKtbcW
zzhcS`Nm?x==yw|Z_>+>#xDOs9S`Nb`!#^vc##`VHV8=$`<+q@1fE^w?gyMk5nNx2-
zzhrjDfK6!j%6Pyi#5&xTrhlNi#N<#!?%YCeZ*N^Vn=^;t7&61(L^f*{er?K)&}xWY
zI5_AMEz6)8n{?L0ui^Z9cp#a2c#%8@<3M#l@wY~ZQA~^gEdZk-Vy$s|-r#LOaoz%W
zgm~eavpLAj15%2-&8=%LkD|f-<^g*ND9j%M3SoLXKUASa{lhW+9rOUcU<RPI0@ak1
z5T!9?Cq!EX_9>~1`{2Id>{RT6ahlPSfvAujIV}cw0nWPuC%}$KM*Gi@9tk#si{Mo@
zUh8TMZ8eNd%KWspKfUWGw_SC;>a_ABm-2pxgnde`j?Bq_^awxkFHL+eu^b!57WL85
z)^GQbQ6}V_6>?3CA;)gsEaLwDTjpf=G(BR>3$YXU*g~rqY4!#6K}`@2tg(V9#IZjf
z^l2t5yovc@CV8f_yfC?4){#=#rzo=sP%tyXvZ4~UoBK{t=JXQy3dDi*7)59sXaj}<
zcR*2m7jT<h06RxNZ~~M7ox%G+iWZU?Vh*T9ig88@y=>q)B<g_*pb_9P<u{D{fWGVl
zcn)6y_&%yc$1^c~l}*p5!SKkf0Ygi9>_i-+I^^qJT}AAM4a`&W4MkG^R0Pq>3tbj4
ztSjqCY0C1JOs~|5dhx@Uo)1Ro-|rFMMqOm2(7CxOkt5p8dQ#PHOB+sMnPI=OVKfsy
zi#L@J$LFOr!Piv~Cns^=$46YpLn5)Une&7mPvo>3$64=z$P_Aor<9ijQHUu_mW)DH
z1W;snq5lmS0jjMXX3D8El1X1i{(LYdndR#2MVP4q-cV<zF`WnN@$Lrt_ESLNV8qI3
zHoam@(czFyEpPzr1am-fa0^@j--3mJU)6brvJ=P*<8kGX0QZR<KxUXdDy1LUu^a+(
z!D!GEaK9UX>_&QHN*e*b2Ln0tZ!#NaXQ3}uO6YK(t8K4dvgvx6NNK90nDcR7BE>$X
zsh1b4O?ex}dUX&a-3&ZRylSPe{p>TtT?^jctOEmy50yM7Rgp4hGu(Ll8ap+13~_wS
z`JHz}bi;-TcS~@KX%uDUeq$-ZsD{qD^}z??o@agGuxXR9ZQKaAz8zq8%6>y3Yt7Eu
zf@aFShdf^BQeb#tQY5wmwdgXM!P%iaIfscwtB9q|0KBW%O?)zPRa<4uF!E)cDcKqn
zV5d<Z>{b=di!{H^v#o6Z1@If_1jd8(SYfQpD3qe?4Jal(z+jMGyNe144QHMrIvm2G
zP~|jEZ(!OIaCjy&jh!V0nH}a?lMR)^{AG~dla<Gr#$!Dj@EGzOVTXMiYy<q3KwtAX
zegwV&Jhu2HNBPqNOkNqY<PT+;&e<8?qb`{?n9FpgnHJ|8G_bf>E@TvLtk|k;D4m6|
zefstt1jlK`#fyecMCK!pg3YobG)%7x8j!lS%f=-$<-NbU>C;8r_nVXwFVG2O89iD&
z31_^Aw}<`oQ<{ZXsX+BXr@Vj=KMwF0d3Ws=`S4;Pj!WD03BWyK(-96d$gmd+rB#e6
zW{f0<sM=iu=|O-|k`z!1L?h50SYs5eC~(?Xm<N&ma0d6mLl6Vl5qt)$F-B1SKrP13
zm>&psfoMS62s(iDh%tq?5TJ-q6sG`2YDGat+dN~1?7SEqQjEB-+#dau*~ZS7$A@Ap
zk2kkD3A_W`f%GksX|k1A>p7s<bHCW>%mt6YTcABy432<Ea0)aAuAm!umCW!}pAn|o
z7`ak7P4gizN_5MzTpk(8>wx~Y&LSfXQR~vBhVtK_kKzwdCT4wwh81<*-uSLL#xV2O
zc_kX=e0)9F51nyebP(sbHm$iVb!|6kBWB~*mrvG-J-g$#sXXqCdy4Z-n=0-?khAjs
z;%(^@WVyi`AATsF_VN+gPW>VB4TNMwQJ!EYPYQj<jv{W;55l%)bv>RGp$p_{N|Drl
zq*aV-VnY<16RHiKM7oJ;o=HY6$H6_$q+t26+z;>~V$?$`0JxKN!3*#eH~@Nr=HN$=
zl0~9Ge^3FO0W@B`6fw2o=qY2`Y{wn-f>fj(QI=x-C*Xk@3BCgtL1q}E#EHg=gE5_D
zW+S%9a|SoT6Od7s$5_!t<FquU?0k64c?_dLdhI$Y;JM%lxPQD71_K`dW565G*R(F+
zGjI~n@A4c%^3^aIh4Q5}6e`6av@$=rR;re#?qWX%7f~2-Tb4N?HrbxeWZvv7qe2!`
zB4jD_>?|T863R1;?drR~FF5p)0cL0$f8d-j0nb|QPFiK;PTUtYK{yQ?CT@lVDHoyG
zvN>rvD|5KPTYdV7Xn%i^<MJg@7{fE_TjrE%?%x+S?QpuU!545(PbtV&ZXszgyQEoG
z<#?dfAAkaB$r@v!jNmMl<Fd&h3-}rELTBBDKq<gTnHSmyupUr=7J+);5=hB-^jd+b
z77FsBW)#MVA4fJ#mJ@3+{9v>wjh#nEn-eM=3c`T{pwKP@rp8Er2yg)xKpk)oWQ55u
zi^pg#XbpA%ZtHiDUgNpIsF$J|3fOrL1FX9pI0I<!fH8pOhXZzgucGPj)mqPn;eOSG
z=rS@gKEjiNrgwH`F`@VJQp8NB%%%QAM=_?UqijP?!Y9W@Q(^ISw!<O7Py|gGu0UJW
zrgw1>I=;v~gNzYz^q@f^{-r;%UiG*zM3K>u4I*_4azVVKSa;{HENT4|cTz-SXyR#5
zkZ`0Bx5BBd-j2E^yn>SvvJOxEiMn<5!rnfuhf5jHR99_nnim`+UQ0$nr8pVS2unqk
zVGM7Sz#b{l+bvA516$w@j(`dv48($uKymObC<szAimPi1g($?A0rxGfmJ2KLV6go(
z`d|xS)J@UM2=hWEN5Q*53J?AE7)WCz$?Y<~I>7ff<!M888Dyo)-ZZZ5fhm341$+Q9
zLWt?Z4S<n6quf~_7*Le^0V)VPqOSq-zXUaa^aql!rYUzK$cPe6jA@Mvoj<%ml$Edl
z5E5xN7|+#zHdD@WnyL#u{+?S#u0~VFaXBxM3#^>VS5b051mA{+v07c#Du(uR9|(+N
zx~gbARqa+PP<@ycVv3_$AZ2>xN<J+oa^tDH8)L_cXgoc~`-ZJ)08c92y}Kg1OBZo{
z$Pkg^=HH@V>o$qE!*&^e+|$Ly3B2}F=<ePXdK^bS{ipnch^p<WNpg%cEmjgM{gJ|o
z6|tP66rDo3qF6q|SY{EX9RUURx-pMKBJ>jlh>=kX@CZx-Rlzbq(Y9oaqMSfZONFrP
zFCaxGg`#E`XEWxWG)|Xe+8nUMrXZ%*+M@z?K%0OY;PHzC@`|mG^k(og;C5+;KrIjf
zUV`)*_pvv?)u<eoQJ6B~-U~9y=AfcK!582#cmbeV@ej1jLV7Z22X+CT3n`svDDux6
zBg^<93N*(Kzs?IpnfepI85+kYy)e(QSv|&hb-_W2hX7Ks3%n~sAB?`rD3DxL8S~}5
zBo*~3>tlF@QLhchpS`>cYx6D!H5?jY^lvboOr&K>A?ENy{Eu>`BFsvq5F4j@JfJ~A
z&eo)fxc^=^p|`Vc0DujRty)!F4GC5v;`~jU37Z!<^^D>xr-}e0k0K?Bd-4RoIJHlg
zAY0c;?r>tGs9jB*m1M3gaxN#yO`5^TCLcHgBEbs4=;|?`eE=A>RtC91UeE?~25kYw
z*%vGT$r;y&x0L&CEk$luP{t*>O03AwfigTk6ebErD-Z?xf{YMjb`}V0l#Yq*q&S}d
zRROnG9k7$+_9)WD!KdIMNU!mjcLzfOj~CA!`g97&DC6}&VP(4yg6&`km<rV9gBc3(
zY`_lb-(zy<K(?3>D#eS@F-$*poX{D6Xj6m}k+L2?z9~Z+hR%;ZO3`?~uMLL^A|g^O
zivm{FsZ@ma@&`H&q456VIB#!ZBSl%YC8Z-V%qsz>YLV5+`1cX>?g*8|6)Pre9U0#w
zwOHd1Y`QPM6gg@jj;re-VjUcmlQn7Sq&au$))lr#kBY(=FV>gE-!f&%q7>3ol#QnB
z5b||Tp9uXG$e{6|l9!mq^>|-oU9?Epwr-v3Aq!qmX)$}OWH@`0U%N0C-AI11vcw6W
zU5sUZFit5bWr3}6z6hqHjcHEU<_aJ?SPK}Lg@9$iQgp=j76O*U_zsp+@Y8A~up-5m
zg3{Pn$qGy<m>FTmRFzCXnio+i@IF`%0>A~3QC1Wc1%dLQ0bo@8F<1<K1_ePdm<Te$
zcznVDJ1%x)?}638)UG3gzM!v{0JgIh*ahx_SJyaxt2PLk@`E0tSPmWFHZb0!tNckO
zizzBuxr%xXtI{?bzBWXz94=5>WTZN3HIy+Urs`D^rCFBIJ)>@P63P8Qr`+?*ZSi3Y
zGk0+$s?*Gja{C(JN6fn-)P^Y6CNNOMu^lgxUhay&P+s>eO7UH82(kL#Jk(X0OXtax
zM-(Vi8aGIOgYVLg%2z+ra;#g=WoOR|n|^&oG`=lJv%!yg(SCku66CasF@=)RrX}Nr
z%gD)+y@7=#jRib0rLc0CAP2||%-KC;aybQoQ8JD7P%ut%CK+RU*(PZed0zClWd^3t
z0FGXotp(O(Cn1IS7Se+OMW!8~*sllawXUe(9l-tV366lwFdJ0r11P!_MIN7XfSnG`
zSmg;gw&fVu4AN_NQ2{%$dSDDtUx_-*R|V`8xV$D{c(fbP=lQ`=&<H#L{|<|YP$En{
ze-L8?%)1pR1glmW+K+Kr9fc>Arn`D2p$_%BjKYc9yu9?7rGKq63M}f-EnS+lF4Gz~
zuAJKXao2?M>Pp@XVLHTsp@_Hw1(WRr<mMCY42Kzb3!xQek9Syz3U4GhgX_Z7e~X9z
zloog`krEZ^F(z$lu@K~EJ$nkLWy^%l-Cd6k%c_kht;w`z>*jfJmII7BDL~d5zwXM0
zQj7_WqFGi+CH`Rj_d#yZM74;bkxMmiO_E-wkX!=1h;jC&%er9gPR1HyF|`FN00qnk
zu+102x8Nm6tKmve?p|OWj2wS6si-67I|D|Kqk%~%h8*kdDvG`Zcs$hpX^D9rHwrWb
zaXF|3{sQSS?$Z#H3fReVpE`hQCd)YMtjcpkx&k<$%6s*b5fKK#Ma0QyGxqRd<w92)
zo>++KbE`~`h**hES(*{5@rObE=bsCmvokUc7Kb!19vH6&tLs<RK-=`iODIp{DHZVP
zK^Z0Dhdr9Aer4W@550alE*p7Unj8;St!Q)mmf(+PxVKl8YawZ+5VHpUF*M%986Od=
zMOY6JrcsDFeyqRuP&|G4Qe;71k_#GR$PayeMb3Klgw1!~S>;<hrS{Z+P;6ubSr%yu
z5x!?BUzfkY^l$J4Fk-P}ym;3DHdY#=)zg5YCAT4$O+_Lr_!6ksp_f>fC1YJrRRt)H
z6q3q-exTTJ{y9jk4aN!+fGyY$*fvIS)j>{h5l}=!K$7EzJZr5u3a$fe`$Rw?ZVb4c
zIbbPh4{m}&;5uNWnI5}`m5JKCF>@F^23x>%umLm#>?||FxKF`=`{QJ+ko!gdo&et9
z5ts+^0-hJ#_DS$+8b#5ZsRWnNrk!zIIi^*s1W`_<Q0f@H8cn}wae~S+U$smnXQ>ln
z){S;6QTwWu%9a$7mtu?#hNh}tnYZfWzyakBh~&zuFZ|@nq$QssEKM!K%%c!X5$1d>
zZhzy&PD}2Bw#T=ehd7oFPoIixe1Ap?mR2$5_9+Oo(jXH20(fySlKC6l0vyY;WE9ZR
zK-R?*f}+Wm&j%D)&NH7P$uy7ebU<Ic05pol4JDQQ2e-kCS#66k!>`8D3Luf1NHQnN
zQv|ykE8zZ50c`sjKwr!TfxsVZ1Zgpfa9hv^lm!&P2tZ@qo`7wr0{R0A)NSAbGTNL`
zVI45QSn*j*j{-)eTfs<h0`SbHSU&-&F`knVU=XkeH16**@Dq^7t2xr=z%1~uuvq*X
zF;7}P48eChm|6_pr>opuVO(I_p@V6W)X#I+W7Btr^*APt7y86MumLfJ@!HA|Q`&F7
zrqpahC&I(@`aO8U&iJDytBn7DI`j3XD_1STtVk`y@gmFx5NnFCA*mPlUPLJofRbVS
zh&E2`vSt-eaJ!pL_3GmB?b}v~ahf_VY>%QtfuQk1yr85Ef_&JRK96ZhW7^VWCKmo`
zWIv`;!6-m+m-FM1-Uk>J?f{X1k(gZX6QnH}MLavWVl3o{X(RB=I4>t9khm^qQkYi6
za<)YZF^^I=;0*GDa6mzv0O+d+AT9P5R@wt7I+ekXfZs&e5fuSV06UR#pbc0HdVpL&
z3Kx<YW>ZiTkN+3O8sjkKv7l84o53aU2j~b=Ygw=YJ1z<_&#m`BORxsW{o#2_AIoze
z$yeU=ws`qDqg`D&_NPfqXWO({LZ<N+H)BR>#4Mo>ruYLMel+CmXv&XLyf2v1Yr}?y
z;R{2jnRp!wbNX|*tWC$9jpgmCRZFy{@gC_^w_R7MlDL5%=_tSoypw?<C`q)H^v$S+
zm?CUeh>gP%6k?W-!w?Bk8&5>_$@mN}wSOKK20?C>q^x>9bvmtLd>NHcBxt-qSWi>%
zK9FbH??@K}{Q79gSeLYENPGi!gY{s(ah_sCA*N9CBBwAjElrB7oHw0TKn8`EB0?(x
zD3HFOuW=p|Q3jl5A_eP)<v#=U+2@1#A3!i*=hOgH0tWy^`71yHD+H`Hb|PG-lyQa6
zF>MFre!PQpF2Mb#?*oi!mg6z`4P=y+Mnya}?LmKV4@g^t#8o+i=`lbbtx)Azo8)oo
z1Wo~-1FM0l@k-#ipXv+Uw4(p#d<@2dZDum|Fl%~&7n`e1K478FOHEq2D}!Uj5O$75
zD|a<SL>OM+gNpRt-l?fhDH|VUbA8?=5gDoED-V+>DZ>Zuh7h_9Jba0U6ICUWPsUyN
zOBBVsgX6_lim;p}zpB+sD5|DHELUbU93K%=h+%3WmV(Uum$7k)M3{Lr2MkX*;;B5o
z(;^oiN4LUw!KTGHKI~##k#$r7u7IK=1>io?6b<HEvcFXecOe}N27|JIUrXgYBfrPM
z4%h-lhSF}zL^4w^<R4QlV>^cdMw^W4I5a`wD+#!7$r*)oJD@=3R~2G=DLiceMZPE)
z1;&F~fIj#VP@on9YmL!7MQ1r+bl3|#2h!d!CMd+YK`XEma2<paN<@uGs?7;&aQ}({
zcCvH9&wzQ&0QXgGJccYc0<;CS!DhfVq{Vn1&~I75V$cLIQdV0Y%)C@*yy9t{-HH_g
zzpR^YCWjOFRGTzJv&wj^LF^2QAeUJ&r4Vy{4v7c|qk6k>Qw?!U{Euy^5KKkDDK3n#
zG4`y8Jlj*Rexg?CzWq+9I+N72U;kp_$3nkvUs5r~k9m4CKj=weP0ds`Ho0h6jt^6W
ziHwHTQ(1?c@??}m<9OQ6nIoJgOb~hV=9NV(PAP0@v0t!K55S9sqWB|VMAI0sPDY3^
zU<YUieg(<dE!6^w)mXqfC}7;iXuu1x8fXX@T5z8!JknAUV^0(uE(>Go0~i4x1hO-5
zL7IXrI};?6SXbmUQswd_8w5TDI?xZ$vVw_V3};~10R^)nQ135hE!rI{rLZMuo3P*s
zpm@D)EJP9G_IZrBk7=<=Sc(3y0XYHvGz;+CPIAU=O-OEG8uGbcJoa9Iew_qP0E#?2
z`NDwb!N126{?IaMn|W&+??J}6uJSS--gnG-3@0dK%(G^u?*G^Dx<}<!IWMmy+p=xn
zUhu988c*8PnDRi19LtT26ujS<k+<?53e`Q$x=|yQ_H(F$_fDtA?C#*SXB2FVN;&0I
zZ?rhTHpgI?KxfEec8X?rsairY^>BpDO)eUiA}@uQ<tfm#DBOKvtE7^C@IjF%+*M(Z
zAMmng&z`h^NlseD_yFp00#(5w@Fpk%c%fVX6k^&&@E%~-a1WTXYsh3IM;~_v?tpGC
z4`>tx)>n=*Fm96~Q5LWxU|H6YoOxjZJBmMz1-PAWKq=r4E`e2`DPY?vfXP{D)q?X#
z2ZQg8dGrU{N}CUcDXD}H3P(e5Hz6zCsh?2;p{)STK?QINd;;j3v>3&gyb2bHMvx|e
zK3xO;Q^tSIP@ZbTqsx4!gYpmv?|7gXOEWw;!Q-iuS*BAyQY{xMk5QWzP|eG7jG9G6
zgldVENeD9EPod)w2t^s~;|q@B>ovArZ+L~Km6aNb*^V2Bv+tnL-MpFXS1Sr5?`%^d
zSYz!rs$1A}I!Z)>nG@fHrPTeTcS}eS=2Qx?9IoKHF_!+$$<|iHzWc6-ZP`NHLFba0
zVoYH@3DBJ@V*CfDj4<s1qstQD3Sb1o=$MfWJZ#psAeX}&^qwtXR7XKx1Zd96XTrx=
zBpIPmz}Y>qv*fmtv%XlsXqv`tv;`E<2Vf7#258J@L~qI1xv*_Nf_XqKtWlV!KvT?<
z3k56*JyuJX(I+)PLGT<T*ZE=5ztXm$)r7|>7?cLbz`xoQA?5=bs)su`q(Ffa-rh>&
zsav@s#eGzsSerT}p&TM?YfL4e7KPrlu9zM@aFv%3c19uQa^(?e4q?bn1Vb6>;Stk1
zl9|`(TwL_m@P3IRLx<pg8D3I}zXDMpXcS1bDZ(rTSsyDX&ZeTQF3&VYm?noMn3jSo
z>o*l*85Q%62?`KRenq1IzQBVjw)m#QAMoPvJAj=@JCzm8eAt=Evo?#-<X|ug@IclB
zJOdbovW;T^Z7%o*FrqmNOpWDD^C?;sTj_VX4!^omysZ_rt|<E$>;|+f;0;g!<Odv*
z_zv*GW{2PhEZI&hB<74q^#h;-^4ORwmzjAnsQh|nZr~NDn;jzIHxZsY|2EU%{#;%!
zig6592k|vA9mZqzeC(J}D}M|#iW<)?vxen5M7etWN1f22ytUD;szO!L%qI9G9ZY$M
z15vRZga-Se<jD`EjU2*YN5aTH4Ua)9b>YbiyyQoJ15e%;88u40_=B-tVtbBPS7tXe
zejHzlk4k6BDxMWAD6-(GI$Imt_(d{dPKaM%Xu;;$Gw}?!qa|nhsAs~?(MdeUW6=~}
z^~Fvhet}Lzhuae4930VvtX4(E+!lsn;?IlZww)y3rqK-M<p$?KXRrg%{6SIh5m2|W
z1?B@mdmuX#B$KtASn?+*9A82g5jWa6a}m>ufT3tgRuTmmS9AwgRfWqUogFZY&jYCN
z6F>vNUPZJ2hzH_!Fp7R<&D_;zP8HSV%q>^%pt`I&Kc#d^^>Tenb*tAmS5Cb=rMAfB
z7(ag?q7EJq4ub{@NA^xIDoYI1K1cE5%DlM`yT^|O-x_pl{5TO+vXm%NvLxO$Ozli;
z@#7puA&h~-Kf7>2Jiz)6Q>F+T4q&HX(FYF+Tf8-h##hAIj~}nx(<W@~gcF|jD2N_`
z+eRmoq7Tv&9-|*rZW9=SDHYifFmEBC5cUMq0mD-YUL7zQgo2ced-pd;P-MdzH!!hA
zh#5M~1D^sZ#BU+Z9$^(Y4vK*zfMXTDfMXh(X&(50d4LzE6fR2_sw`)zjBK;I4C_|U
z%Q9)5T3eU3<x*+~#-eizn_9K?kB1Kzw&7tS%caZ8I($qq$|%n2N~GLUAfo5a6;C0A
zj=%jT^mqeM9FPOc@gmHXjY7=vhd9i>z<W*Y3*;9%yx2G{G*mcTxx!M3!b^4t(rk?h
zQz6cUw&%;25AWBov)UgVNKKDT!pe0)O+X)f1>Oel0}4HbShjaG(il||5g;X_U#^)c
zB!$(?qWCOEyvqPP0FFaQ>wpA3+snv9OzBsOFw+}>W|{~7pB~_aYR$!JO&Qa6r)3?}
zI{xwboH=vqax`lu9)CJTL~;Bh1$&8G7ao1}mAKcip>SNWQWU})d!$i><As<atP)~n
zm;eL3MG;YF9~~jGIb;<&+z0p^gX2<sIhAQyC%@~*X2Tcl`SZl1Hf^AGc7j5jKYxK#
z2{G$SuNYrM9ZLZtU>b#xzaCKte*+Xg4$?~NjYJ7B4M>re%S@-2OfxWVE>B&Ik@Q-y
z4}4}^!0nU)b3p~b5h057Q;-h~2mGntnlTg<(@gV#=7ImG2Pnw7TC@-kCQcNOy}Xj$
zG^5|>$&<y?if@VRc+w>&h8k>hA-cxkts=ZqfK?)F`itFlye!!kgT}FeeHB4|xnO~a
zRS7aTt_ZMk%K4bk5D`_!1GjkC#0#;ltxc*s!}N+V+cFAp2;c+o9P9^-LizLlZou)`
zvVax?d;y0cHh_vCIZJJ1%!quAk*TUmdm>#LWC0_<LBMwMYaGj+0P8_oj00D!n}Scn
zQIC&wm{uFNuQtxh_4qA9e#??&*nzO)QXf=ycI5%TVbIj;aedCy)M>Uu9%rsEjoX*`
zGEY6_cI7^>owEJOr8(Tgj+g6kJF?w!9$CszRxwQZ3#v4(!%kFfY=1eB!<d;9Q+Av*
z?mNpD0(k(9+m_}e6Wa8@;{n_srYnHgpxKX!5D)Rkb4d&l@$FA1i#xcLB-iXYA_x9E
zi6;^NdnwN3J~Rrjye&fBF2VZbEfmiosxPiy6%U7x5P4!=3JS7aIi8LthKM+3<Oref
z+Eo$aycm|?7;##Jm^E9v7)`dE?Cf1E835)0UT8Fm;z+<fXbd=vL9vv^WeWf!Y7SrU
z!ZNjAk+I!`L#Bl=UkNM(z90~+1~iI5L2w#$1{8jl-47mvcR)Ab57J`XR&T(LC$F)B
z4>6?}P!z+Ad7Q8<Ux0d?F<L83*Ba9eFl}p0Q&=JZ&$uo?*8LXJpMZA21JGC>=V@#Q
z$K`3<Uzz5yDZ)$`*B_{)3~e`ah8dR{L@(4hR~b`pW4b)1KLUy(k9QwHs|IEQighE<
z9niW0FD77vfj6iPXr;g;5CHrDjr$t`czoOdjlLP9qzo_V;Q8|rV24lRK5}1JFZW%u
z|DXpb$l0pb5O#wHB^G1|@x2+-MReVIBImc?imZzlCy8vN080^;HxSFIT9l>hvfzax
z&pr%Q1UVYdvg`4`OtEqyggC2Fh&ePtA?6sdH9yqJDom$#rWt9RUy1d2!K?#y!Eb<(
z6vb~IC=A$9sqK5r{0#bnMc^c0-VyK&NFhcti7~RG*zkg-kbeoJ2qUQ&Bi~MdLe2Up
zY<t1)fFeS1q}cokQfuy5p)?p|vLg4hB8Ub>RLiO(eHqjMdyM%MXbRWcfbGixXcXZq
zU@>4B?gz~ea9`*rX^cSM02Igy;0~a%E-s_x2J$#RKw7q)$H(-TAS>S3QOn3PE7BBS
z8q@cHH~1Q`e%b|a8pMF3fWk{3Q=}&Ynj`oDupBKr_zNrtJQg&zy$qNEZUNdk!04F9
zW5~9!ZCe3t8}J3(_B^23f7Am`PEI;ev6BA!h~YxVmnd)CC@7RKOP3Z|_wErn#*fF<
z7ac#gD^KuP3{CKarcr>EF=C`;G|Z_KYNe3zBj(&WgCI|vD(=jmAAgs{OZ>;uliIa$
z1>1>y`SasezC7s?Vs1`er0VUbHQfs<9s_ehZ}1Xa1-wWoP81iW>60DcJa_^o0bW3@
z0Eaq405A4y;3jwqC`!B-iyGlYd>O0<6zw=5jrG?BEb|9|$CPJ=DHaa_MQSskD9i$B
zu@YE`?Kd?FRZ~Dw$fjD@9_cfn5m*H%GHk~JP#L@c+*ew0@Ev#qgaNkk1fY;{f7HhH
zxIX>JjxQ3>=r1m#u`SYg9A*Ogna4-%H_Rq7))8yWVO_FQ;6BoKT*m!+1Ze7x;|AvM
zfOdfUD))`&TQk6GWG{FQDAq3E6F|EJrh*B8$9D@bHP&OR$~=U00HA-asq(etf6xOI
z<YE=x(BJU)7jYP}Q0|n#Uu@(JhIH`XLCqMSspbi6NrdGxxjHWpniS;htG^J>Aog+C
z7Pm<&Sg4TlHlXxG#7af@pm1fBJw`<>Ko>9uaNl_`odOGik1_o{ruji$Afq>4(2SyZ
zLHUEl;7^bR6a$PhDI5pE6!1O>1wR2PC=`S2AOdikykI>+GeDyd^8(%oC<5Lft#%wM
z)&Xw;XW#^AQGi0i4u;#K6$RV}3e;bq4WLof*ya_W7qAC3?qg5z4BQ5V0PQ+pIf^yw
zqh$kI!E~_AIFE@UfF78Z2K4m<K+6s28@UaNb8^PBn#ZUDs0r8>8hw}ttOE3H2|%Oo
zd7QYMwiAp3J2<1VACNw6oTuLo0G8_jc+9v@e}m<qEue9G(hr=cud*<qvSUc|TaRY1
zfd?EN9d*S^mlh7V-`M7Pl*oZMF(oI&bcc+F)x!}o8kWn{k?~8F4;ghtBSMb(WRl2_
zdxyDAJKQ^5xJZ!<6Jl<TCx1rTSya{(@Is6OW57><Mj<!}DB2X3ATSqDSZ)Ei|M!vp
z)d(gj8ZSylZf<}b07Z#ySOfNeGJr<$W9L9Is}C#*5f)pti&#1bP(Zjp%fK`6BcQ-i
zESRQIq~?KNz;@sTXh#6sK;el1R{@RU%1-Kiz-5g3XcT#0!2G@78u$}X<Y~vjJtbv`
ztSQ{x0M63*j)8UaxKI#F0x8l+CNZ{+?d}X%?@B<s0`>tOuLw{S&>X=fz~jMA=`i5&
zWxJ&9Mxrrb9Xvia0qZ&i_5%(-@K|;Nc3?W7vCTY3Y>a7^r;pUe4u<EBX0M3{vSi7k
zD^jGW-Uhdl-K|n3*}ab8OOg5Sq(+lN6BJ(xv08*>89Aj8n;N#MWZ{Q8PI<j&h^6N-
zJWCCziG^DLFSveyBFQMS4p;@M0$)IJtPGe}2~fl-+LlCuJJ0$URk5rqXaZPAHLw5-
z0gSkI09rxt4WJ-519yRD|8Wnz;!oiH$G!jm-M!}zAL{S;`H5V3k+9nAy}iZrY17nM
z@#1SL#4quub~dY4iRf|Tm8a^|LTu05+i+Kf?#(wv(PG5}p0my{5tfZ(^pP1xA@l$n
z0R`~`@CP^zXm5Z~AOP$Ej8@rovCF9i7-3OZmjV|cqeCPWVPzRc+-<-HPy>_(jJo!M
zl^_Pt>H!M%G0+|G>$hf_2Q&}-hdf}P9dG5qT^1bQm4772-MfP^<g6!-i&!ToVT%_}
zm>OeS`3knIxF7k2@x>HsAr`oEA~s^Q@*^R?_GOl3mKd|W6kbNiivh(n3{WI#jF>5w
z{F=QBP^>wYTpj!c@&gV#a178HsKxjJ=F5U_0V8CNH(vnk04@U#8(an4xA7ndOaWtn
zW|{{y5Bvu`z<Yc1R&~+e#-q~?AATsZT%`oy>+`m4LI;6<2~mzqVZWbIu<_%ZFurR-
zDb9O|@lc1pE@L`;6~~ZBW<<rTn}U^@_7IhK1iipy&=U*?6i(V#hKX|PQdgvPU_0ml
zz5wq5inQ7|mdUZfR)E6}?5r4pb6tutjoTaxDERMy-9R(V1DXf^!ye!ma-O%})>9m8
zCQJ~qe18RBC5NdxqUDbrYLoL65L3aX5XW|VPx-OJa0^>*7RwZ~$&^}?R=NaP?toG6
z58xZ%1*Gjkg5t~Z-WT8^pkSW@jC@UvB2J-Q2e_P~9|b7h{PAxFSPB?vYeEbsXr_7K
zb?^Xhdy|h&>&(2_O$x8{h3UL{c)}jH&GCJhe9T!s)FIc)jA>^5fM=<#Z(?C6Xbo-w
zj`@BE(2XVOn2=@BIL_<=7)iGT?AVrpx!?}a>^1g)_5<GQd+;AUdZfR<?kkb2Z@>64
zVN>B%&#Oh4UgKlVy0_m^?kDDpfB2YlM%+tm>4;?ZFon5ob1XRk6awu*C(s)_0bF(*
za4h*6z;_Jg_Af^8jvx;x1uBB7pd6qb1Oox1ZbrzOX&%r#@EUu7FBf{zrmg<j?K?t;
zab$bk#-=v45UcZ<&Vsk+#~R-dFW<nH*+R_i{u5%%?b2=nMzEwX;E#R0_00`1YR&=d
zfgDPqH#vksfxZZ~gK^+6;E#5iX&%r#pm`wP1AJG+<L=!>)aA?KCH}72lG$P*-$~5>
zOp4-DefX;mz8s#f!c6One=Kd!+_E$cQ<$qr%hNodc|h~PtLA~&*f{-_E0={MUac7?
z1=-eCyr@)3X{rt{17eg%G0xhzuXr4QN34xPT)1%IRKJrrJ^L@C&h*rwt*d!J^MK}o
zSJDHFYD<(TDWV1r6tTuvZ|dvU7jd6_qG0Fcr3kSNmOaKlt^QL&Oy_Bl@hf=>X^ql6
zpm`u8J%InW)89FERC&Jy|5E8G9-rp>C9)nlB6R1^i)VNbGGG29|F@2}$z|mBt*J{B
zV{5#mmC-z)dEj5~0sQ^5{ucgP`q|T`iVzpV8`pT-+Kn4GL<}B<{wIZ)&iyBU!28!9
zTx|z54`?3v_jrKOZr;3k`P8n!-4-HSwrooDi`&-pPa)9E`zIn|>A}}MGG3Fb3vbTQ
zO!I)|0nG!ifCsc+@m_(0pfy4BfaU?s1DY6X=YZw`%>$YTUI7na;6$&#Q)73Y1@}gm
QVS8FOZPR2!Bk!^Q1E7ej8vp<R

literal 0
HcmV?d00001

diff --git a/vue3/src/assets/images/dark.svg b/openhis-ui-vue3/src/assets/images/dark.svg
similarity index 100%
rename from vue3/src/assets/images/dark.svg
rename to openhis-ui-vue3/src/assets/images/dark.svg
diff --git a/vue3/src/assets/images/jlau.jpg b/openhis-ui-vue3/src/assets/images/jlau.jpg
similarity index 100%
rename from vue3/src/assets/images/jlau.jpg
rename to openhis-ui-vue3/src/assets/images/jlau.jpg
diff --git a/vue3/src/assets/images/light.svg b/openhis-ui-vue3/src/assets/images/light.svg
similarity index 100%
rename from vue3/src/assets/images/light.svg
rename to openhis-ui-vue3/src/assets/images/light.svg
diff --git a/vue3/src/assets/images/login-background.jpg b/openhis-ui-vue3/src/assets/images/login-background.jpg
similarity index 100%
rename from vue3/src/assets/images/login-background.jpg
rename to openhis-ui-vue3/src/assets/images/login-background.jpg
diff --git a/openhis-ui-vue3/src/assets/images/logo.svg b/openhis-ui-vue3/src/assets/images/logo.svg
new file mode 100644
index 00000000..d6628948
--- /dev/null
+++ b/openhis-ui-vue3/src/assets/images/logo.svg
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.9.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 310 90.7" style="enable-background:new 0 0 310 90.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<g>
+		<g>
+			<g>
+				<path class="st0" d="M233.7,44.8c0-0.1,0-0.2-0.1-0.2l0.7-6.2c1.1-4.7,2.6-8.3,0.6-11.5c-0.8-1.3-2.2-3.1-4.5-2.4
+					c-0.5,1.7,0.4,3,0.5,4.8l-1.2,15.6c-0.1,4.1-2.5,3.7-5.6,5.5c-5.3,3.1-8.8,1-7.7,3.5c2.2,5,8.2-2.4,12.3-2.7
+					c0.1,1.4-0.7,4.3-1.1,5.6c-0.3,0.8-0.3,0.7-0.5,1.4c-0.7,2.4-1.4,4-3,5.3c-1.9,1.6-6.1,3.4-8.6,3.8c-1.3,0.2-3-0.2-3.9,0.3
+					c0.4,0.8,0.6,0.6,1.9,0.6c4.8-0.1,8.8-0.4,12.7-2.9c2.5-1.7,4-7.6,4.9-10.7c0.2-0.8,0.3-1.1,0.7-1.6c1.9,1.6,2.7,9.4,5,11.9
+					c1.9,2.1,3.7,1.2,6,0.1c1.2-0.6,1.6-0.9,2.6-1.5c0.8-0.5,2.3-0.9,1.7-1.8c-1.9-1.4-5.4,1.5-9.3-3.6c-1.6-2.1-1-0.7-4.2-5.3
+					c-0.5-0.8-1-1.1-1.4-1.7c0.5-1.2,0.2-1.6,1.2-2.6c0.6-0.7,6.5-4,7.2-4.3c1.3-0.5,1.7-0.4,2.3-1.6c1.7-2.9,1.7-1.6,0.1-3.1
+					c-1.2-0.2-1.7,1.6-2.6,2.1C239.5,42.4,235.1,45.3,233.7,44.8"/>
+				<path class="st0" d="M179,28.3c-0.9,0.5-2.2,1.2-2.3,3.6c0.1,0,0.1-0.1,0.2-0.1c0.4-0.2,0.5-0.2,1.2,0.1l0.1,0l0,0.1l0,0
+					c0,0.1,0,0.1,0,0.3v0v0l-0.1,0.7l0,0l0,0c-0.2,0.4-0.7,0.7-1.1,1c-0.4,0.2-0.7,0.4-0.9,0.7c-0.1,0.2-0.3,0.9-0.4,1.7
+					c-0.1,0.7-0.2,1.5-0.3,2l7.2-4.7c0.5-0.4,1-0.8,1.5-1.1c0.3-0.2,0.6-0.5,0.9-0.7c0-0.3-0.1-0.5-0.1-0.7
+					c-0.2-0.9-0.3-1.2,1.4-1.6c0.7-0.1,1.2-0.2,1.8-0.2c0.6,0,1.1,0.1,1.6,0.4l0.1,0.1l0,0.1c0.6,2.1-1.4,3.2-3.5,4.5
+					c-0.5,0.3-1,0.6-1.4,0.9l-9.3,6.1h0c-1.2,0.8-1.2,1-1.6,2c-0.1,0.3-0.2,0.6-0.3,1l0,0l-2.8,7c1-0.2,2.8-0.9,4.8-1.9
+					c3.8-1.8,8.3-4.3,10-5.3v0c1-0.6,2.2-0.9,3.3-0.9c1,0.1,1.9,0.4,2.5,1.3l0.1,0.1l0,0.1c-0.2,1.1-0.9,1.6-2.1,2.2
+					c-0.5,0.3-1,0.6-1.6,1c-0.3,0.2-0.6,0.5-1,0.8c-1,0.8-2,1.7-3.4,1.9l0,0l0,0c-0.7-0.1-0.8-0.4-0.9-0.7c-0.1-0.2-0.2-0.4-3,0.6
+					c-1.4,0.5-2.7,0.9-3.9,1.2c-3.7,1.1-6.2,1.8-7.6,4.6c-0.7,1.3-1.5,2.5-2.4,3.6c-0.9,1.1-1.9,2-2.9,2.9l-0.2,0.2
+					c-1,0.9-2.1,1.8-3.2,2.4l0,0l0,0l-3.3,1.2l0,0l0,0c-0.4,0.1-0.9,0.1-1.2,0c-0.4-0.1-0.7-0.4-0.7-1c0.1-0.8,0.6-1.8,1.2-2.6
+					c0.8-1.1,1.9-2,2.5-2.3c0.9-0.4,1.4-0.4,1.8-0.4c0.7,0,0.9-0.1,3.5-3.1c0.4-0.5,0.8-0.9,1-1.2c1.2-1.4,1.2-1.4,2.8-4
+					c0.3-0.6,1.2-2.3,1.8-3.9c0.3-0.8,0.5-1.5,0.6-1.9c-0.8,0.2-2.2,1.2-3.6,2c-1.3,0.9-2.6,1.7-3.4,1.9c-0.1,0.1-0.3,0.2-0.5,0.2
+					c-0.2,0-0.5-0.1-0.5-0.3l0,0c0,0-0.1,0-0.1-0.1l-0.1-0.1l0-0.1c-0.2-1.2,2.9-3.1,5.8-4.8c1.9-1.2,3.7-2.2,4-2.8
+					c0.3-0.5,0.5-1.3,0.7-2.2c0.2-0.8,0.3-1.8,0.4-2.5c-0.8,0.1-1.6,0.6-2.3,1c-1.2,0.7-2.2,1.3-2.9,0.3l0,0l0,0
+					c-0.3-1.1,2.5-2.5,3.7-3l0,0c0.1-0.1,0.3-0.1,0.4-0.2c0.6-0.3,1.2-0.6,1.6-1.1c0.2-0.3,0.4-0.7,0.5-1.2c0.1-0.3,0-0.6-0.1-0.8
+					c-0.4-0.5-2,0.4-3.4,1.2c-0.6,0.3-1.1,0.6-1.6,0.9c-0.4,0.2-2,0.9-3.3,1.4c-0.8,0.3-1.5,0.5-1.8,0.5h0l0,0l-1.1-0.3l-0.4-0.1
+					l0.2-0.3c0.5-0.9,2.6-1.9,4.1-2.6c0.5-0.2,1-0.5,1.3-0.6c1.1-0.6,1.9-1,2.6-1.3c1.8-0.9,2.8-1.4,3.3-1.9
+					c0.5-0.4,0.5-0.9,0.6-1.9c0-0.2,0-0.5,0-0.8c0.1-1.9,0-3.2-0.1-4.1c0-0.3,0-0.6-0.1-0.9c0-1.1,0.2-1.5,1.5-1.5
+					c0.7,0,1.3,0.2,1.9,0.5c0.6,0.3,1.1,0.6,1.4,0.8l0.1,0.1l0,0.1c0.1,1.1-0.1,1.9-0.2,2.6c-0.1,0.7-0.2,1.2,0,1.8
+					c0.3,0.1,0.6,0,0.8,0c0.7-0.1,1.3-0.1,1.5,0.8C180.4,27.5,179.8,27.8,179,28.3 M169.5,63c0.6-1.8,1.7-4.7,2.4-5.4l0.2-0.2
+					l0.2,0.1c0.9,0.6,0.9,1,0.9,1.7c0,0.3,0,0.5,0.1,0.9c1-0.2,1.3-0.5,1.8-1c0.4-0.4,0.9-0.9,1.8-1.4c0.3-0.2,0.5-0.3,0.7-0.5
+					c1.1-0.7,2-1.3,3.9-1.3c0.5,0,0.9,0.1,1.2,0.2c1.1,0.5,1.6,1.5,1.8,2.9c0.2,1.3,0.1,2.9-0.2,4.5c-0.5,2.7-1.6,5.5-2.6,7
+					l-0.1,0.1l-0.1,0c-1.3,0.2-2.9,0.4-4.2,0.1c-1.4-0.3-2.5-1.1-2.7-2.8c-0.1-0.4,0-1,0.1-1.5c0.1-0.6,0.2-1.2,0.4-1.6
+					c0.7-1.6,2.2-1.8,3.6-2c1.8-0.2,3.4-0.5,2.9-4c-0.3-0.4-1-0.2-1.9,0.3c-1.5,0.9-3.5,2.7-4.7,3.8c-0.5,0.4-0.9,0.8-1.1,1
+					c-1,0.8-1.1,1-1.6,2c0,0.1-0.1,0.2-0.2,0.4c-0.6,1.1-1.2,1.6-1.6,1.8c-0.3,0.1-0.6,0-0.9-0.1c-0.2-0.2-0.4-0.4-0.5-0.8
+					c-0.3-0.9-0.3-2.4,0.1-3.5C169.2,63.7,169.4,63.4,169.5,63z M179.6,65.5c-1.5,0.5-1.9,1.4-2,1.9l0.5-0.1c0.7-0.2,1-0.7,1-0.7h0
+					C179.4,66.2,179.6,65.8,179.6,65.5z M161.8,49.8"/>
+			</g>
+		</g>
+		<g>
+			<path class="st0" d="M296.6,30.4c0.4,0,0.3,1,0.1,1.2C296.5,31.2,296.8,30.9,296.6,30.4z"/>
+			<path class="st0" d="M295.1,24.9c3-1.1,5.7-3,8.7-4.5c0.4-0.2,1-0.5,1.5-0.7c0.9-0.5,1.2-0.9,2.5-0.6c1.1,2.6-0.6,5.4-1.3,7.7
+				c-1,3.2-2.4,6.5-3.6,9.7c2.3,0,5.6-0.3,5.8,1.8c0.1,1.2-1.2,2.1-2.3,2.9c-2.7,1.8-5,3.5-7.9,5.1c-0.5,0.3-1.2,0.7-1.6,0.8
+				c-0.9,0.3-2.1,0.1-2.4,0.5c0.6,0.6,1.9,0.7,2,1.5c0.2,1.2-1.9,2.4-1.5,4.2c0.9,0.6,1.7,0.6,2.8,0.3c0.6-0.2,1-0.7,1.5-0.7
+				c2.7-0.3,5.2,3.2,3,5.5c-2.5,0.3-5.5,0-7.9-0.2c-0.5,2.1-0.3,4.8-0.3,7.3c-0.1,2.5,0.1,5-0.2,7c-3,1.5-5.5-0.8-8.1-2.1
+				c-0.8-0.4-1.7-0.8-2.5-1.3c-1.6-0.8-2.7-1.3-4.2-2.3c-0.6-0.4-1.1-0.8-1.7-1.2c-1.1-0.7-2.7-1.4-3.3-2.2
+				c-0.3-0.4-0.8-1.3-0.7-1.8c0.1-1.2,2.7-2.5,3.7-3c4.7-2.2,9.6-3.9,15.2-5c0.1-1.1,0.4-2,0.3-3.3c-1.1-0.4-3.4-0.1-3.2-2
+				c0.1-1.5,2.1-1.4,3.5-1.8c2.7-0.8,4.8-2.6,7.4-3.7c2.7-1.2,5.3-1.9,6.5-4.3c-1.2-0.8-3.3-0.4-4.5,0c-1.3,0.5-2.1,1.7-3.3,2
+				c-0.9,0.2-1.8,0-2.6,0.3c-2.1,0.6-4,2-6,2.9c-0.5,0.3-1.1,0.4-1.6,0.6c-3.4,1.6-6.4,3.7-9.1,6.4c-0.6,0.6-1.5,1.3-2.3,2.1
+				c-1.3,1.2-2.1,2.6-4.6,2.2c-0.7-0.9-1.8-1-1.6-2.7c0.1-1.1,2-2.8,2.8-3.6c1.2-1.1,2-2.3,3-3.2c1.6-1.5,3.9-2.9,5.7-4.3
+				c0.2-0.2,0.4-0.3,0.6-0.5c0.5-0.4,1-1,1.5-1.4c0.4-0.3,0.8-0.4,1.2-0.7c1.3-1.1,2.3-2.7,3-3.9c-0.1-0.7-0.5-1.8,0-2.5
+				c-1,0.3-1.6,1.3-2.3,2c-1.6,1.5-2.5,2.9-3.9,4.8c-0.9,1.1-2.5,2.9-3.9,1.4c-1.1-1.3-0.3-4.3-0.6-6.6c-0.1-0.8-0.6-1.4-0.2-2
+				c0.8-0.3,1.7,0.1,2.1,0.6c0.9,1,0.6,3.3,1.7,4c0.9-0.2,1.8-1.1,2.1-1.9c0.2-0.6,0-1.4,0.1-2.2c0.3-3.5-0.6-7.1-1.7-10.2
+				c-0.3-0.8-0.9-1.5-0.9-2.2c1.3-0.1,2.7,1,4,1.8c0.6,0.3,1.3,0.7,1.9,1.1c1.1,0.7,2.1,1.2,2.3,2.8c1.2-0.7,1.7-2.1,2.4-3.2
+				c0.7-1.1,1.5-2.3,1.8-3.7c0.2-0.4-0.4-0.6,0-0.8c0-0.2,0.1-0.2,0.1-0.4c1.9,0.3,5.4,1.8,4.2,4.2c-0.3,0.6-1,0.6-1.6,1.1
+				c-0.2,0.1-0.3,0.4-0.5,0.6C295.9,23.6,295.4,24.1,295.1,24.9z M305.8,20.9c-1.7,0.8-3.2,2-4.8,3c-0.8,0.5-1.6,1-2.5,1.5
+				c-0.9,0.5-1.9,0.9-2.2,1.7c0.9,0.7,2.1,0.5,2.7,1.3c1.7,2-0.2,6.3-0.6,8.5c1.2-0.9,1.6-2.3,2.3-3.6c2-3.9,4.1-7.8,5.2-12.4
+				C305.9,20.9,305.8,20.9,305.8,20.9z M286.5,31.7c0.8-0.2,0.9-1,1.3-1.6c0.6-0.3,1.1-0.8,1.5-1.3c-0.9-0.1-1.9,0.2-2.2-0.7
+				C286,28.7,286.2,30.4,286.5,31.7z M289.4,32c0.2-0.3,0.8-0.1,1.1,0c0.2-0.3,0.4-0.5,0.5-1c-0.1-0.3,0.7-0.8,0.1-0.8
+				C290.5,30.7,289.4,31.3,289.4,32z M296.8,31.6c0.2-0.2,0.2-1.1-0.1-1.2C296.8,30.9,296.5,31.2,296.8,31.6z M293.1,33.3
+				c0.1,0.9,1.4,1.1,1.3,2c-0.1,1.6-2.4,1.3-3.8,0.7c-0.9,0.9-2.2,1.3-2.7,2.6c2.8-0.4,4.7-1.6,6.8-2.7c-0.1-1.2,0.1-2.5-0.1-3.4
+				c-0.1-0.4-0.2-0.9-0.5-1.1C293.7,31.9,293,32.4,293.1,33.3z M277.8,49.5c1.2-0.9,2.5-1.7,3.9-2.6c2.7-1.7,5.3-3.6,7.9-5
+				c1.1-0.6,5.8-1.9,4.4-3.4c-0.1,0-0.1,0-0.2,0c-2.1,1-4,1.6-6.5,2.1c-0.8,0.2-1.9,0.1-2.7,0.4c-0.5,0.2-1.1,0.9-1.7,1.3
+				c-2.1,1.6-3.6,3.4-5.4,5.3c-1.3,1.3-3,2.5-3.7,4.1C275.2,51.4,276.5,50.4,277.8,49.5z M290,58.4c-3,0.3-6,1.6-8.7,2.7
+				c-0.5,1-3.5,1.4-3.5,2.7c0,0.8,1.5,1.6,2.4,2.1c2.2,1.2,4.4,1.7,6.8,2.2c1.3,0.3,2.6,0.8,3.8,0.5c0.5-1.6,0.7-3.6,0.7-5.3
+				c0-0.3-0.2-0.6-0.3-0.9c0-0.2,0.2-0.5,0.2-0.8c0.1-1,0.1-2,0.1-3.1C291.3,58.2,290.5,58.2,290,58.4z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M123.3,42c0.4,0.2,0.8,0.3,1.1,0.3c0.4,0,0.7-0.1,1-0.3c0.5-0.4,0.8-1,0.7-2.1c-0.1-1-0.6-1.8-1-2.5
+			c-0.2-0.3-0.4-0.5-0.5-0.8c0.1-0.2,0.2-0.3,0.3-0.4c0.1-0.2,0.1-0.2,0.8-0.4c0.2-0.1,0.5-0.1,0.7-0.2c0.5-0.1,1-0.2,1.4-0.6
+			c0.3-0.3,0.6-0.7,0.7-1.2c0.1-0.3,0-0.6,0-0.9c-0.1-0.3-0.2-0.6-0.5-0.9c-0.5-0.6-1.5-1.1-3-1.4c-1.6-0.3-2.1,0-2.2,0.6
+			c-0.1,0.3,0,0.7,0.1,1.1c0.1,0.8,0.3,1.9-0.2,3.2c-0.3,0.7-0.7,1.1-1.1,1.4c-0.5,0.5-1,0.9-0.8,1.9
+			C121.2,40.3,122.2,41.5,123.3,42z"/>
+		<path class="st1" d="M123,26.4c1,0.8,1.2,1.1,1.4,1.7c0.1,0.3,0.3,0.7,0.6,1.2l0.1,0.1l0.1,0c1.3,0.1,2.3,0,2.9-0.3
+			c0.5-0.2,0.8-0.6,1-1c0.1-0.4,0.1-0.8,0-1.2c-0.2-0.7-0.7-1.4-1.1-1.8c-0.6-0.5-1.7-1.1-2.5-1.6l-0.2-0.1l0,0
+			c-0.1-0.1-0.2-0.1-0.3-0.2c-1-0.6-1.8-1-3.3-0.7l-0.2,0l-0.1,0.1l-0.2,0.4l0,0l0,0c-0.1,0.8,0,1.4,0.3,1.9
+			C121.9,25.5,122.4,25.9,123,26.4z"/>
+		<path class="st1" d="M123.8,65C123.8,65,123.7,65,123.8,65C123.8,65.1,123.8,65,123.8,65z"/>
+		<path class="st1" d="M131.8,65.5c-0.8-1.3-2.4-1.8-3.7-2.6c-0.4-0.2-0.8-0.6-1.1-1c-0.2-0.4-0.2-0.8,0.1-1.1
+			c0.4-0.4,0.8-0.9,1.3-1.4c0.9-0.9,1.8-1.9,2.2-2.9l0.1-0.1l0-0.1c-0.3-0.9-0.6-1.5-1.1-1.7c-0.5-0.2-1.2-0.1-2.4,0.3v0l-3.5,1.4
+			l0,0l0,0c-0.5,0.3-1,0.7-1.4,1.2c-0.4,0.5-0.7,1-1.1,1.6c-1.1,1.8-0.5,2.4,0,2.9c0.4,0.4,0.7,0.7-1.2,2.2c-0.5,0.4-0.8,0.7-1,0.9
+			v0c-0.1,0.1-0.2,0.2-0.2,0.2c-0.1,0-0.1,0.1-0.3,0.1c0.3-1.4,1.1-3.6,2-5.8c1-2.5,2.3-4.9,3.2-6.3c0.3-0.5,0.5-1,0.7-1.4
+			c0.1-0.3,0.3-0.6,0.5-0.9c0.1-0.2,0.3-0.5,0.5-0.8c0.6-0.9,1.3-2,1.4-2.8c0.1-0.8-0.3-1.3-1.5-1.4c-0.6-0.1-1.1,0.1-1.5,0.2
+			c-0.4,0.2-0.7,0.5-0.9,0.8c-0.8,1-2.3,2.8-3.8,4.2c-0.8,0.7-1.5,1.3-2.1,1.6c0.1-0.8,0.3-1.5,0.5-2.2c0.3-1.2,0.7-2.4,0.8-4.1
+			c0.1-0.9,0.1-1.7,0.2-2.5c0.1-1.4,0.3-2.7,0.4-4.3c0.1-1.8,0.2-5.1,0.1-8.1c0-2.2-0.2-4.2-0.4-5.4c-0.9-4.3-2.3-6.7-3.4-7.7
+			c-0.5-0.4-0.9-0.6-1.3-0.5c-0.4,0-0.7,0.3-0.9,0.8c-0.2,0.7-0.1,2.1,0.8,3.9c3,6.2,2.4,11.8,1.7,18.2c-0.1,1.3-0.3,2.7-0.4,4.2
+			c-0.1,1.2-0.2,2.3-0.2,3.3c-0.2,4-0.4,6.7-3,8.8l-8.3,6.5c-0.3,0.2-0.5,0.4-0.8,0.5h0c-0.4,0.3-0.7,0.6-1.4,0.9
+			c-0.3,0.2-0.6,0.3-0.9,0.4c-0.7,0.3-1,0.4-1.4,1.3c-0.4,1-0.7,2-0.7,3c0,1,0.3,1.9,1,2.7l0.1,0.1l0.1,0c1.4,0.1,3.1-0.7,4.8-1.7
+			c2.5-1.5,4.9-3.7,5.9-4.9c1.1-1.3,2.1-2.3,3.1-3.4c0.4-0.4,0.8-0.8,1.1-1.1c0.5-0.5,0.9-1.2,1.3-1.8c0.6-1,1.3-2,2.3-2.4l-3.3,8.1
+			l0,0c-0.2,0.7-0.5,1.3-0.8,1.9c-0.7,1.5-1.2,2.5-0.4,4.7c0.2,0.6,0.3,0.9,0.6,1.1c0.3,0.2,0.6,0.4,1.2,0.5l0.2,0l0.1-0.2
+			c0.2-0.3,0.4-0.7,0.7-1c0.3-0.6,0.7-1.1,1.1-1.6c0.7-0.7,2.8-3.1,4.5-4.8c0.5-0.5,0.9-0.9,1.3-1.2c0.1-0.1,0.2-0.1,0.3-0.2
+			c1.1-0.1,3.1,0.8,3.5,1.2c0.6,0.5,1.4,1.2,1.8,1.9c0.3,0.5,0.5,1,0.7,1.5c0.3,0.6,1.8-0.6,2-0.8C132.7,67.8,132.4,66.5,131.8,65.5
+			z M126.3,58.5c-0.1,0-0.3,0.2-1,0.9l0,0c-0.1,0.1-1,1-1.6,1.4l-0.5-0.2l0,0c0,0-0.1-0.1-0.2-0.1l-0.4-0.6
+			C123.1,59.5,124.6,58.1,126.3,58.5z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st1" d="M44.6,88.8c-23.9,0-43.4-19.5-43.4-43.4S20.6,2.1,44.6,2.1s43.4,19.5,43.4,43.4S68.5,88.8,44.6,88.8z
+			 M44.6,3.8c-23,0-41.7,18.7-41.7,41.7s18.7,41.7,41.7,41.7c23,0,41.7-18.7,41.7-41.7S67.5,3.8,44.6,3.8z"/>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M78.5,44.9l3.1,2l1.9,0.2l-0.1,0.7l-1.9-0.2L78.2,49l0.1-0.8l2.4-0.9c0,0,0.1,0,0.3-0.1l0,0
+				c-0.1,0-0.2-0.1-0.3-0.2l-2.2-1.4L78.5,44.9z M78.6,50.1l-0.4,1.5l4.5,1.1l-0.2,0.7L78,52.2l-0.4,1.4l-0.6-0.1l0.9-3.6L78.6,50.1
+				z M77.2,55L77,55.5l3.8,1.4l0.2-0.5l0.5,0.2L81,58.2L80.4,58l0.2-0.5l-3.8-1.4l-0.2,0.5l-0.5-0.2l0.6-1.6L77.2,55z M77.9,62.5
+				c0.2-0.1,0.4-0.2,0.6-0.4c0.2-0.2,0.4-0.4,0.5-0.6c0.3-0.7,0.3-1.1-0.2-1.3c-0.1-0.1-0.3-0.1-0.4-0.1c-0.1,0-0.3,0.1-0.4,0.2
+				c-0.1,0.1-0.4,0.3-0.7,0.5c-0.5,0.4-0.8,0.6-1.1,0.6c-0.3,0-0.5,0-0.8-0.1c-0.4-0.2-0.6-0.5-0.7-0.9c-0.1-0.4,0-0.9,0.2-1.3
+				c0.2-0.5,0.5-0.8,0.7-0.9l0.7,0.3c-0.3,0.2-0.6,0.5-0.8,0.9c-0.1,0.3-0.2,0.5-0.2,0.8c0,0.2,0.2,0.4,0.4,0.5
+				c0.2,0.1,0.4,0.1,0.6,0c0.2-0.1,0.5-0.3,0.9-0.6c0.4-0.3,0.8-0.6,1.1-0.6c0.3-0.1,0.6,0,0.9,0.1c0.4,0.2,0.6,0.5,0.7,0.9
+				c0.1,0.4,0,0.9-0.3,1.4c-0.1,0.2-0.2,0.4-0.4,0.6c-0.2,0.2-0.3,0.4-0.5,0.4L77.9,62.5z M72.2,64.8l1.5,1l0.4-0.7
+				c0.2-0.3,0.2-0.5,0.2-0.8c0-0.3-0.2-0.5-0.4-0.6c-0.2-0.1-0.5-0.2-0.7-0.1c-0.2,0.1-0.4,0.2-0.6,0.5L72.2,64.8z M77.8,64.7
+				l-0.4,0.7l-1.7-0.1c-0.3,0-0.6,0-0.8,0.1c-0.2,0.1-0.3,0.2-0.4,0.3l-0.3,0.4l1.8,1.2l-0.4,0.6L71.4,65l0.9-1.3
+				c0.3-0.4,0.6-0.7,1-0.8c0.4-0.1,0.7,0,1.1,0.2c0.6,0.4,0.8,1,0.5,1.7l0,0c0.1-0.1,0.3-0.1,0.4-0.2c0.2,0,0.4,0,0.7,0L77.8,64.7z
+				 M74.2,69.9L72.4,72l-3.9-3.4l1.8-2l0.4,0.4l-1.3,1.5l1.3,1.1l1.2-1.4l0.4,0.4L71,69.9l1.3,1.2l1.4-1.6L74.2,69.9z M67.4,69.8
+				l2,5.2l-0.6,0.5L64,72.8l0.6-0.5l3.7,2.1c0.1,0.1,0.3,0.2,0.4,0.3l0,0c-0.1-0.1-0.2-0.3-0.2-0.4l-1.6-4L67.4,69.8z M63.3,73.8
+				l-0.4,0.3l2.3,3.4l0.4-0.3l0.3,0.5l-1.4,0.9l-0.3-0.5l0.4-0.3l-2.3-3.4l-0.4,0.3l-0.3-0.5l1.4-0.9L63.3,73.8z M62.5,79.8
+				l-0.7,0.3l-4.1-2.6c-0.1-0.1-0.2-0.2-0.3-0.2l0,0c0.1,0.1,0.2,0.3,0.3,0.7l1.5,3.3l-0.6,0.3l-2.2-4.7l0.8-0.4l4,2.6
+				c0.2,0.1,0.3,0.2,0.3,0.2l0,0c-0.1-0.1-0.2-0.4-0.3-0.7l-1.5-3.3l0.6-0.3L62.5,79.8z M55.4,80.4c0.3,1.4-0.2,2.3-1.5,2.6
+				c-1.2,0.3-2-0.3-2.4-1.6l-0.7-3.1l0.7-0.2l0.7,3c0.2,1,0.8,1.4,1.6,1.2c0.8-0.2,1.1-0.8,0.9-1.8l-0.7-3.1l0.7-0.2L55.4,80.4z
+				 M43.5,83.9l-0.8-0.1l-2.2-4.3c-0.1-0.1-0.1-0.2-0.1-0.4l0,0c0,0.1,0,0.4,0,0.7l-0.3,3.6l-0.7-0.1l0.5-5.2l0.8,0.1l2.2,4.2
+				c0.1,0.2,0.2,0.3,0.2,0.4l0,0c0-0.1,0-0.4,0-0.8l0.3-3.6l0.7,0.1L43.5,83.9z M37.1,80.9c-0.4,1.4-1.2,2-2.5,1.6
+				c-1.2-0.3-1.7-1.2-1.3-2.6l0.8-3.1l0.6,0.2l-0.8,3c-0.3,1,0,1.6,0.9,1.9c0.8,0.2,1.4-0.2,1.6-1.1l0.8-3.1l0.6,0.2L37.1,80.9z
+				 M30.1,80.9l-0.6-0.3l1-2.1l-2.4-1.1l-1,2.1l-0.6-0.3l2.2-4.7l0.6,0.3l-1,2l2.4,1.1l1-2l0.6,0.3L30.1,80.9z M24.3,77.8
+				c-0.4,0-0.9-0.2-1.4-0.6c-0.6-0.4-1-1-1.1-1.6c-0.1-0.6,0.1-1.3,0.5-1.9c0.5-0.7,1.1-1.1,1.8-1.2c0.7-0.1,1.4,0,2,0.4
+				c0.4,0.3,0.7,0.6,0.9,0.9l-0.4,0.6c-0.2-0.4-0.5-0.7-0.8-0.9c-0.5-0.3-1-0.4-1.5-0.3c-0.5,0.1-1,0.4-1.3,1
+				c-0.4,0.5-0.5,1-0.4,1.5c0.1,0.5,0.3,0.9,0.8,1.2c0.4,0.3,0.9,0.4,1.3,0.5L24.3,77.8z M19.4,73.9c-0.6-0.1-1.1-0.4-1.6-0.9
+				c-0.5-0.5-0.8-1.1-0.8-1.8c0-0.7,0.3-1.3,0.8-1.9c0.6-0.6,1.2-0.9,1.9-0.9c0.7,0,1.4,0.2,1.9,0.8c0.4,0.4,0.7,0.8,0.8,1.2L22,71
+				c-0.1-0.5-0.4-0.9-0.8-1.3c-0.4-0.4-0.9-0.6-1.4-0.6c-0.5,0-1,0.3-1.5,0.7c-0.5,0.5-0.7,1-0.7,1.4c0,0.5,0.2,0.9,0.6,1.3
+				c0.3,0.3,0.6,0.5,0.9,0.5l1-1l-0.8-0.8l0.4-0.4l1.3,1.3L19.4,73.9z M14.4,69.3L14,68.6l1.8-4.5c0.1-0.1,0.1-0.2,0.2-0.3l0,0
+				c-0.1,0.1-0.3,0.2-0.6,0.4l-3,2.1L12,65.8l4.3-3l0.5,0.7L15,67.9c-0.1,0.2-0.1,0.3-0.2,0.4l0,0c0.1-0.1,0.3-0.3,0.6-0.5l2.9-2
+				l0.4,0.5L14.4,69.3z M12.2,61.6l1.7-1.6c0.1,0,0.2-0.1,0.3-0.2l0,0c-0.2,0-0.3,0.1-0.4,0.1L11.5,60L12.2,61.6z M10.9,63.8
+				l-0.3-0.7l1.1-1l-0.8-2l-1.5,0.1l-0.3-0.7l5.6-0.2l0.3,0.7L10.9,63.8z M8.4,57.2l-0.1-0.7l2.3-0.5L10,53.5L7.7,54l-0.1-0.7
+				l5.1-1.1l0.1,0.7l-2.2,0.5l0.6,2.6l2.2-0.5l0.1,0.7L8.4,57.2z M7.4,50.7c-0.2-0.4-0.4-0.8-0.4-1.4c-0.1-0.7,0.1-1.4,0.6-1.8
+				c0.4-0.5,1-0.8,1.8-0.8c0.8-0.1,1.5,0.1,2.1,0.6c0.6,0.5,0.9,1.1,0.9,1.8c0,0.5,0,0.9-0.1,1.2l-0.7,0.1c0.2-0.4,0.2-0.8,0.2-1.2
+				c0-0.6-0.3-1-0.7-1.4c-0.4-0.3-1-0.5-1.6-0.4C8.9,47.4,8.4,47.6,8,48c-0.3,0.4-0.5,0.8-0.4,1.4c0,0.5,0.2,0.9,0.5,1.3L7.4,50.7z"
+				/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M44.6,74C28.8,74,16,61.2,16,45.5c0-15.7,12.8-28.6,28.6-28.6s28.6,12.8,28.6,28.6C73.1,61.2,60.3,74,44.6,74
+			z M44.6,18c-15.1,0-27.4,12.3-27.4,27.4c0,15.1,12.3,27.4,27.4,27.4C59.7,72.9,72,60.6,72,45.5C72,30.3,59.7,18,44.6,18z"/>
+	</g>
+	<g>
+		<g>
+			<g>
+				<path class="st0" d="M35.1,7.7c-0.2,0.2-0.4,0.4-0.2,0.9c0,0,0,0,0,0c0.1-0.1,0.1-0.1,0.2-0.1l0,0l0,0l0,0c0,0,0,0,0,0.1l0,0
+					l0,0l0,0.1l0,0l0,0c0,0.1-0.1,0.2-0.2,0.3c-0.1,0.1-0.1,0.1-0.1,0.2c0,0,0,0.2,0,0.4c0,0.1,0,0.3,0.1,0.4l1.1-1.4
+					c0.1-0.1,0.2-0.2,0.2-0.3c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0-0.1-0.1-0.1c-0.1-0.2-0.1-0.2,0.2-0.4c0.1-0.1,0.2-0.1,0.3-0.2
+					c0.1,0,0.2,0,0.3,0l0,0l0,0c0.2,0.4-0.1,0.7-0.4,1.1c-0.1,0.1-0.2,0.2-0.2,0.3l-1.5,1.8l0,0c-0.2,0.2-0.2,0.3-0.2,0.5
+					c0,0.1,0,0.1,0,0.2l0,0l-0.1,1.6c0.2-0.1,0.5-0.4,0.8-0.7c0.6-0.6,1.4-1.4,1.6-1.7l0,0c0.2-0.2,0.4-0.3,0.6-0.4
+					c0.2,0,0.4,0,0.6,0.1l0,0l0,0c0,0.2-0.1,0.4-0.3,0.6c-0.1,0.1-0.2,0.2-0.3,0.3c0,0.1-0.1,0.1-0.1,0.2c-0.1,0.2-0.3,0.5-0.5,0.6
+					l0,0l0,0c-0.1,0-0.2,0-0.2-0.1c0,0-0.1-0.1-0.6,0.3c-0.2,0.2-0.5,0.3-0.7,0.5c-0.7,0.4-1.1,0.7-1.2,1.4
+					c-0.1,0.3-0.1,0.6-0.3,0.9c-0.1,0.3-0.2,0.5-0.4,0.8l0,0c-0.1,0.2-0.3,0.5-0.5,0.7l0,0l0,0l-0.6,0.4l0,0l0,0
+					c-0.1,0-0.2,0.1-0.2,0.1c-0.1,0-0.2,0-0.2-0.2c0-0.2,0-0.4,0.1-0.6c0.1-0.3,0.2-0.5,0.3-0.6c0.2-0.1,0.3-0.2,0.3-0.2
+					c0.1-0.1,0.2-0.1,0.5-0.8c0.1-0.1,0.1-0.2,0.1-0.3c0.1-0.3,0.1-0.3,0.3-1c0-0.1,0.1-0.5,0.1-0.9c0-0.2,0-0.3,0-0.4
+					c-0.1,0.1-0.4,0.4-0.6,0.6c-0.2,0.3-0.4,0.5-0.5,0.6c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0l0,0c0,0,0,0,0,0l0,0l0,0
+					c-0.1-0.2,0.4-0.8,0.8-1.3c0.3-0.4,0.6-0.7,0.6-0.8c0-0.1,0-0.3,0-0.5c0-0.2,0-0.4-0.1-0.5c-0.1,0.1-0.3,0.2-0.4,0.3
+					c-0.2,0.2-0.4,0.4-0.6,0.3l0,0l0,0c-0.1-0.2,0.3-0.7,0.5-0.8l0,0c0,0,0,0,0.1-0.1c0.1-0.1,0.2-0.2,0.2-0.3c0-0.1,0-0.2,0-0.3
+					c0-0.1,0-0.1-0.1-0.2c-0.1-0.1-0.4,0.2-0.6,0.5c-0.1,0.1-0.2,0.2-0.3,0.3c-0.1,0.1-0.3,0.3-0.6,0.5c-0.1,0.1-0.3,0.2-0.3,0.2
+					l0,0l0,0l-0.2,0l-0.1,0l0-0.1c0-0.2,0.4-0.5,0.7-0.8c0.1-0.1,0.2-0.2,0.2-0.2c0.2-0.2,0.3-0.3,0.4-0.4c0.3-0.3,0.5-0.5,0.5-0.6
+					c0.1-0.1,0-0.2,0-0.4c0,0,0-0.1,0-0.2c-0.1-0.4-0.2-0.6-0.3-0.8c0-0.1,0-0.1-0.1-0.2c-0.1-0.2,0-0.3,0.2-0.4c0.1,0,0.3,0,0.4,0
+					c0.1,0,0.3,0,0.3,0.1l0,0l0,0c0.1,0.2,0.1,0.4,0.1,0.5c0,0.1,0,0.3,0.1,0.4c0.1,0,0.1,0,0.2,0c0.1-0.1,0.2-0.1,0.3,0.1
+					C35.3,7.5,35.2,7.6,35.1,7.7 M35.4,15.2c0-0.4,0-1,0.1-1.2l0,0l0,0c0.2,0.1,0.2,0.1,0.3,0.3c0,0,0,0.1,0.1,0.2
+					c0.2-0.1,0.2-0.2,0.3-0.3c0.1-0.1,0.1-0.2,0.3-0.4c0,0,0.1-0.1,0.1-0.1c0.2-0.2,0.3-0.4,0.7-0.5c0.1,0,0.2,0,0.3,0
+					c0.2,0,0.4,0.2,0.5,0.5c0.1,0.2,0.2,0.6,0.2,0.9c0.1,0.6,0,1.2-0.1,1.6l0,0l0,0c-0.2,0.1-0.5,0.3-0.8,0.3
+					c-0.3,0-0.6-0.1-0.7-0.4c0-0.1-0.1-0.2-0.1-0.3c0-0.1,0-0.3,0-0.3c0-0.4,0.3-0.5,0.6-0.6c0.3-0.2,0.7-0.3,0.3-1
+					c-0.1-0.1-0.2,0-0.4,0.2c-0.2,0.3-0.5,0.8-0.7,1.1c-0.1,0.1-0.1,0.2-0.2,0.3c-0.1,0.2-0.2,0.3-0.2,0.5c0,0,0,0,0,0.1
+					C36,16,36,16.1,35.9,16.2c-0.1,0-0.1,0-0.2,0c-0.1,0-0.1-0.1-0.2-0.1c-0.1-0.2-0.2-0.4-0.2-0.7C35.3,15.4,35.3,15.3,35.4,15.2z
+					 M37.5,15.1c-0.3,0.2-0.3,0.4-0.3,0.5l0.1,0c0.1-0.1,0.2-0.2,0.2-0.2l0,0C37.5,15.2,37.5,15.1,37.5,15.1z M33,13.1"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<path class="st0" d="M55.1,11.7C55.1,11.6,55.1,11.6,55.1,11.7l0.5-1.2c0.5-0.9,1-1.5,0.8-2.2c-0.1-0.3-0.2-0.7-0.7-0.8
+					c-0.2,0.3-0.1,0.6-0.2,1l-1.2,3c-0.3,0.8-0.7,0.6-1.5,0.7c-1.2,0.3-1.8-0.4-1.7,0.2c0.1,1.1,1.8,0,2.6,0.2
+					c-0.1,0.3-0.4,0.8-0.6,1c-0.1,0.1-0.1,0.1-0.2,0.2c-0.3,0.4-0.5,0.7-0.9,0.9c-0.5,0.2-1.4,0.3-1.9,0.2c-0.3,0-0.6-0.2-0.8-0.2
+					c0,0.2,0.1,0.2,0.3,0.2c0.9,0.3,1.8,0.5,2.7,0.2c0.6-0.2,1.3-1.2,1.6-1.8c0.1-0.2,0.1-0.2,0.2-0.3c0.3,0.4-0.1,2,0.2,2.7
+					c0.2,0.5,0.7,0.5,1.2,0.4c0.3,0,0.4-0.1,0.6-0.1c0.2-0.1,0.5,0,0.4-0.3c-0.3-0.4-1.2,0-1.6-1.3c-0.2-0.5-0.2-0.2-0.5-1.3
+					c-0.1-0.2-0.1-0.3-0.2-0.4c0.2-0.2,0.1-0.3,0.4-0.4c0.2-0.1,1.5-0.4,1.7-0.4c0.3,0,0.4,0,0.6-0.2c0.5-0.5,0.4-0.2,0.2-0.6
+					c-0.2-0.1-0.4,0.2-0.6,0.3C56.4,11.5,55.3,11.8,55.1,11.7"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st0" d="M73.4,20.1c0.1,0.1-0.1,0.2-0.1,0.2C73.3,20.2,73.4,20.2,73.4,20.1z"/>
+				</g>
+				<g>
+					<path class="st0" d="M73.8,19c0.6,0.2,1.3,0.2,2,0.3c0.1,0,0.2,0,0.3,0.1c0.2,0,0.3,0,0.5,0.2c-0.1,0.6-0.7,0.9-1.1,1.2
+						c-0.6,0.4-1.2,0.8-1.8,1.2c0.4,0.3,1,0.6,0.8,1c-0.1,0.2-0.5,0.2-0.7,0.2c-0.7,0-1.3,0-2-0.1c-0.1,0-0.3,0-0.4-0.1
+						c-0.2-0.1-0.4-0.2-0.5-0.2c0,0.2,0.2,0.3,0.2,0.5c-0.1,0.2-0.6,0.2-0.7,0.5c0.1,0.2,0.2,0.3,0.4,0.4c0.1,0,0.2,0,0.3,0.1
+						c0.5,0.3,0.5,1.2-0.1,1.3c-0.5-0.3-0.9-0.7-1.3-1c-0.3,0.3-0.6,0.8-0.9,1.2c-0.3,0.4-0.6,0.9-0.9,1.2c-0.7-0.1-0.8-0.8-1.1-1.3
+						c-0.1-0.2-0.2-0.3-0.3-0.5c-0.2-0.3-0.3-0.6-0.4-0.9c-0.1-0.1-0.1-0.3-0.1-0.4c-0.1-0.2-0.3-0.6-0.3-0.8c0-0.1,0-0.3,0.1-0.4
+						c0.2-0.2,0.8-0.1,1-0.1c1.1,0.2,2.1,0.5,3.2,1c0.2-0.2,0.3-0.3,0.4-0.5c-0.1-0.2-0.6-0.4-0.3-0.7c0.2-0.2,0.5,0,0.8,0.1
+						c0.6,0.2,1.1,0.1,1.7,0.3c0.6,0.1,1.1,0.3,1.6,0.1c-0.1-0.3-0.5-0.5-0.8-0.5c-0.3-0.1-0.5,0-0.8-0.1c-0.2-0.1-0.3-0.2-0.5-0.3
+						c-0.4-0.1-0.9-0.1-1.4-0.2c-0.1,0-0.2-0.1-0.4-0.1c-0.8-0.1-1.5-0.1-2.3,0c-0.2,0-0.4,0-0.6,0.1c-0.4,0.1-0.7,0.2-1-0.2
+						c0-0.2-0.2-0.4,0.1-0.6c0.2-0.2,0.7-0.2,0.9-0.3c0.3-0.1,0.6-0.2,0.9-0.2c0.4-0.1,1,0,1.5-0.1c0.1,0,0.1,0,0.2,0
+						c0.1,0,0.3-0.1,0.4-0.1c0.1,0,0.2,0,0.3,0c0.4,0,0.7-0.2,1-0.3c0.1-0.1,0.1-0.4,0.3-0.4c-0.2-0.1-0.4,0-0.6,0.1
+						c-0.4,0.1-0.8,0.2-1.2,0.3c-0.3,0.1-0.8,0.2-0.8-0.2c0-0.3,0.5-0.8,0.7-1.2c0.1-0.1,0.1-0.3,0.2-0.4c0.2,0,0.3,0.2,0.3,0.3
+						c0,0.3-0.3,0.6-0.2,0.9c0.2,0.1,0.4,0,0.6-0.1c0.1-0.1,0.2-0.2,0.3-0.4c0.5-0.6,0.8-1.3,0.9-1.9c0-0.2,0-0.4,0.1-0.5
+						c0.2,0.1,0.3,0.5,0.5,0.8c0.1,0.1,0.1,0.3,0.2,0.4c0.1,0.3,0.2,0.5,0.1,0.7c0.3,0,0.5-0.1,0.8-0.3c0.3-0.1,0.5-0.2,0.7-0.4
+						c0.1,0,0-0.2,0.1-0.1c0,0,0,0,0.1,0c0.3,0.3,0.7,1,0.2,1.2c-0.1,0.1-0.2,0-0.4,0c0,0-0.1,0-0.1,0C74.1,18.9,73.9,18.9,73.8,19z
+						 M76.1,19.6c-0.4-0.1-0.8,0-1.2-0.1c-0.2,0-0.4,0-0.6,0c-0.2,0-0.4-0.1-0.6,0c0.1,0.2,0.3,0.3,0.3,0.5c0.1,0.5-0.8,1-1.1,1.4
+						c0.3,0,0.6-0.2,0.8-0.3C74.6,20.7,75.4,20.3,76.1,19.6C76.1,19.6,76.1,19.6,76.1,19.6z M71.5,19.1c0.2,0.1,0.3-0.1,0.4-0.1
+						c0.1,0,0.3,0,0.4,0c-0.1-0.1-0.3-0.2-0.3-0.4C71.8,18.6,71.6,18.9,71.5,19.1z M72,19.5c0.1,0,0.1,0.1,0.2,0.1
+						c0.1,0,0.1,0,0.2-0.1c0-0.1,0.2-0.1,0.1-0.1C72.3,19.4,72.1,19.4,72,19.5z M73.3,20.3c0.1,0,0.2-0.2,0.1-0.2
+						C73.4,20.2,73.3,20.2,73.3,20.3z M72.5,20.2c-0.1,0.2,0.1,0.4,0,0.5c-0.2,0.3-0.6-0.1-0.7-0.3c-0.3,0-0.5,0-0.8,0.1
+						c0.5,0.3,1,0.3,1.5,0.3c0.1-0.2,0.3-0.4,0.4-0.6c0-0.1,0.1-0.2,0-0.2C72.7,20,72.5,20,72.5,20.2z M67.9,21.1c0.3,0,0.6,0,1,0
+						c0.7,0,1.3,0,1.9,0.1c0.3,0,1.2,0.4,1.2,0c0,0,0,0,0,0c-0.5-0.1-0.9-0.2-1.3-0.4c-0.2-0.1-0.3-0.2-0.5-0.3c-0.1,0-0.3,0-0.5,0
+						c-0.6,0-1,0.2-1.6,0.2c-0.4,0.1-0.8,0.1-1.1,0.3C67.3,21.1,67.6,21.1,67.9,21.1z M68.9,24.1c-0.6-0.3-1.2-0.4-1.8-0.6
+						c-0.2,0.1-0.8-0.2-0.9,0c-0.1,0.1,0.1,0.5,0.2,0.6c0.2,0.5,0.5,0.8,0.9,1.2c0.2,0.2,0.4,0.4,0.6,0.5c0.3-0.2,0.5-0.5,0.8-0.8
+						c0-0.1,0-0.1,0.1-0.2c0,0,0.1-0.1,0.1-0.1c0.1-0.2,0.3-0.3,0.4-0.5C69.2,24.2,69,24.1,68.9,24.1z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<circle class="st1" cx="11.1" cy="33.5" r="0.9"/>
+		</g>
+		<g>
+			<circle class="st1" cx="78" cy="33.5" r="0.9"/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M31.1,49.7l0,0.2l0.7,7.8l0,0.2h1v0l6.8,0.1l1.5,11.6l0,0.2h7.1l0-0.2l1.5-11.6l6.8-0.1v0h1l0-0.2l0.7-7.8
+			l0-0.2H31.1z M41.2,54.7c-0.2,0.5-0.5,1-0.9,1.2h0c-0.4,0.3-1,0.4-1.6,0.4c-0.6,0-1.2-0.1-1.6-0.3c-0.4-0.2-0.7-0.5-1-1
+			c-0.2-0.4-0.3-0.9-0.3-1.3c0-0.5,0.1-1,0.4-1.4c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.5-0.3c0.6,0,1.1,0.1,1.5,0.4
+			c0.4,0.3,0.7,0.6,0.9,1.1l0.1,0.2l-1.1,0.2l0-0.1c-0.1-0.3-0.3-0.5-0.5-0.7c-0.2-0.1-0.5-0.2-0.9-0.2c-0.4,0-0.8,0.1-1,0.2
+			c-0.3,0.2-0.4,0.4-0.6,0.6c-0.1,0.3-0.2,0.5-0.2,0.8c0,0.4,0.1,0.7,0.2,1c0.1,0.3,0.3,0.5,0.6,0.6c0.3,0.1,0.6,0.2,0.9,0.2
+			c0.4,0,0.7-0.1,1-0.3c0.3-0.2,0.4-0.4,0.5-0.8l0-0.2l1.1,0.2L41.2,54.7z M47.4,54.7c-0.2,0.5-0.5,1-0.9,1.2h0
+			c-0.4,0.3-1,0.4-1.6,0.4c-0.6,0-1.2-0.1-1.6-0.3c-0.4-0.2-0.7-0.5-1-1c-0.2-0.4-0.3-0.9-0.3-1.3c0-0.5,0.1-1,0.4-1.4
+			c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.5-0.3c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1.1l0.1,0.2l-1.1,0.2l0-0.1
+			c-0.1-0.3-0.3-0.5-0.5-0.7c-0.2-0.1-0.5-0.2-0.9-0.2c-0.4,0-0.8,0.1-1,0.2c-0.3,0.2-0.4,0.4-0.6,0.6c-0.1,0.3-0.2,0.5-0.2,0.8
+			c0,0.4,0.1,0.7,0.2,1c0.1,0.3,0.3,0.5,0.6,0.6c0.3,0.1,0.6,0.2,0.9,0.2c0.4,0,0.7-0.1,1-0.3c0.3-0.2,0.4-0.4,0.5-0.8l0-0.2
+			l1.1,0.2L47.4,54.7z M53.3,54.2c0,0.5-0.1,0.9-0.2,1.2c-0.1,0.3-0.4,0.6-0.8,0.7c-0.4,0.2-0.8,0.3-1.4,0.3c-0.6,0-1-0.1-1.4-0.2
+			c-0.4-0.2-0.6-0.4-0.8-0.7c-0.2-0.3-0.2-0.7-0.2-1.2v-2.9h1.1v2.9c0,0.5,0.1,0.7,0.1,0.8c0.1,0.2,0.2,0.3,0.4,0.4
+			c0.2,0.1,0.5,0.1,0.8,0.1c0.5,0,0.9-0.1,1.1-0.3c0.2-0.2,0.3-0.5,0.3-1.1v-2.9h1.1V54.2z"/>
+		<g>
+			<path class="st1" d="M48.5,38.3c-2.3-3.2-2.2-4.5-2.2-4.5c0-0.2-0.2-0.2-0.3-0.1c-0.1,0.2-0.2,0.4-0.2,0.6c0,0-0.2,0.6,0.3,2.7
+				c0,0,0.6,2.2,0.7,3.1c0,0.3,0,0.7-0.2,1c-0.2,0.3-0.5,0.4-0.7,0.5c-0.5,0.1-1.1-0.1-1.4-0.6c-0.1-0.2-0.2-0.3-0.2-0.5
+				c0-0.1-0.1-0.2-0.1-0.3c0-0.2-0.1-0.5-0.1-0.7c-0.1-0.8-0.3-1.6-0.5-2.5c-0.2-0.9-0.3-1.7-0.4-2.4c-0.4-4.6,1-6.7,1.6-7.6
+				c0.8-1.1,1.4-2,1.7-2.7c0.2-0.4,0.4-0.8,0.5-1.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0-0.1,0-0.1c0.1-0.3,0.2-0.7,0.2-1.1
+				c0-0.3,0.1-0.5,0.1-0.6c0-0.1,0-0.1,0-0.2c0-0.2-0.2-0.2-0.3-0.1c-0.8,1.1-1.7,1.8-4.4,4.5c-3.6,3.3-3,7.8-3,7.8l0,0
+				c0.1,2.1,0.6,4.2,0.9,6.3c0.3,3-0.4,7.4-0.6,8.3c0.9,0,7.8,0,8.3,0l0.2-0.3c0.5-0.6,1.5-2.1,1.7-4.4c0-0.6,0-1.2-0.1-1.7
+				C49.7,40.4,49.2,39.3,48.5,38.3z"/>
+			<path class="st1" d="M37.4,39.3c0,0.3,0.1,0.6,0.1,0.9c0,0.8,0,2.5-0.5,3.6c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.1,0.3
+				c-0.3,0.4-0.5,0.6-0.8,0.7c-0.6,0.2-1-0.2-1.1-0.4c-0.7-1.4,0.2-2.4,1.8-6.7c0.8-2.2,1.1-3.8,1.2-4.9c0-1-0.2-1.6-0.3-2l0,0
+				c0,0,0,0,0,0c0-0.1-0.1-0.1-0.2-0.1c-0.1,0-0.1,0.1-0.1,0.2l0,0c0,0.1,0,0.1,0,0.2c-0.2,1.2-1.2,3.4-2.3,5.2
+				c-0.3,0.4-0.5,0.8-0.7,1.1c-0.1,0.1-0.1,0.1-0.2,0.2c-4.2,5-3.6,9.1-3.6,9.1c0,0.6,0.2,1,0.3,1.4c0,0,0,0,0.1,0c0.7,0,8,0,8,0
+				c0.8-5.8-0.6-8.2-1.2-8.8C37.5,39.2,37.4,39.2,37.4,39.3z"/>
+			<path class="st1" d="M57,40.3c-1-1.5-2.1-2.4-2.7-3.1c-3-3.2-3.2-7-3.2-8.1c0-0.1-0.1-0.2-0.1-0.2c-0.1,0-0.2,0-0.2,0.1
+				c0,0.1-0.1,0.1-0.1,0.2c-0.3,0.9-1.7,5.5,1,9.1c0.7,0.8,1.4,1.6,2.3,2.9c0.4,0.7,0.8,1.5,0.9,2.3c0,0.2,0,0.4,0,0.5
+				c0,0.3-0.2,0.5-0.4,0.6c-0.4,0.2-1,0-1.2-0.4c-0.1-0.2-0.2-0.5-0.3-0.7c-0.5-2.8-1.5-4.3-2.3-5c-0.1-0.1-0.3,0-0.2,0.1
+				c1.4,4.6,0.2,8.4-0.3,9.5h8.6c0.2-0.3,0.3-1.1,0.4-1.8C59.3,43.5,57.6,41.1,57,40.3z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M19.7,20.3c0.1,0,0.2,0,0.2-0.1c0.1,0,0.1-0.1,0.1-0.2c0-0.1,0-0.3-0.1-0.4c-0.1-0.2-0.3-0.2-0.5-0.3
+			c-0.1,0-0.1-0.1-0.2-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.2c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.1-0.1,0.2-0.3c0-0.1,0-0.2,0-0.3
+			c0-0.1-0.1-0.1-0.1-0.2c-0.1,0-0.1-0.1-0.2-0.1c-0.2,0-0.4,0-0.7,0.1c-0.3,0.1-0.4,0.2-0.3,0.4c0,0.1,0.1,0.1,0.1,0.2
+			c0.1,0.1,0.3,0.3,0.4,0.6c0,0.2,0,0.3,0,0.4c0,0.1-0.1,0.3,0.1,0.4C19.1,20.3,19.4,20.3,19.7,20.3z"/>
+		<path class="st1" d="M17.7,17.7c0.3,0,0.3,0,0.4,0.1c0.1,0,0.1,0.1,0.3,0.1l0,0l0,0c0.2-0.1,0.4-0.3,0.5-0.4
+			c0.1-0.1,0.1-0.2,0-0.3c0-0.1-0.1-0.2-0.1-0.2c-0.1-0.1-0.3-0.2-0.4-0.2c-0.2,0-0.4,0-0.6,0l-0.1,0l0,0c0,0-0.1,0-0.1,0
+			c-0.2,0-0.4,0-0.7,0.3l0,0l0,0l0,0.1l0,0l0,0c0.1,0.2,0.2,0.2,0.3,0.3C17.5,17.6,17.6,17.7,17.7,17.7z"/>
+		<path class="st1" d="M22.5,24.1C22.5,24.1,22.5,24.2,22.5,24.1C22.5,24.2,22.5,24.1,22.5,24.1z"/>
+		<path class="st1" d="M23.9,23.3c-0.3-0.1-0.6,0-0.9,0c-0.1,0-0.2,0-0.3,0c-0.1,0-0.1-0.1-0.1-0.2c0-0.1,0-0.3,0-0.4
+			c0-0.3,0.1-0.5,0-0.8l0,0l0,0c-0.2-0.1-0.3-0.2-0.4-0.2c-0.1,0-0.2,0.1-0.4,0.3l0,0l-0.4,0.6l0,0l0,0c-0.1,0.1-0.1,0.2-0.1,0.4
+			c0,0.1,0,0.3,0,0.4c0,0.4,0.2,0.5,0.4,0.5c0.1,0,0.2,0,0.1,0.5c0,0.1-0.1,0.2-0.1,0.3l0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0.1
+			c-0.1-0.3-0.2-0.7-0.3-1.2c-0.1-0.5-0.2-1.1-0.2-1.4c0-0.1,0-0.2,0-0.3c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.2,0-0.5-0.1-0.6
+			c-0.1-0.1-0.2-0.2-0.4-0.1c-0.1,0.1-0.2,0.1-0.2,0.2c0,0.1-0.1,0.2-0.1,0.2c0,0.3-0.1,0.8-0.1,1.2c0,0.2-0.1,0.4-0.2,0.5
+			c-0.1-0.1-0.1-0.3-0.2-0.4c-0.1-0.2-0.2-0.5-0.3-0.8c-0.1-0.2-0.2-0.3-0.3-0.4c-0.1-0.3-0.3-0.5-0.5-0.8c-0.2-0.3-0.6-0.9-0.9-1.4
+			c-0.3-0.4-0.5-0.7-0.7-0.9c-0.7-0.6-1.2-0.9-1.5-0.9c-0.1,0-0.2,0-0.3,0.1c-0.1,0.1-0.1,0.1-0.1,0.2c0,0.2,0.2,0.4,0.6,0.6
+			c1.2,0.7,1.8,1.7,2.5,2.9c0.1,0.2,0.3,0.5,0.4,0.8c0.1,0.2,0.2,0.4,0.4,0.6c0.4,0.7,0.7,1.2,0.5,1.9l-0.6,2.1c0,0.1,0,0.1-0.1,0.2
+			l0,0c0,0.1-0.1,0.2-0.1,0.3c0,0.1-0.1,0.1-0.1,0.2c-0.1,0.1-0.1,0.2-0.1,0.4c0,0.2,0.1,0.4,0.2,0.6c0.1,0.2,0.3,0.3,0.5,0.3l0,0
+			l0,0c0.2-0.1,0.5-0.5,0.6-0.9c0.2-0.6,0.4-1.2,0.4-1.5c0-0.3,0.1-0.6,0.1-1c0-0.1,0-0.2,0.1-0.3c0-0.2,0-0.3,0-0.5
+			c0-0.2,0-0.5,0.1-0.7l0.4,1.8l0,0c0,0.2,0.1,0.3,0.1,0.4c0.1,0.3,0.1,0.6,0.5,0.8c0.1,0.1,0.2,0.1,0.2,0.1c0.1,0,0.1,0,0.3-0.1
+			l0,0l0,0c0-0.1,0-0.2,0-0.2c0-0.1,0-0.3,0-0.4c0-0.2,0.1-0.9,0.2-1.3c0-0.1,0.1-0.3,0.1-0.4c0,0,0,0,0-0.1
+			c0.2-0.1,0.6-0.2,0.7-0.2c0.2,0,0.4,0,0.5,0.1c0.1,0,0.2,0.1,0.3,0.2c0.1,0.1,0.2-0.3,0.3-0.4C24.3,23.5,24.1,23.4,23.9,23.3z
+			 M22.1,22.7c0,0,0,0.1-0.1,0.3l0,0c0,0,0,0.3-0.1,0.4l-0.1,0l0,0c0,0,0,0,0,0l-0.1,0C21.7,23.3,21.8,22.9,22.1,22.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/vue3/src/assets/images/logo_bg.jpg b/openhis-ui-vue3/src/assets/images/logo_bg.jpg
similarity index 100%
rename from vue3/src/assets/images/logo_bg.jpg
rename to openhis-ui-vue3/src/assets/images/logo_bg.jpg
diff --git a/vue3/src/assets/images/pay.png b/openhis-ui-vue3/src/assets/images/pay.png
similarity index 100%
rename from vue3/src/assets/images/pay.png
rename to openhis-ui-vue3/src/assets/images/pay.png
diff --git a/vue3/src/assets/images/profile.jpg b/openhis-ui-vue3/src/assets/images/profile.jpg
similarity index 100%
rename from vue3/src/assets/images/profile.jpg
rename to openhis-ui-vue3/src/assets/images/profile.jpg
diff --git a/vue3/src/assets/images/user.png b/openhis-ui-vue3/src/assets/images/user.png
similarity index 100%
rename from vue3/src/assets/images/user.png
rename to openhis-ui-vue3/src/assets/images/user.png
diff --git a/vue3/src/assets/logo/logo.png b/openhis-ui-vue3/src/assets/logo/logo.png
similarity index 100%
rename from vue3/src/assets/logo/logo.png
rename to openhis-ui-vue3/src/assets/logo/logo.png
diff --git a/vue3/src/assets/logo/logoBlack.png b/openhis-ui-vue3/src/assets/logo/logoBlack.png
similarity index 100%
rename from vue3/src/assets/logo/logoBlack.png
rename to openhis-ui-vue3/src/assets/logo/logoBlack.png
diff --git a/vue3/src/assets/logo/logoNew.png b/openhis-ui-vue3/src/assets/logo/logoNew.png
similarity index 100%
rename from vue3/src/assets/logo/logoNew.png
rename to openhis-ui-vue3/src/assets/logo/logoNew.png
diff --git a/vue3/src/assets/styles/btn.scss b/openhis-ui-vue3/src/assets/styles/btn.scss
similarity index 100%
rename from vue3/src/assets/styles/btn.scss
rename to openhis-ui-vue3/src/assets/styles/btn.scss
diff --git a/vue3/src/assets/styles/element-ui.scss b/openhis-ui-vue3/src/assets/styles/element-ui.scss
similarity index 100%
rename from vue3/src/assets/styles/element-ui.scss
rename to openhis-ui-vue3/src/assets/styles/element-ui.scss
diff --git a/vue3/src/assets/styles/font.scss b/openhis-ui-vue3/src/assets/styles/font.scss
similarity index 100%
rename from vue3/src/assets/styles/font.scss
rename to openhis-ui-vue3/src/assets/styles/font.scss
diff --git a/vue3/src/assets/styles/index.scss b/openhis-ui-vue3/src/assets/styles/index.scss
similarity index 100%
rename from vue3/src/assets/styles/index.scss
rename to openhis-ui-vue3/src/assets/styles/index.scss
diff --git a/vue3/src/assets/styles/mixin.scss b/openhis-ui-vue3/src/assets/styles/mixin.scss
similarity index 100%
rename from vue3/src/assets/styles/mixin.scss
rename to openhis-ui-vue3/src/assets/styles/mixin.scss
diff --git a/vue3/src/assets/styles/openhis.scss b/openhis-ui-vue3/src/assets/styles/openhis.scss
similarity index 94%
rename from vue3/src/assets/styles/openhis.scss
rename to openhis-ui-vue3/src/assets/styles/openhis.scss
index ab1c600e..6b7182bf 100644
--- a/vue3/src/assets/styles/openhis.scss
+++ b/openhis-ui-vue3/src/assets/styles/openhis.scss
@@ -152,7 +152,9 @@
 .el-table .el-dropdown, .el-icon-arrow-down {
 	font-size: 12px;
 }
-
+.el-scrollbar__bar.is-horizontal{
+	height: 10px!important;
+}
 .el-tree-node__content > .el-checkbox {
 	margin-right: 8px;
 }
@@ -295,4 +297,18 @@
 }
 .el-input.is-disabled .el-input__wrapper {
     cursor: text !important;
+}
+
+.descriptions-item-label {
+	color: #606266;
+	font-size: 14px;
+	font-weight: 700;
+	margin-left: 15px;
+}
+
+.descriptions-item-value {
+	color: #606266;
+	font-size: 14px;
+	font-weight: 500;
+	margin-left: 15px;
 }
\ No newline at end of file
diff --git a/vue3/src/assets/styles/sidebar.scss b/openhis-ui-vue3/src/assets/styles/sidebar.scss
similarity index 100%
rename from vue3/src/assets/styles/sidebar.scss
rename to openhis-ui-vue3/src/assets/styles/sidebar.scss
diff --git a/vue3/src/assets/styles/transition.scss b/openhis-ui-vue3/src/assets/styles/transition.scss
similarity index 100%
rename from vue3/src/assets/styles/transition.scss
rename to openhis-ui-vue3/src/assets/styles/transition.scss
diff --git a/vue3/src/assets/styles/variables.module.scss b/openhis-ui-vue3/src/assets/styles/variables.module.scss
similarity index 100%
rename from vue3/src/assets/styles/variables.module.scss
rename to openhis-ui-vue3/src/assets/styles/variables.module.scss
diff --git a/vue3/src/components/Auto/PfPatientCardB/PfPatientCard.vue b/openhis-ui-vue3/src/components/Auto/PfPatientCardB/PfPatientCard.vue
similarity index 100%
rename from vue3/src/components/Auto/PfPatientCardB/PfPatientCard.vue
rename to openhis-ui-vue3/src/components/Auto/PfPatientCardB/PfPatientCard.vue
diff --git a/vue3/src/components/Auto/PfPatientCardB/index.js b/openhis-ui-vue3/src/components/Auto/PfPatientCardB/index.js
similarity index 100%
rename from vue3/src/components/Auto/PfPatientCardB/index.js
rename to openhis-ui-vue3/src/components/Auto/PfPatientCardB/index.js
diff --git a/vue3/src/components/Auto/PfPatientCardB/index.vue b/openhis-ui-vue3/src/components/Auto/PfPatientCardB/index.vue
similarity index 100%
rename from vue3/src/components/Auto/PfPatientCardB/index.vue
rename to openhis-ui-vue3/src/components/Auto/PfPatientCardB/index.vue
diff --git a/vue3/src/components/Auto/printBills/bedCard.vue b/openhis-ui-vue3/src/components/Auto/printBills/bedCard.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/bedCard.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/bedCard.vue
diff --git a/vue3/src/components/Auto/printBills/changeShiftBill.vue b/openhis-ui-vue3/src/components/Auto/printBills/changeShiftBill.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/changeShiftBill.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/changeShiftBill.vue
diff --git a/vue3/src/components/Auto/printBills/exeOrderSheet.vue b/openhis-ui-vue3/src/components/Auto/printBills/exeOrderSheet.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/exeOrderSheet.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/exeOrderSheet.vue
diff --git a/vue3/src/components/Auto/printBills/injectLabel.vue b/openhis-ui-vue3/src/components/Auto/printBills/injectLabel.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/injectLabel.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/injectLabel.vue
diff --git a/vue3/src/components/Auto/printBills/injectOrderSheet.vue b/openhis-ui-vue3/src/components/Auto/printBills/injectOrderSheet.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/injectOrderSheet.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/injectOrderSheet.vue
diff --git a/vue3/src/components/Auto/printBills/labelGroup.vue b/openhis-ui-vue3/src/components/Auto/printBills/labelGroup.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/labelGroup.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/labelGroup.vue
diff --git a/vue3/src/components/Auto/printBills/sheetGroup.vue b/openhis-ui-vue3/src/components/Auto/printBills/sheetGroup.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/sheetGroup.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/sheetGroup.vue
diff --git a/vue3/src/components/Auto/printBills/temperatureSheet.vue b/openhis-ui-vue3/src/components/Auto/printBills/temperatureSheet.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/temperatureSheet.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/temperatureSheet.vue
diff --git a/vue3/src/components/Auto/printBills/triageTicket.vue b/openhis-ui-vue3/src/components/Auto/printBills/triageTicket.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/triageTicket.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/triageTicket.vue
diff --git a/vue3/src/components/Auto/printBills/triageTicketGroup.vue b/openhis-ui-vue3/src/components/Auto/printBills/triageTicketGroup.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/triageTicketGroup.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/triageTicketGroup.vue
diff --git a/vue3/src/components/Auto/printBills/triageTicketNew.vue b/openhis-ui-vue3/src/components/Auto/printBills/triageTicketNew.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/triageTicketNew.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/triageTicketNew.vue
diff --git a/vue3/src/components/Auto/printBills/wristBill.vue b/openhis-ui-vue3/src/components/Auto/printBills/wristBill.vue
similarity index 100%
rename from vue3/src/components/Auto/printBills/wristBill.vue
rename to openhis-ui-vue3/src/components/Auto/printBills/wristBill.vue
diff --git a/vue3/src/components/Breadcrumb/index.vue b/openhis-ui-vue3/src/components/Breadcrumb/index.vue
similarity index 100%
rename from vue3/src/components/Breadcrumb/index.vue
rename to openhis-ui-vue3/src/components/Breadcrumb/index.vue
diff --git a/vue3/src/components/Crontab/day.vue b/openhis-ui-vue3/src/components/Crontab/day.vue
similarity index 100%
rename from vue3/src/components/Crontab/day.vue
rename to openhis-ui-vue3/src/components/Crontab/day.vue
diff --git a/vue3/src/components/Crontab/hour.vue b/openhis-ui-vue3/src/components/Crontab/hour.vue
similarity index 100%
rename from vue3/src/components/Crontab/hour.vue
rename to openhis-ui-vue3/src/components/Crontab/hour.vue
diff --git a/vue3/src/components/Crontab/index.vue b/openhis-ui-vue3/src/components/Crontab/index.vue
similarity index 100%
rename from vue3/src/components/Crontab/index.vue
rename to openhis-ui-vue3/src/components/Crontab/index.vue
diff --git a/vue3/src/components/Crontab/min.vue b/openhis-ui-vue3/src/components/Crontab/min.vue
similarity index 100%
rename from vue3/src/components/Crontab/min.vue
rename to openhis-ui-vue3/src/components/Crontab/min.vue
diff --git a/vue3/src/components/Crontab/month.vue b/openhis-ui-vue3/src/components/Crontab/month.vue
similarity index 100%
rename from vue3/src/components/Crontab/month.vue
rename to openhis-ui-vue3/src/components/Crontab/month.vue
diff --git a/vue3/src/components/Crontab/result.vue b/openhis-ui-vue3/src/components/Crontab/result.vue
similarity index 100%
rename from vue3/src/components/Crontab/result.vue
rename to openhis-ui-vue3/src/components/Crontab/result.vue
diff --git a/vue3/src/components/Crontab/second.vue b/openhis-ui-vue3/src/components/Crontab/second.vue
similarity index 100%
rename from vue3/src/components/Crontab/second.vue
rename to openhis-ui-vue3/src/components/Crontab/second.vue
diff --git a/vue3/src/components/Crontab/week.vue b/openhis-ui-vue3/src/components/Crontab/week.vue
similarity index 100%
rename from vue3/src/components/Crontab/week.vue
rename to openhis-ui-vue3/src/components/Crontab/week.vue
diff --git a/vue3/src/components/Crontab/year.vue b/openhis-ui-vue3/src/components/Crontab/year.vue
similarity index 100%
rename from vue3/src/components/Crontab/year.vue
rename to openhis-ui-vue3/src/components/Crontab/year.vue
diff --git a/vue3/src/components/DictTag/index.vue b/openhis-ui-vue3/src/components/DictTag/index.vue
similarity index 100%
rename from vue3/src/components/DictTag/index.vue
rename to openhis-ui-vue3/src/components/DictTag/index.vue
diff --git a/vue3/src/components/Editor/index.vue b/openhis-ui-vue3/src/components/Editor/index.vue
similarity index 100%
rename from vue3/src/components/Editor/index.vue
rename to openhis-ui-vue3/src/components/Editor/index.vue
diff --git a/vue3/src/components/FileUpload/index.vue b/openhis-ui-vue3/src/components/FileUpload/index.vue
similarity index 100%
rename from vue3/src/components/FileUpload/index.vue
rename to openhis-ui-vue3/src/components/FileUpload/index.vue
diff --git a/vue3/src/components/Hamburger/index.vue b/openhis-ui-vue3/src/components/Hamburger/index.vue
similarity index 100%
rename from vue3/src/components/Hamburger/index.vue
rename to openhis-ui-vue3/src/components/Hamburger/index.vue
diff --git a/vue3/src/components/HeaderSearch/index.vue b/openhis-ui-vue3/src/components/HeaderSearch/index.vue
similarity index 100%
rename from vue3/src/components/HeaderSearch/index.vue
rename to openhis-ui-vue3/src/components/HeaderSearch/index.vue
diff --git a/vue3/src/components/IconSelect/index.vue b/openhis-ui-vue3/src/components/IconSelect/index.vue
similarity index 100%
rename from vue3/src/components/IconSelect/index.vue
rename to openhis-ui-vue3/src/components/IconSelect/index.vue
diff --git a/vue3/src/components/IconSelect/requireIcons.js b/openhis-ui-vue3/src/components/IconSelect/requireIcons.js
similarity index 100%
rename from vue3/src/components/IconSelect/requireIcons.js
rename to openhis-ui-vue3/src/components/IconSelect/requireIcons.js
diff --git a/vue3/src/components/ImagePreview/index.vue b/openhis-ui-vue3/src/components/ImagePreview/index.vue
similarity index 100%
rename from vue3/src/components/ImagePreview/index.vue
rename to openhis-ui-vue3/src/components/ImagePreview/index.vue
diff --git a/vue3/src/components/ImageUpload/index.vue b/openhis-ui-vue3/src/components/ImageUpload/index.vue
similarity index 100%
rename from vue3/src/components/ImageUpload/index.vue
rename to openhis-ui-vue3/src/components/ImageUpload/index.vue
diff --git a/vue3/src/components/OpenHis/Doc/index.vue b/openhis-ui-vue3/src/components/OpenHis/Doc/index.vue
similarity index 100%
rename from vue3/src/components/OpenHis/Doc/index.vue
rename to openhis-ui-vue3/src/components/OpenHis/Doc/index.vue
diff --git a/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue b/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue
new file mode 100644
index 00000000..d1cb76b5
--- /dev/null
+++ b/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog
+    title="药品追溯码"
+    v-model="props.openDialog"
+    width="842"
+    append-to-body
+    destroy-on-close
+    :draggable="true"
+    @close="cancel"
+    @opened="
+      () => {
+        console.log(123);
+        traceNoTempRef.focus();
+      }
+    "
+  >
+    <div>
+      <div style="font-size: 16px">
+        <div style="margin-bottom: 15px">药品名称： {{ props.ypName }}</div>
+        扫描追溯码
+        <el-input
+          ref="traceNoTempRef"
+          type="textarea"
+          :rows="1"
+          v-model="traceNoTemp"
+          style="width: 180px; margin-right: 20px"
+          @input="throttledGetList(traceNoTemp)"
+        />
+        输入追溯码
+        <el-input
+          v-model="traceNoInput"
+          style="width: 180px; margin-right: 20px"
+          @keyup.enter="handelTraceNo(traceNoInput)"
+        />
+        <el-button type="primary" plain icon="CircleClose" @click="handleReturn"> 撤回 </el-button>
+        <el-button type="danger" plain icon="CircleClose" @click="handleClear"> 清除 </el-button>
+      </div>
+      <!-- <el-input
+          ref="inputRef"
+          v-model="traceNo"
+          type="textarea"
+          :rows="15"
+          disabled
+          @input="throttledGetList"
+          style="width: 100%; margin-top: 10px; margin-right: 20px"
+        /> -->
+      <div
+        style="
+          background: #f5f7fa;
+          margin-top: 10px;
+          padding: 10px;
+          width: 780px;
+          height: 350px;
+          border: solid 1px #ebeef5;
+          overflow-y: auto;
+        "
+      >
+        <div style="display: flex; flex-wrap: wrap; gap: 8px">
+          <div
+            v-for="(item, index) in traceNoList"
+            :key="item + index"
+            style="
+              display: inline-flex;
+              align-items: center;
+              background: white;
+              padding: 4px 8px 4px 12px;
+              border-radius: 12px;
+            "
+          >
+            <span style="margin-right: 6px">
+              [{{ index + 1 }}]
+              <template v-if="index < 9">&nbsp;</template>
+              <template v-else></template>
+              {{ item }}
+            </span>
+            <div
+              @click="removeTraceNo(index)"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 16px;
+                height: 16px;
+                background: #f56c6c;
+                border-radius: 50%;
+                cursor: pointer;
+              "
+            >
+              <el-icon size="10" color="white">
+                <Close />
+              </el-icon>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div>
+        追溯码：{{ existenceTraceNoList[rowData.itemId] }}
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { watch } from 'vue';
+import { searchTraceNo } from '@/api/public';
+import { debounce } from 'lodash-es';
+
+const props = defineProps({
+  openDialog: {
+    type: Boolean,
+    default: false,
+  },
+  ypName: {
+    type: String,
+    default: '',
+  },
+  rowData: {
+    type: Object,
+    default: () => {},
+  },
+});
+const openTraceNo = ref(false);
+const traceNo = ref('');
+const traceNoList = ref([]);
+const existenceTraceNoList = ref([]);
+const traceNoTemp = ref('');
+const traceNoInput = ref('');
+const traceNoTempRef = ref();
+const emit = defineEmits(['submit', 'cancel']);
+
+watch(
+  () => props.rowData,
+  async (newRowData) => {
+    if (newRowData && Object.keys(newRowData).length > 0) {
+      const { itemType, itemId, locationId, lotNumber } = newRowData;
+
+      try {
+        const response = await searchTraceNo({
+          itemType,
+          itemId,
+          locationId,
+          lotNumber,
+        });
+
+        // 处理返回数据，例如更新 traceNoList
+        existenceTraceNoList.value = response.data || [];
+      } catch (error) {
+        console.error('获取追溯码失败:', error);
+      }
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+// 撤回最后一条追溯码
+function handleReturn() {
+  if (traceNoList.value.length !== 0) {
+    // 1. 从数组中移除最后一项
+    traceNoList.value.pop();
+    // 2. 重新构建显示文本
+    traceNo.value = traceNoList.value
+      .map((item, index) => {
+        return index < 9 ? `[${index + 1}]   ${item}` : `[${index + 1}] ${item}`;
+      })
+      .join(', ');
+    if (traceNoList.value != 0) {
+      traceNo.value += '\n';
+    }
+  }
+  traceNoTempRef.value.focus();
+}
+
+function removeTraceNo(index) {
+  traceNoList.value.splice(index, 1);
+  traceNoTempRef.value.focus();
+}
+
+function formatValue(index) {
+  if (index >= 10) {
+    return `&nbsp;&nbsp;`;
+  } else {
+    return `&nbsp;`;
+  }
+}
+
+function handleClear() {
+  traceNo.value = '';
+  traceNoList.value = [];
+}
+const throttledGetList = debounce(handelTraceNo, 500);
+function handelTraceNo(value) {
+  let list = value.trim().split('\n');
+  list.forEach((item) => {
+    traceNoList.value.push(item);
+  });
+  traceNo.value = traceNoList.value
+    .map((item, index) => {
+      return index < 9 ? `[${index + 1}]   ${item}` : `[${index + 1}] ${item}`;
+    })
+    .join(', ');
+  if (traceNoList.value != 0) {
+    traceNo.value += '\n';
+  }
+  traceNoTemp.value = '';
+  traceNoInput.value = '';
+  // let saveValue = value.substring(inputValue.length + 5, value.length);
+  // inputValue = value;
+  // console.log(value);
+  // console.log(saveValue);
+  // traceNoList.value.push(saveValue);
+  // traceNo.value = value + '[' + (traceNoList.value.length + 1) + ']' + '  ';
+}
+function cancel() {
+  emit('cancel');
+  traceNoList.value = [];
+  traceNo.value = '';
+}
+
+function submit() {
+  emit('submit', traceNoList.value.join(','));
+  openTraceNo.value = false;
+  traceNoList.value = [];
+  traceNo.value = '';
+}
+</script>
\ No newline at end of file
diff --git a/vue3/src/components/OpenHis/popoverList/index.vue b/openhis-ui-vue3/src/components/OpenHis/popoverList/index.vue
similarity index 78%
rename from vue3/src/components/OpenHis/popoverList/index.vue
rename to openhis-ui-vue3/src/components/OpenHis/popoverList/index.vue
index b6126fbb..328fe312 100644
--- a/vue3/src/components/OpenHis/popoverList/index.vue
+++ b/openhis-ui-vue3/src/components/OpenHis/popoverList/index.vue
@@ -22,12 +22,10 @@
 </template>
 
 <script setup>
-import { ref, watch, defineProps, defineEmits } from "vue";
-
 const props = defineProps({
   modelValue: {
     type: String,
-    default: "",
+    default: '',
   },
   row: {
     type: Object,
@@ -39,11 +37,11 @@ const props = defineProps({
   },
   placeholder: {
     type: String,
-    default: "",
+    default: '',
   },
   placement: {
     type: String,
-    default: "bottom-start",
+    default: 'bottom-start',
   },
   width: {
     type: Number,
@@ -51,12 +49,7 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits([
-  "update:modelValue",
-  "selsect-advice-base",
-  "focus",
-  "blur",
-]);
+const emit = defineEmits(['update:modelValue', 'selsect-advice-base', 'focus', 'blur']);
 
 const isPopoverVisible = ref(false);
 const inputValue = ref(props.modelValue);
@@ -70,22 +63,22 @@ watch(
 );
 
 const handleInput = (value) => {
-  emit("search", value);
+  emit('search', value);
 };
 
 const handleFocus = () => {
   isPopoverVisible.value = true;
-  emit("focus", props.row, props.index);
+  emit('focus', props.row, props.index);
 };
 
 const handleBlur = () => {
   // 延迟隐藏以允许选择操作完成
   isPopoverVisible.value = false;
-  emit("blur", props.row);
+  emit('blur', props.row);
 };
 
 const handleSelectAdvice = (payload) => {
   isPopoverVisible.value = false;
-  emit("selsect-advice-base", payload);
+  emit('selsect-advice-base', payload);
 };
 </script>
\ No newline at end of file
diff --git a/vue3/src/components/Pagination/index.vue b/openhis-ui-vue3/src/components/Pagination/index.vue
similarity index 100%
rename from vue3/src/components/Pagination/index.vue
rename to openhis-ui-vue3/src/components/Pagination/index.vue
diff --git a/vue3/src/components/ParentView/index.vue b/openhis-ui-vue3/src/components/ParentView/index.vue
similarity index 100%
rename from vue3/src/components/ParentView/index.vue
rename to openhis-ui-vue3/src/components/ParentView/index.vue
diff --git a/vue3/src/components/RightToolbar/index.vue b/openhis-ui-vue3/src/components/RightToolbar/index.vue
similarity index 100%
rename from vue3/src/components/RightToolbar/index.vue
rename to openhis-ui-vue3/src/components/RightToolbar/index.vue
diff --git a/vue3/src/components/Screenfull/index.vue b/openhis-ui-vue3/src/components/Screenfull/index.vue
similarity index 100%
rename from vue3/src/components/Screenfull/index.vue
rename to openhis-ui-vue3/src/components/Screenfull/index.vue
diff --git a/vue3/src/components/SizeSelect/index.vue b/openhis-ui-vue3/src/components/SizeSelect/index.vue
similarity index 100%
rename from vue3/src/components/SizeSelect/index.vue
rename to openhis-ui-vue3/src/components/SizeSelect/index.vue
diff --git a/vue3/src/components/SvgIcon/index.vue b/openhis-ui-vue3/src/components/SvgIcon/index.vue
similarity index 100%
rename from vue3/src/components/SvgIcon/index.vue
rename to openhis-ui-vue3/src/components/SvgIcon/index.vue
diff --git a/vue3/src/components/SvgIcon/svgicon.js b/openhis-ui-vue3/src/components/SvgIcon/svgicon.js
similarity index 100%
rename from vue3/src/components/SvgIcon/svgicon.js
rename to openhis-ui-vue3/src/components/SvgIcon/svgicon.js
diff --git a/vue3/src/components/TopNav/index.vue b/openhis-ui-vue3/src/components/TopNav/index.vue
similarity index 100%
rename from vue3/src/components/TopNav/index.vue
rename to openhis-ui-vue3/src/components/TopNav/index.vue
diff --git a/vue3/src/components/TreeSelect/index.vue b/openhis-ui-vue3/src/components/TreeSelect/index.vue
similarity index 100%
rename from vue3/src/components/TreeSelect/index.vue
rename to openhis-ui-vue3/src/components/TreeSelect/index.vue
diff --git a/vue3/src/components/iFrame/index.vue b/openhis-ui-vue3/src/components/iFrame/index.vue
similarity index 100%
rename from vue3/src/components/iFrame/index.vue
rename to openhis-ui-vue3/src/components/iFrame/index.vue
diff --git a/vue3/src/components/patientBar/components/BallTag.vue b/openhis-ui-vue3/src/components/patientBar/components/BallTag.vue
similarity index 100%
rename from vue3/src/components/patientBar/components/BallTag.vue
rename to openhis-ui-vue3/src/components/patientBar/components/BallTag.vue
diff --git a/vue3/src/components/patientBar/inPatientBarDoctorFold.vue b/openhis-ui-vue3/src/components/patientBar/inPatientBarDoctorFold.vue
similarity index 58%
rename from vue3/src/components/patientBar/inPatientBarDoctorFold.vue
rename to openhis-ui-vue3/src/components/patientBar/inPatientBarDoctorFold.vue
index 9fc85da3..77762ca5 100644
--- a/vue3/src/components/patientBar/inPatientBarDoctorFold.vue
+++ b/openhis-ui-vue3/src/components/patientBar/inPatientBarDoctorFold.vue
@@ -8,57 +8,52 @@
     <div class="basic_info">
       <div class="patient-header white-bg">
         <div class="select_wrapper_div">
-          <b class="bedNumber" style="margin-left: 12px">{{ patientInfo.bedName }}</b>
-          <label class="content-text-color" style="margin-left: 12px; color: #a15209"
-            >{{ patientInfo.name
-            }}<span class="sex-age">{{ patientInfo.sexName }}/{{ patientInfo.age }}</span></label
-          >
-          <div style="margin-left: 16px" v-if="patientInfo?.nursingLevel">
-            <!-- <care-tag v-model="patientInfo.nursingLevel"></care-tag> -->
-            {{ patientInfo.nursingLevel }}
-            <!-- //护理等级 -->
-          </div>
+          <b class="bedNumber" style="margin-left: 12px">{{ patientInfo?.bedName }}</b>
+          <label class="content-text-color" style="margin-left: 12px; color: #a15209">
+            {{ patientInfo?.patientName }}
+            <span class="sex-age"> {{ patientInfo?.sexName }}/{{ patientInfo?.age }} </span>
+          </label>
+
           <div style="display: flex; margin-left: 8px">
             <!-- 状态展示// TODO 后端给状态，前段 -->
             <ball-tag
               style="margin-right: 4px"
-              v-for="item in patientInfo.list"
+              v-for="item in patientInfo?.list"
               :key="item"
               :tagId="item"
             ></ball-tag>
           </div>
           <div
             class="gray-border"
-            v-show="patientInfo?.feeTypeName && patientInfo.feeTypeName !== ''"
+            v-show="patientInfo?.feeTypeName && patientInfo?.feeTypeName !== ''"
           >
-            {{ patientInfo.feeTypeName }}
+            {{ patientInfo?.feeTypeName }}
           </div>
-          <label style="margin-left: 24px"
-            ><span class="label-text-color">住院：</span
-            ><span class="content-text-color">{{ patientInfo.inDays }}</span></label
-          >
-          <label style="margin-left: 24px"
-            ><span class="label-text-color">入科：</span
-            ><span class="content-text-color">{{ patientInfo.inDeptDate }}</span></label
-          >
-          <label style="margin-left: 24px"
-            ><span class="label-text-color">入院时间：</span
-            ><span class="content-text-color">{{ patientInfo.inTime }}</span></label
-          >
-          <label style="margin-left: 24px"
-            ><span class="label-text-color">住院号:{{ patientInfo.inpatientCode }}</span>
+          <label style="margin-left: 24px">
+            <span class="label-text-color">住院：</span>
+            <span class="content-text-color">{{ patientInfo?.inHospitalDays + '天' }}</span>
+          </label>
+          <label style="margin-left: 24px">
+            <span class="label-text-color">入科：</span>
+            <span class="content-text-color">{{ patientInfo?.inDeptDate }}</span>
+          </label>
+          <label style="margin-left: 24px">
+            <span class="label-text-color">入院时间：</span>
+            <span class="content-text-color">{{ patientInfo?.inHospitalTime }}</span>
+          </label>
+          <label style="margin-left: 24px">
+            <span class="label-text-color">住院号:{{ patientInfo?.busNo }}</span>
           </label>
           <svg-icon icon-class="hipCopy" height="20px" width="20px" class="copy-svg" />
-          <label style="margin-left: 30px"
-            ><span class="label-text-color">诊断：</span
-            ><span class="content-text-color">{{ patientInfo.impDiagnosis }}</span></label
-          >
-          <div style="margin-left: auto">
+          <label style="margin-left: 30px">
+            <span class="label-text-color">诊断：</span>
+            <span class="content-text-color">{{ patientInfo?.regDiagnosisName }}</span>
+          </label>
+          <!-- <div style="margin-left: auto">
             <el-icon v-if="expand" @click="toggleExpand"><ArrowUpBold /></el-icon>
             <el-icon v-else @click="toggleExpand"><ArrowDownBold /></el-icon>
-          </div>
+          </div> -->
         </div>
-        <!-- <el-divider v-if="showDividers" style="margin: 0"></el-divider> -->
       </div>
     </div>
     <div v-if="expand" class="expand_more">
@@ -66,16 +61,16 @@
         <div style="margin-top: -10px">
           <label style="font-size: 14px">
             <span class="primary-text">过敏：</span>
-            <span class="primary-text">{{ patientInfo.allergies || '无过敏史' }}</span>
+            <span class="primary-text">{{ patientInfo?.allergies || '无过敏史' }}</span>
           </label>
-          <label style="font-size: 14px; margin-left: 32px" v-show="patientInfo.insuplcAdmdvsName">
+          <label style="font-size: 14px; margin-left: 32px" v-show="patientInfo?.insuplcAdmdvsName">
             <span class="primary-text">医保统筹区:</span>
-            <span class="primary-text">{{ patientInfo.insuplcAdmdvsName }}</span>
+            <span class="primary-text">{{ patientInfo?.insuplcAdmdvsName }}</span>
           </label>
 
-          <label style="font-size: 14px; margin-left: 32px" v-show="patientInfo.ciType">
+          <label style="font-size: 14px; margin-left: 32px" v-show="patientInfo?.ciType">
             <span class="primary-text">商保信息：</span>
-            <span class="primary-text">{{ patientInfo.ciType }}</span>
+            <span class="primary-text">{{ patientInfo?.ciType }}</span>
           </label>
           <div style="display: flex; flex-wrap: nowrap; margin-top: 8px; white-space: nowrap">
             <div
@@ -84,8 +79,8 @@
             >
               <span class="content-text-color">
                 {{
-                  patientInfo.height && patientInfo.weight
-                    ? `${patientInfo.height}cm/${patientInfo.weight}kg`
+                  patientInfo?.height && patientInfo?.weight
+                    ? `${patientInfo?.height}cm/${patientInfo?.weight}kg`
                     : '身高/体重'
                 }}
               </span>
@@ -98,9 +93,9 @@
                 flex-shrink: 0;
                 min-width: fit-content;
               "
-              v-show="patientInfo.postoperativeDays"
+              v-show="patientInfo?.postoperativeDays"
             >
-              <span class="content-text-color">术后{{ patientInfo.postoperativeDays }}天</span>
+              <span class="content-text-color">术后{{ patientInfo?.postoperativeDays }}天</span>
             </div>
             <div
               class="blue-bg"
@@ -110,11 +105,11 @@
                 flex-shrink: 0;
                 min-width: fit-content;
               "
-              v-show="patientInfo.poorTypeName"
+              v-show="patientInfo?.poorTypeName"
             >
               <span class="label-text-color">贫困类型:</span>
               <span class="content-text-color" style="margin-left: 4px">{{
-                patientInfo.poorTypeName
+                patientInfo?.poorTypeName
               }}</span>
             </div>
 
@@ -126,11 +121,11 @@
                 flex-shrink: 0;
                 min-width: fit-content;
               "
-              v-show="patientInfo.pathwayName"
+              v-show="patientInfo?.pathwayName"
             >
               <span class="label-text-color">路径情况:</span>
               <span class="content-text-color" style="margin-left: 4px">{{
-                patientInfo.pathwayName
+                patientInfo?.pathwayName
               }}</span>
             </div>
           </div>
@@ -143,21 +138,21 @@
               <div class="line-block">
                 <div class="line-block-top">
                   <span class="label-text-color">科室：</span>
-                  <span class="content-text-color">{{ patientInfo.admissionDeptName }}</span>
+                  <span class="content-text-color">{{ patientInfo?.admissionDeptName }}</span>
                 </div>
                 <div class="line-block-bottom">
                   <span class="label-text-color">病区：</span>
-                  <span class="content-text-color">{{ patientInfo.deptNurseName }}</span>
+                  <span class="content-text-color">{{ patientInfo?.deptNurseName }}</span>
                 </div>
               </div>
               <div class="line-block">
                 <div class="line-block-top">
                   <span class="label-text-color">主治医生：</span>
-                  <span class="content-text-color">{{ patientInfo.masterDoctorName }}</span>
+                  <span class="content-text-color">{{ patientInfo?.masterDoctorName }}</span>
                 </div>
                 <div class="line-block-bottom">
                   <span class="label-text-color">责任护士：</span>
-                  <span class="content-text-color">{{ patientInfo.masterNurseName }}</span>
+                  <span class="content-text-color">{{ patientInfo?.masterNurseName }}</span>
                 </div>
               </div>
               <div class="line-blockMoney">
@@ -166,7 +161,7 @@
                 </div>
                 <div class="line-blockMoney-bottom">
                   <b class="money-content size-15">{{
-                    patientInfo.totalAmount ? patientInfo.totalAmount : 0
+                    patientInfo?.totalAmount ? patientInfo?.totalAmount : 0
                   }}</b>
                 </div>
               </div>
@@ -176,7 +171,7 @@
                 </div>
                 <div class="line-blockMoney-bottom">
                   <b class="money-content size-15">{{
-                    patientInfo.prepayAmount ? patientInfo.prepayAmount : 0
+                    patientInfo?.prepayAmount ? patientInfo?.prepayAmount : 0
                   }}</b>
                 </div>
               </div>
@@ -186,7 +181,7 @@
                 </div>
                 <div class="line-blockMoney-bottom">
                   <b class="money-content size-15">{{
-                    patientInfo.balance ? patientInfo.balance : 0
+                    patientInfo?.balance ? patientInfo?.balance : 0
                   }}</b>
                 </div>
               </div>
@@ -199,156 +194,49 @@
   </div>
 </template>
 <script  setup>
-import { computed, onMounted, ref, watch } from 'vue'
-import BallTag from './components/BallTag.vue'
+import { computed, onMounted, ref, watch } from 'vue';
+import BallTag from './components/BallTag.vue';
+import { patientInfo } from '@/views/inpatientDoctor/home/store/patient.js';
 // import { ElMessage } from 'element-plus'
 
-const expand = ref(false)
-const fakePatientInfo = ref({
-  care: '2',
-  balls: ['0', '1', '2', '3', '4'],
-  number: '0023445454',
-})
-
-const iconClassPhoto = computed(() => {
-  // 获取 sex 和 age 的值
-  const sexValue = patientInfo.value.sexName
-  const ageValue = patientInfo.value.age
-
-  // 确保 ageValue 是一个字符串，如果不是，尝试将其转换为字符串
-  let ageString = ''
-
-  if (typeof ageValue === 'string') {
-    ageString = ageValue
-  } else if (typeof ageValue !== 'undefined') {
-    ageString = ageValue.toString() // 尝试将 ageValue 转换为字符串
-  }
-
-  // 匹配年龄的正则表达式，包括 "31岁" 和 "x" 的情况
-  const ageMatch = ageString.match(/^(\d+)/)
-  const ageNumber = ageMatch ? parseInt(ageMatch[1], 10) : NaN
-
-  // 如果 ageNumber 是有效的，进行分类
-  if (!isNaN(ageNumber)) {
-    // 普通数字年龄分类
-    if (ageNumber < 3) {
-      return sexValue === '男' ? 'headMaleBaby' : 'headFemaleBaby' // 婴儿
-    } else if (ageNumber <= 14) {
-      return sexValue === '男' ? 'headMaleChild' : 'headFemaleChild' // 儿童
-    } else if (ageNumber <= 28) {
-      return sexValue === '男' ? 'headMaleYoung' : 'headFemaleYoung' // 青年
-    } else if (ageNumber <= 44) {
-      return sexValue === '男' ? 'headMaleMiddleAged' : 'headFemaleMiddleAged' // 中年
-    } else {
-      return sexValue === '男' ? 'headMaleElder' : 'headFemaleElder' // 老年
-    }
-  }
+const expand = ref(false);
 
-  // 如果 ageString 不是有效的年龄格式，返回未知
-  return 'headUnknown'
-})
-const patientInfo = ref({
-  visitCode: 'IPD0000107',
-  inpatientCode: '20240000068',
-  name: '金沙县',
-  birthDate: '2018-08-19 00:00:00',
-  patCode: '202400000032',
-  sex: '1',
-  sexName: '男',
-  age: '6岁',
-  tel: null,
-  feeType: null,
-  feeTypeName: null,
-  relation: null,
-  allergies: null,
-  ambDoctor: null,
-  ambDiagnosis: null,
-  impDiagnosis: null,
-  dischargeDiagnosis: null,
-  nursingLevel: null,
-  height: 1.0,
-  weight: 1.0,
-  temperature: null,
-  heartRate: null,
-  pulse: null,
-  highBloodPressure: null,
-  endBloodPressure: null,
-  admissionDeptCode: '2302',
-  admissionDeptName: '儿科住院',
-  deptNurseCode: '2302',
-  deptNurseName: '儿科',
-  bedId: '2',
-  bedName: '2床',
-  admittedDoctor: '000239',
-  admittedDoctorName: null,
-  masterDoctor: '000239',
-  masterDoctorName: null,
-  directorDoctor: '000239',
-  directorDoctorName: null,
-  masterNurse: '0005',
-  masterNurseName: null,
-  condition: null,
-  conditionName: null,
-  totalAmount: 0,
-  prepayAmount: 0,
-  balance: 0,
-  statusCode: 'RECEIVED',
-  inTime: '2024年12月16日 00:00',
-  outTime: null,
-  postoperativeDays: null,
-  inDays: '112天',
-  poorType: null,
-  poorTypeName: null,
-  pathwayFlag: null,
-  pathwayName: '类风湿性关节炎',
-  inDeptDate: null,
-  list: ['预警'],
-  ciType: null,
-  insuplcAdmdvsName: null,
-})
 // 定义一个布尔变量来控制是否显示 hip-dividers
-const showDividers = ref(true)
+const showDividers = ref(true);
 
 // 示例方法：切换显示状态
 const toggleDividers = () => {
-  showDividers.value = !showDividers.value
-}
-const iconClass = ref('hipBarDown')
+  showDividers.value = !showDividers.value;
+};
+const iconClass = ref('hipBarDown');
 
 // 切换展开状态的方法
 function toggleExpand() {
-  expand.value = !expand.value
-  iconClass.value = expand.value ? 'hipBarUp' : 'hipBarDown'
-  toggleDividers()
+  expand.value = !expand.value;
+  iconClass.value = expand.value ? 'hipBarUp' : 'hipBarDown';
+  toggleDividers();
 }
 
 const fetchPatientInfoById = async (patientId) => {
   // 查询患者信息
-  console.log(patientId)
-}
+  console.log(patientId);
+};
 
-const props = defineProps(
-  {
-    visitCode: '',
-  },
-)
+const props = defineProps({
+  visitCode: '',
+});
 watch(
   () => props.visitCode,
   (val) => {
     if (val !== null && val !== '') {
-      fetchPatientInfoById(val)
+      fetchPatientInfoById(val);
     }
-  },
-)
+  }
+);
 
 defineOptions({
   name: 'NurserDoctorPatientBarminimal',
-})
-
-// onMounted(function () {
-//   // fetchPatientInfoById('IPD0000063')
-//   fetchPatientInfoById(props.visitCode)
-// })
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/vue3/src/directive/common/clickOutsideRow.js b/openhis-ui-vue3/src/directive/common/clickOutsideRow.js
similarity index 100%
rename from vue3/src/directive/common/clickOutsideRow.js
rename to openhis-ui-vue3/src/directive/common/clickOutsideRow.js
diff --git a/vue3/src/directive/common/copyText.js b/openhis-ui-vue3/src/directive/common/copyText.js
similarity index 100%
rename from vue3/src/directive/common/copyText.js
rename to openhis-ui-vue3/src/directive/common/copyText.js
diff --git a/vue3/src/directive/common/horizontalScroll.js b/openhis-ui-vue3/src/directive/common/horizontalScroll.js
similarity index 100%
rename from vue3/src/directive/common/horizontalScroll.js
rename to openhis-ui-vue3/src/directive/common/horizontalScroll.js
diff --git a/vue3/src/directive/index.js b/openhis-ui-vue3/src/directive/index.js
similarity index 100%
rename from vue3/src/directive/index.js
rename to openhis-ui-vue3/src/directive/index.js
diff --git a/vue3/src/directive/permission/hasPermi.js b/openhis-ui-vue3/src/directive/permission/hasPermi.js
similarity index 100%
rename from vue3/src/directive/permission/hasPermi.js
rename to openhis-ui-vue3/src/directive/permission/hasPermi.js
diff --git a/vue3/src/directive/permission/hasRole.js b/openhis-ui-vue3/src/directive/permission/hasRole.js
similarity index 100%
rename from vue3/src/directive/permission/hasRole.js
rename to openhis-ui-vue3/src/directive/permission/hasRole.js
diff --git a/vue3/src/layout/components/AppMain.vue b/openhis-ui-vue3/src/layout/components/AppMain.vue
similarity index 100%
rename from vue3/src/layout/components/AppMain.vue
rename to openhis-ui-vue3/src/layout/components/AppMain.vue
diff --git a/vue3/src/layout/components/IframeToggle/index.vue b/openhis-ui-vue3/src/layout/components/IframeToggle/index.vue
similarity index 100%
rename from vue3/src/layout/components/IframeToggle/index.vue
rename to openhis-ui-vue3/src/layout/components/IframeToggle/index.vue
diff --git a/vue3/src/layout/components/InnerLink/index.vue b/openhis-ui-vue3/src/layout/components/InnerLink/index.vue
similarity index 100%
rename from vue3/src/layout/components/InnerLink/index.vue
rename to openhis-ui-vue3/src/layout/components/InnerLink/index.vue
diff --git a/vue3/src/layout/components/Navbar.vue b/openhis-ui-vue3/src/layout/components/Navbar.vue
similarity index 100%
rename from vue3/src/layout/components/Navbar.vue
rename to openhis-ui-vue3/src/layout/components/Navbar.vue
diff --git a/vue3/src/layout/components/Settings/index.vue b/openhis-ui-vue3/src/layout/components/Settings/index.vue
similarity index 100%
rename from vue3/src/layout/components/Settings/index.vue
rename to openhis-ui-vue3/src/layout/components/Settings/index.vue
diff --git a/vue3/src/layout/components/Sidebar/Link.vue b/openhis-ui-vue3/src/layout/components/Sidebar/Link.vue
similarity index 100%
rename from vue3/src/layout/components/Sidebar/Link.vue
rename to openhis-ui-vue3/src/layout/components/Sidebar/Link.vue
diff --git a/vue3/src/layout/components/Sidebar/Logo.vue b/openhis-ui-vue3/src/layout/components/Sidebar/Logo.vue
similarity index 100%
rename from vue3/src/layout/components/Sidebar/Logo.vue
rename to openhis-ui-vue3/src/layout/components/Sidebar/Logo.vue
diff --git a/vue3/src/layout/components/Sidebar/SidebarItem.vue b/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
similarity index 100%
rename from vue3/src/layout/components/Sidebar/SidebarItem.vue
rename to openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
diff --git a/vue3/src/layout/components/Sidebar/index.vue b/openhis-ui-vue3/src/layout/components/Sidebar/index.vue
similarity index 100%
rename from vue3/src/layout/components/Sidebar/index.vue
rename to openhis-ui-vue3/src/layout/components/Sidebar/index.vue
diff --git a/vue3/src/layout/components/TagsView/ScrollPane.vue b/openhis-ui-vue3/src/layout/components/TagsView/ScrollPane.vue
similarity index 100%
rename from vue3/src/layout/components/TagsView/ScrollPane.vue
rename to openhis-ui-vue3/src/layout/components/TagsView/ScrollPane.vue
diff --git a/vue3/src/layout/components/TagsView/index.vue b/openhis-ui-vue3/src/layout/components/TagsView/index.vue
similarity index 100%
rename from vue3/src/layout/components/TagsView/index.vue
rename to openhis-ui-vue3/src/layout/components/TagsView/index.vue
diff --git a/vue3/src/layout/components/index.js b/openhis-ui-vue3/src/layout/components/index.js
similarity index 100%
rename from vue3/src/layout/components/index.js
rename to openhis-ui-vue3/src/layout/components/index.js
diff --git a/vue3/src/layout/index.vue b/openhis-ui-vue3/src/layout/index.vue
similarity index 100%
rename from vue3/src/layout/index.vue
rename to openhis-ui-vue3/src/layout/index.vue
diff --git a/vue3/src/main.js b/openhis-ui-vue3/src/main.js
similarity index 100%
rename from vue3/src/main.js
rename to openhis-ui-vue3/src/main.js
diff --git a/vue3/src/permission.js b/openhis-ui-vue3/src/permission.js
similarity index 100%
rename from vue3/src/permission.js
rename to openhis-ui-vue3/src/permission.js
diff --git a/vue3/src/plugins/auth.js b/openhis-ui-vue3/src/plugins/auth.js
similarity index 100%
rename from vue3/src/plugins/auth.js
rename to openhis-ui-vue3/src/plugins/auth.js
diff --git a/vue3/src/plugins/cache.js b/openhis-ui-vue3/src/plugins/cache.js
similarity index 100%
rename from vue3/src/plugins/cache.js
rename to openhis-ui-vue3/src/plugins/cache.js
diff --git a/vue3/src/plugins/download.js b/openhis-ui-vue3/src/plugins/download.js
similarity index 100%
rename from vue3/src/plugins/download.js
rename to openhis-ui-vue3/src/plugins/download.js
diff --git a/vue3/src/plugins/index.js b/openhis-ui-vue3/src/plugins/index.js
similarity index 100%
rename from vue3/src/plugins/index.js
rename to openhis-ui-vue3/src/plugins/index.js
diff --git a/vue3/src/plugins/modal.js b/openhis-ui-vue3/src/plugins/modal.js
similarity index 100%
rename from vue3/src/plugins/modal.js
rename to openhis-ui-vue3/src/plugins/modal.js
diff --git a/vue3/src/plugins/tab.js b/openhis-ui-vue3/src/plugins/tab.js
similarity index 100%
rename from vue3/src/plugins/tab.js
rename to openhis-ui-vue3/src/plugins/tab.js
diff --git a/vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
similarity index 96%
rename from vue3/src/router/index.js
rename to openhis-ui-vue3/src/router/index.js
index 2025549e..96af9867 100644
--- a/vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -103,16 +103,16 @@ export const dynamicRoutes = [
     ]
   },
   {
-    path: '/system/tenant-option',
+    path: '/system/tenant-contract',
     component: Layout,
     hidden: true,
     permissions: ['*:*:*'],
     children: [
       {
         path: 'set/:tenantId(\\d+)',
-        component: () => import('@/views/system/tenant/setOption'),
-        name: 'SetOption',
-        meta: { title: '个性化配置', activeMenu: '/system/basicmanage/tenant' }
+        component: () => import('@/views/system/tenant/setContract'),
+        name: 'SetContract',
+        meta: { title: '合同管理', activeMenu: '/system/basicmanage/tenant' }
       }
     ]
   },
diff --git a/vue3/src/settings.js b/openhis-ui-vue3/src/settings.js
similarity index 100%
rename from vue3/src/settings.js
rename to openhis-ui-vue3/src/settings.js
diff --git a/vue3/src/store/index.js b/openhis-ui-vue3/src/store/index.js
similarity index 100%
rename from vue3/src/store/index.js
rename to openhis-ui-vue3/src/store/index.js
diff --git a/vue3/src/store/modules/app.js b/openhis-ui-vue3/src/store/modules/app.js
similarity index 100%
rename from vue3/src/store/modules/app.js
rename to openhis-ui-vue3/src/store/modules/app.js
diff --git a/vue3/src/store/modules/dict.js b/openhis-ui-vue3/src/store/modules/dict.js
similarity index 100%
rename from vue3/src/store/modules/dict.js
rename to openhis-ui-vue3/src/store/modules/dict.js
diff --git a/vue3/src/store/modules/permission.js b/openhis-ui-vue3/src/store/modules/permission.js
similarity index 100%
rename from vue3/src/store/modules/permission.js
rename to openhis-ui-vue3/src/store/modules/permission.js
diff --git a/vue3/src/store/modules/settings.js b/openhis-ui-vue3/src/store/modules/settings.js
similarity index 100%
rename from vue3/src/store/modules/settings.js
rename to openhis-ui-vue3/src/store/modules/settings.js
diff --git a/vue3/src/store/modules/tagsView.js b/openhis-ui-vue3/src/store/modules/tagsView.js
similarity index 100%
rename from vue3/src/store/modules/tagsView.js
rename to openhis-ui-vue3/src/store/modules/tagsView.js
diff --git a/vue3/src/store/modules/user.js b/openhis-ui-vue3/src/store/modules/user.js
similarity index 95%
rename from vue3/src/store/modules/user.js
rename to openhis-ui-vue3/src/store/modules/user.js
index 68b95fb8..432e04d6 100644
--- a/vue3/src/store/modules/user.js
+++ b/openhis-ui-vue3/src/store/modules/user.js
@@ -1,7 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import defAva from '@/assets/images/user.png'
-import { remove } from 'lodash'
 
 const useUserStore = defineStore(
   'user',
@@ -15,6 +14,7 @@ const useUserStore = defineStore(
       practitionerId: '',
       orgName: '',
       nickName: '',
+      fixmedinsCode: '', // 医疗机构编码
       roles: [],
       permissions: []
     }),
@@ -55,6 +55,7 @@ const useUserStore = defineStore(
             this.orgName = user.orgName
             this.nickName = user.nickName
             this.practitionerId = res.practitionerId
+            this.fixmedinsCode = res.optionJson.fixmedinsCode
             this.avatar = avatar
             resolve(res)
           }).catch(error => {
diff --git a/vue3/src/store/store.js b/openhis-ui-vue3/src/store/store.js
similarity index 100%
rename from vue3/src/store/store.js
rename to openhis-ui-vue3/src/store/store.js
diff --git a/vue3/src/utils/auth.js b/openhis-ui-vue3/src/utils/auth.js
similarity index 100%
rename from vue3/src/utils/auth.js
rename to openhis-ui-vue3/src/utils/auth.js
diff --git a/vue3/src/utils/dict.js b/openhis-ui-vue3/src/utils/dict.js
similarity index 100%
rename from vue3/src/utils/dict.js
rename to openhis-ui-vue3/src/utils/dict.js
diff --git a/vue3/src/utils/dynamicTitle.js b/openhis-ui-vue3/src/utils/dynamicTitle.js
similarity index 100%
rename from vue3/src/utils/dynamicTitle.js
rename to openhis-ui-vue3/src/utils/dynamicTitle.js
diff --git a/vue3/src/utils/errorCode.js b/openhis-ui-vue3/src/utils/errorCode.js
similarity index 100%
rename from vue3/src/utils/errorCode.js
rename to openhis-ui-vue3/src/utils/errorCode.js
diff --git a/vue3/src/utils/his.js b/openhis-ui-vue3/src/utils/his.js
similarity index 100%
rename from vue3/src/utils/his.js
rename to openhis-ui-vue3/src/utils/his.js
diff --git a/vue3/src/utils/index.js b/openhis-ui-vue3/src/utils/index.js
similarity index 100%
rename from vue3/src/utils/index.js
rename to openhis-ui-vue3/src/utils/index.js
diff --git a/vue3/src/utils/jsencrypt.js b/openhis-ui-vue3/src/utils/jsencrypt.js
similarity index 100%
rename from vue3/src/utils/jsencrypt.js
rename to openhis-ui-vue3/src/utils/jsencrypt.js
diff --git a/vue3/src/utils/openhis.js b/openhis-ui-vue3/src/utils/openhis.js
similarity index 100%
rename from vue3/src/utils/openhis.js
rename to openhis-ui-vue3/src/utils/openhis.js
diff --git a/vue3/src/utils/permission.js b/openhis-ui-vue3/src/utils/permission.js
similarity index 100%
rename from vue3/src/utils/permission.js
rename to openhis-ui-vue3/src/utils/permission.js
diff --git a/vue3/src/utils/request.js b/openhis-ui-vue3/src/utils/request.js
similarity index 100%
rename from vue3/src/utils/request.js
rename to openhis-ui-vue3/src/utils/request.js
diff --git a/vue3/src/utils/scroll-to.js b/openhis-ui-vue3/src/utils/scroll-to.js
similarity index 100%
rename from vue3/src/utils/scroll-to.js
rename to openhis-ui-vue3/src/utils/scroll-to.js
diff --git a/vue3/src/utils/theme.js b/openhis-ui-vue3/src/utils/theme.js
similarity index 100%
rename from vue3/src/utils/theme.js
rename to openhis-ui-vue3/src/utils/theme.js
diff --git a/vue3/src/utils/validate.js b/openhis-ui-vue3/src/utils/validate.js
similarity index 100%
rename from vue3/src/utils/validate.js
rename to openhis-ui-vue3/src/utils/validate.js
diff --git a/vue3/src/views/basicmanage/automaticBilling/index.vue b/openhis-ui-vue3/src/views/basicmanage/automaticBilling/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/automaticBilling/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/automaticBilling/index.vue
diff --git a/vue3/src/views/basicmanage/bargainSets/index.vue b/openhis-ui-vue3/src/views/basicmanage/bargainSets/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/bargainSets/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/bargainSets/index.vue
diff --git a/vue3/src/views/basicmanage/bedspace/index.vue b/openhis-ui-vue3/src/views/basicmanage/bedspace/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/bedspace/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/bedspace/index.vue
diff --git a/openhis-ui-vue3/src/views/basicmanage/bodyStructure/components/api.js b/openhis-ui-vue3/src/views/basicmanage/bodyStructure/components/api.js
new file mode 100644
index 00000000..a0e00646
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/bodyStructure/components/api.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+export function getList(queryParams) {
+  return request({
+    url: '/base-data-manage/body-structure/body',
+    method: 'get',
+    param: queryParams
+  })
+}
+
+export function addBodyStructure(data) {
+  return request({
+    url: '/base-data-manage/body-structure/body',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateBodyStructure(data) {
+  return request({
+    url: '/base-data-manage/body-structure/body',
+    method: 'post',
+    data: data
+  })
+}
+
+export function deleteBodyStructure(ids) {
+  return request({
+    url: '/base-data-manage/body-structure/body?ids=' + ids ,
+    method: 'delete',
+  })
+}
+
+export function getBodyStructureDetail(id) {
+  return request({
+    url: '/base-data-manage/body-structure/body?id=' + id,
+    method: 'get',
+  })
+}
+export function disableBodyStructure(id) {
+  return request({
+    url: '/base-data-manage/body-structure/body-inactive?id=' + id,
+    method: 'put',
+  })
+}
+
+export function enableBodyStructure(id) {
+  return request({
+    url: '/base-data-manage/body-structure/body-active?id=' + id,
+    method: 'put',
+  })
+}
diff --git a/openhis-ui-vue3/src/views/basicmanage/bodyStructure/index.vue b/openhis-ui-vue3/src/views/basicmanage/bodyStructure/index.vue
new file mode 100644
index 00000000..b9e8f78f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/bodyStructure/index.vue
@@ -0,0 +1,236 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"> 新增 </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-tooltip
+          :content="selectRowIds.length == 0 ? '至少选择一条数据' : ''"
+          placement="top"
+          :disabled="selectRowIds.length != 0"
+        >
+          <el-button
+            type=""
+            plain
+            icon="Delete"
+            :disabled="selectRowIds.length == 0"
+            @click="handleDelete"
+            >删除</el-button
+          >
+        </el-tooltip>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="" plain icon="Download" @click="handleExport"> 导出 </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="" plain icon="Refresh" @click="getPageList">刷新</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table
+      ref="bodyStructureTableRef"
+      v-loading="loading"
+      :data="bodyStructure"
+      row-key="id"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="部位名称" align="left" prop="name" />
+      <el-table-column label="拼音" align="left" prop="pyStr" />
+      <el-table-column label="五笔拼音" align="left" prop="wbStr" />
+      <el-table-column label="状态" align="center" prop="statusEnum_enumText" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button link type="primary" @click="handelEdit(scope.row)">编辑</el-button>
+          <el-button
+            link
+            type="primary"
+            @click="handleDisabled(scope.row.id)"
+            v-if="scope.row.statusEnum == '2'"
+            >停用</el-button
+          >
+          <el-button link type="primary" @click="handelEnable(scope.row.id)" v-else>启用</el-button>
+          <el-button link type="primary" @click="handleAddInferior(scope.row)">
+            添加下级
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" v-model="open" width="600px" @close="cancel" append-to-body>
+      <el-form ref="bodyStructureRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="id" prop="id" v-show="false">
+          <el-input v-model="form.id" placeholder="请输入部位编号" />
+        </el-form-item>
+        <el-form-item label="部位编号" prop="busNo" v-show="false">
+          <el-input v-model="form.busNo" placeholder="请输入部位编号" />
+        </el-form-item>
+        <el-form-item label="部位名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入部位名称" />
+        </el-form-item>
+
+        <el-col>
+          <el-form-item label="上级部位" prop="busNoParent">
+            <el-tree-select
+              clearable
+              style="width: 100%"
+              v-model="form.busNoParent"
+              :data="bodyStructure"
+              :props="{ value: 'busNo', label: 'name', children: 'children' }"
+              value-key="id"
+              check-strictly
+            />
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BodyStructure">
+import {
+  getList,
+  deleteBodyStructure,
+  addBodyStructure,
+  updateBodyStructure,
+  disableBodyStructure,
+  enableBodyStructure,
+} from './components/api';
+
+const { proxy } = getCurrentInstance();
+const loading = ref(true);
+const bodyStructure = ref([]);
+const queryParams = ref({});
+const open = ref(false);
+const form = ref({
+  id: undefined,
+  busNo: undefined,
+  name: undefined,
+  statusEnum: undefined,
+  busNoParent: undefined,
+});
+const bodyStructureTableRef = ref();
+const bodyStructureRef = ref();
+const selectRowIds = ref([]);
+const total = ref(0);
+const title = ref('');
+const rules = ref({
+  busNo: [{ required: false, message: '请输入部位编号', trigger: 'input' }],
+  name: [
+    { required: true, message: '请输入部位名称', trigger: 'change' },
+    { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'change' },
+  ],
+});
+
+getPageList();
+
+function reset() {
+  form.value.id = undefined;
+  bodyStructureRef.value.resetFields();
+}
+
+function getPageList() {
+  loading.value = false;
+  getList(queryParams.value).then((res) => {
+    bodyStructure.value = res.data.records;
+    total.value = res.data.total;
+    loading.value = false;
+  });
+}
+
+function handleAdd() {
+  title.value = '添加身体部位';
+  open.value = true;
+  reset();
+  console.log(form.value);
+}
+
+function handelEdit(row) {
+  console.log(row.busNo);
+
+  title.value = '编辑部位';
+  open.value = true;
+  setTimeout(() => {
+    form.value.id = row.id;
+    form.value.busNo = row.busNo;
+    form.value.name = row.name;
+    form.value.statusEnum = row.statusEnum;
+    form.value.busNoParent = row.busNo.split('.').length > 1 ? row.busNo.split('.')[0] : undefined;
+  }, 50);
+}
+
+function cancel() {
+  open.value = false;
+  reset();
+  console.log(form.value);
+}
+
+// 新增/编辑
+function submitForm() {
+  proxy.$refs['bodyStructureRef'].validate((valid) => {
+    if (valid) {
+      if (form.value.id == undefined) {
+        if (form.value.busNoParent) {
+          form.value.busNo = form.value.busNoParent;
+        }
+        addBodyStructure(form.value).then((res) => {
+          proxy.$modal.msgSuccess('操作成功');
+          open.value = false;
+          getPageList();
+        });
+      } else {
+        updateBodyStructure(form.value).then((res) => {
+          proxy.$modal.msgSuccess('操作成功');
+          open.value = false;
+          getPageList();
+        });
+      }
+    }
+  });
+}
+
+// 添加下级
+function handleAddInferior(row) {
+  title.value = '添加下级';
+  open.value = true;
+  form.value.busNoParent = row.busNo;
+}
+
+// 删除
+function handleDelete() {
+  loading.value = true;
+  deleteBodyStructure(selectRowIds.value.join(',')).then((res) => {
+    proxy.$modal.msgSuccess('操作成功');
+    loading.value = false;
+    getPageList();
+  });
+}
+// 停用
+function handleDisabled(id) {
+  disableBodyStructure(id).then((res) => {
+    proxy.$modal.msgSuccess('操作成功');
+    getPageList();
+  });
+}
+
+// 启用
+function handelEnable(id) {
+  enableBodyStructure(id).then((res) => {
+    proxy.$modal.msgSuccess('操作成功');
+    getPageList();
+  });
+}
+
+function handleSelectionChange() {
+  selectRowIds.value = bodyStructureTableRef.value.getSelectionRows().map((item) => item.id);
+}
+</script>
\ No newline at end of file
diff --git a/vue3/src/views/basicmanage/caseTemplates/index.vue b/openhis-ui-vue3/src/views/basicmanage/caseTemplates/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/caseTemplates/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/caseTemplates/index.vue
diff --git a/vue3/src/views/basicmanage/commonlyDiagnosis/index.vue b/openhis-ui-vue3/src/views/basicmanage/commonlyDiagnosis/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/commonlyDiagnosis/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/commonlyDiagnosis/index.vue
diff --git a/vue3/src/views/basicmanage/consumablesBinding/components/activityList.vue b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/activityList.vue
similarity index 100%
rename from vue3/src/views/basicmanage/consumablesBinding/components/activityList.vue
rename to openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/activityList.vue
diff --git a/vue3/src/views/basicmanage/consumablesBinding/components/api.js b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/api.js
similarity index 100%
rename from vue3/src/views/basicmanage/consumablesBinding/components/api.js
rename to openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/api.js
diff --git a/vue3/src/views/basicmanage/consumablesBinding/components/consumablesList.vue b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/consumablesList.vue
similarity index 100%
rename from vue3/src/views/basicmanage/consumablesBinding/components/consumablesList.vue
rename to openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/consumablesList.vue
diff --git a/vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue
similarity index 100%
rename from vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue
rename to openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue
diff --git a/vue3/src/views/basicmanage/consumablesBinding/index.vue b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/consumablesBinding/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/consumablesBinding/index.vue
diff --git a/vue3/src/views/basicmanage/contract/index.vue b/openhis-ui-vue3/src/views/basicmanage/contract/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/contract/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/contract/index.vue
diff --git a/vue3/src/views/basicmanage/customer/index.vue b/openhis-ui-vue3/src/views/basicmanage/customer/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/customer/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/customer/index.vue
diff --git a/vue3/src/views/basicmanage/fee/index.vue b/openhis-ui-vue3/src/views/basicmanage/fee/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/fee/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/fee/index.vue
diff --git a/openhis-ui-vue3/src/views/basicmanage/frequency/components/FreForm.vue b/openhis-ui-vue3/src/views/basicmanage/frequency/components/FreForm.vue
new file mode 100644
index 00000000..c06811ac
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/frequency/components/FreForm.vue
@@ -0,0 +1,223 @@
+<template>
+  <el-dialog
+      title="添加频次详情"
+      v-model="dialogVisible"
+      width="520px"
+      top="8vh"
+      :close-on-click-modal="false"
+      @close="resetForm"
+  >
+    <!-- 表单区域 -->
+    <el-form
+        :model="formData"
+        ref="form"
+        label-width="120px"
+        class="freq-form"
+    >
+      <!-- 字典代码 -->
+      <el-form-item label="字典代码">
+        <el-input
+            v-model="formData.rateCode"
+            readonly
+            class="input-readonly"
+        />
+      </el-form-item>
+
+      <!-- 分割线 -->
+      <el-divider content-position="left">每日执行</el-divider>
+
+      <el-row :gutter="16">
+        <el-col :span="12">
+          <el-form-item label="次数">
+            <el-input-number
+                v-model="formData.dayCount"
+                :min="1"
+                :max="99"
+                controls-position="right"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="间隔(天)">
+            <el-input-number
+                v-model="formData.dayInterval"
+                :min="0"
+                :max="99"
+                controls-position="right"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="时间点">
+        <el-select v-model="formData.dayTimes" multiple placeholder="选择时间点">
+          <el-option
+              v-for="time in timeOptions"
+              :key="time"
+              :value="time"
+              :label="time"
+          />
+        </el-select>
+      </el-form-item>
+
+<!--      &lt;!&ndash; 分割线 &ndash;&gt;-->
+<!--      <el-divider content-position="left">每周执行</el-divider>-->
+
+<!--      <el-row :gutter="16">-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="是否启用">-->
+<!--            <el-switch-->
+<!--                v-model="formData.weekCycleFlag"-->
+<!--                :active-value="1"-->
+<!--                :inactive-value="0"-->
+<!--                active-text="是"-->
+<!--                inactive-text="否"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="间隔(周)">-->
+<!--            <el-input-number-->
+<!--                v-model="formData.weekInterval"-->
+<!--                :min="1"-->
+<!--                :max="52"-->
+<!--                controls-position="right"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
+
+<!--      <el-form-item label="周次数">-->
+<!--        <el-input-number-->
+<!--            v-model="formData.weekTimes"-->
+<!--            :min="1"-->
+<!--            :max="7"-->
+<!--            controls-position="right"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+      <!-- 分割线 -->
+      <el-divider content-position="left">周期与总计</el-divider>
+
+      <el-row :gutter="16">
+        <el-col :span="12">
+          <el-form-item label="总次数">
+            <el-input-number
+                v-model="formData.totalExecutionCount"
+                :min="1"
+                :max="999"
+                controls-position="right"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="周期长度">
+            <el-input-number
+                v-model="formData.executionPeriod"
+                :min="1"
+                :max="999"
+                controls-position="right"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item label="周期单位">
+        <el-select v-model="formData.executionPeriodUnit" style="width: 100%">
+          <el-option label="分钟" value="minute" />
+          <el-option label="天" value="day" />
+          <el-option label="周" value="week" />
+          <el-option label="月" value="month" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="备注">
+        <el-input
+            type="textarea"
+            v-model="formData.memo"
+            :rows="2"
+            maxlength="200"
+            show-word-limit
+        />
+      </el-form-item>
+    </el-form>
+
+    <!-- 底部按钮 -->
+    <template #footer>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+
+<style scoped>
+.freq-form {
+  padding: 0 10px;
+}
+.input-readonly {
+  background-color: #f5f7fa;
+  color: #c0c4cc;
+}
+</style>
+
+<script setup>
+import { ref, watch, defineProps, defineEmits } from "vue";
+
+
+const props = defineProps({
+  modelValue: { type: Boolean, default: false },
+  initialFormData: { type: Object, default: () => ({}) }
+})
+
+const emit = defineEmits(['update:modelValue', 'submit'])
+
+const formData = ref({
+  rateCode: '',
+  name: '',
+  dayCount: 0,
+  dayInterval: 0,
+  dayTimes: [],
+  weekCycleFlag: 0,
+  weekInterval: 0,
+  weekTimes: 0,
+  continueFlag: 0,
+  totalExecutionCount: 0,
+  executionPeriod: 0,
+  executionPeriodUnit: 'day',
+  memo: ''
+});
+
+
+const generateTimeOptions = () => {
+  const options = [];
+  for (let hour = 0; hour < 24; hour++) {
+    for (let minute = 0; minute <= 59; minute += 30) {
+      const time = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`;
+      options.push(time);
+    }
+  }
+  return options;
+};
+
+const timeOptions = ref(generateTimeOptions());
+// 计算属性：让 el-dialog 直接绑定 v-model
+const dialogVisible = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+function resetForm() {
+  formData.value = { ...props.initialFormData }
+}
+function submitForm() {
+  emit('submit', formData.value)
+  dialogVisible.value = false   // 关闭
+}
+watch(
+    () => props.initialFormData,
+    (newVal) => { formData.value = { ...newVal }; },
+    { immediate: true }
+);
+</script>
+
+
diff --git a/openhis-ui-vue3/src/views/basicmanage/frequency/components/frequency.js b/openhis-ui-vue3/src/views/basicmanage/frequency/components/frequency.js
new file mode 100644
index 00000000..b56daf0a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/frequency/components/frequency.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 初始化
+export function getFrequencyDetailList(query) {
+  return request({
+    url: '/personalization/frequency/getPageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export function addFrequencyDetail(data) {
+  return request({
+    url: '/personalization/frequency/save',
+    method: 'post',
+    data: data
+  })
+}
+// 删除
+export function deleteFrequencyDetail(data) {
+  return request({
+    url: '/personalization/frequency/' + data,
+    method: 'delete',
+  })
+}
+
diff --git a/openhis-ui-vue3/src/views/basicmanage/frequency/index.vue b/openhis-ui-vue3/src/views/basicmanage/frequency/index.vue
new file mode 100644
index 00000000..0206b13c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/frequency/index.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--诊疗目录-->
+      <el-col :span="4" :xs="24">
+        <div class="head-title">频次字典</div>
+        <div>
+          <el-table
+            ref="freTableRef"
+            v-loading="loading"
+            :data="frequency"
+            row-key="id"
+            @row-click="handleRowClick"
+        >
+           <el-table-column label="字典频次名称" align="left" prop="dictLabel" />
+            <el-table-column label="字典频次代码" align="left" prop="dictValue" />
+          </el-table>
+          <pagination
+              v-show="frequencyTotal > 0"
+              :total="frequencyTotal"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              @pagination="getFrequencyList"
+          />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+                type="primary"
+                plain
+                icon="Plus"
+                @click="openDialog"
+                v-hasPermi="['system:user:add']"
+            >添加频次详情</el-button
+            >
+          </el-col>
+        </el-row>
+
+        <el-table
+            v-loading="loading"
+            :data="frequencyDetail"
+        >
+          <!-- 定义表格列 -->
+          <el-table-column
+              prop="rateCode"
+              label="频次代码"
+              width="180">
+          </el-table-column>
+
+          <el-table-column
+              prop="name"
+              label="名称"
+              width="200">
+          </el-table-column>
+
+          <el-table-column
+              prop="dayCount"
+              label="每天执行次数"
+              width="120">
+          </el-table-column>
+
+<!--          <el-table-column-->
+<!--              prop="dayInterval"-->
+<!--              label="每次执行间隔（天数）"-->
+<!--              width="180">-->
+<!--          </el-table-column>-->
+
+          <el-table-column
+              prop="dayTimes"
+              label="执行时间点"
+              width="300">
+          </el-table-column>
+
+<!--          <el-table-column-->
+<!--              prop="weekCycleFlag"-->
+<!--              label="是否周期性每周执行"-->
+<!--              width="150">-->
+<!--            <template #default="scope">-->
+<!--              {{ scope.row.weekCycleFlag === 1 ? '是' : '否' }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+<!--          <el-table-column-->
+<!--              prop="weekInterval"-->
+<!--              label="每周执行的间隔"-->
+<!--              width="150">-->
+<!--          </el-table-column>-->
+
+<!--          <el-table-column-->
+<!--              prop="weekTimes"-->
+<!--              label="每周执行的次数"-->
+<!--              width="120">-->
+<!--          </el-table-column>-->
+
+<!--          <el-table-column-->
+<!--              prop="continueFlag"-->
+<!--              label="是否为连续执行"-->
+<!--              width="150">-->
+<!--            <template #default="scope">-->
+<!--              {{ scope.row.continueFlag === 1 ? '是' : '否' }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+          <el-table-column
+              prop="totalExecutionCount"
+              label="执行总次数"
+              width="120">
+          </el-table-column>
+
+          <el-table-column
+              prop="executionPeriod"
+              label="执行周期长度"
+              width="150">
+          </el-table-column>
+
+          <el-table-column
+              prop="executionPeriodUnit"
+              label="执行周期单位"
+              width="150">
+          </el-table-column>
+<!--          <el-table-column-->
+<!--              prop="memo"-->
+<!--              label="备注信息"-->
+<!--              width="200">-->
+<!--          </el-table-column>-->
+          <el-table-column
+              label="操作"
+              align="center"
+              width="150"
+              class-name="small-padding fixed-width"
+              fixed="right"
+          >
+            <template #default="scope">
+              <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="openSave(scope.row, scope.$index)"
+                  v-hasPermi="['system:user:edit']"
+              >编辑</el-button
+              >
+              <el-button
+                  type="danger"
+                  link
+                  icon="Delete"
+                  :disabled="scope.row.id == ''"
+                  @click="deleteSelectedRows(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+<!--        <pagination-->
+<!--            v-show="frequencyDetailTotal > 0"-->
+<!--             :total="frequencyDetailTotal"-->
+<!--            v-model:page="queryDetailParams.pageNum"-->
+<!--            v-model:limit="queryDetailParams.pageSize"-->
+<!--            @pagination="getDetailList"-->
+<!--        />-->
+      </el-col>
+    </el-row>
+    <FreForm
+        v-model="dialogVisible"
+        :initialFormData="showFormData"
+        @submit="handleFormSubmit"
+    />
+  </div>
+</template>
+
+<script setup name="frequency">
+import {
+  addFrequencyDetail, deleteFrequencyDetail,
+  getFrequencyDetailList
+} from './components/frequency.js';
+import { ElMessage } from "element-plus";
+import {
+  listData
+} from "@/api/system/dict/data.js";
+import FreForm from "@/views/basicmanage/frequency/components/FreForm.vue";
+const frequency = ref([]);
+const frequencyDetail = ref([]);
+const frequencyTotal = ref(0);
+const frequencyDetailTotal = ref(0);
+const currentLeftRow = ref(null);
+let addFlag = ref(true);
+const data = reactive({
+  form: {},
+  queryParams: {
+    dictType: 'rate_code',
+    status : 0,
+    pageNum: 1,
+    pageSize: 10,
+  },
+  queryDetailParams: {
+    code: '',
+    status : 0,
+    pageNum: 1,
+    pageSize: 10,
+  }
+});
+const dialogVisible = ref(false);
+const showFormData   = ref({});            // 真正给弹窗用的数据
+// 初始表单数据
+
+const { queryParams, form, tableRules,queryDetailParams } = toRefs(data);
+
+/** 获取字典列表 */
+function getFrequencyList() {
+  listData(queryParams.value).then((res) => {
+    if (res.code === 200) {
+      frequency.value =
+          res.rows.length > 0
+              ? res.rows.map((res) => {
+                return {
+                  ...res,
+                  isEditing: false, // 标记当前行是否正在编辑
+                  error: false, // 新增 error 字段
+                };
+              })
+              : [];
+    }
+    frequencyTotal.value = res.total;
+  });
+}
+function getDetailList() {
+  getFrequencyDetailList(queryDetailParams.value).then((res) => {
+    if (res.code === 200) {
+      frequencyDetail.value =
+          res.data.records.length > 0
+              ? res.data.records.map((record) => {
+                // 将 dayTimes 字符串转换为数组
+                const dayTimesArray = record.dayTimes.split(',');
+                const sortedDayTimesArray = dayTimesArray.sort((a, b) => {
+                  const timeToMinutes = (time) => {
+                    const [hours, minutes] = time.split(':').map(Number);
+                    return hours * 60 + minutes;
+                  };
+                  return timeToMinutes(a) - timeToMinutes(b);
+                });
+                const sortedDayTimesString = sortedDayTimesArray.join(',');
+                return {
+                  ...record,
+                  dayTimes: sortedDayTimesString, // 使用排序后的字符串
+                  error: false, // 新增 error 字段
+                };
+              })
+              : [];
+    }
+    if( res.data.records.length > 0){
+      //有数据不允许添加
+      addFlag.value = false;
+    }else{
+      addFlag.value = true;
+    }
+    frequencyDetailTotal.value = res.data.total;
+  });
+}
+/** 节点单击事件 */
+function handleRowClick(row) {
+  queryDetailParams.value.code = row.dictValue;
+  currentLeftRow.value = row;        // 记录当前行
+  getDetailList();
+
+}
+function openDialog() {
+  if (!currentLeftRow?.value) {
+    ElMessage.warning('请先选择一行字典数据！')
+    return;
+  }
+  if (addFlag.value === false) {
+    ElMessage.warning('已有详情！请直接修改！')
+    addFlag.value = true;
+    return;
+  }
+  //默认显示数据
+  showFormData.value = {
+    rateCode: currentLeftRow.value.dictValue,
+    name : currentLeftRow.value.dictLabel,
+    dayCount: 0,
+    dayInterval: 0,
+    dayTimes: [],
+    weekCycleFlag: 0,
+    weekInterval: 0,
+    weekTimes: 0,
+    continueFlag: 0,
+    totalExecutionCount: 0,
+    executionPeriod: 0,
+    executionPeriodUnit: 'day',
+    memo: ''
+  };
+  dialogVisible.value = true;
+}
+// 处理表单提交
+/* 保存/新增 */
+function handleFormSubmit(initialFormData) {
+
+  addFrequencyDetail(initialFormData).then(() => {
+    getDetailList();
+    ElMessage.success('保存成功');
+  });
+}
+
+function openSave(row) {
+  //默认显示数据
+  showFormData.value = { ...row };
+  row.dayTimes = row.dayTimes.split(',');
+  row.dayTimes.sort((a, b) => {
+    // 将时间字符串转换为分钟数进行比较
+    const timeToMinutes = (time) => {
+      const [hours, minutes] = time.split(':').map(Number);
+      return hours * 60 + minutes;
+    };
+
+    return timeToMinutes(a) - timeToMinutes(b);
+  });
+  // 更新 showFormData 中的 dayTimes
+  showFormData.value.dayTimes = row.dayTimes;
+
+  dialogVisible.value = true;
+}
+
+
+/* 删除 */
+function deleteSelectedRows(row) {
+   deleteFrequencyDetail(row.id).then(() => {
+    ElMessage.success('删除成功');
+    getDetailList();
+  });
+}
+
+getFrequencyList();
+
+</script>
+<style scoped>
+.el-form--inline .el-form-item {
+  display: inline-flex;
+  vertical-align: middle;
+  margin-right: 10px !important;
+}
+.error-border {
+  border: 1px solid red;
+}
+</style>
diff --git a/vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js
similarity index 100%
rename from vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js
rename to openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js
diff --git a/vue3/src/views/basicmanage/implementDepartment/index.vue b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
similarity index 89%
rename from vue3/src/views/basicmanage/implementDepartment/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
index 24cb7d85..bb2eae44 100644
--- a/vue3/src/views/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -41,7 +41,7 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="100" align="center" />
-          <el-table-column label="诊疗目录" align="center" :show-overflow-tooltip="true">
+          <el-table-column label="诊疗目录" width="150" align="center" :show-overflow-tooltip="true">
             <template #default="scope">
               <div style="display: flex; align-items: center; justify-content: center">
                 <el-select
@@ -66,22 +66,26 @@
             label="项目名称"
             align="center"
             :show-overflow-tooltip="true"
-            width="300"
           >
             <template #default="scope">
               <div style="display: flex; align-items: center; justify-content: center">
                 <el-select
                   v-model="scope.row.activityDefinitionId"
+                  filterable
+                  remote
+                  reserve-keyword
                   placeholder="请选择"
-                  clearable
-                  style="width: 200px"
+                  remote-show-suffix
+                  :remote-method="(query) => debouncedRemoteMethod(query, scope.row)"
+                  :loading="loading"
+                  style="width: 350px"
                   :class="{ 'error-border': scope.row.error }"
                 >
                   <el-option
-                    v-for="dict in scope.row.projectList"
-                    :key="dict.value"
-                    :label="dict.info"
-                    :value="dict.value"
+                    v-for="item in scope.row.projectList"
+                    :key="item.value"
+                    :label="item.info"
+                    :value="item.value"
                   />
                 </el-select>
               </div>
@@ -180,6 +184,7 @@ import {
   editImplementDepartment,
   deleteImplementDepartment,
 } from './components/implementDepartment';
+import { debounce } from 'lodash-es';
 const { proxy } = getCurrentInstance();
 const organization = ref([]);
 const loading = ref(true);
@@ -206,6 +211,9 @@ const data = reactive({
   },
   isAdding: false,
 });
+const debouncedRemoteMethod = debounce((query, row) => {
+  remoteMethod(query, row);
+}, 300);
 
 const { queryParams, tableRules } = toRefs(data);
 
@@ -218,11 +226,12 @@ function getList() {
     distributionCategoryCode: distributionCategoryCode.value,
   };
   getDiagnosisTreatmentList(params).then((res) => {
+    console.log(res.data.records)
     loading.value = false;
     catagoryList.value = res.data.records
     catagoryList.value.map((k,index)=>{
       // if(k.activityCategoryCode){
-        DiagnosisTreatmentList(k,index)
+        DiagnosisTreatmentList(k,index, 2)
       // }
     })
     total.value = res.data.total;
@@ -240,9 +249,12 @@ function DiagnosisTreatmentList(row,index,type) {
     statusEnum: 2, // 状态（包括 1：预置，2：启用，3：停用）
     ...row,
     categoryCode: row.activityCategoryCode,
+    pageSize:100,
   }
-  if(type){
+  if(type == 1){
     catagoryList.value[index].activityDefinitionId =''
+  }else if(type == 2){
+    params.searchKey = row.activityDefinitionId_dictText
   }
   getImplementDepartmentOne(params)
     .then((res) => {
@@ -260,6 +272,27 @@ function DiagnosisTreatmentList(row,index,type) {
     });
 }
 
+function remoteMethod(query, row) {
+  loading.value = true;
+  const params = {
+    statusEnum: 2,
+    activityCategoryCode: row.activityCategoryCode, // 确保已选诊疗目录
+    searchKey: query, // 模糊搜索关键字
+  };
+  getImplementDepartmentOne(params).then((res) => {
+    loading.value = false;
+    if (res.code === 200) {
+      // 更新当前行的 projectList 数据
+      row.projectList = res.data.records.map((item) => ({
+        value: item.id,
+        info: item.name,
+      }));
+    } else {
+      proxy.$modal.msgError(res.msg);
+    }
+  });
+}
+
 /** 选择条数  */
 function handleSelectionChange(selection) {
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
diff --git a/vue3/src/views/basicmanage/lisMerge/index.vue b/openhis-ui-vue3/src/views/basicmanage/lisMerge/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/lisMerge/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/lisMerge/index.vue
diff --git a/vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue
similarity index 100%
rename from vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue
rename to openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue
diff --git a/vue3/src/views/basicmanage/ordersCombination/components/api.js b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/api.js
similarity index 85%
rename from vue3/src/views/basicmanage/ordersCombination/components/api.js
rename to openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/api.js
index 1b44deb7..8303c2f7 100644
--- a/vue3/src/views/basicmanage/ordersCombination/components/api.js
+++ b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/api.js
@@ -56,3 +56,14 @@ export function getUserPractitionerPCage(params) {
     params:params
   })
 }
+
+/**
+ * 删除组套
+ */
+export function deleteOrderGroup(params) {
+  return request({
+    url: '/personalization/order-group/order-group',
+    method: 'delete',
+    params:params
+  })
+}
diff --git a/vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
similarity index 99%
rename from vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
rename to openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
index 303f762d..971d2658 100644
--- a/vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
@@ -4,9 +4,9 @@
       <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
         添加项目
       </el-button>
-      <el-button type="default" @click="saveCombination()" :disabled="false"> 保存 </el-button>
-      <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
-      <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button>
+      <!-- <el-button type="default" @click="saveCombination()" :disabled="false"> 保存 </el-button> -->
+      <!-- <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button> -->
+      <!-- <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button> -->
       <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
     </div>
     <el-table
@@ -936,7 +936,7 @@ function handleSaveSign(row, index) {
 }
 
 function saveCombination() {
-  console.log(props,"参数")
+  console.log(props, '参数');
   let params = JSON.parse(JSON.stringify(props.comtination));
   console.log(params);
 
diff --git a/openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue
new file mode 100644
index 00000000..d1a852f4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue
@@ -0,0 +1,361 @@
+<template>
+  <div class="main-content">
+    <!-- 中间组套列表 -->
+    <div class="section-card-left">
+      <div class="section-header">
+        <div class="actions">
+          <span class="descriptions-item-label">组套名称：</span>
+          <el-input
+            v-model="queryParams.searchKey"
+            placeholder="请输入组套名称"
+            clearable
+            class="search-input"
+            @keydown.enter="getOrderGroupList"
+          >
+            <template #append>
+              <el-button icon="Search" @click="getOrderGroupList" />
+            </template>
+          </el-input>
+          <span class="descriptions-item-label">使用范围：</span>
+          <el-select
+            v-model="queryParams.rangeCode"
+            placeholder="请选择使用范围"
+            prefix-icon="el-icon-search"
+            clearable
+            @change="getOrderGroupList"
+            class="search-input"
+          >
+            <el-option
+              v-for="item in use_range"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
+      </div>
+      <el-table
+        :data="orderGroupList"
+        highlight-current-row
+        @current-change="handleTemplateSelect"
+        style="width: 100%"
+        v-loading="templateLoading"
+        border
+      >
+        <el-table-column type="index" label="序号" width="60" align="center" />
+        <el-table-column prop="name" label="组套名称" min-width="180" header-align="center" />
+        <el-table-column prop="rangeCode_dictText" label="使用范围" width="100" align="center" />
+        <el-table-column prop="createdAt" label="创建时间" width="160" align="center">
+          <template #default="{ row }">
+            <!-- {{ formatDate(row.createdAt) }} -->
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100" fixed="right" align="center">
+          <template #default="{ row }">
+            <el-button type="text" @click="editTemplate(row)">编辑</el-button>
+            <el-button type="text" @click="deleteTemplate(row.id)" style="color: #f56c6c">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 右侧组套详情 -->
+    <div draggable="true" class="section-card-right">
+      <div class="template-detail">
+        <!-- 基本信息卡片 -->
+        <div class="info-card">
+          <div class="card-header">
+            <span>基本信息</span>
+            <el-button type="primary" @click="addTemplate">新建组套</el-button>
+            <el-button type="primary" @click="addTemplate">保存组套</el-button>
+          </div>
+          <el-form :model="currentTemplate" label-width="100px" class="info-form" :inline="true">
+            <el-form-item label="组套名称">
+              <el-input v-model="currentTemplate.name" ref="name" placeholder="请输入组套名称" />
+            </el-form-item>
+            <el-form-item label="组套类型">
+              <el-select
+                v-model="currentTemplate.typeEnum"
+                placeholder="请选择组套类型"
+                class="search-input"
+              >
+                <el-option
+                  v-for="item in typeEnum"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="使用范围">
+              <el-select
+                v-model="currentTemplate.rangeCode"
+                placeholder="请选择使用范围"
+                class="search-input"
+              >
+                <el-option
+                  v-for="item in use_range"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="info-card">
+          <div class="card-header">
+            <span>项目列表</span>
+          </div>
+          <div style="padding: 10px 10px">
+            <Prescriptionlist :comtination="comtination" />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import Prescriptionlist from './components/prescriptionlist.vue';
+import { getOrderGroup, deleteOrderGroup } from './components/api.js';
+
+const { proxy } = getCurrentInstance();
+const { use_range } = proxy.useDict('use_range');
+
+const currentTemplate = ref({});
+// 查询参数
+const queryParams = ref({});
+// 组套列表
+const orderGroupList = ref([]);
+const typeEnum = ref([
+  {
+    value: '1',
+    label: '医嘱组套',
+  },
+  {
+    value: '2',
+    label: '诊疗组套',
+  },
+]);
+const comtination = ref('');
+const templateLoading = ref(false);
+
+getOrderGroupList();
+function getOrderGroupList() {
+  getOrderGroup(queryParams.value).then((res) => {
+    orderGroupList.value = res.data.records;
+  });
+}
+
+// 处理组套选择
+const handleTemplateSelect = (row) => {
+  currentTemplate.value = row;
+  comtination.value = row;
+};
+
+// 添加组套
+const addTemplate = () => {
+  currentTemplate.value = {};
+  proxy.$refs.name.focus();
+};
+
+// 编辑组套
+const editTemplate = () => {};
+
+// 删除组套
+const deleteTemplate = (id) => {
+  deleteOrderGroup({ id: id }).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('删除成功');
+    }
+  });
+};
+</script>
+
+<style scoped>
+.main-content {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+  gap: 10px;
+  padding: 30px;
+  width: 100%;
+  height: calc(100% - 80px);
+}
+
+.section-card-left {
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 15px rgba(0, 0, 0, 0.06);
+  width: 35%;
+  height: 100%;
+  overflow: hidden;
+  padding: 10px;
+  border: 1px solid #ebeef5;
+}
+
+.section-card-right {
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 15px rgba(0, 0, 0, 0.06);
+  width: 64%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 10px;
+  background: #f8fafc;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.search-area {
+  padding: 10px 15px;
+  border-bottom: 1px solid #ebeef5;
+  background: #f8fafc;
+}
+
+.search-input {
+  width: 200px;
+}
+
+.template-detail {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  overflow-y: auto;
+  height: 100%;
+}
+
+.info-card {
+  background: #ffffff;
+  border-radius: 10px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+  border: 1px solid #ebeef5;
+  overflow: hidden;
+}
+
+.card-header {
+  display: flex;
+  align-items: center;
+  padding: 12px 15px;
+  background: #f8fafc;
+  border-bottom: 1px solid #ebeef5;
+  font-weight: 600;
+  color: #555;
+}
+
+.card-header i {
+  margin-right: 10px;
+  color: #409eff;
+  font-size: 18px;
+}
+
+.card-header span {
+  flex: 1;
+}
+
+.add-btn {
+  padding: 5px 10px;
+}
+
+.info-form {
+  padding: 20px 15px 10px;
+}
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding: 5px 0;
+}
+
+.custom-tree-node i {
+  margin-right: 8px;
+  color: #909399;
+}
+
+.node-label {
+  flex: 1;
+}
+
+.count-badge {
+  background-color: #e6f7ff;
+  color: #1890ff;
+  border-radius: 10px;
+  padding: 2px 8px;
+  font-size: 14px;
+  margin-left: 10px;
+}
+
+.tree-actions {
+  visibility: hidden;
+  margin-left: 10px;
+}
+
+.el-tree-node__content:hover .tree-actions {
+  visibility: visible;
+}
+
+:deep(.el-tree-node.is-current > .el-tree-node__content) {
+  background-color: #ecf5ff;
+  font-weight: 500;
+}
+
+:deep(.el-tree-node__content) {
+  height: 40px;
+}
+
+:deep(.el-table) {
+  flex: 1;
+}
+
+:deep(.el-table__header) {
+  font-weight: 600;
+}
+
+:deep(.el-table__row) {
+  transition: background-color 0.3s;
+}
+
+:deep(.el-table__row:hover) {
+  background-color: #f5f7fa !important;
+}
+
+.el-button--primary {
+  background: linear-gradient(135deg, #409eff, #337ecc);
+  border: none;
+}
+
+.el-button--primary:hover {
+  opacity: 0.9;
+}
+
+.cost {
+  font-weight: 600;
+  color: #e53935;
+}
+
+:deep(.el-tag) {
+  border-radius: 12px;
+  padding: 0 10px;
+}
+
+:deep(.el-input__inner) {
+  border-radius: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/basicmanage/organization/components/api.js b/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js
similarity index 100%
rename from vue3/src/views/basicmanage/organization/components/api.js
rename to openhis-ui-vue3/src/views/basicmanage/organization/components/api.js
diff --git a/vue3/src/views/basicmanage/organization/index.vue b/openhis-ui-vue3/src/views/basicmanage/organization/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/organization/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/organization/index.vue
diff --git a/vue3/src/views/basicmanage/pharmacyDepartment/components/pharmacyDepartment.js b/openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/components/pharmacyDepartment.js
similarity index 100%
rename from vue3/src/views/basicmanage/pharmacyDepartment/components/pharmacyDepartment.js
rename to openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/components/pharmacyDepartment.js
diff --git a/vue3/src/views/basicmanage/pharmacyDepartment/index.vue b/openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/pharmacyDepartment/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/index.vue
diff --git a/vue3/src/views/basicmanage/supplier/components/supplier.js b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
similarity index 100%
rename from vue3/src/views/basicmanage/supplier/components/supplier.js
rename to openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js
diff --git a/vue3/src/views/basicmanage/supplier/index.vue b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
similarity index 96%
rename from vue3/src/views/basicmanage/supplier/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
index 3350bfc7..2b4bb1c0 100644
--- a/vue3/src/views/basicmanage/supplier/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
@@ -40,7 +40,6 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['system:user:add']"
           >添加</el-button
         >
       </el-col>
@@ -51,7 +50,6 @@
           icon="Remove"
           :disabled="multiple"
           @click="handleClose"
-          v-hasPermi="['system:user:edit']"
           >停用</el-button
         >
       </el-col>
@@ -62,7 +60,6 @@
           icon="CirclePlus"
           :disabled="multiple"
           @click="handleStart"
-          v-hasPermi="['system:user:remove']"
           >启用</el-button
         >
       </el-col>
@@ -72,7 +69,6 @@
           plain
           icon="Search"
           @click="getList"
-          v-hasPermi="['system:user:import']"
           >查询</el-button
         >
       </el-col>
@@ -82,7 +78,6 @@
           plain
           icon="CircleClose"
           @click="handleClear"
-          v-hasPermi="['system:user:export']"
           >清空条件</el-button
         >
       </el-col>
@@ -162,7 +157,6 @@
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:user:edit']"
             >编辑</el-button
           >
           <el-button
@@ -170,7 +164,6 @@
             type="primary"
             icon="View"
             @click="handleView(scope.row)"
-            v-hasPermi="['system:user:remove']"
             >查看</el-button
           >
         </template>
@@ -343,8 +336,8 @@ const data = reactive({
   rules: {
     name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
     typeEnum: [{ required: true, message: "类型不能为空", trigger: "blur" }],
-    address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
-    phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
+    // address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+    // phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
     // email: [{ required: true, message: "联系人邮箱不能为空", trigger: "blur" },
     // { validator: validateEmail, trigger: 'blur' }
     // ],
diff --git a/vue3/src/views/basicmanage/tcmPrescription/index.vue b/openhis-ui-vue3/src/views/basicmanage/tcmPrescription/index.vue
similarity index 100%
rename from vue3/src/views/basicmanage/tcmPrescription/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/tcmPrescription/index.vue
diff --git a/vue3/src/views/basicmanage/ward/components/api.js b/openhis-ui-vue3/src/views/basicmanage/ward/components/api.js
similarity index 74%
rename from vue3/src/views/basicmanage/ward/components/api.js
rename to openhis-ui-vue3/src/views/basicmanage/ward/components/api.js
index 81ae43a8..b1060b66 100644
--- a/vue3/src/views/basicmanage/ward/components/api.js
+++ b/openhis-ui-vue3/src/views/basicmanage/ward/components/api.js
@@ -63,4 +63,28 @@ export function deleteLocation(busNo) {
       method: 'delete',
     })
 }
+  
+  
+/**
+ * 启用病区/床位/病房
+ */
+export function enableLocation(data) {
+    return request({
+      url: '/base-data-manage/location/enable',
+      method: 'put',
+      data: data
+    })
+}
+  
+  
+/**
+ * 停用病区/床位/病房
+ */
+export function unableLocation(data) {
+    return request({
+      url: '/base-data-manage/location/deactivate',
+      method: 'put',
+      data: data
+    })
+}
   
\ No newline at end of file
diff --git a/vue3/src/views/basicmanage/ward/index.vue b/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
similarity index 55%
rename from vue3/src/views/basicmanage/ward/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/ward/index.vue
index 61519d2e..2b842838 100644
--- a/vue3/src/views/basicmanage/ward/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
@@ -1,57 +1,166 @@
 <template>
-  <div style="display: flex; justify-content: space-between" class="app-container">
+  <div style="display: flex; justify-content: space-between; height: 90vh" class="app-container">
     <el-card style="width: 30%">
       <template #header>
         <span style="vertical-align: middle">病区</span>
       </template>
       <div style="width: 100%">
         <el-button type="primary" @click="open = true" class="mb8"> 新增 </el-button>
+        <el-button type="success" plain @click="handleEnableBatch('wardRef')" class="mb8">
+          批量启用
+        </el-button>
+        <el-button type="primary" plain @click="handleUnableBatch('wardRef')" class="mb8">
+          批量停用
+        </el-button>
         <el-button style="float: right" @click="getWardList()" class="mb8" icon="refresh" />
         <el-table
           max-height="630"
           :data="wardList"
           @cell-click="(row) => clickRow(row, 10)"
           highlight-current-row
+          ref="wardRef"
         >
+          <el-table-column type="selection" :selectable="checkSelectable" width="55" />
           <el-table-column label="病区" align="center" prop="name" />
           <el-table-column label="病区号" align="center" prop="startTime">
             <template #default="scope">
               {{ getLastPartOfString(scope.row.busNo) }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center">
+          <el-table-column label="状态" align="center" prop="statusEnum_enumText">
+            <template #default="scope">
+              <el-tag
+                :type="
+                  scope.row.statusEnum === 1 || scope.row.statusEnum === 6
+                    ? 'success'
+                    : scope.row.statusEnum === 2
+                    ? 'primary'
+                    : 'warning'
+                "
+              >
+                {{ scope.row.statusEnum_enumText }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
               <el-button type="primary" link @click.stop="handleEdit(scope.row)"> 编辑 </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.statusEnum === 5"
+                @click.stop="
+                  () => {
+                    handleUnable(scope.row, 10).then(() => {
+                      getWardList();
+                    });
+                  }
+                "
+                v-if="
+                  scope.row.statusEnum === 1 ||
+                  scope.row.statusEnum === 6 ||
+                  scope.row.statusEnum === 5
+                "
+              >
+                停用
+              </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.statusEnum === 5"
+                @click.stop="
+                  () => {
+                    handleEnable(scope.row).then(() => {
+                      getWardList();
+                    });
+                  }
+                "
+                v-else-if="scope.row.statusEnum === 2"
+              >
+                启用
+              </el-button>
               <el-button type="danger" link @click="handleDelete(scope.row)"> 删除 </el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
     </el-card>
-    <div style="width: 69%">
+    <div style="width: 69%; height: 100%; padding-bottom: 20px">
       <el-card style="margin-bottom: 20px">
         <template #header>
           <span style="vertical-align: middle">病房</span>
         </template>
+        <el-button type="success" plain @click="handleEnableBatch('hourseRef')">批量启用</el-button>
+        <el-button type="primary" plain @click="handleUnableBatch('hourseRef')">批量停用</el-button>
         <el-table
-          height="320"
+          height="280"
           :data="houseList"
-          @cell-click="(row) => clickRow(row, 11)"
+          @cell-click="(row) => clickRow(row, 8)"
           highlight-current-row
           v-loading="loading"
+          ref="hourseRef"
         >
+          <el-table-column type="selection" :selectable="checkSelectable" width="55" />
           <el-table-column label="病房" align="center" prop="name" />
           <el-table-column label="病房号" align="center" prop="busNo">
             <template #default="scope">
               {{ getLastPartOfString(scope.row.busNo) }}
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="statusEnum_enumText" />
+          <el-table-column label="状态" align="center" prop="statusEnum_enumText">
+            <template #default="scope">
+              <el-tag
+                :type="
+                  scope.row.statusEnum === 1 || scope.row.statusEnum === 6
+                    ? 'success'
+                    : scope.row.statusEnum === 2
+                    ? 'primary'
+                    : 'warning'
+                "
+              >
+                {{ scope.row.statusEnum_enumText }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center">
             <template #default="scope">
               <el-button type="primary" link @click.stop="handleEdit(scope.row, 4)">
                 编辑
               </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.statusEnum === 5"
+                @click.stop="
+                  () => {
+                    handleUnable(scope.row).then(() => {
+                      clickRow(houseRow, 10);
+                    });
+                  }
+                "
+                v-if="
+                  scope.row.statusEnum === 1 ||
+                  scope.row.statusEnum === 6 ||
+                  scope.row.statusEnum === 5
+                "
+              >
+                停用
+              </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.statusEnum === 5"
+                @click.stop="
+                  () => {
+                    handleEnable(scope.row).then(() => {
+                      clickRow(houseRow, 10);
+                    });
+                  }
+                "
+                v-else-if="scope.row.statusEnum === 2"
+              >
+                启用
+              </el-button>
               <el-button type="danger" link @click="handleDelete(scope.row)"> 删除 </el-button>
             </template>
           </el-table-column>
@@ -61,19 +170,69 @@
         <template #header>
           <span style="vertical-align: middle">床位</span>
         </template>
-        <el-table height="280" :data="bedList" v-loading="loading" width="">
+        <el-button type="success" plain @click="handleEnableBatch('bedRef')">批量启用</el-button>
+        <el-button type="primary" plain @click="handleUnableBatch('bedRef')">批量停用</el-button>
+        <el-table ref="bedRef" height="270" :data="bedList" v-loading="loading" width="">
+          <el-table-column type="selection" :selectable="checkSelectable" width="55" />
           <el-table-column label="病床" align="center" prop="name" />
           <el-table-column label="病床号" align="center" prop="busNo">
             <template #default="scope">
               {{ getLastPartOfString(scope.row.busNo) }}
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="statusEnum_enumText" />
+          <el-table-column label="状态" align="center" prop="statusEnum_enumText">
+            <template #default="scope">
+              <el-tag
+                :type="
+                  scope.row.statusEnum === 1 || scope.row.statusEnum === 6
+                    ? 'success'
+                    : scope.row.statusEnum === 2
+                    ? 'primary'
+                    : 'warning'
+                "
+                >{{ scope.row.statusEnum_enumText }}</el-tag
+              >
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center">
             <template #default="scope">
               <el-button type="primary" link @click.stop="handleEdit(scope.row, 10)">
                 编辑
               </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.statusEnum === 5"
+                @click.stop="
+                  () => {
+                    handleUnable(scope.row, 10).then(() => {
+                      clickRow(bedRow, 8);
+                    });
+                  }
+                "
+                v-if="
+                  scope.row.statusEnum === 1 ||
+                  scope.row.statusEnum === 6 ||
+                  scope.row.statusEnum === 5
+                "
+              >
+                停用
+              </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.statusEnum === 5"
+                @click.stop="
+                  () => {
+                    handleEnable(scope.row, 10).then(() => {
+                      clickRow(bedRow, 8);
+                    });
+                  }
+                "
+                v-else-if="scope.row.statusEnum === 2"
+              >
+                启用
+              </el-button>
               <el-button type="danger" link @click="handleDelete(scope.row)"> 删除 </el-button>
             </template>
           </el-table-column>
@@ -92,7 +251,7 @@
           <el-radio-group v-model="form.formEnum" @change="handleRadioChange" :disabled="isEdit">
             <el-radio :label="4">病区</el-radio>
             <el-radio :label="10">病房</el-radio>
-            <el-radio :label="11">床位</el-radio>
+            <el-radio :label="8">床位</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="type + '名称'" prop="name">
@@ -147,7 +306,15 @@
 </template>
     
 <script setup name="Ward">
-import { getList, addLocation, getOrgList, deleteLocation, editLocation } from './components/api';
+import {
+  getList,
+  addLocation,
+  getOrgList,
+  deleteLocation,
+  editLocation,
+  unableLocation,
+  enableLocation,
+} from './components/api';
 const { proxy } = getCurrentInstance();
 const queryParams = ref({
   pageNum: 1,
@@ -164,6 +331,8 @@ const organization = ref([]);
 const loading = ref(false);
 const isEdit = ref(false);
 const open = ref(false);
+const bedRow = ref({});
+const houseRow = ref({});
 const form = reactive({
   formEnum: 4,
 });
@@ -183,7 +352,7 @@ const rules = ref({
   ],
 });
 /**
- * 患者列表
+ * 病区列表
  */
 function getWardList() {
   queryParams.value.formEnum = 4;
@@ -224,10 +393,13 @@ function clickRow(row, val) {
   loading.value = true;
   queryParams.value.formEnum = val;
   queryParams.value.busNo = row.busNo;
+  bedList.value = [];
   getList(queryParams.value).then((res) => {
     if (val == 10) {
       houseList.value = res.data.records;
-    } else if (val == 11) {
+      houseRow.value = row;
+    } else if (val == 8) {
+      bedRow.value = row;
       bedList.value = res.data.records;
     }
     setTimeout(() => {
@@ -237,6 +409,56 @@ function clickRow(row, val) {
   });
 }
 
+function checkSelectable(row, index) {
+  return row.statusEnum !== 5;
+}
+
+function handleEnable(row) {
+  return enableLocation([row.id]).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('启用成功');
+    }
+  });
+}
+
+function handleUnable(row) {
+  return unableLocation([row.id]).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('停用成功');
+    }
+  });
+}
+
+function handleEnableBatch(tableRef) {
+  let list = proxy.$refs[tableRef].getSelectionRows().map((item) => {
+    return item.id;
+  });
+  if (list.length == 0) {
+    proxy.$modal.msgError('请选择要启用的数据');
+    return;
+  }
+  enableLocation(list).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess(res.message);
+    }
+  });
+}
+
+function handleUnableBatch(tableRef) {
+  let list = proxy.$refs[tableRef].getSelectionRows().map((item) => {
+    return item.id;
+  });
+  if (list.length == 0) {
+    proxy.$modal.msgError('请选择要停用的数据');
+    return;
+  }
+  unableLocation(list).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess(res.message);
+    }
+  });
+}
+
 function submitForm() {
   if (form.busNoParent) {
     if (form.formEnum == 4) {
diff --git a/vue3/src/views/basicmanage/warehouseLocation/components/api.js b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js
similarity index 69%
rename from vue3/src/views/basicmanage/warehouseLocation/components/api.js
rename to openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js
index 77623771..e28adfe8 100644
--- a/vue3/src/views/basicmanage/warehouseLocation/components/api.js
+++ b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js
@@ -42,3 +42,25 @@ export function updateWarehouse(data) {
   }
 
 
+/**
+ * 启用病区/床位/病房
+ */
+export function enableLocation(data) {
+  return request({
+    url: '/base-data-manage/location/enable',
+    method: 'put',
+    data: data
+  })
+}
+
+
+/**
+* 停用病区/床位/病房
+*/
+export function unableLocation(data) {
+  return request({
+    url: '/base-data-manage/location/deactivate',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/vue3/src/views/basicmanage/warehouseLocation/index.vue b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue
similarity index 92%
rename from vue3/src/views/basicmanage/warehouseLocation/index.vue
rename to openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue
index 168ff624..a71209e7 100644
--- a/vue3/src/views/basicmanage/warehouseLocation/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue
@@ -70,19 +70,16 @@
         <template #default="scope">
           <el-button link type="primary" @click="handelEdit(scope.row)">编辑</el-button>
           <!-- <el-button
-            link
             type="primary"
-            @click="handleDisabled(scope.row.id)"
-            v-if="scope.row.activeFlag == '1'"
-            >停用</el-button
-          >
-          <el-button
             link
-            type="primary"
-            @click="handelEnable(scope.row.id)"
-            v-else
-            >启用</el-button
-          > -->
+            @click.stop="handleUnable(scope.row, 10)"
+            v-if="scope.row.statusEnum === 1 || scope.row.statusEnum === 6"
+          >
+            停用
+          </el-button>
+          <el-button type="primary" link @click.stop="handleEnable(scope.row, 10)" v-else>
+            启用
+          </el-button> -->
           <el-button
             type="danger"
             link
@@ -145,6 +142,8 @@ import {
   addWarehouse,
   updateWarehouse,
   deleteWarehouse,
+  enableLocation,
+  unableLocation,
   // disableOrg,
   init,
   // enableOrg,
@@ -211,6 +210,24 @@ function resetQuery() {
   handleQuery();
 }
 
+function handleEnable(row) {
+  enableLocation([row.id]).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('启用成功');
+      handleQuery();
+    }
+  });
+}
+
+function handleUnable(row) {
+  unableLocation([row.id]).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('停用成功');
+      handleQuery();
+    }
+  });
+}
+
 function getPageList() {
   loading.value = true;
   getList(queryParams.value).then((res) => {
diff --git a/vue3/src/views/basicservices/registrationfee/components/registrationfee.js b/openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js
similarity index 100%
rename from vue3/src/views/basicservices/registrationfee/components/registrationfee.js
rename to openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js
diff --git a/vue3/src/views/basicservices/registrationfee/index.vue b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
similarity index 99%
rename from vue3/src/views/basicservices/registrationfee/index.vue
rename to openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
index da245336..7b812081 100644
--- a/vue3/src/views/basicservices/registrationfee/index.vue
+++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
@@ -441,7 +441,7 @@ const data = reactive({
 const { queryParams, form, rules } = toRefs(data);
 
 function init() {
-  getInitOption({ statusEnum: 2, pageSize: 50, pageNo: 1 }).then((res) => {
+  getInitOption({ statusEnum: 2, pageSize: 1000, pageNo: 1 }).then((res) => {
     definitionList.value = res.data.records;
   });
 }
diff --git a/vue3/src/views/catalog/device/components/device.js b/openhis-ui-vue3/src/views/catalog/device/components/device.js
similarity index 97%
rename from vue3/src/views/catalog/device/components/device.js
rename to openhis-ui-vue3/src/views/catalog/device/components/device.js
index fed23f6e..53966b81 100644
--- a/vue3/src/views/catalog/device/components/device.js
+++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js
@@ -78,7 +78,7 @@ export function deptTreeSelect(queryParams) {
   return request({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    param: queryParams
+    params: queryParams
   })
 }
 
@@ -87,7 +87,7 @@ export function locationTreeSelect(queryParams) {
   return request({
     url: '/base-data-manage/location/location-page-tree',
     method: 'get',
-    param: queryParams
+    params: queryParams
   })
 }
 
diff --git a/vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
similarity index 89%
rename from vue3/src/views/catalog/device/components/deviceDialog.vue
rename to openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
index b78ae9be..654bd459 100644
--- a/vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" v-model="visible" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="visible" width="955px" append-to-body>
       <el-form
         :model="form"
         :rules="rules"
@@ -9,13 +9,13 @@
         label-width="110px"
         label-position="left"
       >
-      <div class="title">
+        <div class="title">
           <el-button
             type="primary"
             plain
             @click="handleImportYb()"
             size="small"
-            style="margin-left: 5px; margin-top: -10px; margin-bottom: 20px;"
+            style="margin-left: 5px; margin-top: -10px; margin-bottom: 20px"
             >从医保目录导入</el-button
           >
         </div>
@@ -36,7 +36,7 @@
                 v-model="form.categoryCode"
                 :data="deviceCategories"
                 :props="{ value: 'value', label: 'info', children: 'children' }"
-                :disabled=false
+                :disabled="false"
                 value-key="value"
                 placeholder=""
                 check-strictly
@@ -88,7 +88,12 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="包装单位" prop="unitCode">
-              <el-select v-model="form.unitCode" placeholder="请选择" clearable @change="handleUnitCodeChange">
+              <el-select
+                v-model="form.unitCode"
+                placeholder="请选择"
+                clearable
+                @change="handleUnitCodeChange"
+              >
                 <el-option
                   v-for="dict in unit_code"
                   :key="dict.value"
@@ -151,11 +156,37 @@
               <el-input v-model="form.ybNo" placeholder="" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="医药机构目录编码" prop="ybOrgNo" label-width="125px">
+              <el-input v-model="form.ybOrgNo" placeholder="" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="主要成分" prop="substanceText">
               <el-input v-model="form.substanceText" placeholder="" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="警戒线最低值(常规单位)" prop="itemMinQuantity" label-width="180px">
+              <el-input-number
+                v-model="form.itemMinQuantity"
+                placeholder=""
+                controls-position="right"
+                :min="0"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="警戒线最高值(常规单位)" prop="itemMaxQuantity" label-width="180px">
+              <el-input-number
+                v-model="form.itemMaxQuantity"
+                placeholder=""
+                controls-position="right"
+                :min="0"
+              />
+            </el-form-item>
+          </el-col>
+
           <!-- <el-col :span="8">
             <el-form-item label="器材版本" prop="version">
               <el-input v-model="form.version" placeholder="" />
@@ -263,27 +294,19 @@
               <el-input
                 v-model="form.purchasePrice"
                 placeholder=""
-                :disabled=false
+                :disabled="false"
                 @input="updatePrices"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="零售价" prop="retailPrice">
-              <el-input
-                v-model="form.retailPrice"
-                placeholder=""
-                :disabled=false
-              />
+              <el-input v-model="form.retailPrice" placeholder="" :disabled="false" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="最高零售价" prop="maximumRetailPrice">
-              <el-input
-                v-model="form.maximumRetailPrice"
-                placeholder=""
-                :disabled=false
-              />
+              <el-input v-model="form.maximumRetailPrice" placeholder="" :disabled="false" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -363,10 +386,12 @@ const data = reactive({
     size: [{ required: true, message: '包装规格不能为空', trigger: 'blur' }],
     partPercent: [{ required: true, message: '拆零比不能为空', trigger: 'blur' }],
     minUnitCode: [{ required: true, message: '最小使用单位不能为空', trigger: 'blur' }],
-   // modelNumber: [{ required: true, message: '产品型号不能为空', trigger: 'blur' }],
+    // modelNumber: [{ required: true, message: '产品型号不能为空', trigger: 'blur' }],
     // hvcmFlag: [
     //   { required: true, message: "高值器材标志不能为空", trigger: "blur" },
     // ],
+    itemMinQuantity: [{ required: true, message: '警戒线最低值不能为空', trigger: 'blur' }],
+    itemMaxQuantity: [{ required: true, message: '警戒线最高值不能为空', trigger: 'blur' }],
     salesUnitCode: [{ required: true, message: '销售单位不能为空', trigger: 'blur' }],
     //approvalNumber: [{ required: true, message: '批准文号不能为空', trigger: 'blur' }],
     // ybFlag: [{ required: true, message: "医保标记不能为空", trigger: "blur" }],
@@ -376,7 +401,7 @@ const data = reactive({
     // ],
     // statusEnum: [{ required: true, message: "状态不能为空", trigger: "blur" }],
     manufacturerId: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-    supplyId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
+    // supplyId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
     // description: [{ required: true, message: "说明不能为空", trigger: "blur" }],
     //jurisdiction: [{ required: true, message: '适用范围不能为空', trigger: 'blur' }],
     ruleId: [{ required: true, message: '执行科室不能为空', trigger: 'blur' }],
@@ -385,7 +410,7 @@ const data = reactive({
     // allergenFlag: [
     //   { required: true, message: "过敏标记不能为空", trigger: "blur" },
     // ],
-   // orgId: [{ required: true, message: '提供部门不能为空', trigger: 'blur' }],
+    // orgId: [{ required: true, message: '提供部门不能为空', trigger: 'blur' }],
     locationId: [{ required: true, message: '地点不能为空', trigger: 'blur' }],
     purchasePrice: [{ required: true, message: '购入价不能为空', trigger: 'blur' }],
     retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
@@ -438,9 +463,9 @@ function show() {
   statusFlagOptions.value = props.statusFlagOptions;
   form.value.categoryCode = props.currentCategoryEnum;
   supplierListOptions.value = props.supplierListOptions;
-  form.value.partPercent = 1
-  form.value.itemTypeCode = '2005'
-  form.value.ybType = '8'
+  form.value.partPercent = 1;
+  form.value.itemTypeCode = '2005';
+  form.value.ybType = '8';
   console.log(props, '22222', title.value, props.deviceCategories);
   getDeptTree();
   getLocationTree();
@@ -451,10 +476,12 @@ function setValue(row) {
   form.value = {
     name: formatValue(row.consumableName), //医疗服务项目名称
     ybNo: formatValue(row.medicalCatalogCode), // 医保编码
-   // modelNumber: formatValue(row.productModel), // 产品型号
+    // modelNumber: formatValue(row.productModel), // 产品型号
     modelNumber: formatValue(row.specification), // 规格
     manufacturerText: formatValue(row.manufacturerName), // 厂家名称
-    partPercent:1,
+    partPercent: 1,
+    itemMinQuantity: formatValue(row.itemMinQuantity), // 警戒线最低值
+    itemMaxQuantity: formatValue(row.itemMaxQuantity), // 警戒线最高值
     // chrgitmLv: formatValue(
     //   row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3'
     // ), // 医保等级
@@ -470,7 +497,7 @@ function getDeptTree() {
 
 /** 查询地点下拉树结构 */
 function getLocationTree() {
-  locationTreeSelect().then((response) => {
+  locationTreeSelect({ formList: '11,16' }).then((response) => {
     console.log(response, 'response查询部门下拉树结构');
     locationOptions.value = response.data.records;
   });
@@ -509,6 +536,7 @@ function reset() {
     approvalNumber: undefined, // 批准文号
     ybFlag: undefined, // 医保标志
     ybNo: undefined, // 医保编码
+    ybOrgNo: undefined, //医药机构目录编码
     ybMatchFlag: undefined, // 医保对码标记
     // statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
     manufacturerId: undefined, // 厂家编码
@@ -568,7 +596,7 @@ function handleUnitCodeChange(value) {
 }
 
 // 在这里可以根据购入价来更新零售价
-function updatePrices(value){
+function updatePrices(value) {
   form.value.retailPrice = form.value.purchasePrice;
   form.value.maximumRetailPrice = form.value.purchasePrice;
 }
diff --git a/vue3/src/views/catalog/device/components/deviceYbDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceYbDialog.vue
similarity index 100%
rename from vue3/src/views/catalog/device/components/deviceYbDialog.vue
rename to openhis-ui-vue3/src/views/catalog/device/components/deviceYbDialog.vue
diff --git a/vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue
similarity index 98%
rename from vue3/src/views/catalog/device/index.vue
rename to openhis-ui-vue3/src/views/catalog/device/index.vue
index 7820e2de..e3264311 100644
--- a/vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -261,12 +261,21 @@
             :show-overflow-tooltip="true"
             width="110"
           />
+          <el-table-column
+            label="医药机构目录编码"
+            align="center"
+            key="ybOrgNo"
+            prop="ybOrgNo"
+            :show-overflow-tooltip="true"
+            width="130"
+          />   
           <el-table-column
             label="医保对码标记"
             align="center"
             key="ybMatchFlag_enumText"
             prop="ybMatchFlag_enumText"
             :show-overflow-tooltip="true"
+            width="105"
           />
           <el-table-column
             label="状态"
diff --git a/vue3/src/views/catalog/diagnosistreatment/components/diagTreYbDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagTreYbDialog.vue
similarity index 100%
rename from vue3/src/views/catalog/diagnosistreatment/components/diagTreYbDialog.vue
rename to openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagTreYbDialog.vue
diff --git a/vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
similarity index 95%
rename from vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
rename to openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
index a155d3a8..ac21ba49 100644
--- a/vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -143,16 +143,23 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="身体部位" prop="bodySiteCode">
-              <el-select v-model="form.bodySiteCode" clearable filterable>
-                <el-option
-                  v-for="category in body_site_code"
-                  :key="category.value"
-                  :label="category.label"
-                  :value="category.value"
-                />
-              </el-select>
+              <el-tree-select
+                v-model="form.bodySiteCode"
+                :data="bodyOptions"
+                :props="{
+                  value: 'id',
+                  label: 'name',
+                  children: 'children',
+                }"
+                value-key="id"
+                placeholder="请选择身体部位"
+                check-strictly
+                filterable
+                clearable
+              />
             </el-form-item>
           </el-col>
+          
           <el-col :span="8">
             <el-form-item label="所需标本" prop="specimenCode">
               <el-select v-model="form.specimenCode" clearable filterable>
@@ -319,6 +326,7 @@ import {
   editDiagnosisTreatment,
   addDiagnosisTreatment,
   deptTreeSelect,
+  bodyTreeSelect,
   locationTreeSelect,
 } from './diagnosistreatment';
 
@@ -337,6 +345,7 @@ const visible = ref(false);
 const emits = defineEmits(['submit']); // 声明自定义事件
 const categoryCode = ref('');
 const deptOptions = ref(undefined); // 部门树选项
+const bodyOptions = ref(undefined); // 身体部位树选项
 const locationOptions = ref(undefined); // 地点树选项
 const diagnosisCategoryOptions = ref(undefined);
 const statusFlagOptions = ref(undefined);
@@ -425,6 +434,7 @@ function show() {
   reset();
   getLocationTree();
   getItemList();
+  getBodyTree();
   getDeptTree();
   title.value = '';
   title.value = props.title;
@@ -452,6 +462,7 @@ function edit() {
   reset();
   getLocationTree();
   getItemList();
+  getBodyTree();
   getDeptTree();
   title.value = '';
   title.value = props.title;
@@ -539,9 +550,16 @@ function getDeptTree() {
     deptOptions.value = response.data.records;
   });
 }
+/** 查询身体部位拉树结构 */
+function getBodyTree() {
+  bodyTreeSelect().then((response) => {
+    console.log(response, 'response查询身体部位下拉树结构');
+    bodyOptions.value = response.data.records;
+  });
+}
 /** 查询地点下拉树结构 */
 function getLocationTree() {
-  locationTreeSelect().then((response) => {
+  locationTreeSelect({ formList: '8,4,10' }).then((response) => {
     console.log(response, 'response查询部门下拉树结构');
     locationOptions.value = response.data.records;
   });
diff --git a/vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
similarity index 90%
rename from vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
rename to openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
index 0c4ab43a..e7882e58 100644
--- a/vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
@@ -72,13 +72,20 @@ export function deptTreeSelect(queryParams) {
     param: queryParams
   })
 }
-
+// 查询身体部位树形数据
+export function bodyTreeSelect(queryParams) {
+  return request({
+    url: '/base-data-manage/body-structure/body',
+    method: 'get',
+    params: queryParams
+  })
+}
 // 查询地点树形数据
 export function locationTreeSelect(queryParams) {
   return request({
     url: '/base-data-manage/location/location-page-tree',
     method: 'get',
-    param: queryParams
+    params: queryParams
   })
 }
 
diff --git a/vue3/src/views/catalog/diagnosistreatment/index.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
similarity index 100%
rename from vue3/src/views/catalog/diagnosistreatment/index.vue
rename to openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
diff --git a/vue3/src/views/catalog/disease/components/disease.js b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
similarity index 100%
rename from vue3/src/views/catalog/disease/components/disease.js
rename to openhis-ui-vue3/src/views/catalog/disease/components/disease.js
diff --git a/vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue
similarity index 100%
rename from vue3/src/views/catalog/disease/index.vue
rename to openhis-ui-vue3/src/views/catalog/disease/index.vue
diff --git a/vue3/src/views/catalog/medicine/components/medicine.js b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
similarity index 87%
rename from vue3/src/views/catalog/medicine/components/medicine.js
rename to openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
index b994d891..11e4ddde 100644
--- a/vue3/src/views/catalog/medicine/components/medicine.js
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
@@ -78,7 +78,7 @@ export function deptTreeSelect(queryParams) {
   return request({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    param: queryParams
+    params: queryParams
   })
 }
 
@@ -87,7 +87,7 @@ export function locationTreeSelect(queryParams) {
   return request({
     url: '/base-data-manage/location/location-page-tree',
     method: 'get',
-    param: queryParams
+    params: queryParams
   })
 }
 
@@ -99,3 +99,10 @@ export function getYbMedicationList(queryParams) {
     params: queryParams
   })
 }
+// 获取药品限制标志
+export function queryYbCatalogue(queryParams) {
+  return request({
+    url: '/yb-request/query-yb-catalogue?hilistCode=' + queryParams.hilistCode + '&dateStr=' + queryParams.dateStr,
+    method: 'post',
+  })
+}
diff --git a/vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
similarity index 94%
rename from vue3/src/views/catalog/medicine/components/medicineDialog.vue
rename to openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
index e832f92e..98eccb25 100644
--- a/vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -244,6 +244,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="警戒线最低值(常规单位)" prop="itemMinQuantity" label-width="180px">
+                  <el-input-number    
+                    v-model="form.itemMinQuantity"
+                    placeholder=""
+                    controls-position="right"
+                    :min="0"
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
 
             <el-row :gutter="24">
@@ -280,34 +290,33 @@
                   <el-input v-model="form.partPercent" placeholder="" />
                 </el-form-item>
               </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="警戒线最高值(常规单位)" prop="itemMaxQuantity" label-width="180px">
+                  <el-input-number
+                    v-model="form.itemMaxQuantity"
+                    placeholder=""
+                    controls-position="right"
+                    :min="0"
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
             <div class="title">价格信息</div>
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="购入价" prop="purchasePrice">
-                  <el-input
-                    v-model="form.purchasePrice"
-                    placeholder=""
-                    :disabled=false
-                  />
+                  <el-input v-model="form.purchasePrice" placeholder="" :disabled="false" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="零售价" prop="retailPrice">
-                  <el-input
-                    v-model="form.retailPrice"
-                    placeholder=""
-                    :disabled=false
-                  />
+                  <el-input v-model="form.retailPrice" placeholder="" :disabled="false" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="最高零售价" prop="maximumRetailPrice">
-                  <el-input
-                    v-model="form.maximumRetailPrice"
-                    placeholder=""
-                    :disabled=false
-                  />
+                  <el-input v-model="form.maximumRetailPrice" placeholder="" :disabled="false" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -633,12 +642,14 @@ const data = reactive({
     minUnitCode: [{ required: true, message: '最小单位不能为空', trigger: 'blur' }],
     ingredient: [{ required: true, message: '成分不能为空', trigger: 'blur' }],
     partPercent: [{ required: true, message: '拆零比不能为空', trigger: 'blur' }],
+    // itemMinQuantity: [{ required: true, message: '警戒线最低值不能为空', trigger: 'blur' }],
+    // itemMaxQuantity: [{ required: true, message: '警戒线最高值不能为空', trigger: 'blur' }],
     doseFrom: [{ required: true, message: '剂量形式不能为空', trigger: 'blur' }],
     // approvalNumber: [{ required: true, message: '批准文号不能为空', trigger: 'blur' }],
     // ybMatchFlag: [
     //   { required: true, message: "医保对码不能为空", trigger: "blur" },
     // ],
-    ybNo: [{ required: true, message: '医保编码不能为空', trigger: 'blur' }],
+    ybNo: [{ required: false, message: '医保编码不能为空', trigger: 'blur' }],
     pharmacologyCategoryCode: [{ required: true, message: '药品性质不能为空', trigger: 'blur' }],
     // skinTestFlag: [
     //   { required: true, message: "皮试不能为空", trigger: "blur" },
@@ -654,7 +665,7 @@ const data = reactive({
     // restrictedScope: [
     //   { required: true, message: "限制使用范围不能为空", trigger: "blur" },
     // ],
-    nationalDrugCode: [{ required: true, message: '贯标国家编码不能为空', trigger: 'blur' }],
+    nationalDrugCode: [{ required: false, message: '贯标国家编码不能为空', trigger: 'blur' }],
     partAttributeEnum: [{ required: true, message: '拆分属性不能为空', trigger: 'blur' }],
     thoPartAttributeEnum: [
       {
@@ -735,7 +746,7 @@ function getDeptTree() {
 }
 /** 查询地点下拉树结构 */
 function getLocationTree() {
-  locationTreeSelect().then((response) => {
+  locationTreeSelect({ formList: '11,16' }).then((response) => {
     console.log(response, 'response查询部门下拉树结构');
     locationOptions.value = response.data.records;
   });
@@ -762,13 +773,15 @@ function show(row) {
 
 function setValue(row) {
   form.value = {
-    name: formatValue(row.registeredName), // 通用名称
+    name: formatValue(props.currentCategoryEnum == '4' ? row.singleDrugName : row.registeredName), // 通用名称
     merchandiseName: formatValue(row.registeredName), // 商品名称
     ybNo: formatValue(row.medicalCatalogCode), // 医保编码
     // categoryCode: row.drugCategory, // 药品分类
     // ybMatchFlag: row.,  // 医保对码
     // pharmacologyCategoryCode: row.,  // 药品性质
-    totalVolume: formatValue(row.drugSpecification), // 规格
+    totalVolume: formatValue(
+      props.currentCategoryEnum == '4' ? row.conventionalUsage : row.drugSpecification
+    ), // 规格
     doseode: formatValue(row.drugForm), // 剂型
     doseUnitCode: formatValue(row.minMeasurementUnit), // 剂量单位
     // usageLimit: row.dosage,  // 用量限定
@@ -782,6 +795,9 @@ function setValue(row) {
     // partAttributeEnum: row.,  // 门诊拆分属性
     // thoPartAttributeEnum: row.,  // 住院临时医嘱拆分属性
     partPercent: formatValue(row.conversionRatio), // 拆零比
+    itemMinQuantity: formatValue(row.itemMinQuantity), // 警戒线最低值
+    itemMaxQuantity: formatValue(row.itemMaxQuantity), // 警戒线最高值
+
     // purchasePrice: row.,  // 购入价
     // retailPrice: row.,  // 零售价
     // maximumRetailPrice: row.,  // 最高零售价
@@ -797,14 +813,15 @@ function setValue(row) {
     // childrenFlag: row.pediatricUse,  // 儿童用药标志
     // selfFlag: row.,  // 自制药标识
     // activeFlag: row.,  // 是否活性
-    restrictedFlag: formatValue(row.useRestrictionFlag), // 限制使用
-    restrictedScope: formatValue(row.useRestriction), // 限制使用范围
+    restrictedFlag: formatValue(row.restrictedFlag), // 限制使用
+    restrictedScope: formatValue(row.restrictedScope), // 限制使用范围
     rxFlag: formatValue(row.otcFlag), // 处方标志
     chrgitmLv: formatValue(
       row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3'
     ), // 医保等级
     // antibioticFlag: row.,  // 抗生素
   };
+  setFlag(form.value);
 }
 
 function handleImportYb() {
@@ -896,6 +913,8 @@ function reset() {
     version: undefined,
     partPercent: undefined,
     ybMatchFlag: undefined,
+    itemMaxQuantity: undefined,
+    itemMinQuantity: undefined,
     ybNo: undefined,
     manufacturerId: undefined,
     manufacturerText: undefined,
diff --git a/vue3/src/views/catalog/medicine/components/medicineYbDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
similarity index 65%
rename from vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
rename to openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
index 76f532aa..2b7d823c 100644
--- a/vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
@@ -23,13 +23,23 @@
       </div>
       <el-table v-loading="listLoading" border :data="list" highlight-current-row max-height="450">
         <el-table-column align="center" label="医保目录编码" prop="medicalCatalogCode" />
-        <el-table-column align="center" label="药品名称" prop="registeredName" />
+        <el-table-column align="center" label="药品名称" prop="registeredName">
+          <template #default="scope">
+            <span v-if="props.currentCategoryEnum == '4'">{{ scope.row.singleDrugName }}</span>
+            <span v-else>{{ scope.row.registeredName }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="药品类别" prop="drugCategoryName">
           <template #default="scope">
             {{ formatStr(scope.row.drugCategoryName) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="药品规格" prop="drugSpecification" />
+        <el-table-column align="center" label="药品规格" prop="drugSpecification">
+          <template #default="scope">
+            <span v-if="props.currentCategoryEnum == '4'">{{ scope.row.conventionalUsage }}</span>
+            <span v-else>{{ scope.row.drugSpecification }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="处方药" prop="otcFlagName">
           <template #default="scope">
             {{ formatStr(scope.row.otcFlagName) }}
@@ -59,20 +69,27 @@
 </template>
 
 <script setup>
-import { getYbMedicationList } from './medicine';
+import { getYbMedicationList, queryYbCatalogue } from './medicine';
 
 const emit = defineEmits(['selectMedicine']);
 const visible = ref(false);
 const total = ref(0);
 const listLoading = ref(false);
+const props = defineProps({
+  currentCategoryEnum: {
+    type: String,
+    required: true,
+  },
+});
 const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
-  catalogType: 1301,
 });
 const list = ref([]);
-getList();
 function getList() {
+  (queryParams.value.catalogType = props.currentCategoryEnum == '4' ? 1302 : 1301),
+    console.log(props.currentCategoryEnum, 'props.currentCategoryEnum');
+
   listLoading.value = true;
   getYbMedicationList(queryParams.value).then((res) => {
     total.value = res.data.data.total;
@@ -82,7 +99,6 @@ function getList() {
 }
 
 function show() {
-  getList();
   visible.value = true;
 }
 
@@ -91,7 +107,28 @@ function cancel() {
 }
 
 function handlewAddMedicine(row) {
-  emit('selectMedicine', row);
+  queryYbCatalogue({ hilistCode: row.medicalCatalogCode, dateStr: '2020-01-01' }).then((res) => {
+    if (res.data.length > 0) {
+      let resultList = res.data.filter((item) => {
+        return (
+          item.memo != null &&
+          item.memo != '' &&
+          item.memo != 'null' &&
+          item.memo != '目录变更' &&
+          item.memo != '历史数据迁移' &&
+          item.memo != '0' &&
+          item.memo != ' '
+        );
+      });
+      if (resultList.length > 0) {
+        row.restrictedFlag = 1;
+        row.restrictedScope = resultList[0].memo;
+      }
+    }
+    emit('selectMedicine', row);
+  }).catch(() => {
+    emit('selectMedicine', row);
+  });
   cancel();
 }
 
diff --git a/vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
similarity index 84%
rename from vue3/src/views/catalog/medicine/index.vue
rename to openhis-ui-vue3/src/views/catalog/medicine/index.vue
index 63e1d842..12a6d324 100644
--- a/vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -91,6 +91,17 @@
               >启用</el-button
             >
           </el-col>
+          
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="Upload"
+              @click="handleImport"
+              >导入</el-button
+            >
+          </el-col>
+
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Search" @click="getList">查询</el-button>
           </el-col>
@@ -251,16 +262,55 @@
     />
     <MedicineYbDialog
       ref="medicineYbRef"
+      :currentCategoryEnum="currentCategoryEnum"
       @selectMedicine="
         (row) => {
           proxy.$refs['medicineRef'].setValue(row);
         }
       "
     />
+
+    <!-- 药品目录导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="uploadRef"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link
+              type="primary"
+              :underline="false"
+              style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate"
+              >下载模板</el-link
+            >
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Medication">
+import { getToken } from "@/utils/auth";
 import {
   getMedicationList,
   editMedication,
@@ -301,6 +351,22 @@ const viewData = ref({});
 // 使用 ref 定义当前查看药品数据
 const viewFlg = ref(false);
 
+/*** 药品目录导入参数 */
+const upload = reactive({
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/data-dictionary/medication/import-data"
+});
+
 const data = reactive({
   form: {},
   queryParams: {
@@ -401,6 +467,20 @@ function handleExport() {
   );
 }
 
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = '药品目录导入';
+  upload.open = true;
+}
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('/data-dictionary/medication/import-template', {}, `medication_template_${new Date().getTime()}.xlsx`);
+}
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs['uploadRef'].submit();
+}
+
 /** 选择条数  */
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.id);
diff --git a/vue3/src/views/catalog/service/index.vue b/openhis-ui-vue3/src/views/catalog/service/index.vue
similarity index 100%
rename from vue3/src/views/catalog/service/index.vue
rename to openhis-ui-vue3/src/views/catalog/service/index.vue
diff --git a/vue3/src/views/charge/clinicRecord/components/api.js b/openhis-ui-vue3/src/views/charge/clinicRecord/components/api.js
similarity index 83%
rename from vue3/src/views/charge/clinicRecord/components/api.js
rename to openhis-ui-vue3/src/views/charge/clinicRecord/components/api.js
index 3b05f2b3..251171a8 100644
--- a/vue3/src/views/charge/clinicRecord/components/api.js
+++ b/openhis-ui-vue3/src/views/charge/clinicRecord/components/api.js
@@ -35,5 +35,12 @@ export function invoiceOpen(invoiceId) {
     method: 'put',
   })
 }
-
+// 收费详情
+export function paymentDetail(data) {
+  return request({
+    url: '/payment/payment/detail',
+    method: 'post',
+    data: data
+  })
+}
 
diff --git a/vue3/src/views/charge/clinicRecord/index.vue b/openhis-ui-vue3/src/views/charge/clinicRecord/index.vue
similarity index 68%
rename from vue3/src/views/charge/clinicRecord/index.vue
rename to openhis-ui-vue3/src/views/charge/clinicRecord/index.vue
index 3a770182..a9c47d02 100644
--- a/vue3/src/views/charge/clinicRecord/index.vue
+++ b/openhis-ui-vue3/src/views/charge/clinicRecord/index.vue
@@ -86,12 +86,13 @@
       <!-- <el-table-column label="医生" align="center" prop="paymentEnum_enumText" /> -->
       <el-table-column label="支付结果" align="center" prop="outcomeEnum_dictText" :show-overflow-tooltip="true"/>
       <el-table-column label="打印次数" align="center" prop="printCount" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" prop="paymentEnum_enumText" width="270">
+      <el-table-column label="操作" align="center" prop="paymentEnum_enumText" width="340">
         <template #default="scope">
           <!-- <el-button type="primary" link @click="handlePrint(scope.row)">单据</el-button> -->
           <!-- <el-button type="primary" link @click="handleEdit(scope.row)">冲红</el-button> -->
-          <el-button type="primary" link @click="handleOpen(scope.row,1)" :disabled="scope.row.invoiceNo">开具电子发票</el-button>
-          <el-button type="primary" link @click="handleOpen(scope.row,2)">冲销发票</el-button>
+          <el-button type="primary" link @click="handleOpen(scope.row,4)">收费详情</el-button>
+          <el-button type="primary" link @click="handleOpen(scope.row,1)" :disabled="scope.row.invoiceNo || scope.row.statusEnum == 3">开具电子发票</el-button>
+          <el-button :disabled="!scope.row.relationId" type="primary" link @click="handleOpenReasonDialog(scope.row)">冲销发票</el-button>
           <el-button type="primary" link @click="handleOpen(scope.row,3)" :disabled="!scope.row.invoiceNo">调阅发票</el-button>
         </template>
       </el-table-column>
@@ -103,12 +104,33 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getLists"
     />
+    <el-dialog title="收费详情" v-model="paymentDetailShow" width="1000" append-to-body style="height:90vh">
+      <el-table :data="paymentDetailList" border style="height: 80vh">
+      <el-table-column label="支付类型" align="center" prop="payEnum_dictText" :show-overflow-tooltip="true"/>
+      <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true"/>
+      <el-table-column label="找零" align="center" prop="returnAmount" :show-overflow-tooltip="true"/>
+      <el-table-column label="交款" align="center" prop="chargeAmount" :show-overflow-tooltip="true"/>
+    </el-table>
+    </el-dialog>
+    <el-dialog title="请输入原因" v-model="reasonDialogVisible" width="30%">
+      <el-form :model="reasonForm" label-width="80px">
+        <el-form-item label="冲销原因">
+          <el-input v-model="reasonForm.reason" placeholder="请输入原因" type="textarea" :rows="3" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="reasonDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitReason">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="ClinicRecord">
 const { proxy } = getCurrentInstance();
-import { getList ,invoiceMzInvoice,invoiceReissue,invoiceWriteoff,invoiceOpen} from './components/api.js';
+import { getList ,invoiceMzInvoice,invoiceReissue,invoiceWriteoff,invoiceOpen,paymentDetail} from './components/api.js';
 import { formatDate } from '@/utils/index';
 const occurrenceTime = ref([formatDate(new Date()),formatDate(new Date())]);
 const total = ref(0);
@@ -118,8 +140,16 @@ const queryParams = ref({
   billDateSTime:"",
   billDateETime:"",
   searchKey:"",
+  kinsEnum: 1
 });
+const paymentDetailShow = ref(false)
 const clinicRecord = ref([]);
+const reasonDialogVisible = ref(false);
+const reasonForm = ref({
+  reason: ''
+});
+const currentRow = ref(null);
+const paymentDetailList = ref([])
 getLists();
 function getClinicRecord() {
   queryParams.value.billDateSTime =
@@ -139,6 +169,37 @@ function getLists(){
     clinicRecord.value = res.data.records;
   });
 }
+function handleOpenReasonDialog(row) {
+  // 可选：保存当前行数据以便后续使用
+  currentRow.value = row;
+  reasonForm.value.reason = ''; // 清空上次输入
+  reasonDialogVisible.value = true;
+}
+// 提交原因
+function submitReason() {
+  if (!reasonForm.value.reason.trim()) {
+    proxy.$message.warning('请输入原因');
+    return;
+  }
+
+  invoiceWriteoff({paymentId:currentRow.value.relationIdStr,reason:reasonForm.value.reason}).then((res) => {
+    if (res.data) {
+      if(res.data.includes(" 电子票据红冲失败")){
+        proxy.$message.error(res.data);
+      }else{
+          proxy.$message.success('红冲成功');
+          // 关闭弹窗
+            reasonDialogVisible.value = false;
+
+          // 可选：重置表单
+          reasonForm.value.reason = '';
+        window.open(res.data)
+      }
+    }
+    getLists();
+  }).catch((err)=>{
+  })
+}
 /** 清空条件按钮操作 */
 function handleReset() {
   // 清空查询条件
@@ -148,12 +209,12 @@ function handleReset() {
   proxy.resetForm("queryRef");
   getLists();
 }
-function handlePrint(row){
+// function handlePrint(row){
 
-}
-function handleEdit(row){
+// }
+// function handleEdit(row){
   
-}
+// }
 function handleOpen(row,type){
   if(type==1){
     invoiceReissue({paymentId:row.id,encounterId:row.encounterId?row.encounterId:""}).then((res) => {
@@ -165,6 +226,10 @@ function handleOpen(row,type){
           window.open(res.data)
         }
       }
+      if(res.code == 200) {
+        getLists();
+      }
+      proxy.$message.error(res.data);
     }).catch((err)=>{
     })
   }else if(type==2) {
@@ -178,7 +243,7 @@ function handleOpen(row,type){
       }
     }).catch((err)=>{
     })
-  }else{
+  }else if(type==3){
     // 调阅电子发票
     invoiceOpen(row.invoiceId?row.invoiceId:"").then((res) => {
       if (res.data) {
@@ -186,7 +251,26 @@ function handleOpen(row,type){
       }
     }).catch((err)=>{
     })
+  }else{
+    paymentDetail({id:row.id?row.id:""}).then((res) => {
+      if (res.data) {
+        paymentDetailShow.value = true
+        paymentDetailList.value = res.data
+      }
+    }).catch((err)=>{
+    })
   }
    
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.el-dialog{
+  height: 90vh!important;
+}
+.dialog-footer {
+  text-align: right;
+}
+.el-textarea__inner {
+  resize: none;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/charge/cliniccharge/components/api.js b/openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js
similarity index 87%
rename from vue3/src/views/charge/cliniccharge/components/api.js
rename to openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js
index c3077afe..b97fde75 100644
--- a/vue3/src/views/charge/cliniccharge/components/api.js
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js
@@ -85,4 +85,16 @@ export function unprecharge(data) {
       params: data
     })
 }
+  
+
+/**
+ * 发耗材
+ */
+export function dispenseMedicalConsumables(data) {
+    return request({
+      url: '/pharmacy-manage/medical-consumables-dispense/consumables-dispense',
+      method: 'put',
+      data: data
+    })
+}
   
\ No newline at end of file
diff --git a/vue3/src/views/charge/cliniccharge/components/chargeDialog.vue b/openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
similarity index 96%
rename from vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
rename to openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
index b7d94403..546259df 100644
--- a/vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
@@ -76,7 +76,13 @@
       <div>
         <el-table :data="props.details" max-height="200" border>
           <el-table-column prop="payEnumText" label="支付类型" align="center" />
-          <el-table-column prop="amount" label="金额" header-align="center" align="right" width="200">
+          <el-table-column
+            prop="amount"
+            label="金额"
+            header-align="center"
+            align="right"
+            width="200"
+          >
             <template #default="scope">
               {{ scope.row.amount ? scope.row.amount + ' 元' : '-' }}
             </template>
@@ -109,10 +115,11 @@
 </template>
 
 <script setup>
-import { savePayment, unprecharge } from './api';
+import { savePayment, unprecharge, dispenseMedicalConsumables } from './api';
 import { computed, watch, reactive, ref, getCurrentInstance, nextTick } from 'vue';
 import { Delete } from '@element-plus/icons-vue';
 import { debounce } from 'lodash-es';
+import useUserStore from '@/store/modules/user';
 
 const props = defineProps({
   open: {
@@ -140,6 +147,10 @@ const props = defineProps({
     type: [],
     default: [],
   },
+  consumablesIdList: {
+    type: [],
+    default: [],
+  },
   chrgBchnoList: {
     type: [],
     default: [],
@@ -152,6 +163,8 @@ const props = defineProps({
 
 const { proxy } = getCurrentInstance();
 
+const userStore = useUserStore();
+
 const formData = reactive({
   totalAmount: 0,
   selfPay: [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }],
@@ -263,7 +276,8 @@ async function printReceipt(param) {
   // 将对象转换为 JSON 字符串
   let jsonString = JSON.stringify(result, null, 2);
   console.log(jsonString, 'jsonString');
-  await window.chrome.webview.hostObjects.CSharpAccessor.PrintReport(
+  await CefSharp.BindObjectAsync('boundAsync');
+  await boundAsync.printReport(
     '门诊收费明细单.grf',
     jsonString
   )
@@ -322,6 +336,10 @@ async function submit() {
         printReceipt(res.data);
         (formData.selfPay = [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }]),
           emit('close', 'success', res.msg);
+        // 长春大学自动发耗材
+        if (userStore.fixmedinsCode == 'H22010200672' && props.consumablesIdList.length > 0) {
+          dispenseMedicalConsumables(props.consumablesIdList);
+        }
       }
     })
     .finally(() => {
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
new file mode 100644
index 00000000..e3b9c5b3
--- /dev/null
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
@@ -0,0 +1,535 @@
+<template>
+  <div
+    style="display: flex; justify-content: space-between"
+    class="app-container"
+    v-loading="readCardLoading"
+    :element-loading-text="loadingText"
+  >
+    <el-card style="width: 30%">
+      <template #header>
+        <span style="vertical-align: middle">患者列表</span>
+      </template>
+      <div style="width: 100%">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="请输入患者名/病历号"
+          clearable
+          style="width: 48%; margin-bottom: 10px; margin-right: 10px"
+          @keyup.enter="getPatientList"
+        >
+          <template #append>
+            <el-button icon="Search" @click="getPatientList" />
+          </template>
+        </el-input>
+        <el-select
+          v-model="queryParams.statusEnum"
+          style="width: 48%; margin-bottom: 10px; margin-right: 10px"
+          placeholder="收费状态"
+          @change="getPatientList"
+        >
+          <el-option
+            v-for="item in chargeStatusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <div style="width: 100%">
+          <el-date-picker
+            v-model="receptionTime"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placement="bottom"
+            value-format="YYYY-MM-DD"
+            style="width: 84%; margin-bottom: 10px; margin-right: 10px"
+          />
+          <el-button type="primary" style="margin-bottom: 10px" @click="getPatientList">
+            搜索
+          </el-button>
+        </div>
+        <el-table
+          ref="patientListRef"
+          height="620"
+          :data="patientList"
+          row-key="encounterId"
+          @cell-click="clickRow"
+          highlight-current-row
+        >
+          <el-table-column label="病历号" align="center" prop="encounterBusNo" />
+          <el-table-column label="姓名" align="center" prop="patientName" />
+          <!-- <el-table-column label="时间" align="center" prop="receptionTime" width="160">
+            <template #default="scope">
+              {{ formatDate(scope.row.receptionTime) }}
+            </template>
+          </el-table-column> -->
+          <el-table-column label="收费状态" align="center" prop="statusEnum_enumText" />
+        </el-table>
+      </div>
+    </el-card>
+    <div style="width: 69%">
+      <el-card style="margin-bottom: 20px">
+        <template #header>
+          <span style="vertical-align: middle">基本信息</span>
+        </template>
+        <el-descriptions :column="4">
+          <el-descriptions-item label="姓名:">{{ patientInfo.patientName }}</el-descriptions-item>
+          <el-descriptions-item label="性别:">
+            {{ patientInfo.genderEnum_enumText }}
+          </el-descriptions-item>
+          <el-descriptions-item label="年龄:">{{ patientInfo.age }}</el-descriptions-item>
+          <el-descriptions-item label="合同类型:">
+            {{ patientInfo.categoryEnum_enumText }}
+          </el-descriptions-item>
+          <!-- <el-descriptions-item label="身份证号:">{{ patientInfo.idCard }}</el-descriptions-item> -->
+          <!-- <el-descriptions-item label="手机号">{{ patientInfo.name }}</el-descriptions-item>
+          <el-descriptions-item label="出生日期">{{ patientInfo.name }}</el-descriptions-item> -->
+        </el-descriptions>
+      </el-card>
+      <el-card style="min-width: 1100px">
+        <template #header>
+          <span style="vertical-align: middle">收费项目</span>
+        </template>
+        <div style="margin-bottom: 10px">
+          <el-button type="primary" @click="confirmCharge()" :disabled="buttonDisabled">
+            确认收费
+          </el-button>
+          <el-button type="primary" plain @click="handleReadCard('01')" style="width: 65px">
+            电子凭证
+          </el-button>
+          <el-button
+            type="primary"
+            plain
+            @click="handleReadCard('02')"
+            style="width: 65px"
+            :disabled="true"
+          >
+            身份证
+          </el-button>
+          <el-button type="primary" plain @click="handleReadCard('03')" style="width: 65px">
+            医保卡
+          </el-button>
+          <el-button
+            type="primary"
+            @click="payToSelt()"
+            style="margin-left: 20px"
+            :disabled="buttonDisabled"
+          >
+            医保转自费
+          </el-button>
+          <el-button
+            type="primary"
+            @click="patToMedicalInsurance()"
+            style="margin-left: 20px"
+            :disabled="buttonDisabled"
+          >
+            自费转医保
+          </el-button>
+          <span style="float: right"
+            >合计金额：{{ totalAmounts ? totalAmounts.toFixed(2) : 0 }}元</span
+          >
+        </div>
+        <el-table
+          ref="chargeListRef"
+          height="530"
+          :data="chargeList"
+          row-key="id"
+          @selection-change="handleSelectionChange"
+          v-loading="chargeLoading"
+          border
+        >
+          <el-table-column type="selection" :selectable="checkSelectable" width="55" />
+          <el-table-column label="单据号" align="center" prop="busNo" width="180" />
+          <el-table-column label="收费项目" align="center" prop="itemName" width="200" />
+          <el-table-column label="数量" align="center" prop="quantityValue" width="80" />
+          <el-table-column label="医疗类型" align="center" prop="medTypeCode_dictText" />
+          <el-table-column label="医保编码" align="center" prop="ybNo" />
+          <el-table-column label="费用性质" align="center" prop="contractName" />
+          <el-table-column label="收费状态" align="center" prop="statusEnum_enumText" width="150">
+            <template #default="scope">
+              <el-tag
+                :type="scope.row.statusEnum === 1 ? 'default' : 'success'"
+                disable-transitions
+              >
+                {{ scope.row.statusEnum_enumText }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="金额" align="right" prop="totalPrice" header-align="center">
+            <template #default="scope">
+              {{ scope.row.totalPrice.toFixed(2) + ' 元' || '0.00' + ' 元' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="收款人" align="center" prop="entererId_dictText" />
+        </el-table>
+      </el-card>
+    </div>
+    <ChargeDialog
+      :open="openDialog"
+      @close="handleClose"
+      :category="patientInfo.categoryEnum"
+      :totalAmount="totalAmount"
+      :patientInfo="patientInfo"
+      :chargeItemIds="chargeItemIdList"
+      :consumablesIdList="consumablesIdList"
+      :chrgBchnoList="chrgBchnoList"
+      :userCardInfo="userCardInfo"
+      :paymentId="paymentId"
+      :details="details"
+    />
+  </div>
+</template>
+
+<script setup name="ClinicCharge">
+import {
+  getList,
+  getChargeList,
+  changeToSelfPay,
+  changeToMedicalInsurance,
+  init,
+  precharge,
+} from './components/api';
+import { invokeYbPlugin } from '@/api/public';
+import ChargeDialog from './components/chargeDialog.vue';
+import { formatDateStr } from '@/utils';
+import useUserStore from '@/store/modules/user';
+
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  statusEnum: 1,
+});
+const totalAmounts = ref(0);
+const selectedRows = ref([]);
+const patientList = ref([]);
+const chargeList = ref([]);
+const chargeItemIdList = ref([]);
+const chrgBchnoList = ref([]);
+const chargeLoading = ref(false);
+const encounterId = ref('');
+const paymentId = ref('');
+const patientInfo = ref({});
+const openDialog = ref(false);
+const totalAmount = ref(0);
+const chargeListRef = ref();
+const details = ref({});
+const chargeStatusOptions = ref([]);
+const receptionTime = ref([
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+]);
+const buttonDisabled = computed(() => {
+  return Object.keys(patientInfo.value).length === 0;
+});
+
+watch(
+  () => selectedRows.value,
+  (newVlaue) => {
+    if (newVlaue && newVlaue.length > 0) {
+      handleTotalAmount();
+    }
+  },
+  { immediate: true }
+);
+function handleSelectionChange(selection) {
+  selectedRows.value = selection;
+}
+function handleTotalAmount() {
+  totalAmounts.value = selectedRows.value.reduce((accumulator, currentRow) => {
+    return accumulator + (Number(currentRow.totalPrice) || 0);
+  }, 0);
+}
+getPatientList();
+initOption();
+/**
+ * 患者列表
+ */
+function getPatientList() {
+  if (receptionTime.value.length > 0) {
+    queryParams.value.receptionTimeSTime = receptionTime.value[0] + ' 00:00:00';
+    queryParams.value.receptionTimeETime = receptionTime.value[1] + ' 23:59:59';
+  } else {
+    queryParams.value.receptionTimeSTime = undefined;
+    queryParams.value.receptionTimeETime = undefined;
+  }
+  getList(queryParams.value).then((res) => {
+    patientList.value = res.data.data.records;
+  });
+}
+
+function initOption() {
+  init().then((res) => {
+    chargeStatusOptions.value = res.data.chargeItemStatusOptions;
+  });
+}
+
+function checkSelectable(row, index) {
+  // 已结算时禁用选择框
+  return row.statusEnum === 1;
+}
+
+/**
+ * 点击患者列表行 获取处方列表
+ */
+function clickRow(row) {
+  patientInfo.value = row;
+  chargeLoading.value = true;
+  encounterId.value = row.encounterId;
+  getChargeList(row.encounterId).then((res) => {
+    chargeList.value = res.data;
+    setTimeout(() => {
+      chargeLoading.value = false;
+      chargeListRef.value.toggleAllSelection();
+    }, 100);
+  });
+}
+
+function handleClose(value, msg) {
+  openDialog.value = false;
+  if (value == 'success') {
+    proxy.$modal.msgSuccess(msg);
+    chargeLoading.value = true;
+    getChargeList(patientInfo.value.encounterId).then((res) => {
+      chargeList.value = res.data;
+      setTimeout(() => {
+        chargeLoading.value = false;
+      }, 100);
+    });
+  }
+}
+
+const consumablesIdList = ref([]);
+// 确认收费
+function confirmCharge() {
+  let selectRows = chargeListRef.value.getSelectionRows();
+  if (selectRows.length == 0) {
+    proxy.$modal.msgWarning('请选择一条收费项目');
+    return;
+  }
+  chargeItemIdList.value = selectRows.map((item) => {
+    return item.id;
+  });
+  consumablesIdList.value = selectRows
+    .filter((item) => {
+      return item.serviceTable == 'wor_device_request';
+    })
+    .map((item) => {
+      return item.id;
+    });
+
+  // totalAmount.value = selectRows.reduce((accumulator, currentRow) => {
+  //   return accumulator + (currentRow.totalPrice || 0);
+  // }, 0);
+  precharge({
+    patientId: patientInfo.value.patientId,
+    encounterId: patientInfo.value.encounterId,
+    chargeItemIds: chargeItemIdList.value,
+  }).then((res) => {
+    if (res.code == 200) {
+      // totalAmount.value = res.data.psnCashPay;
+      paymentId.value = res.data.paymentId;
+      chrgBchnoList.value = res.data.chrgBchnoList;
+      totalAmount.value = res.data.details.find((item) => item.payEnum == 220000).amount;
+      details.value = res.data.details;
+      openDialog.value = true;
+    } else {
+      proxy.$modal.msgError(res.msg);
+    }
+  });
+  // console.log(patientInfo)
+}
+
+let userCardInfo = ref({});
+const readCardLoading = ref(false);
+const loadingText = ref('');
+const BusiCardInfo = ref(''); // miyao
+async function handleReadCard(value) {
+  // if (window.CefSharp === undefined) {
+  //   alert('请在医保版本中调用读卡功能！');
+  // } else {
+  try {
+    // await CefSharp.BindObjectAsync('boundAsync');
+    // string url,
+    // string fixmedins_code,
+    // string businessType,
+    // string operatorCode,
+    // string operatorName,
+    // string officeId,
+    // string officeName
+
+    // readCardLoading.value = true;
+    let jsonResult;
+    let cardInfo;
+    let userMessage = undefined;
+    switch (value) {
+      case '01': // 电子凭证
+        // readCardLoading.value = true;
+        await invokeYbPlugin({
+          FunctionId: 3,
+          url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
+          orgId: 'H22010200672',
+          businessType: '01101',
+          operatorId: userStore.id.toString(),
+          operatorName: userStore.name,
+          officeId: 'D83',
+          officeName: '财务科',
+        })
+          .then((res) => {
+            readCardLoading.value = true;
+            loadingText.value = '正在读取...';
+            jsonResult = res.data;
+          })
+          .catch(() => {
+            readCardLoading.value = false;
+          })
+          .finally(() => {
+            readCardLoading.value = false;
+          });
+        cardInfo = JSON.parse(JSON.stringify(jsonResult));
+        let message = JSON.parse(cardInfo.message);
+        userMessage = {
+          certType: '02', // 证件类型
+          certNo: message.data.idNo, // 身份证号
+          psnCertType: '02', // 居民身份证
+        };
+        userCardInfo = {
+          certType: '01', // 证件类型
+          certNo: message.data.idNo, // 身份证号
+          psnCertType: '01', // 居民身份证
+          busiCardInfo: message.data.ecToken, // 令牌
+        };
+        BusiCardInfo.value = message.data.ecToken;
+        console.log(BusiCardInfo.value);
+        break;
+      case '02':
+        break;
+      case '03': // 社保卡
+        readCardLoading.value = true;
+        loadingText.value = '正在读取...';
+        await invokeYbPlugin(
+            JSON.stringify({
+              FunctionId: 1,
+              IP: 'ddjk.jlhs.gov.cn',
+              PORT: 20215,
+              TIMEOUT: 60,
+              SFZ_DRIVER_TYPE: 1,
+            })
+          )
+          .then((res) => {
+            jsonResult = JSON.stringify(res.data);
+          })
+          .finally(() => {
+            readCardLoading.value = false;
+          });
+        // console.log(
+        //   'jsonResult',
+        //   JSON.parse({
+        //     IssuingAreaCode: '310000',
+        //     SocialSecurityNumber: '371324198810224515',
+        //     CardNumber: 'M501A1A78',
+        //     CardIdentificationCode: '310000D15600000535925154E880AB97',
+        //     Name: '\u5218\u5CF0',
+        //     CardResetInfo: '00814A444686603100333E4FA9',
+        //     SpecificationVersion: '3.00',
+        //     IssuingDate: '20190313',
+        //     ExpirationDate: '20290313',
+        //     TerminalNumber: '000000000000',
+        //     TerminalDeviceNumber: '00041161201901000005',
+        //     Code: 0,
+        //     ErrorMessage: null,
+        //   })
+        // );
+        let message1 = JSON.parse(jsonResult);
+        userMessage = {
+          certType: '02', // 证件类型
+          certNo: message1.SocialSecurityNumber, // 身份证号
+          psnCertType: '02', // 居民身份证
+        };
+        userCardInfo = {
+          certType: '02', // 证件类型
+          certNo: message1.SocialSecurityNumber, // 身份证号
+          psnCertType: '02', // 居民身份证
+          busiCardInfo: message1.BusiCardInfo, //卡号
+        };
+        BusiCardInfo.value = message1.BusiCardInfo;
+        console.log(message1.BusiCardInfo);
+        break;
+      case '99':
+        break;
+    }
+    readCardLoading.value = false;
+    if (userMessage.certNo) {
+      let selectRows = chargeListRef.value.getSelectionRows();
+      if (selectRows.length == 0) {
+        proxy.$modal.msgWarning('请选择一条收费项目');
+        return;
+      }
+      chargeItemIdList.value = selectRows.map((item) => {
+        return item.id;
+      });
+      totalAmount.value = selectRows.reduce((accumulator, currentRow) => {
+        return accumulator + (currentRow.totalPrice || 0);
+      }, 0);
+      precharge({
+        patientId: patientInfo.value.patientId,
+        encounterId: patientInfo.value.encounterId,
+        chargeItemIds: chargeItemIdList.value,
+        ybMdtrtCertType: userCardInfo.psnCertType,
+        busiCardInfo: userCardInfo.busiCardInfo,
+      }).then((res) => {
+        if (res.code == 200) {
+          // totalAmount.value = res.data.psnCashPay;
+          paymentId.value = res.data.paymentId;
+          totalAmount.value = res.data.details.find((item) => item.payEnum == 220000).amount;
+          details.value = res.data.details;
+          // chrgBchnoList.value = res.data.chrgBchnoList;
+          chargeItemIdList.value = selectRows.map((item) => {
+            return item.id;
+          });
+          consumablesIdList.value = selectRows
+            .filter((item) => {
+              return item.serviceTable == 'wor_device_request';
+            })
+            .map((item) => {
+              return item.id;
+            });
+          openDialog.value = true;
+        } else {
+          proxy.$modal.msgError(res.msg);
+        }
+      });
+    }
+  } catch (error) {
+    console.error('调用失败:', error);
+    readCardLoading.value = false;
+  }
+  // }
+}
+
+/**
+ * 医保转自费
+ */
+function payToSelt() {
+  changeToSelfPay(encounterId.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+    }
+  });
+}
+
+/**
+ * 自费转医保
+ */
+function patToMedicalInsurance() {
+  changeToMedicalInsurance(encounterId.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+    }
+  });
+}
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/charge/clinicrefund/components/api.js b/openhis-ui-vue3/src/views/charge/clinicrefund/components/api.js
similarity index 59%
rename from vue3/src/views/charge/clinicrefund/components/api.js
rename to openhis-ui-vue3/src/views/charge/clinicrefund/components/api.js
index eb3e4fed..559ece9d 100644
--- a/vue3/src/views/charge/clinicrefund/components/api.js
+++ b/openhis-ui-vue3/src/views/charge/clinicrefund/components/api.js
@@ -14,10 +14,11 @@ export function getList(queryParams) {
 /**
  * 患者退费账单
  */
-export function getRefundList(encounterId) {
+export function getRefundList(params) {
     return request({
-      url: '/charge-manage/refund/patient-refund?encounterId=' + encounterId,
+      url: '/charge-manage/refund/patient-refund',
       method: 'get',
+      params: params
     })
 }
 
@@ -61,3 +62,36 @@ export function validReturnDrug(params) {
       method: 'get',
     })
 }
+
+/**
+ * 获取退款详情列表
+ */
+export function getReturnDetail(data) {
+    return request({
+      url: '/payment/payment/detail',
+      method: 'post',
+      data: data
+    })
+}
+
+/**
+ * 自动退耗材
+ */
+export function renturnDispenseMedical(data) {
+    return request({
+      url: '/pharmacy-manage/return-medicine/medicine-return',
+      method: 'put',
+      data: data
+    })
+}
+
+/**
+ * 获取退药列表
+ */
+export function getReturnMedicineList(data) {
+    return request({
+      url: '/pharmacy-manage/return-medicine/medicine-return-list',
+      method: 'get',
+      params: data
+    })
+}
diff --git a/vue3/src/views/charge/clinicrefund/components/refundDialog.vue b/openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue
similarity index 74%
rename from vue3/src/views/charge/clinicrefund/components/refundDialog.vue
rename to openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue
index 5012531f..1501814f 100644
--- a/vue3/src/views/charge/clinicrefund/components/refundDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue
@@ -84,6 +84,22 @@
           </el-text>
         </div>
       </div>
+      <div>
+        <el-table :data="props.details" max-height="200" border>
+          <el-table-column prop="payEnum_dictText" label="支付类型" align="center" />
+          <el-table-column
+            prop="amount"
+            label="金额"
+            header-align="center"
+            align="right"
+            width="200"
+          >
+            <template #default="scope">
+              {{ scope.row.amount ? scope.row.amount + ' 元' : '-' }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <!-- 金额汇总 -->
       <div class="summary">
         <el-space :size="30">
@@ -108,9 +124,10 @@
 </template>
 
 <script setup>
-import { refund } from './api';
+import { refund, renturnDispenseMedical, getReturnMedicineList } from './api';
 import { computed, watch, reactive, ref, getCurrentInstance } from 'vue';
 import { Delete } from '@element-plus/icons-vue';
+import useUserStore from '@/store/modules/user';
 
 const props = defineProps({
   open: {
@@ -135,11 +152,21 @@ const props = defineProps({
     type: [],
     default: [],
   },
+  medicineReturnList: {
+    type: [],
+    default: [],
+  },
+  details: {
+    type: Object,
+    default: undefined,
+  },
 });
 
 const { proxy } = getCurrentInstance();
 const reason = ref('');
 
+const userStore = useUserStore();
+
 const formData = reactive({
   totalAmount: 0,
   selfPay: [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }],
@@ -167,23 +194,65 @@ function submit() {
     proxy.$modal.msgError('请输入正确的金额');
     return;
   }
-  refund({
-    paymentEnum: 0,
-    kindEnum: 1,
-    patientId: props.patientInfo.patientId,
-    id: props.paymentId,
-    encounterId: props.patientInfo.encounterId,
-    chargeItemIds: props.chargeItemIds,
-    paymentDetails: formData.selfPay,
-    reason: reason.value,
-    ybFlag: '0',
-    eleFlag: '0',
-    // returnedAmount: parseFloat(returnedAmount.value),
-  }).then((res) => {
-    if (res.code == 200) {
-      emit('close', 'success');
-    }
-  });
+  if (userStore.fixmedinsCode == '1123123') {
+    getReturnMedicineList({ encounterId: props.patientInfo.encounterId, refundStatus: 11 }).then(
+      (res) => {
+        let returnMedicineList = [];
+        returnMedicineList = res.data
+          .filter((item) => {
+            return item.serviceTable == 'wor_device_request';
+          })
+          .map((item) => {
+            return {
+              requestId: item.requestId,
+              dispenseId: item.dispenseId,
+              tableName: 'wor_device_request',
+            };
+          });
+        renturnDispenseMedical(returnMedicineList).then((res) => {
+          if (res.code == 200) {
+            refund({
+              paymentEnum: 0,
+              kindEnum: 1,
+              patientId: props.patientInfo.patientId,
+              id: props.paymentId,
+              encounterId: props.patientInfo.encounterId,
+              chargeItemIds: props.chargeItemIds,
+              paymentDetails: formData.selfPay,
+              reason: reason.value,
+              ybFlag: '0',
+              eleFlag: '0',
+              // returnedAmount: parseFloat(returnedAmount.value),
+            }).then((res) => {
+              if (res.code == 200) {
+                emit('close', 'success');
+              }
+            });
+          }
+        });
+      }
+    );
+  } else {
+    refund({
+      paymentEnum: 0,
+      kindEnum: 1,
+      patientId: props.patientInfo.patientId,
+      id: props.paymentId,
+      encounterId: props.patientInfo.encounterId,
+      chargeItemIds: props.chargeItemIds,
+      paymentDetails: formData.selfPay,
+      reason: reason.value,
+      ybFlag: '0',
+      eleFlag: '0',
+      // returnedAmount: parseFloat(returnedAmount.value),
+    }).then((res) => {
+      if (res.code == 200) {
+        // 长春大学自动退耗材
+
+        emit('close', 'success');
+      }
+    });
+  }
 }
 
 const currentDate = ref(new Date().toLocaleString());
diff --git a/vue3/src/views/charge/clinicrefund/index.vue b/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
similarity index 90%
rename from vue3/src/views/charge/clinicrefund/index.vue
rename to openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
index 05cbcb0d..61556b13 100644
--- a/vue3/src/views/charge/clinicrefund/index.vue
+++ b/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
@@ -30,12 +30,13 @@
           />
         </el-select>
         <el-date-picker
-          v-model="receptionTime"
+          v-model="maxBillDate"
           type="daterange"
           range-separator="~"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
           placement="bottom"
+          :clearable="false"
           value-format="YYYY-MM-DD"
           style="width: 84%; margin-bottom: 10px; margin-right: 10px"
         />
@@ -176,6 +177,7 @@
       :patientInfo="patientInfo"
       :paymentId="paymentId"
       :chargeItemIds="chargeItemIdList"
+      :details="details"
     />
   </div>
 </template>
@@ -185,6 +187,7 @@ import {
   getList,
   getRefundList,
   refund,
+  getReturnDetail,
   init,
   getChargeItemIds,
   validReturnDrug,
@@ -208,9 +211,10 @@ const chargeOption = ref([]);
 const chargeLoading = ref(false);
 const openDialog = ref(false);
 const chargeItemIdList = ref([]);
+const details = ref({});
 const encounterId = ref('');
 const paymentId = ref('');
-const receptionTime = ref([
+const maxBillDate = ref([
   formatDateStr(new Date(), 'YYYY-MM-DD'),
   formatDateStr(new Date(), 'YYYY-MM-DD'),
 ]);
@@ -220,13 +224,13 @@ initOptions();
  * 患者列表
  */
 function getPatientList() {
-  // if (receptionTime.value.length > 0) {
-  //   queryParams.value.receptionTimeSTime = receptionTime.value[0] + ' 00:00:00';
-  //   queryParams.value.receptionTimeETime = receptionTime.value[1] + ' 23:59:59';
-  // } else {
-  //   queryParams.value.receptionTimeSTime = undefined;
-  //   queryParams.value.receptionTimeETime = undefined;
-  // }
+  if (maxBillDate.value.length > 0) {
+    queryParams.value.maxBillDateSTime = maxBillDate.value[0] + ' 00:00:00';
+    queryParams.value.maxBillDateETime = maxBillDate.value[1] + ' 23:59:59';
+  } else {
+    queryParams.value.maxBillDateSTime = undefined;
+    queryParams.value.maxBillDateETime = undefined;
+  }
   getList(queryParams.value).then((res) => {
     patientList.value = res.data.records;
   });
@@ -288,7 +292,11 @@ function clickRow(row) {
   patientInfo.value = row;
   chargeLoading.value = true;
   encounterId.value = row.encounterId;
-  getRefundList(row.encounterId).then((res) => {
+  getRefundList({
+    encounterId: row.encounterId,
+    billDateSTime: maxBillDate.value[0] + ' 00:00:00',
+    billDateETime: maxBillDate.value[1] + ' 23:59:59',
+  }).then((res) => {
     chargeList.value = res.data;
     spanMap.value = {};
     chargeList.value.sort((a, b) => a.paymentId.localeCompare(b.paymentId));
@@ -301,13 +309,19 @@ function clickRow(row) {
 }
 
 function handleRefund(row) {
-  totalAmount.value = chargeList.value
-    .filter((item) => {
-      return item.paymentId === row.paymentId;
-    })
-    .reduce((accumulator, currentRow) => {
-      return new Decimal(accumulator).add(new Decimal(currentRow.totalPrice || 0));
-    }, 0);
+  // totalAmount.value = chargeList.value
+  //   .filter((item) => {
+  //     return item.paymentId === row.paymentId;
+  //   })
+  //   .reduce((accumulator, currentRow) => {
+  //     return new Decimal(accumulator).add(new Decimal(currentRow.totalPrice || 0));
+  //   }, 0);
+  getReturnDetail({ id: row.paymentId }).then((res) => {
+    if (res.data.length > 0) {
+      totalAmount.value = res.data.find((item) => item.payEnum === 220000).amount;
+    }
+    details.value = res.data;
+  });
   paymentId.value = row.paymentId;
   patientInfo.value.patientId = row.patientId;
   getChargeItemIds(row.encounterId).then((res) => {
diff --git a/vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
similarity index 99%
rename from vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
index 0354d864..2bb4b235 100644
--- a/vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
@@ -247,7 +247,8 @@ async function printReceipt(param) {
   // 将对象转换为 JSON 字符串
   let jsonString = JSON.stringify(result, null, 2);
   console.log(jsonString, 'jsonString');
-  await window.chrome.webview.hostObjects.CSharpAccessor.PrintReport(
+  await CefSharp.BindObjectAsync('boundAsync');
+  await boundAsync.printReport(
     '门诊收费明细单.grf',
     jsonString
   )
diff --git a/vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
similarity index 98%
rename from vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
index 09cb38af..bbd35dd8 100644
--- a/vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
@@ -21,7 +21,7 @@ export function getOutpatientRegistrationList(query) {
 // 查询费用性质
 export function getContractList() {
   return request({
-    url: '/charge-manage/register/contract-list',
+    url: '/app-common/contract-list',
     method: 'get'
   })
 }
diff --git a/vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
similarity index 85%
rename from vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
index c195eabd..d26bfb55 100644
--- a/vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -4,36 +4,12 @@
   <el-dialog :title="title" v-model="visible" width="980px" append-to-body>
     <el-form ref="patientRef" :model="form" :rules="rules" label-width="100px">
       <el-row>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="姓名" prop="name">
             <el-input v-model="form.name" clearable :disabled="isViewMode" />
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="7">
-          <el-form-item label="其他姓名" prop="nameJson">
-            <el-input v-model="form.nameJson" clearable :disabled="isViewMode" />
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="6">
-          <el-form-item label="民族" prop="nationalityCode">
-            <el-select v-model="form.nationalityCode" clearable filterable :disabled="isViewMode">
-              <el-option
-                v-for="item in nationality_code"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <!-- <el-col :span="6">
-						<el-form-item label="年龄" prop="age">
-						   <el-input v-model="form.age" clearable :disabled="isViewMode"/>
-						</el-form-item>
-					  </el-col> -->
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="性别" prop="genderEnum">
             <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
               <el-radio
@@ -46,7 +22,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <!-- <el-col :span="8">
           <el-form-item label="活动标识" prop="tempFlag">
             <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
               <el-radio v-for="dict in patient_temp_flag" :key="dict.value" :label="dict.value">
@@ -54,14 +30,34 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="8">
+          <el-form-item label="联系方式" prop="phone">
+            <el-input v-model="form.phone" clearable :disabled="isViewMode" />
+          </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="7">
-          <el-form-item label="证件类别" prop="typeCode">
+        <el-col :span="8">
+          <el-form-item label="证件号码" prop="idCard">
+            <el-input v-model="form.idCard" clearable :disabled="isViewMode" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="民族" prop="nationalityCode">
+            <el-select v-model="form.nationalityCode" clearable filterable :disabled="isViewMode">
+              <el-option
+                v-for="item in nationality_code"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="卡类别" prop="typeCode">
             <el-select
               v-model="form.typeCode"
-              placeholder="证件类别"
+              placeholder="卡类别"
               clearable
               :disabled="isViewMode"
             >
@@ -75,22 +71,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="证件号码" prop="idCard">
-            <el-input v-model="form.idCard" clearable :disabled="isViewMode" />
+          <el-form-item label="就诊卡号" prop="identifierNo">
+            <el-input v-model="form.identifierNo" clearable :disabled="isViewMode" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="国家编码" prop="countryCode">
             <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
           </el-form-item>
         </el-col>
       </el-row>
+      <!-- <el-col :span="6">
+						<el-form-item label="年龄" prop="age">
+						   <el-input v-model="form.age" clearable :disabled="isViewMode"/>
+						</el-form-item>
+				</el-col> -->
       <el-row>
-        <el-col :span="7">
-          <el-form-item label="联系方式" prop="phone">
-            <el-input v-model="form.phone" clearable :disabled="isViewMode" />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="职业" prop="prfsEnum">
             <el-select v-model="form.prfsEnum" placeholder="职业" clearable :disabled="isViewMode">
@@ -103,14 +99,23 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="工作单位" prop="workCompany">
             <el-input v-model="form.workCompany" clearable :disabled="isViewMode" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="年龄" prop="age">
+            <el-input
+              v-model="form.age"
+              :disabled="isViewMode"
+              @input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
-        <el-col :span="7">
+        <el-col :span="8">
           <el-form-item label="联系人" prop="linkName">
             <el-input v-model="form.linkName" clearable :disabled="isViewMode" />
           </el-form-item>
@@ -132,14 +137,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="联系人电话" prop="linkRelationCode">
             <el-input v-model="form.linkTelcom" clearable :disabled="isViewMode" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="10">
+        <el-col :span="8">
           <el-form-item label="地址选择" prop="addressSelect">
             <el-cascader
               :options="options"
@@ -162,7 +167,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="10">
+        <el-col :span="8">
           <el-form-item label="血型ABO" prop="bloodAbo">
             <el-select
               v-model="form.bloodAbo"
@@ -179,7 +184,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
+        <el-col :span="8">
           <el-form-item label="血型RH" prop="bloodRh">
             <el-select v-model="form.bloodRh" placeholder="血型RH" clearable :disabled="isViewMode">
               <el-option
@@ -193,7 +198,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="10">
+        <el-col :span="8">
           <el-form-item label="婚姻状态" prop="maritalStatusEnum">
             <el-select
               v-model="form.maritalStatusEnum"
@@ -210,7 +215,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
+        <el-col :span="8">
           <el-form-item label="死亡时间" prop="deceasedDate">
             <el-date-picker
               v-model="form.deceasedDate"
@@ -235,8 +240,10 @@
 </template>
 
 <script setup name="PatientAddDialog">
+import { watch } from "vue";
 import pcas from 'china-division/dist/pcas-code.json';
 import { addPatient, patientlLists, getOutpatientRegistrationList } from './outpatientregistration';
+import { fromPairs } from 'lodash';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -275,17 +282,19 @@ const addressCom = ref(''); //地址
 
 const options = ref(pcas); // 地区数据
 
-const title = ref('添加病人');
+const title = ref('新增患者');
 const visible = ref(false);
 const emits = defineEmits(['submit']); // 声明自定义事件
 
 const data = reactive({
   isViewMode: false,
-  form: {},
+  form: {
+    typeCode: '08',
+  },
   rules: {
     name: [{ required: true, message: '姓名不能为空', trigger: 'change' }],
     genderEnum: [{ required: true, message: '请选择性别', trigger: 'change' }],
-    idCard: [{ required: true, message: '证件号码不能为空', trigger: 'change' }],
+    age: [{ required: true, message: '年龄不能为空', trigger: 'change' }],
     phone: [{ required: true, message: '联系方式不能为空', trigger: 'change' }],
   },
 });
@@ -298,6 +307,34 @@ const props = defineProps({
     required: false,
   },
 });
+
+watch(
+  () => form.value.idCard,
+  (newIdCard) => {
+    if (newIdCard && newIdCard.length === 18) {
+      const birthYear = parseInt(newIdCard.substring(6, 10));
+      const birthMonth = parseInt(newIdCard.substring(10, 12));
+      const birthDay = parseInt(newIdCard.substring(12, 14));
+      
+      const today = new Date();
+      const currentYear = today.getFullYear();
+      const currentMonth = today.getMonth() + 1;
+      const currentDay = today.getDate();
+      
+      let age = currentYear - birthYear;
+      
+      // 如果当前月份小于出生月份，或者月份相同但当前日期小于出生日期，则年龄减1
+      if (
+        currentMonth < birthMonth ||
+        (currentMonth === birthMonth && currentDay < birthDay)
+      ) {
+        age--;
+      }
+      
+      form.value.age = age;
+    }
+  }
+);
 /** 查询菜单列表 */
 function getList() {
   patientlLists().then((response) => {
@@ -312,9 +349,9 @@ function getList() {
 }
 
 /** 打开用户信息弹窗 */
-function getPatientInfo() {
+function getPatientInfo(idCard) {
   const param = {
-    searchKey: form.value.idCard,
+    searchKey: idCard,
   };
   getOutpatientRegistrationList(param).then((res) => {
     console.log(param, 'param');
@@ -365,7 +402,7 @@ function reset() {
     menuName: undefined,
     age: undefined,
     genderEnum: undefined,
-    typeCode: undefined,
+    typeCode: '08',
     idCard: undefined,
     phone: undefined,
     prfsEnum: undefined,
@@ -404,12 +441,15 @@ function submitForm() {
   proxy.$refs['patientRef'].validate((valid) => {
     if (valid) {
       // 使用
+      if (!form.value.identifierNo) {
+        form.value.typeCode = undefined;
+      }
       form.value.address = getAddress(form);
       addPatient(form.value).then((response) => {
         proxy.$modal.msgSuccess('新增成功');
+        getPatientInfo(response.data.idCard);
         visible.value = false;
-        getPatientInfo();
-        reset()
+        reset();
       });
     }
   });
diff --git a/vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue
similarity index 100%
rename from vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue
diff --git a/vue3/src/views/charge/outpatientregistration/components/patientList.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue
similarity index 100%
rename from vue3/src/views/charge/outpatientregistration/components/patientList.vue
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue
diff --git a/vue3/src/views/charge/outpatientregistration/components/refundDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/refundDialog.vue
similarity index 100%
rename from vue3/src/views/charge/outpatientregistration/components/refundDialog.vue
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/components/refundDialog.vue
diff --git a/vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
similarity index 87%
rename from vue3/src/views/charge/outpatientregistration/index.vue
rename to openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 54bcfafa..bee9bda8 100644
--- a/vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -29,17 +29,18 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6" style="padding: 0">
-                <el-button type="primary" icon="Plus" @click="handleAddPatient" style="width: 65px"
-                  >新建</el-button
-                >
+                <el-button type="primary" icon="Plus" @click="handleAddPatient" style="width: 65px">
+                  新建
+                </el-button>
                 <el-button
                   type="primary"
                   plain
                   icon="Search"
                   @click="handleSearch"
                   style="width: 65px"
-                  >查询</el-button
                 >
+                  查询
+                </el-button>
                 <el-button type="primary" plain @click="handleReadCard('01')" style="width: 65px">
                   电子凭证
                 </el-button>
@@ -55,7 +56,7 @@
                 <el-button type="primary" plain @click="handleReadCard('03')" style="width: 65px">
                   医保卡
                 </el-button>
-                <el-button
+                <!-- <el-button
                   type="primary"
                   plain
                   @click="handleReadCard('99')"
@@ -63,36 +64,8 @@
                   :disabled="true"
                 >
                   学生卡
-                </el-button>
+                </el-button> -->
               </el-col>
-              <!-- <el-col :span="2" class="icon-select-container"> -->
-              <!-- <el-icon><Postcard /></el-icon>
-                <el-form-item prop="" label-width="0px">
-                  <el-select
-                    v-model="form.type"
-                    placeholder="医保卡"
-                    clearable
-                    :disabled="true"
-                    width="240px"
-                  >
-                    <el-option
-                      v-for="item in contractList"
-                      :key="item.busNo"
-                      :label="item.contractName"
-                      :value="item.busNo"
-                    />
-                  </el-select>
-                </el-form-item> -->
-              <!-- </el-col> -->
-              <!-- <el-col :span="1"> -->
-              <!-- <el-form-item prop="allergenFlag" label-width="0px">
-                  <el-checkbox
-                    v-model="form.allergenFlag"
-                    label="(终端)扫码"
-                    :style="{ color: 'orange' }"
-                  ></el-checkbox>
-                </el-form-item> -->
-              <!-- </el-col> -->
               <el-col :span="5">
                 <el-form-item label="姓名：" prop="name">
                   <el-input v-model="form.name" placeholder="姓名" :disabled="true" />
@@ -459,6 +432,20 @@
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column
+              label="患者姓名"
+              align="center"
+              key="patientName"
+              prop="patientName"
+              width="120"
+            />
+            <el-table-column label="年龄" align="center" key="age" prop="age" width="120" />
+            <el-table-column
+              label="患者性别"
+              align="center"
+              key="genderEnum_enumText"
+              prop="genderEnum_enumText"
+            />
             <el-table-column
               label="科室名称"
               align="center"
@@ -512,20 +499,6 @@
               key="patientId"
               prop="patientId"
             /> -->
-            <el-table-column
-              label="患者姓名"
-              align="center"
-              key="patientName"
-              prop="patientName"
-              width="120"
-            />
-            <el-table-column label="年龄" align="center" key="age" prop="age" width="120" />
-            <el-table-column
-              label="患者性别"
-              align="center"
-              key="genderEnum_enumText"
-              prop="genderEnum_enumText"
-            />
             <!-- <el-table-column label="证件号" align="center" key="idCard" prop="idCard" width="180" /> -->
             <el-table-column
               label="就诊状态"
@@ -613,7 +586,7 @@
       :open="openDialog"
       @close="handleClose"
       :category="patientInfo.categoryEnum"
-      :totalAmount="form.totalPrice"
+      :totalAmount="totalAmount"
       :patientInfo="patientInfo"
       :chargeItemIds="chargeItemIdList"
       :chrgBchnoList="chrgBchnoList"
@@ -656,6 +629,7 @@ import {
   cancelRegister,
   gerPreInfo,
 } from './components/outpatientregistration';
+import { invokeYbPlugin } from '@/api/public';
 import patientInfoDialog from './components/patientInfoDialog';
 import PatientAddDialog from './components/patientAddDialog';
 import patientList from './components/patientList';
@@ -743,6 +717,7 @@ const data = reactive({
     // status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
   },
   rules: {
+    contractNo: [{ required: true, message: '费用性质', trigger: 'blur' }],
     patientId: [{ required: true, message: '病人不能为空', trigger: 'blur' }],
     priorityEnum: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
     serviceTypeId: [{ required: true, message: '挂号类型不能为空', trigger: 'blur' }],
@@ -846,140 +821,145 @@ function handleSearch() {
 }
 let userCardInfo = ref({});
 async function handleReadCard(value) {
-  if (chrome.webview === undefined) {
-    alert('请在医保版本中调用读卡功能！');
-  } else {
-    try {
-      let webView = window.chrome.webview.hostObjects.CSharpAccessor;
-      // string url,
-      // string fixmedins_code,
-      // string businessType,
-      // string operatorCode,
-      // string operatorName,
-      // string officeId,
-      // string officeName
+  // if (window.CefSharp === undefined) {
+  //   alert('请在医保版本中调用读卡功能！');
+  // } else {
+  try {
+    // await CefSharp.BindObjectAsync('boundAsync');
+    // string url,
+    // string fixmedins_code,
+    // string businessType,
+    // string operatorCode,
+    // string operatorName,
+    // string officeId,
+    // string officeName
 
-      // readCardLoading.value = true;
-      let jsonResult;
-      let cardInfo;
-      let userMessage = undefined;
-      switch (value) {
-        case '01': // 电子凭证
-          // readCardLoading.value = true;
-          await webView
-            .GetInfoByQrCodeAsync(
-              'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
-              'H22017200667',
-              '01101',
-              userStore.id,
-              userStore.name,
-              'D83',
-              '财务科'
-            )
-            .then((res) => {
-              readCardLoading.value = true;
-              loadingText.value = '正在读取...';
-              jsonResult = res;
-            })
-            .catch(() => {
-              readCardLoading.value = false;
-            });
-          cardInfo = JSON.parse(jsonResult);
-          let message = JSON.parse(cardInfo.message);
-          userMessage = {
-            certType: '02', // 证件类型
-            certNo: message.data.idNo, // 身份证号
-            psnCertType: '02', // 居民身份证
-          };
-          userCardInfo = {
-            certType: '01', // 证件类型
-            certNo: message.data.idNo, // 身份证号
-            psnCertType: '01', // 居民身份证
-            busiCardInfo: message.data.ecToken, // 令牌
-          };
-          BusiCardInfo.value = message.data.ecToken;
-          console.log(BusiCardInfo.value);
-          break;
-        case '02':
-          break;
-        case '03': // 社保卡
-          readCardLoading.value = true;
-          loadingText.value = '正在读取...';
-          await webView
-            .ReadHeaSecCardAsync(
-              JSON.stringify({
-                IP: 'ddjk.jlhs.gov.cn',
-                PORT: 20215,
-                TIMEOUT: 60,
-                SFZ_DRIVER_TYPE: 1,
-              })
-            )
-            .then((res) => {
-              jsonResult = res;
-            })
-            .finally(() => {
-              readCardLoading.value = false;
-            });
-          // console.log(
-          //   'jsonResult',
-          //   JSON.parse({
-          //     IssuingAreaCode: '310000',
-          //     SocialSecurityNumber: '371324198810224515',
-          //     CardNumber: 'M501A1A78',
-          //     CardIdentificationCode: '310000D15600000535925154E880AB97',
-          //     Name: '\u5218\u5CF0',
-          //     CardResetInfo: '00814A444686603100333E4FA9',
-          //     SpecificationVersion: '3.00',
-          //     IssuingDate: '20190313',
-          //     ExpirationDate: '20290313',
-          //     TerminalNumber: '000000000000',
-          //     TerminalDeviceNumber: '00041161201901000005',
-          //     Code: 0,
-          //     ErrorMessage: null,
-          //   })
-          // );
-          let message1 = JSON.parse(jsonResult);
-          userMessage = {
-            certType: '02', // 证件类型
-            certNo: message1.SocialSecurityNumber, // 身份证号
-            psnCertType: '02', // 居民身份证
-          };
-          userCardInfo = {
-            certType: '02', // 证件类型
-            certNo: message1.SocialSecurityNumber, // 身份证号
-            psnCertType: '02', // 居民身份证
-            busiCardInfo: message1.BusiCardInfo, //卡号
-          };
-          BusiCardInfo.value = message1.BusiCardInfo;
-          console.log(message1.BusiCardInfo);
-          break;
-        case '99':
-          break;
-      }
-      readCardLoading.value = true;
-      if (userMessage.certNo) {
-        gerPreInfo(userMessage)
+    // readCardLoading.value = true;
+    let jsonResult;
+    let cardInfo;
+    let userMessage = undefined;
+    switch (value) {
+      case '01': // 电子凭证
+        // readCardLoading.value = true;
+        // await boundAsync
+        //   .getInfoByQrCodeAsync(
+
+        //   )
+        await invokeYbPlugin({
+          FunctionId: 3,
+          url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
+          orgId: 'H22010200672',
+          businessType: '01101',
+          operatorId: userStore.id.toString(),
+          operatorName: userStore.name,
+          officeId: 'D83',
+          officeName: '财务科',
+        })
+          .then((res) => {
+            readCardLoading.value = true;
+            loadingText.value = '正在读取...';
+            console.log(res);
+            jsonResult = res.data;
+          })
+          .catch(() => {
+            readCardLoading.value = false;
+          });
+        cardInfo = JSON.parse(JSON.stringify(jsonResult));
+        let message = JSON.parse(cardInfo.message);
+        userMessage = {
+          certType: '02', // 证件类型
+          certNo: message.data.idNo, // 身份证号
+          psnCertType: '02', // 居民身份证
+        };
+        userCardInfo = {
+          certType: '01', // 证件类型
+          certNo: message.data.idNo, // 身份证号
+          psnCertType: '01', // 居民身份证
+          busiCardInfo: message.data.ecToken, // 令牌
+        };
+        BusiCardInfo.value = message.data.ecToken;
+        console.log(BusiCardInfo.value);
+        break;
+      case '02':
+        break;
+      case '03': // 社保卡
+        readCardLoading.value = true;
+        loadingText.value = '正在读取...';
+        await invokeYbPlugin(
+          JSON.stringify({
+            FunctionId: 1,
+            IP: 'ddjk.jlhs.gov.cn',
+            PORT: 20215,
+            TIMEOUT: 60,
+            SFZ_DRIVER_TYPE: 1,
+          })
+        )
           .then((res) => {
-            if (res.code == 200) {
-              form.value.patientId = res.data.id;
-              form.value.name = res.data.name;
-              form.value.age = res.data.age;
-              form.value.idCard = res.data.idCard;
-              form.value.card = res.data.id;
-              form.value.contractNo = res.data.contractBusNo;
-              form.value.genderEnum = res.data.genderEnum;
-              form.value.ybAreaNo = res.data.contractName;
-            }
+            jsonResult = JSON.stringify(res.data);
           })
           .finally(() => {
             readCardLoading.value = false;
           });
-      }
-    } catch (error) {
-      console.error('调用失败:', error);
-      readCardLoading.value = false;
+        // console.log(
+        //   'jsonResult',
+        //   JSON.parse({
+        //     IssuingAreaCode: '310000',
+        //     SocialSecurityNumber: '371324198810224515',
+        //     CardNumber: 'M501A1A78',
+        //     CardIdentificationCode: '310000D15600000535925154E880AB97',
+        //     Name: '\u5218\u5CF0',
+        //     CardResetInfo: '00814A444686603100333E4FA9',
+        //     SpecificationVersion: '3.00',
+        //     IssuingDate: '20190313',
+        //     ExpirationDate: '20290313',
+        //     TerminalNumber: '000000000000',
+        //     TerminalDeviceNumber: '00041161201901000005',
+        //     Code: 0,
+        //     ErrorMessage: null,
+        //   })
+        // );
+        let message1 = JSON.parse(jsonResult);
+        userMessage = {
+          certType: '02', // 证件类型
+          certNo: message1.SocialSecurityNumber, // 身份证号
+          psnCertType: '02', // 居民身份证
+        };
+        userCardInfo = {
+          certType: '02', // 证件类型
+          certNo: message1.SocialSecurityNumber, // 身份证号
+          psnCertType: '02', // 居民身份证
+          busiCardInfo: message1.BusiCardInfo, //卡号
+        };
+        BusiCardInfo.value = message1.BusiCardInfo;
+        console.log(message1.BusiCardInfo);
+        break;
+      case '99':
+        break;
+    }
+    readCardLoading.value = true;
+    if (userMessage.certNo) {
+      gerPreInfo(userMessage)
+        .then((res) => {
+          if (res.code == 200) {
+            form.value.patientId = res.data.id;
+            form.value.name = res.data.name;
+            form.value.age = res.data.age;
+            form.value.idCard = res.data.idCard;
+            form.value.card = res.data.id;
+            form.value.contractNo = res.data.contractBusNo;
+            form.value.genderEnum = res.data.genderEnum;
+            form.value.ybAreaNo = res.data.contractName;
+          }
+        })
+        .finally(() => {
+          readCardLoading.value = false;
+        });
     }
+  } catch (error) {
+    console.error('调用失败:', error);
+    readCardLoading.value = false;
   }
+  // }
 }
 
 /** 新增用户信息弹窗 */
@@ -1034,7 +1014,7 @@ function getContract() {
   getContractList().then((response) => {
     contractList.value = response.data;
     console.log('getContractList', 'response', response.data);
-    form.value.contractNo = response.data.length > 0 ? response.data[0].busNo : '0000';
+    // form.value.contractNo = response.data.length > 0 ? response.data[0].busNo : '0000';
   });
 }
 
@@ -1171,6 +1151,7 @@ function handleAdd() {
             // proxy.$modal.msgSuccess('挂号成功');
             chrgBchno.value = res.data.chrgBchno;
             registerBusNo.value = res.data.busNo;
+            totalAmount.value = res.data.psnCashPay;
             readCardLoading.value = false;
             openDialog.value = true;
             // chargeItemIdList.value = res.data;
diff --git a/vue3/src/views/charge/registerRecords/index.vue b/openhis-ui-vue3/src/views/charge/registerRecords/index.vue
similarity index 100%
rename from vue3/src/views/charge/registerRecords/index.vue
rename to openhis-ui-vue3/src/views/charge/registerRecords/index.vue
diff --git a/vue3/src/views/charge/schedule/index.vue b/openhis-ui-vue3/src/views/charge/schedule/index.vue
similarity index 100%
rename from vue3/src/views/charge/schedule/index.vue
rename to openhis-ui-vue3/src/views/charge/schedule/index.vue
diff --git a/vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
diff --git a/vue3/src/views/clinicmanagement/bargain/component/api.js b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
similarity index 100%
rename from vue3/src/views/clinicmanagement/bargain/component/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
diff --git a/vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
diff --git a/vue3/src/views/clinicmanagement/bargain/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/bargain/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
diff --git a/vue3/src/views/clinicmanagement/chargeDetail/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/chargeDetail/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/chargeDetail/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/chargeDetail/index.vue
diff --git a/vue3/src/views/clinicmanagement/consultationCharge/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/consultationCharge/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/consultationCharge/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/consultationCharge/index.vue
diff --git a/vue3/src/views/clinicmanagement/consultationRefund/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/consultationRefund/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/consultationRefund/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/consultationRefund/index.vue
diff --git a/vue3/src/views/clinicmanagement/dayEnd/component/api.js b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/api.js
similarity index 32%
rename from vue3/src/views/clinicmanagement/dayEnd/component/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/api.js
index d0c5227b..fe731500 100644
--- a/vue3/src/views/clinicmanagement/dayEnd/component/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/api.js
@@ -16,9 +16,51 @@ export function getDepartmentList() {
 
 // 获取日结
 export function getTotal(params) {
-    return request({
-      url: '/payment/bill/getTotal',
-      method: 'get',
-      params: params
-    })
-  }
\ No newline at end of file
+  return request({
+    url: '/payment/bill/getTotal',
+    method: 'get',
+    params: params
+  })
+}
+
+// 查询费用性质
+export function getContractList() {
+  return request({
+    url: '/app-common/contract-list',
+    method: 'get'
+  })
+}
+
+// 获取门诊日结数据
+export function getClincReport(params) {
+  return request({
+    url: '/payment/bill/getTotalCcu',
+    method: 'get',
+    params: params
+  })
+}
+
+// 获取全部人员
+export function getAllUser(params) {
+  return request({
+    url: '/base-data-manage/practitioner/user-practitioner-page',
+    method: 'get',
+    params: params
+  })
+}
+
+
+import axios from 'axios';
+
+export function testWithAxios() {
+  return axios.create(
+    {
+      // axios中请求配置有baseURL选项，表示请求URL公共部分
+      baseURL: '/api',
+      // 超时
+      timeout: 60000
+    }
+  ).post('/api/data/', {
+    FunctionId: 3
+  });
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
new file mode 100644
index 00000000..29b40e5c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
@@ -0,0 +1,1492 @@
+{
+  "panels": [
+    {
+      "index": 1,
+      "name": 3,
+      "paperType": "A4",
+      "height": 297,
+      "width": 210,
+      "paperHeader": 0,
+      "paperFooter": 841.8897637795277,
+      "printElements": [
+        {
+          "options": {
+            "left": 219,
+            "top": 22.5,
+            "height": 19.5,
+            "width": 120,
+            "title": "门诊收费日结单",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 16.5,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 57,
+            "height": 13.5,
+            "width": 120,
+            "title": "经办人",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "nickName"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 142.5,
+            "top": 57,
+            "height": 13.5,
+            "width": 120,
+            "title": "科室",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "orgId_dictText"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 261,
+            "top": 57,
+            "height": 13.5,
+            "width": 247.5,
+            "title": "时间段",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 426,
+            "top": 58.5,
+            "height": 13.5,
+            "width": 145.5,
+            "title": "机构名称：长春大学医院",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 76.5,
+            "height": 9,
+            "width": 534,
+            "borderWidth": "1.5",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 105,
+            "height": 13.5,
+            "width": 36,
+            "title": "西药",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 63,
+            "top": 105,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1001",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 153,
+            "top": 105,
+            "height": 13.5,
+            "width": 33,
+            "title": "检查",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 183,
+            "top": 105,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "2009",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 282,
+            "top": 105,
+            "height": 13.5,
+            "width": 48,
+            "title": "中成药",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 319.5,
+            "top": 105,
+            "height": 13.5,
+            "width": 85.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "2010",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 463.5,
+            "top": 106.5,
+            "height": 13.5,
+            "width": 87,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "2005",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 414.5,
+            "top": 107,
+            "height": 13.5,
+            "width": 58.5,
+            "title": "医用耗材",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 133.5,
+            "height": 13.5,
+            "width": 36,
+            "title": "护理",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 63,
+            "top": 133.5,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1009",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 153,
+            "top": 133.5,
+            "height": 13.5,
+            "width": 33,
+            "title": "治疗",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 183,
+            "top": 133.5,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1008",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 323.5,
+            "top": 134.5,
+            "height": 13.5,
+            "width": 84,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1004",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 282,
+            "top": 135,
+            "height": 13.5,
+            "width": 37.5,
+            "title": "化验",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 460.5,
+            "top": 135,
+            "height": 13.5,
+            "width": 90,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "3001",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 416,
+            "top": 135.5,
+            "height": 13.5,
+            "width": 58.5,
+            "title": "外科处置",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 148,
+            "top": 161.5,
+            "height": 13.5,
+            "width": 45,
+            "title": "彩超费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 182.5,
+            "top": 161.5,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "3006",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 323.5,
+            "top": 161.5,
+            "height": 13.5,
+            "width": 84,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "3004",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 31.5,
+            "top": 162,
+            "height": 13.5,
+            "width": 45,
+            "title": "处置费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 63,
+            "top": 162,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "3002",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 460.5,
+            "top": 162,
+            "height": 13.5,
+            "width": 88.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "3003",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 282.5,
+            "top": 162.5,
+            "height": 13.5,
+            "width": 43.5,
+            "title": "X光费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 415.5,
+            "top": 163.5,
+            "height": 13.5,
+            "width": 58.5,
+            "title": "心电费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1",
+            "textAlign": ""
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 31,
+            "top": 190,
+            "height": 13.5,
+            "width": 45,
+            "title": "注射费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1",
+            "textAlign": ""
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 62.5,
+            "top": 190,
+            "height": 13.5,
+            "width": 84,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "3005",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 183,
+            "top": 190.5,
+            "height": 13.5,
+            "width": 82.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1013",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 283.5,
+            "top": 190.5,
+            "height": 13.5,
+            "width": 45,
+            "title": "挂号费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 150.5,
+            "top": 191,
+            "height": 13.5,
+            "width": 43.5,
+            "title": "其他费",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 324.5,
+            "top": 191,
+            "height": 13.5,
+            "width": 84,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1011",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 16.5,
+            "top": 222,
+            "height": 9,
+            "width": 567,
+            "borderWidth": "1.5",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 444,
+            "top": 249,
+            "height": 13.5,
+            "width": 58.5,
+            "title": "网银",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 499.5,
+            "top": 249,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "uniCashSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 359.5,
+            "top": 250,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "aliCashSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 18,
+            "top": 250.5,
+            "height": 13.5,
+            "width": 76.5,
+            "title": "总收入",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 78,
+            "top": 250.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "SUM",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 219,
+            "top": 250.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "vxCashSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 250.5,
+            "height": 13.5,
+            "width": 61.5,
+            "title": "支付宝",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 164,
+            "top": 251,
+            "height": 13.5,
+            "width": 55.5,
+            "title": "微信",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 79,
+            "top": 277,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "0000cash",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 163,
+            "top": 277,
+            "height": 13.5,
+            "width": 55.5,
+            "title": "自费人次",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 359.5,
+            "top": 277,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "229900reg",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value + ' 人'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 18,
+            "top": 277.5,
+            "height": 13.5,
+            "width": 76.5,
+            "title": "自费现金总额",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 277.5,
+            "height": 13.5,
+            "width": 64.5,
+            "title": "省医保人次",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1",
+            "textAlign": ""
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 444,
+            "top": 277.5,
+            "height": 13.5,
+            "width": 66,
+            "title": "市医保人次",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 218,
+            "top": 278,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "0000reg",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value + ' 人'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 500,
+            "top": 278,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "220100reg",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value + ' 人'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 219.5,
+            "top": 305,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "229900tcSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 79,
+            "top": 305.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "229900cash",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 161.5,
+            "top": 305.5,
+            "height": 13.5,
+            "width": 64.5,
+            "title": "省医保统筹",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 359.5,
+            "top": 305.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "229900zhSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 443.5,
+            "top": 305.5,
+            "height": 13.5,
+            "width": 67.5,
+            "title": "省医保基金",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 18,
+            "top": 306,
+            "height": 13.5,
+            "width": 76.5,
+            "title": "省医保现金",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 306,
+            "height": 13.5,
+            "width": 66,
+            "title": "省医保账户",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 500,
+            "top": 306.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "229900fundSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 219,
+            "top": 333,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "220100tcSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 162.5,
+            "top": 333.5,
+            "height": 13.5,
+            "width": 64.5,
+            "title": "市医保统筹",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 17.5,
+            "top": 334,
+            "height": 13.5,
+            "width": 76.5,
+            "title": "市医保现金",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 299.5,
+            "top": 334,
+            "height": 13.5,
+            "width": 69,
+            "title": "市医保账户",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 499.5,
+            "top": 334.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "220100fundSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 80,
+            "top": 335,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "220100cash",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 360.5,
+            "top": 335,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "220100zhSum",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value ? value.toFixed(2) + ' 元' : '0.00' + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 443,
+            "top": 335,
+            "height": 13.5,
+            "width": 67.5,
+            "title": "市医保基金",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 369,
+            "height": 9,
+            "width": 567,
+            "borderWidth": "1.5",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 162,
+            "top": 382.5,
+            "height": 13.5,
+            "width": 76.5,
+            "title": "制表人",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 216,
+            "top": 382.5,
+            "height": 13.5,
+            "width": 75,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "scheduler",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 298.5,
+            "top": 382.5,
+            "height": 13.5,
+            "width": 76.5,
+            "title": "制表时间",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "1"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 370.5,
+            "top": 382.5,
+            "height": 13.5,
+            "width": 148.5,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "qrCodeLevel": 0,
+            "field": "createTime",
+            "textAlign": "right",
+            "testData": "20000.00",
+            "hideTitle": true
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        }
+      ],
+      "paperNumberLeft": 389,
+      "paperNumberTop": 573,
+      "paperNumberDisabled": true,
+      "paperNumberContinue": true,
+      "overPrintOptions": {
+        "content": "",
+        "opacity": 0.7,
+        "type": 1
+      },
+      "watermarkOptions": {
+        "content": "",
+        "fillStyle": "rgba(184, 184, 184, 0.3)",
+        "fontSize": "14px",
+        "rotate": 25,
+        "width": 175,
+        "height": 200,
+        "timestamp": false,
+        "format": "YYYY-MM-DD HH:mm"
+      },
+      "panelLayoutOptions": {
+        "layoutType": "column",
+        "layoutRowGap": 0,
+        "layoutColumnGap": 0
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/vue3/src/views/clinicmanagement/dayEnd/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
similarity index 34%
rename from vue3/src/views/clinicmanagement/dayEnd/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
index b133d929..2a0df0c3 100644
--- a/vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -14,9 +14,27 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           style="width: 300px; margin-right: 20px"
+          @change="getValue"
           value-format="YYYY-MM-DD"
         />
+      </el-form-item>
+      <el-form-item label="费用性质：">
+        <el-select
+          v-model="contractNo"
+          placeholder="费用性质"
+          clearable
+          @change="getValue"
+          style="width: 150px; margin-right: 30px"
+        >
+          <el-option
+            v-for="item in contractList"
+            :key="item.busNo"
+            :label="item.contractName"
+            :value="item.busNo"
+          />
+        </el-select>
         <el-button type="primary" plain icon="Search" @click="getValue">查询</el-button>
+        <el-button type="primary" plain icon="Printer" @click="print">打印</el-button>
       </el-form-item>
       <!-- <el-form-item label="科室：" prop="sourceLocationId">
         <el-select
@@ -43,297 +61,182 @@
         <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
       </el-col>
     </el-row> -->
-    <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <!-- <el-col :span="3">
-        <span>经办人编号：</span>
-      </el-col> -->
-      <el-col :span="3">
-        <span class="label">经办人姓名：</span>
-        <span class="value"> {{ userStore.nickName }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">科室：</span>
-        <span class="value">{{ userStore.orgName }}</span>
-      </el-col>
-      <el-col :span="4.5">
-        <span class="label">时间：</span>
-        <span class="value"> {{ queryTime[0] + '~' + queryTime[1] }} </span>
-      </el-col>
-    </el-row>
-    <!-- <el-table
-      v-loading="loading"
-      :data="purchaseinventoryList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column
-        label="科目"
-        align="center"
-        key="name"
-        prop="name"
-        width="140"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="应收"
-        align="center"
-        key="purchasePrice"
-        prop="purchasePrice"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="金额"
-        align="center"
-        key="totalPrice"
-        prop="totalPrice"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="优惠"
-        align="center"
-        key="price"
-        prop="price"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="科目"
-        align="center"
-        key="name"
-        prop="name"
-        width="140"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="应收"
-        align="center"
-        key="purchasePrice"
-        prop="purchasePrice"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="金额"
-        align="center"
-        key="totalPrice"
-        prop="totalPrice"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="优惠"
-        align="center"
-        key="price"
-        prop="price"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="科目"
-        align="center"
-        key="name"
-        prop="name"
-        width="140"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="应收"
-        align="center"
-        key="purchasePrice"
-        prop="purchasePrice"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="金额"
-        align="center"
-        key="totalPrice"
-        prop="totalPrice"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="优惠"
-        align="center"
-        key="price"
-        prop="price"
-        :show-overflow-tooltip="true"
-      />
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    /> -->
-    <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <el-col :span="3">
-        <span class="label">实际现金收入：</span>
-        <span class="value"> {{ formatValue(reportValue.cashSum) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">现金：</span>
-        <span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">微信：</span>
-        <span class="value">{{ formatValue(reportValue.vxCashSum) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">支付宝：</span>
-        <span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
-      </el-col>
-    </el-row>
-    <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <el-col :span="3">
-        <span class="label">统筹支付：</span>
-        <span class="value">{{ formatValue(reportValue.tcSum) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">账户支付：</span>
-        <span class="value">{{ formatValue(reportValue.zhSum) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">基金支付总额：</span>
-        <span class="value">{{ formatValue(reportValue.fundSum) }}</span>
-      </el-col>
-      <!-- <el-col :span="3">
-        <span>医保人次：{{ reportValue.aliCashSum }}</span>
-      </el-col> -->
-    </el-row>
-    <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <el-col :span="3">
-        <span class="label">诊查费：</span>
-        <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">检查费：</span>
-        <span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">化验费：</span>
-        <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">治疗费：</span>
-        <span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
-      </el-col>
-    </el-row>
-    <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <el-col :span="3">
-        <span class="label">西药费：</span>
-        <span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">中药饮片费：</span>
-        <span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">中成药费：</span>
-        <span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span>
-      </el-col>
-    </el-row>
-    <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <el-col :span="3">
-        <span class="label">诊疗费：</span>
-        <span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">挂号费：</span>
-        <span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span>
-      </el-col>
-      <el-col :span="3">
-        <span class="label">其他费用：</span>
-        <span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span>
-      </el-col>
-      <!-- <el-col :span="3">
-        <span>现金：</span>
-      </el-col> -->
-    </el-row>
-    <!-- <el-row
-      :gutter="10"
-      outpatientNo="mb8"
-      style="
-        margin: 20px 0;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        padding: 0 20px;
-      "
-    >
-      <el-col :span="3">
-        <span>应收金额：0.00</span>
-      </el-col>
-      <el-col :span="3">
-        <span>实收金额：</span>
-      </el-col>
-      <el-col :span="3">
-        <span>优惠金额：</span>
-      </el-col>
-    </el-row> -->
+    <div v-loading="loading">
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <!-- <el-col :span="3">
+          <span>经办人编号：</span>
+        </el-col> -->
+        <el-col :span="3">
+          <span class="label">经办人姓名：</span>
+          <span class="value"> {{ userStore.nickName }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">科室：</span>
+          <span class="value">{{ userStore.orgName }}</span>
+        </el-col>
+        <el-col :span="4.5">
+          <span class="label">时间：</span>
+          <span class="value"> {{ queryTime[0] + '~' + queryTime[1] }} </span>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="3">
+          <span class="label">实际现金收入：</span>
+          <span class="value"> {{ formatValue(reportValue.cashSum) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">现金：</span>
+          <span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">微信：</span>
+          <span class="value">{{ formatValue(reportValue.vxCashSum) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">支付宝：</span>
+          <span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="3">
+          <span class="label">统筹支付：</span>
+          <span class="value">{{ formatValue(reportValue.tcSum) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">账户支付：</span>
+          <span class="value">{{ formatValue(reportValue.zhSum) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">基金支付总额：</span>
+          <span class="value">{{ formatValue(reportValue.fundSum) }}</span>
+        </el-col>
+        <!-- <el-col :span="3">
+          <span>医保人次：{{ reportValue.aliCashSum }}</span>
+        </el-col> -->
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="3">
+          <span class="label">诊查费：</span>
+          <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">检查费：</span>
+          <span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">化验费：</span>
+          <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">治疗费：</span>
+          <span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="3">
+          <span class="label">西药费：</span>
+          <span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">中药饮片费：</span>
+          <span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">中成药费：</span>
+          <span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">卫生材料费：</span>
+          <span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="3">
+          <span class="label">诊疗费：</span>
+          <span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">挂号费：</span>
+          <span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span>
+        </el-col>
+        <el-col :span="3">
+          <span class="label">其他费用：</span>
+          <span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span>
+        </el-col>
+        <!-- <el-col :span="3">
+          <span>现金：</span>
+        </el-col> -->
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script setup name="dayEnd">
-import { getRreportReturnIssue, getTotal } from './component/api';
+import { getRreportReturnIssue, getTotal, getContractList } from './component/api';
 import dayjs from 'dayjs';
 import useUserStore from '@/store/modules/user';
 import { formatDate, formatDateStr } from '@/utils/index';
+import Decimal from 'decimal.js';
 
 const userStore = useUserStore();
 // import Dialog from "./components/Dialog";
@@ -351,11 +254,13 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref('');
+const contractList = ref(undefined);
 const reportValue = ref({});
 const queryTime = ref([
   formatDateStr(new Date(), 'YYYY-MM-DD'),
   formatDateStr(new Date(), 'YYYY-MM-DD'),
 ]);
+const contractNo = ref('0000');
 
 const data = reactive({
   queryParams: {
@@ -376,13 +281,22 @@ const { queryParams, form, rules } = toRefs(data);
 
 getValue();
 function getValue() {
+  loading.value = true;
   getTotal({
+    contractNo: contractNo.value,
     startTime: queryTime.value[0] + ' 00:00:00',
     endTime: queryTime.value[1] + ' 23:59:59',
     entererId: userStore.practitionerId,
   }).then((res) => {
+    loading.value = false;
     reportValue.value = res.data;
-    console.log(reportValue.value, '123123');
+  });
+}
+
+getContract();
+function getContract() {
+  getContractList().then((response) => {
+    contractList.value = response.data;
   });
 }
 
@@ -433,6 +347,64 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
+/** 打印门诊日结 */
+async function print() {
+  // const selectedRows = proxy.$refs['tableRef'].getSelectionRows();
+  console.log(reportValue.value, '==reportValue.value==');
+  const result = {
+    data: [
+      {
+        ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
+        nickName: userStore.nickName,
+        orgName: userStore.orgName,
+        fixmedinsName: '长春大学医院',
+        queryTime: queryTime.value[0] + '~' + queryTime.value[1],
+        zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
+        feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
+          .add(reportValue.value.CHECK_FEE || 0)
+          .add(reportValue.value.DIAGNOSTIC_TEST_FEE || 0)
+          .add(reportValue.value.MEDICAL_EXPENSE_FEE || 0)
+          .add(reportValue.value.WEST_MEDICINE || 0)
+          .add(reportValue.value.CHINESE_MEDICINE_SLICES_FEE || 0)
+          .add(reportValue.value.CHINESE_MEDICINE_FEE || 0)
+          .add(reportValue.value.GENERAL_CONSULTATION_FEE || 0)
+          .add(reportValue.value.REGISTRATION_FEE || 0)
+          .add(reportValue.value.OTHER_FEE || 0)
+          .add(reportValue.value.SANITARY_MATERIALS_FEE || 0),
+      },
+    ],
+  };
+  console.log(result, '==result.data==');
+  // 将对象转换为 JSON 字符串
+  let jsonString = JSON.stringify(result, null, 2);
+  console.log(jsonString, 'jsonstring');
+  await CefSharp.BindObjectAsync('boundAsync');
+  await boundAsync
+    .printReport(getPrintFileName(contractNo.value), jsonString)
+    .then((response) => {
+      //返回结果是jsonString，可判断其调用是否成功
+      console.log(response, 'response');
+      var res = JSON.parse(response);
+      if (!res.IsSuccess) {
+        proxy.$modal.msgError('调用打印插件失败:' + res.ErrorMessage);
+      }
+    })
+    .catch((error) => {
+      proxy.$modal.msgError('调用打印插件失败:' + error);
+    });
+}
+
+function getPrintFileName(value) {
+  switch (value) {
+    case '0000':
+      return '门诊日结单(按登录角色查询)自费.grf';
+    case '229900': // 省医保
+      return '门诊日结单(按登录角色查询)省医保.grf';
+    case '220100': // 市医保
+      return '门诊日结单(按登录角色查询)市医保.grf';
+  }
+}
+
 function formatValue(value) {
   return value == null || value == undefined ? '0.00 元' : value.toFixed(2) + ' 元';
 }
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
new file mode 100644
index 00000000..ca236452
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
@@ -0,0 +1,498 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-form-item label="查询日期：">
+        <el-date-picker
+          v-model="queryTime"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 300px; margin-right: 20px"
+          @change="getValue"
+          value-format="YYYY-MM-DD"
+        />
+      </el-form-item>
+      <el-form-item label="费用性质：">
+        <el-select
+          v-model="contractNo"
+          placeholder="费用性质"
+          clearable
+          @change="getValue"
+          style="width: 150px; margin-right: 30px"
+        >
+          <el-option
+            v-for="item in contractList"
+            :key="item.busNo"
+            :label="item.contractName"
+            :value="item.busNo"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="经办人：">
+        <el-select
+          v-model="entererId"
+          placeholder="经办人"
+          clearable
+          filterable
+          @change="
+            (value) => {
+              if (!value) {
+                curUserInfo = {};
+              }
+              getValue();
+            }
+          "
+          style="width: 150px; margin-right: 30px"
+        >
+          <el-option
+            v-for="item in userList"
+            :key="item.practitionerId"
+            :label="item.nickName"
+            :value="item.practitionerId"
+            @click="
+              () => {
+                curUserInfo = item;
+              }
+            "
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-button type="primary" plain icon="Search" @click="getValue">查询</el-button>
+      <el-button type="primary" plain icon="Printer" @click="print">打印</el-button>
+    </el-form>
+    <div v-loading="loading" style="width: 1300px">
+      <div style="text-align: center">
+        <h2>门诊收费日结单</h2>
+      </div>
+      <el-row
+        :gutter="5"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="4">
+          <span class="label">经办人姓名：</span>
+          <span class="value"> {{ curUserInfo.nickName ? curUserInfo.nickName : '全部' }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span class="label">科室：</span>
+          <span class="value">{{ curUserInfo.orgId_dictText }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">机构：</span>
+          <span class="value">{{ '长春大学医院' }}</span>
+        </el-col>
+        <el-col :span="7">
+          <span class="label">时间：</span>
+          <span class="value"> {{ queryTime[0] + '~' + queryTime[1] }} </span>
+        </el-col>
+      </el-row>
+      <div class="divider"></div>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col
+          v-for="(item, index) in fin_type_code"
+          :span="5"
+          :key="index"
+          style="margin-bottom: 15px"
+        >
+          <span class="label">{{ item.label + '：' }}</span>
+          <span class="value">{{ formatValue(reportValue[item.value]) }}</span>
+        </el-col>
+      </el-row>
+      <div class="divider"></div>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="5">
+          <span class="label">总收入：</span>
+          <span class="value">{{ formatValue(reportValue.SUM) }}</span>
+        </el-col>
+        <!-- <el-col :span="5">
+          <span class="label">实际现金收入：</span>
+          <span class="value">
+            {{
+              formatValue(
+                (reportValue['0000cash'] || 0) +
+                  (reportValue['220100cash'] || 0) +
+                  (reportValue['229900cash'] || 0)
+              )
+            }}
+          </span>
+        </el-col> -->
+        <!-- <el-col :span="5">
+          <span class="label">现金：</span>
+          <span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span>
+        </el-col> -->
+        <el-col :span="5">
+          <span class="label">微信：</span>
+          <span class="value">{{ formatValue(reportValue.vxCashSum) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">支付宝：</span>
+          <span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">网银：</span>
+          <span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
+        </el-col>
+      </el-row>
+      <!-- <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="5">
+          <span class="label">统筹支付：</span>
+          <span class="value">{{ formatValue(reportValue.tcSum) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">账户支付：</span>
+          <span class="value">{{ formatValue(reportValue.zhSum) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">基金支付总额：</span>
+          <span class="value">{{ formatValue(reportValue.fundSum) }}</span>
+        </el-col>
+      </el-row> -->
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="5">
+          <span class="label">自费现金总额：</span>
+          <span class="value">{{ formatValue(reportValue['0000cash']) }}</span>
+        </el-col>
+        <!-- <el-col :span="5">
+          <span class="label">医保现金总额：</span>
+          <span class="value">{{ formatValue(reportValue.ybCashSum) }}</span>
+        </el-col> -->
+        <el-col :span="5">
+          <span class="label">自费人次：</span>
+          <span class="value">
+            {{ reportValue['0000reg'] ? reportValue['0000reg'] + ' 人' : '0 人' }}
+          </span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">省医保人次：</span>
+          <span class="value">
+            {{ reportValue['229900reg'] ? reportValue['229900reg'] + ' 人' : '0 人' }}
+          </span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">市医保人次：</span>
+          <span class="value">
+            {{ reportValue['220100reg'] ? reportValue['220100reg'] + ' 人' : '0 人' }}
+          </span>
+        </el-col>
+        <!-- <el-col :span="5">
+          <span class="label">医保人次：</span>
+          <span class="value">{{ reportValue.ybReg + ' 人' }}</span>
+        </el-col> -->
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="5">
+          <span class="label">省医保现金：</span>
+          <span class="value">{{ formatValue(reportValue['229900cash']) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">省医保统筹：</span>
+          <span class="value">{{ formatValue(reportValue['229900tcSum']) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">省医保账户：</span>
+          <span class="value">{{ formatValue(reportValue['229900zhSum']) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">省医保基金：</span>
+          <span class="value">{{ formatValue(reportValue['229900fundSum']) }}</span>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="5">
+          <span class="label">市医保现金：</span>
+          <span class="value">{{ formatValue(reportValue['220100cash']) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">市医保统筹：</span>
+          <span class="value">{{ formatValue(reportValue['220100tcSum']) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">市医保账户：</span>
+          <span class="value">{{ formatValue(reportValue['220100zhSum']) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">市医保基金：</span>
+          <span class="value">{{ formatValue(reportValue['220100fundSum']) }}</span>
+        </el-col>
+      </el-row>
+      <el-row
+        :gutter="10"
+        outpatientNo="mb8"
+        style="
+          margin: 20px 0;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          padding: 0 20px;
+        "
+      >
+        <el-col :span="5">
+          <span class="label">省医保总额：</span>
+          <span class="value">{{ formatValue((reportValue['229900cash'] || 0 + reportValue['229900tcSum'] || 0 + reportValue['229900zhSum'] || 0 + reportValue['229900fundSum'] || 0)) }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">省医保总额：</span>
+          <span class="value">{{ formatValue((reportValue['220100cash'] || 0 + reportValue['220100tcSum'] || 0 + reportValue['220100zhSum'] || 0 + reportValue['220100fundSum'] || 0)) }}</span>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script setup name="dayEnd">
+import { getAllUser, getContractList, getClincReport, testWithAxios } from './component/api';
+import useUserStore from '@/store/modules/user';
+import { formatDate, formatDateStr } from '@/utils/index';
+import Decimal from 'decimal.js';
+import { hiprint } from 'vue-plugin-hiprint';
+import templateJson from './component/template.json';
+
+const userStore = useUserStore();
+
+const { proxy } = getCurrentInstance();
+
+const purchaseinventoryList = ref([]);
+const userList = ref([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const entererId = ref(undefined);
+const contractList = ref(undefined);
+const reportValue = ref({});
+const curUserInfo = ref({});
+const { fin_type_code } = proxy.useDict('fin_type_code');
+const queryTime = ref([
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+]);
+const contractNo = ref('0000');
+
+const data = reactive({
+  queryParams: {
+    form: {},
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    purposeLocationId: undefined,
+    sourceLocationId: undefined,
+    supplierId: undefined,
+    approvalTimeSTime: undefined,
+    approvalTimeETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams } = toRefs(data);
+
+getValue();
+function getValue() {
+  console.log(fin_type_code.value);
+
+  loading.value = true;
+  getClincReport({
+    contractNo: contractNo.value,
+    startTime: queryTime.value[0] + ' 00:00:00',
+    endTime: queryTime.value[1] + ' 23:59:59',
+    entererId: entererId.value,
+  }).then((res) => {
+    loading.value = false;
+    reportValue.value = res.data;
+    let list = processObjectWithFinType(reportValue.value);
+    console.log(list);
+  });
+}
+
+getContract();
+function getContract() {
+  getContractList().then((response) => {
+    contractList.value = response.data;
+  });
+  getAllUser({ pageSize: 100 }).then((res) => {
+    userList.value = res.data.records.filter((item) => item.userName != 'admin');
+  });
+}
+
+function processObjectWithFinType(obj) {
+  return Object.keys(obj).map((key) => {
+    const matchedItem = fin_type_code.value.find((item) => item.value === key);
+    if (matchedItem) {
+      return {
+        label: matchedItem ? matchedItem.label : key,
+        value: obj[key],
+      };
+    }
+  });
+}
+
+/** 打印门诊日结 */
+async function print() {
+  // const selectedRows = proxy.$refs['tableRef'].getSelectionRows();
+  console.log(reportValue.value, '==reportValue.value==');
+  const result = {
+    data: [
+      {
+        ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
+        nickName: userStore.nickName,
+        orgName: userStore.orgName,
+        fixmedinsName: '长春大学医院',
+        createTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'),
+        scheduler: userStore.nickName,
+        queryTime: queryTime.value[0] + '~' + queryTime.value[1],
+        zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
+        feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
+          .add(reportValue.value.CHECK_FEE || 0)
+          .add(reportValue.value.DIAGNOSTIC_TEST_FEE || 0)
+          .add(reportValue.value.MEDICAL_EXPENSE_FEE || 0)
+          .add(reportValue.value.WEST_MEDICINE || 0)
+          .add(reportValue.value.CHINESE_MEDICINE_SLICES_FEE || 0)
+          .add(reportValue.value.CHINESE_MEDICINE_FEE || 0)
+          .add(reportValue.value.GENERAL_CONSULTATION_FEE || 0)
+          .add(reportValue.value.REGISTRATION_FEE || 0)
+          .add(reportValue.value.OTHER_FEE || 0)
+          .add(reportValue.value.SANITARY_MATERIALS_FEE || 0),
+      },
+    ],
+  };
+  console.log(result, '==result.data==');
+
+  const printElements = templateJson;
+  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+  const printerList = hiprintTemplate.getPrinterList();
+  console.log(hiprintTemplate, '打印机列表');
+  hiprintTemplate.print2(result.data[0], {
+    title: '打印标题',
+  });
+  // 将对象转换为 JSON 字符串
+  // let jsonString = JSON.stringify(result, null, 2);
+  // console.log(jsonString, 'jsonstring');
+  // await CefSharp.BindObjectAsync('boundAsync');
+  // await boundAsync
+  //   .printReport(getPrintFileName(contractNo.value), jsonString)
+  //   .then((response) => {
+  //     //返回结果是jsonString，可判断其调用是否成功
+  //     console.log(response, 'response');
+  //     var res = JSON.parse(response);
+  //     if (!res.IsSuccess) {
+  //       proxy.$modal.msgError('调用打印插件失败:' + res.ErrorMessage);
+  //     }
+  //   })
+  //   .catch((error) => {
+  //     proxy.$modal.msgError('调用打印插件失败:' + error);
+  //   });
+}
+
+function getPrintFileName(value) {
+  switch (value) {
+    case '0000':
+      return '门诊日结单(按登录角色查询)自费.grf';
+    case '229900': // 省医保
+      return '门诊日结单(按登录角色查询)省医保.grf';
+    case '220100': // 市医保
+      return '门诊日结单(按登录角色查询)市医保.grf';
+  }
+}
+
+function formatValue(value) {
+  return value == null || value == undefined || value == NaN  ? '0.00 元' : value.toFixed(2) + ' 元';
+}
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+.label {
+  display: inline-block;
+  width: 120px !important;
+}
+.value {
+  float: right;
+}
+.el-col {
+  margin-right: 50px;
+}
+.divider {
+  height: 3px;
+  background-color: #000;
+  margin: 20px 0;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/clinicmanagement/disposal/components/api.js b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
similarity index 50%
rename from vue3/src/views/clinicmanagement/disposal/components/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
index c6b782a9..d9deb52c 100644
--- a/vue3/src/views/clinicmanagement/disposal/components/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  */
 export function getList(queryParams) {
   return request({
-    url: '/outpatient-manage/disposal/encounter-list',
+    url: '/outpatient-manage/treatment/encounter-list',
     method: 'get',
     params: queryParams
   })
@@ -16,7 +16,7 @@ export function getList(queryParams) {
  */
 export function getDisposalList(encounterId) {
   return request({
-    url: '/outpatient-manage/disposal/disposal-list?encounterId=' + encounterId,
+    url: '/outpatient-manage/treatment/treatment-list?encounterId=' + encounterId,
     method: 'get',
   })
 }
@@ -26,7 +26,7 @@ export function getDisposalList(encounterId) {
  */
 export function getExecuteList(queryParams) {
   return request({
-    url: '/outpatient-manage/disposal/execute-list',
+    url: '/outpatient-manage/treatment/execute-list',
     method: 'get',
     params: queryParams
   })
@@ -37,7 +37,7 @@ export function getExecuteList(queryParams) {
  */
 export function init() {
   return request({
-    url: '/outpatient-manage/disposal/init',
+    url: '/outpatient-manage/treatment/init',
     method: 'get',
   })
 }
@@ -45,20 +45,32 @@ export function init() {
 /**
  * 执行
  */
-export function execute(queryParams) {
+export function execute(data) {
   return request({
-    url: '/outpatient-manage/disposal/execute?itemId=' + queryParams.itemId + '&type=' + queryParams.type,
+    url: '/outpatient-manage/treatment/perform',
     method: 'put',
+    data: data
   })
 }
 
 /**
  * 取消
  */
-export function cancel(queryParams) {
+export function cancel(data) {
   return request({
-    url: '/outpatient-manage/disposal/cancel',
+    url: '/outpatient-manage/treatment/cancel-perform',
     method: 'put',
-    params: queryParams
+    data: data
+  })
+}
+
+/**
+ * 获取执行记录
+ */
+export function getPerformRecord(params) {
+  return request({
+    url: '/outpatient-manage/treatment/perform-record',
+    method: 'get',
+    params: params
   })
 }
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
new file mode 100644
index 00000000..7f794061
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
@@ -0,0 +1,50 @@
+<template>
+  <el-dialog
+    title="执行记录"
+    v-model="props.open"
+    width="1000px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+    @open="openDialog"
+  >
+    <el-table
+      :data="recordList"
+      highlight-current-row
+      @row-click="handlePatientSelect"
+      max-height="650"
+      style="width: 100%"
+      border
+    >
+      <el-table-column prop="occurrenceTime" label="执行时间" align="center" width="150" />
+      <el-table-column prop="statusEnum_enumText" label="执行状态" align="center" />
+      <el-table-column prop="orgName" label="执行科室" align="center" width="100" />
+      <el-table-column prop="practitionerName" label="执行人" align="center" width="100" />
+    </el-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  recordList: {
+    type: [],
+  },
+});
+const emit = defineEmits(['close']);
+
+function close() {
+  emit('close');
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
new file mode 100644
index 00000000..c98c4596
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
@@ -0,0 +1,541 @@
+<template>
+  <div class="his-container">
+    <!-- 主体内容区域 -->
+    <div class="main-content">
+      <!-- 左侧患者列表区域 -->
+      <div class="section patient-section">
+        <div class="section-header">
+          <div class="section-title">
+            <i class="el-icon-user"></i>
+            <h2>患者列表</h2>
+          </div>
+        </div>
+
+        <div class="search-area">
+          <el-input v-model="patientSearch" placeholder="搜索患者" clearable class="search-input" />
+        </div>
+        <el-table
+          :data="patientList"
+          highlight-current-row
+          @row-click="handlePatientSelect"
+          max-height="650"
+          style="width: 100%"
+          border
+        >
+          <el-table-column prop="encounterNo" label="就诊号" align="center" width="150" />
+          <el-table-column prop="patientName" label="姓名" align="center" />
+          <el-table-column prop="genderEnum_enumText" label="性别" align="center" width="100" />
+          <el-table-column prop="age" label="年龄" align="center" width="100" />
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          layout="total, sizes, prev, pager, next"
+          @pagination="getPatientList"
+        />
+      </div>
+
+      <!-- 右侧区域 -->
+      <div class="right-section">
+        <!-- 处置项目区域 -->
+        <div class="section treatment-section">
+          <div class="section-header">
+            <div class="section-title">
+              <i class="el-icon-first-aid-kit"></i>
+              <h2>处置项目</h2>
+              <el-button type="primary" plain @click="printBottleLabel()">打印瓶签</el-button>
+              <el-button type="primary" plain @click="printPrescription()">打印处方</el-button>
+            </div>
+          </div>
+          <el-table
+            :data="activityList"
+            height="calc(100% - 60px)"
+            style="width: 100%"
+            border
+            v-loading="loading"
+            :span-method="operationSpanMethod"
+          >
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" align="center" prop="sortNumber" width="60" />
+            <el-table-column align="center" prop="busNo" label="项目编号" width="150" />
+            <el-table-column align="center" prop="itemName" label="项目名称" />
+            <!-- <el-table-column align="center" prop="medicationName" label="药品名称" /> -->
+            <el-table-column
+              align="center"
+              prop="serviceCategory_dictText"
+              label="项目类型"
+              width="80"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.medCategory
+                    ? scope.row.medCategory_dictText
+                    : scope.row.serviceCategory_dictText
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="size" label="规格" width="100" />
+            <el-table-column align="center" prop="executeNum" label="执行次数" width="90" />
+            <el-table-column align="center" label="已执行次数" width="90">
+              <template #default="scope">
+                {{ scope.row.performCount - scope.row.cancelCount }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              header-align="center"
+              prop="unitPrice"
+              label="单价"
+              width="90"
+            >
+              <template #default="scope">
+                <span>
+                  {{
+                    scope.row.unitPrice ? scope.row.unitPrice.toFixed(2) + ' 元' : '0.00' + ' 元'
+                  }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              header-align="center"
+              prop="totalPrice"
+              label="总价"
+              width="90"
+            >
+              <template #default="scope">
+                <span>{{
+                  scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) + ' 元' : '0.00' + ' 元'
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="serviceStatus_enumText" label="状态" width="100">
+              <template #default="{ row }">
+                <el-tag type="primary" size="small">
+                  {{ row.serviceStatus_enumText }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="200" fixed="right">
+              <template #default="{ row }">
+                <el-button type="text" @click="handleExecute(row)"> 执行 </el-button>
+                <el-button type="danger" link @click="handleCancel(row)"> 取消 </el-button>
+                <el-button type="text" @click="getRecord(row)">执行记录</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+
+        <!-- 耗材区域 -->
+        <div class="section material-section">
+          <div class="section-header">
+            <div class="section-title">
+              <i class="el-icon-box"></i>
+              <h2>耗材使用</h2>
+            </div>
+          </div>
+          <el-table
+            :data="deviceList"
+            height="calc(100% - 60px)"
+            style="width: 100%"
+            ref="deviceListRef"
+            v-loading="loading"
+            border
+          >
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column type="index" label="序号" align="center" width="60" />
+            <el-table-column prop="itemName" align="center" label="耗材名称" />
+            <el-table-column prop="size" align="center" label="规格" />
+            <el-table-column prop="quantity" align="center" label="使用数量">
+              <template #default="scope">
+                <span>{{ scope.row.quantity + ' ' + scope.row.unitCode_dictText }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="right" header-align="center" prop="unitPrice" label="单价">
+              <template #default="scope">
+                <span>{{ scope.unitPrice ? scope.unitPrice.toFixed(2) : '0.00' + ' 元' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="right" header-align="center" prop="totalPrice" label="总价">
+              <template #default="scope">
+                <span>{{ scope.totalPrice ? scope.totalPrice.toFixed(2) : '0.00' + ' 元' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="serviceStatus_enumText" label="状态">
+              <template #default="{ row }">
+                <el-tag type="primary" size="small">
+                  {{ row.dispenseStatus_enumText }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="操作" width="80">
+              <template #default="{ row }">
+                <el-button type="text" size="small" @click="removeMaterial(row)">移除</el-button>
+              </template>
+            </el-table-column> -->
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <PerformRecordDialog :open="openDialog" :recordList="recordList" @close="openDialog = false" />
+  </div>
+</template>
+
+<script setup>
+import { getCurrentInstance } from 'vue';
+import { getList, getDisposalList, execute, cancel, getPerformRecord } from './components/api';
+import PerformRecordDialog from './components/performRecordDialog';
+
+// 患者搜索
+const patientSearch = ref('');
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+const total = ref(0);
+// 患者数据
+const patientList = ref([]);
+// 处置项目列表
+const activityList = ref([]);
+// 耗材列表
+const deviceList = ref([]);
+
+// 当前选中的患者
+const currentPatient = ref({});
+const recordList = ref([]);
+const openDialog = ref(false);
+const loading = ref(false);
+
+const { proxy } = getCurrentInstance();
+
+// 总费用计算
+const totalCost = computed(() => {
+  if (!currentPatient.value.id) return 0;
+
+  const treatmentCost = currentPatient.value.treatments.reduce((sum, item) => sum + item.cost, 0);
+
+  const materialCost = currentPatient.value.materials.reduce(
+    (sum, item) => sum + item.cost * item.quantity,
+    0
+  );
+
+  return treatmentCost + materialCost;
+});
+getPatientList();
+function getPatientList() {
+  getList(queryParams.value).then((res) => {
+    patientList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+function handlePatientSelect(row) {
+  console.log(row, 3456789);
+  loading.value = true;
+  getDisposalList(row.encounterId).then((res) => {
+    deviceList.value = res.data.records.filter((item) => {
+      return item.requestTable == 'wor_device_request';
+    });
+    activityList.value = res.data.records.filter((item) => {
+      return (
+        item.requestTable == 'wor_service_request' || item.requestTable == 'med_medication_request'
+      );
+    });
+    loading.value = false;
+    console.log(activityList.value, 345678);
+  });
+}
+
+function handleExecute(row) {
+  let data = {
+    requestId: row.requestId,
+    dispenseId: row.dispenseId,
+    requestTable: row.requestTable,
+  };
+  let params = activityList.value
+    .filter((item) => {
+      return item.groupId == row.groupId;
+    })
+    .map((item) => {
+      return {
+        requestId: item.requestId,
+        dispenseId: item.dispenseId,
+        requestTable: item.requestTable,
+      };
+    });
+  let list = proxy.$refs.deviceListRef.getSelectionRows().map((item) => {
+    return {
+      requestId: item.requestId,
+      dispenseId: item.dispenseId,
+      requestTable: item.requestTable,
+    };
+  });
+  list.push(data);
+  execute(params).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('执行成功');
+      handlePatientSelect(row);
+    } else {
+      proxy.$modal.msgError(res.message);
+    }
+  });
+}
+
+// 添加操作列的合并方法
+function operationSpanMethod({ row, column, rowIndex, columnIndex }) {
+  // 操作列是最后一列，索引为11 (从0开始)
+  if (columnIndex === 11) {
+    const groupId = row.groupId;
+    // 如果没有groupId，则不合并
+    if (groupId === undefined || groupId === null) {
+      return [1, 1];
+    }
+
+    // 向上查找相同groupId的行，如果找到则隐藏当前行
+    for (let i = rowIndex - 1; i >= 0; i--) {
+      if (activityList.value[i].groupId === groupId) {
+        return [0, 0]; // 隐藏被合并的行
+      } else {
+        break;
+      }
+    }
+
+    // 向下统计相同groupId的行数
+    let spanCount = 1;
+    for (let i = rowIndex + 1; i < activityList.value.length; i++) {
+      if (activityList.value[i].groupId === groupId) {
+        spanCount++;
+      } else {
+        break;
+      }
+    }
+
+    return [spanCount, 1];
+  }
+  return [1, 1];
+}
+
+// 判断是否为组内的第一行
+function isFirstRowInGroup(rowIndex) {
+  const row = activityList.value[rowIndex];
+  const groupId = row.groupId;
+
+  // 如果没有groupId，每行都显示操作按钮
+  if (groupId === undefined || groupId === null) {
+    return true;
+  }
+
+  // 检查是否为该groupId的第一行
+  for (let i = rowIndex - 1; i >= 0; i--) {
+    if (activityList.value[i].groupId === groupId) {
+      return false;
+    } else {
+      break;
+    }
+  }
+  return true;
+}
+
+function handleCancel(row) {
+  let data = {
+    requestId: row.requestId,
+    dispenseId: row.dispenseId,
+    requestTable: row.requestTable,
+  };
+  let params = activityList.value
+    .filter((item) => {
+      return item.groupId == row.groupId;
+    })
+    .map((item) => {
+      return {
+        requestId: item.requestId,
+        dispenseId: item.dispenseId,
+        requestTable: item.requestTable,
+      };
+    });
+  cancel(params).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+      handlePatientSelect(row);
+    } else {
+      proxy.$modal.msgError(res.message);
+    }
+  });
+}
+function getRecord(row) {
+  getPerformRecord({ reqId: row.requestId }).then((res) => {
+    recordList.value = res.data;
+    openDialog.value = true;
+  });
+}
+</script>
+
+<style scoped>
+.his-container {
+  height: 90vh;
+  display: flex;
+  flex-direction: column;
+  background-color: #f0f2f5;
+  font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', Arial, sans-serif;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.main-content {
+  display: flex;
+  flex: 1;
+  gap: 20px;
+  overflow: hidden;
+  height: calc(100% - 70px);
+}
+
+.patient-section {
+  min-width: 400px;
+  width: 28%;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.right-section {
+  flex: 2;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  min-width: 600px;
+}
+
+.current-patient {
+  background: white;
+  border-radius: 12px;
+  padding: 20px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.patient-info {
+  display: flex;
+  align-items: center;
+  gap: 15px;
+}
+
+.patient-avatar {
+  background: #e6f7ff;
+  border-radius: 50%;
+  padding: 5px;
+}
+
+.patient-details {
+  display: flex;
+  flex-direction: column;
+}
+
+.patient-name {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.patient-gender,
+.patient-age {
+  margin-left: 10px;
+  font-size: 16px;
+  color: #666;
+  font-weight: normal;
+}
+
+.patient-meta {
+  display: flex;
+  gap: 20px;
+}
+
+.meta-item {
+  display: flex;
+  align-items: center;
+  color: #666;
+  font-size: 14px;
+}
+
+.meta-item i {
+  margin-right: 5px;
+  color: #1890ff;
+}
+
+.patient-status {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  gap: 10px;
+}
+
+.total-cost {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #666;
+}
+
+.cost-value {
+  font-weight: 600;
+  color: #e53935;
+  font-size: 20px;
+  margin-left: 10px;
+}
+
+.treatment-section,
+.material-section {
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+  padding: 20px 10px 5px 10px;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  flex: 1;
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.section-title h2 {
+  margin: 0;
+  font-size: 18px;
+  color: #333;
+  font-weight: 600;
+}
+
+.section-title i {
+  font-size: 20px;
+  color: #1890ff;
+}
+
+.search-area {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.search-input {
+  width: 200px;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/clinicmanagement/ePrescribing/components/api.js b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/api.js
similarity index 100%
rename from vue3/src/views/clinicmanagement/ePrescribing/components/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/api.js
diff --git a/vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
diff --git a/vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue
diff --git a/vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue
diff --git a/vue3/src/views/clinicmanagement/ePrescribing/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
similarity index 84%
rename from vue3/src/views/clinicmanagement/ePrescribing/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
index 9f930df1..cc63e485 100644
--- a/vue3/src/views/clinicmanagement/ePrescribing/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
@@ -39,7 +39,14 @@
         <el-button type="default" @click="combination()" :disabled="false"> 处方查询 </el-button>
         <el-button type="danger" @click="split()" :disabled="false"> 处方撤销 </el-button>
       </div> -->
-      <el-table max-height="650" ref="eprescriptionRef" :data="prescriptionList" border>
+      <el-table
+        max-height="650"
+        ref="eprescriptionRef"
+        :data="prescriptionList"
+        border
+        v-loading="loading"
+        :element-loading-text="'处理中...'"
+      >
         <el-table-column label="处方号" align="center" prop="prescriptionNo" sortable width="190" />
         <el-table-column label="门诊号" align="center" prop="iptOtpNo" width="110" />
         <el-table-column label="姓名" align="center" prop="patientName" width="100" />
@@ -195,6 +202,7 @@ const queryParams = ref({
 });
 const dateRange = ref([]);
 const showSearch = ref(true);
+const loading = ref(false);
 const prescriptionList = ref([]);
 const form = ref({
   description: undefined,
@@ -284,11 +292,14 @@ function revokePrescriptionStatus() {
 /** 打开查看弹窗 */
 function openEPrescribingDetail(row) {
   console.log(row.prescriptionNo, 'row88888', row);
+
+  loading.value = true;
   getPrescriptionDetailInfo(row.prescriptionNo).then((response) => {
     console.log(response, 'response88888');
     eprescriptionDetailData.value = response.data;
     nextTick(() => {
       proxy.$refs['ePrescribingDetailRef'].show();
+      loading.value = false;
     });
     getList();
   });
@@ -323,54 +334,60 @@ function openMedicinePickupQuery(row) {
 /** 处方上传 */
 function uploadElePrescriptions(row) {
   console.log(row, '处方上传');
+  loading.value = true;
   // 电子处方上传预核验
-  preVerification(row.prescriptionNo, row.ecToken, row.authNo, row.tenantId).then((response) => {
-    console.log(response, '电子处方上传预核验');
-    let date = new Date();
-    const preVerificationResult = response.data;
-    if (response.code == 200) {
-      const practitionerId = userStore.id;
-      // 电子处方医保电子签名
-      eleSignature(
-        preVerificationResult.hiRxno,
-        practitionerId,
-        dayjs(date).format('YYYY-MM-DD HH:mm:ss'),
-        row.tenantId
-      ).then((response) => {
-        console.log(response, '电子处方医保电子签名');
-        if (response.code == 200) {
-          // 电子处方上传
-          uploadElePrescription(
-            preVerificationResult.hiRxno,
-            practitionerId,
-            dayjs(date).format('YYYY-MM-DD HH:mm:ss'),
-            row.tenantId
-          ).then((response) => {
-            if (response.code == 200) {
-              console.log(response, '电子处方上传');
-              // 医保电子处方状态更新（上传）
-              console.log(row.prescriptionNo, '处方上传prescriptionNo');
-              uploadPrescriptionStatus(row.prescriptionNo).then((response) => {
-                if (response.code == 200) {
-                  console.log(response, '医保电子处方状态更新（上传）');
-                  proxy.$modal.msgSuccess('处方上传成功');
-                  getList();
-                } else {
-                  proxy.$modal.msgError(response.msg);
-                }
-              });
-            }
-          });
-        }
-      });
-    }
+  preVerification(row.prescriptionNo, row.ecToken, row.authNo, row.tenantId)
+    .then((response) => {
+      console.log(response, '电子处方上传预核验');
+      let date = new Date();
+      const preVerificationResult = response.data;
+      if (response.code == 200) {
+        const practitionerId = userStore.id;
+        // 电子处方医保电子签名
+        eleSignature(
+          preVerificationResult.hiRxno,
+          practitionerId,
+          dayjs(date).format('YYYY-MM-DD HH:mm:ss'),
+          row.tenantId
+        ).then((response) => {
+          console.log(response, '电子处方医保电子签名');
+          if (response.code == 200) {
+            // 电子处方上传
+            uploadElePrescription(
+              preVerificationResult.hiRxno,
+              practitionerId,
+              dayjs(date).format('YYYY-MM-DD HH:mm:ss'),
+              row.tenantId
+            ).then((response) => {
+              if (response.code == 200) {
+                console.log(response, '电子处方上传');
+                // 医保电子处方状态更新（上传）
+                console.log(row.prescriptionNo, '处方上传prescriptionNo');
+                uploadPrescriptionStatus(row.prescriptionNo).then((response) => {
+                  if (response.code == 200) {
+                    loading.value = false;
+                    console.log(response, '医保电子处方状态更新（上传）');
+                    proxy.$modal.msgSuccess('处方上传成功');
+                    getList();
+                  } else {
+                    proxy.$modal.msgError(response.msg);
+                  }
+                });
+              }
+            });
+          }
+        });
+      }
 
-    // medicinePickupQueryData.value = response.data;
-    // // nextTick(() => {
-    // //   proxy.$refs['medicinePickupQueryRef'].show();
-    // // });
-    // getList();
-  });
+      // medicinePickupQueryData.value = response.data;
+      // // nextTick(() => {
+      // //   proxy.$refs['medicinePickupQueryRef'].show();
+      // // });
+      // getList();
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 }
 
 /** 医保电子处方拒绝上传 */
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/api.js b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/api.js
new file mode 100644
index 00000000..a0706ade
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/api.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+export function getPrescriptionPageInfo(queryParams) {
+  return request({
+    url: '/doctor-station/main/prescription-page-info',
+    method: 'get',
+    params: queryParams
+  })
+}
+  /**
+ * 获取患者本次就诊处方
+ */
+export function getPrescriptionDetail(prescriptionNo) {
+  return request({
+    url: '/doctor-station/main/prescription-detail-info?prescriptionNo=' + prescriptionNo,
+    method: 'get',
+  })
+}
+  
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue
new file mode 100644
index 00000000..0629790d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue
@@ -0,0 +1,290 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+    <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button
+          type="primary"
+          plain
+          icon="Back"
+          @click="handleBack"
+          
+          >返回列表</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="handleQuery"
+          
+          >查询</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="CircleClose"
+          @click="handleClear"
+          
+          >重置</el-button
+        >
+      </el-col> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <!-- <el-table-column label="组" align="center" width="60">
+        <template #default="scope">
+          <div v-if="groupMarkers[scope.$index] === '┏'">┏</div>
+          <div v-if="groupMarkers[scope.$index] === '┗'">┗</div>
+          <div v-if="groupMarkers[scope.$index] === '┃'">┃</div>
+        </template>
+      </el-table-column> -->
+      <el-table-column
+        label="处方号"
+        align="center"
+        key="prescriptionNo"
+        prop="prescriptionNo"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="请求人"
+        align="center"
+        key="requesterId_dictText"
+        prop="requesterId_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="请求时间"
+        align="center"
+        key="requestTime"
+        prop="requestTime"
+        :show-overflow-tooltip="true"
+        width="160px"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.requestTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="医嘱名称"
+        align="center"
+        key="adviceName"
+        prop="adviceName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格"
+        align="center"
+        key="volume"
+        prop="volume"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="产品批号"
+        align="center"
+        key="lotNumber"
+        prop="lotNumber"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="请求数量" align="center" prop="">
+        <template #default="scope">
+          <span>
+            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        label="请求单位"
+        align="center"
+        key="unitCode_dictText"
+        prop="unitCode_dictText"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column label="请求状态" align="center" prop="" width="80">
+        <template #default="scope">
+          <el-tag v-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
+          <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning"
+            >待保存</el-tag
+          >
+          <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="用法"
+        align="center"
+        key="methodCode_dictText"
+        prop="methodCode_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="使用频次"
+        align="center"
+        key="rateCode_dictText"
+        prop="rateCode_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="单次剂量" align="center" prop="">
+        <template #default="scope">
+          <span>
+            {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总价" align="center" prop="" header-align="center" width="99">
+        <template #default="scope">
+          <span style="text-align: center">
+            {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="收费状态"
+        align="center"
+        key="chargeStatus_enumText"
+        prop="chargeStatus_enumText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="收费状态" align="center" prop="" width="80">
+        <template #default="scope">
+          <el-tag v-if="scope.row.chargeStatus == 2" type="success">{{scope.row.chargeStatus_enumText}}</el-tag>
+          <el-tag v-else-if="!scope.row.requestId && scope.row.chargeStatus == 1" type="warning"
+            >{{scope.row.chargeStatus_enumText}}</el-tag>
+          <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">{{scope.row.chargeStatus_enumText}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="发药药房/耗材房/执行科室" align="center" prop="" width="179">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.positionName }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="用药天数"
+        align="center"
+        key="dispensePerDuration"
+        prop="dispensePerDuration"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="诊断定义名称"
+        align="center"
+        key="conditionDefinitionName"
+        prop="conditionDefinitionName"
+        :show-overflow-tooltip="true"
+      />
+     
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="historicalPrescriptionDetail">
+import {
+   getPrescriptionDetail
+} from "./api";
+
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+
+  typeDetail: {
+    type: String,
+    required: false,
+  },
+  prescriptionNo:{
+    type: String,
+    required: false,
+  }
+});
+
+const prescriptionNo = ref('')
+const typeDetail = ref('2')
+const purchaseinventoryList = ref([]);
+const loading = ref(false);
+const occurrenceTime = ref([])
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const supplyTypeOptions = ref(undefined); 
+const supplyStatusOptions = ref(undefined);
+const groupMarkers = ref([]);
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+  },
+  rules: {},
+});
+watch(
+  () => props,
+  (newValue) => {
+    typeDetail.value = newValue.typeDetail;
+    getList();
+  },
+  { immdiate: true, deep: true }
+);
+const emits = defineEmits(['handleBack']);
+const { queryParams, form, rules } = toRefs(data);
+
+function handleBack(){
+  typeDetail.value = '1'
+  emits("handleBack", typeDetail.value);
+}
+
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+//   props.prescriptionNo = ""
+   getPrescriptionDetail(props.prescriptionNo).then((res) => {
+    loading.value = false;
+    if(res.data&&res.data.length>0){
+        purchaseinventoryList.value = res.data
+    }
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+    queryParams.value.pageNo = 1;
+    getList();
+}
+
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+getList()
+
+
+
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
new file mode 100644
index 00000000..51cf4cb3
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button type="primary" plain icon="Back" @click="handleBack">返回列表</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="CircleClose"
+          @click="handleClear"
+          
+          >重置</el-button
+        >
+      </el-col> -->
+    </el-row>
+    <div>
+      <div class="prescription-container">
+        <div>
+          <span>处方号：</span>
+          <span>CF0000000001</span>
+        </div>
+        <div style="text-align: center">
+          <h2>长春大学医院</h2>
+        </div>
+        <div style="text-align: center">
+          <h3>处方单</h3>
+        </div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">姓名：</span>
+            <span class="item-value">张先生</span>
+          </div>
+          <div>
+            <span class="item-label">年龄：</span>
+            <span class="item-value">20岁</span>
+          </div>
+          <div>
+            <span class="item-label">性别：</span>
+            <span class="item-value">男</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">科室：</span>
+            <span class="item-value">门诊内科</span>
+          </div>
+          <div>
+            <span class="item-label">费用性质：</span>
+            <span class="item-value">自费</span>
+          </div>
+          <div>
+            <span class="item-label">日期：</span>
+            <span class="item-value">2025-01-01</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">门诊号：</span>
+            <span class="item-value">M0000000001</span>
+          </div>
+          <div>
+            <span class="item-label">开单医生：</span>
+            <span class="item-value">徐丹</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">诊断：</span>
+            <span class="item-value">感冒</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="font-size: 16px; font-weight: 700">Rp</div>
+        <div class="medicen-list">
+          <div>
+            <span>1.</span>
+            <span>罗红霉素分散片</span>
+            <span>1mg</span>
+            <span>1盒</span>
+            <span>批次号： 202500000001</span>
+          </div>
+          <div>
+            <span>用法：</span>
+            <span>口服一次1片一天</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">医师：</span>
+            <span class="item-value">徐丹</span>
+          </div>
+          <div>
+            <span class="item-label">收费：</span>
+            <span class="item-value"></span>
+          </div>
+          <div>
+            <span class="item-label">合计：</span>
+            <span class="item-value">徐丹</span>
+          </div>
+        </div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">调配：</span>
+            <span class="item-value">徐丹</span>
+          </div>
+          <div>
+            <span class="item-label">核对：</span>
+            <span class="item-value"></span>
+          </div>
+          <div>
+            <span class="item-label">发药：</span>
+            <span class="item-value">徐丹</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="historicalPrescriptionDetail">
+import { getPrescriptionDetail } from './api';
+
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+  typeDetail: {
+    type: String,
+    required: false,
+  },
+  prescriptionNo: {
+    type: String,
+    required: false,
+  },
+});
+
+const prescriptionNo = ref('');
+const typeDetail = ref('2');
+const purchaseinventoryList = ref([]);
+const loading = ref(false);
+const occurrenceTime = ref([]);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const supplyTypeOptions = ref(undefined);
+const supplyStatusOptions = ref(undefined);
+const groupMarkers = ref([]);
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+  },
+  rules: {},
+});
+watch(
+  () => props,
+  (newValue) => {
+    typeDetail.value = newValue.typeDetail;
+    getList();
+  },
+  { immdiate: true, deep: true }
+);
+const emits = defineEmits(['handleBack']);
+const { queryParams, form, rules } = toRefs(data);
+
+function handleBack() {
+  typeDetail.value = '1';
+  emits('handleBack', typeDetail.value);
+}
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  //   props.prescriptionNo = ""
+  getPrescriptionDetail(props.prescriptionNo).then((res) => {
+    loading.value = false;
+    if (res.data && res.data.length > 0) {
+      purchaseinventoryList.value = res.data;
+    }
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+getList();
+</script>
+<style scoped>
+.prescription-container {
+  height: 650px;
+  width: 500px;
+  border: solid 2px #757575;
+  font-size: 13px;
+  padding: 10px;
+}
+.divider {
+  height: 2px;
+  background-color: #757575;
+  margin: 5px 0 5px 0;
+}
+.medicen-list {
+  height: 330px;
+}
+.item-label {
+  width: 70px;
+  text-align: left;
+  font-weight: 700;
+  color: #000000;
+  display: inline-block;
+}
+.item-value {
+  color: #393a3b;
+  font-weight: 500;
+  width: 80px;
+  display: inline-block;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
new file mode 100644
index 00000000..646858f7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container" v-loading="loadingcontainer" v-if="typeDetail == '1'">
+    <el-form
+      :model="queryParams"
+      ref="earlyWarningRef"
+      :inline="true"
+      :rules="rules"
+      label-width="200px"
+    >
+      <el-form-item label="处方号/病人名称/开方医生：" prop="searchKey">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="可按处方号/病人名称/开方医生查询"
+          clearable
+          style="width: 260px"
+        />
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="处方号"
+        align="center"
+        key="prescriptionNo"
+        prop="prescriptionNo"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="患者"
+        align="center"
+        key="patientName"
+        prop="patientName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="疾病诊断"
+        align="center"
+        key="conditionDefinitionName"
+        prop="conditionDefinitionName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="修改时间"
+        align="center"
+        key="requestTime"
+        prop="requestTime"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.requestTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="开方医生"
+        align="center"
+        key="practitionerName"
+        prop="practitionerName"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column
+        label="操作"
+        align="center"
+        fixed="right"
+        class-name="small-padding fixed-width"
+      >
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="viewDetails(scope.row)"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+  <!-- <historicalPrescriptionDetail
+    v-loading="loadingcontainer"
+    v-else
+    @handleBack="handleBack"
+    :typeDetail="typeDetail"
+    :prescriptionNo="prescriptionNo"
+  /> -->
+  <Prescription v-else />
+</template>
+
+<script setup name="historicalPrescription">
+import { ref } from 'vue';
+import { getPrescriptionPageInfo } from './component/api';
+import historicalPrescriptionDetail from './component/details.vue';
+import Prescription from './component/prescription.vue';
+const { proxy } = getCurrentInstance();
+
+const { item_type } = proxy.useDict('item_type');
+const prescriptionNo = ref('');
+const typeDetail = ref('1');
+const purchaseinventoryList = ref([]);
+const loading = ref(false);
+const loadingcontainer = ref(false);
+const occurrenceTime = ref([]);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const supplyTypeOptions = ref(undefined);
+const supplyStatusOptions = ref(undefined);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    categoryCode: undefined,
+    remainingMonth: undefined,
+    expirationDateSTime: undefined,
+    expirationDateETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+function handleBack(val) {
+  loadingcontainer.value = true;
+  typeDetail.value = val;
+  setTimeout(() => {
+    loadingcontainer.value = false;
+  }, 800);
+}
+function viewDetails(row) {
+  loadingcontainer.value = true;
+  prescriptionNo.value = row.prescriptionNo;
+  console.log(row.prescriptionNo, prescriptionNo.value, '详情');
+  typeDetail.value = '2';
+  setTimeout(() => {
+    loadingcontainer.value = false;
+  }, 700);
+}
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getPrescriptionPageInfo(queryParams.value).then((res) => {
+    loading.value = false;
+
+    //     res = {
+    // 	"code": 200,
+    // 	"msg": "操作成功",
+    // 	"data": {
+    // 		"records": [
+    // 			{
+    // 				"prescriptionNo": "PCN00000029",
+    // 				"encounterId": "1937393559205539842",
+    // 				"patientId": "1937393514477481986",
+    // 				"patientName": "龙傲天",
+    // 				"conditionDefinitionName": "感冒",
+    // 				"requestTime": "2025-06-24 17:05:36",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000028",
+    // 				"encounterId": "1937393559205539842",
+    // 				"patientId": "1937393514477481986",
+    // 				"patientName": "龙傲天",
+    // 				"conditionDefinitionName": "感冒",
+    // 				"requestTime": "2025-06-24 17:02:18",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000027",
+    // 				"encounterId": "1937393559205539842",
+    // 				"patientId": "1937393514477481986",
+    // 				"patientName": "龙傲天",
+    // 				"conditionDefinitionName": "感冒",
+    // 				"requestTime": "2025-06-24 14:25:21",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000023",
+    // 				"encounterId": "1937393559205539842",
+    // 				"patientId": "1937393514477481986",
+    // 				"patientName": "龙傲天",
+    // 				"conditionDefinitionName": "感冒",
+    // 				"requestTime": "2025-06-24 14:14:26",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000022",
+    // 				"encounterId": "1937113899091587074",
+    // 				"patientId": "1937066626118815745",
+    // 				"patientName": "就诊卡",
+    // 				"conditionDefinitionName": "肾痨",
+    // 				"requestTime": "2025-06-24 14:05:18",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000004",
+    // 				"encounterId": "1935570184300519426",
+    // 				"patientId": "1935541163105837058",
+    // 				"patientName": "孙嘉琦",
+    // 				"conditionDefinitionName": "眼科杂病",
+    // 				"requestTime": "2025-06-19 16:24:47",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000003",
+    // 				"encounterId": "1935570184300519426",
+    // 				"patientId": "1935541163105837058",
+    // 				"patientName": "孙嘉琦",
+    // 				"conditionDefinitionName": "眼科杂病",
+    // 				"requestTime": "2025-06-19 16:24:47",
+    // 				"practitionerName": "李辉"
+    // 			},
+    // 			{
+    // 				"prescriptionNo": "PCN00000002",
+    // 				"encounterId": "1935570184300519426",
+    // 				"patientId": "1935541163105837058",
+    // 				"patientName": "孙嘉琦",
+    // 				"conditionDefinitionName": "眼科杂病",
+    // 				"requestTime": "2025-06-19 14:40:05",
+    // 				"practitionerName": "李辉"
+    // 			}
+    // 		],
+    // 		"total": 8,
+    // 		"size": 10,
+    // 		"current": 1,
+    // 		"orders": [],
+    // 		"optimizeCountSql": true,
+    // 		"searchCount": true,
+    // 		"maxLimit": null,
+    // 		"countId": null,
+    // 		"pages": 1
+    // 	}
+    // }
+
+    purchaseinventoryList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  //   proxy.$refs['earlyWarningRef'].validate((valid) => {
+  // if (valid) {
+  queryParams.value.expirationDateSTime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[0] + ' 00:00:00'
+      : '';
+  queryParams.value.expirationDateETime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[1] + ' 23:59:59'
+      : '';
+  queryParams.value.pageNo = 1;
+  getList();
+  // }
+  //   })
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.expirationDateSTime = '';
+  queryParams.value.expirationDateETime = '';
+  occurrenceTime.value = '';
+  proxy.resetForm('earlyWarningRef');
+  getList();
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+getList();
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/components/api.js b/openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/components/api.js
new file mode 100644
index 00000000..f98e9018
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/components/api.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+// 待执行输液记录查询
+export function getChargeItemByOrg(data) {
+  return request({
+    url: '/payment/bill/charge-summary',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getDepartmentList() {
+  return request({
+    url: '/app-common/department-list',
+    method: 'get',
+    
+  })
+}
+
+    
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue
new file mode 100644
index 00000000..70cd1be1
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="app-continer">
+    <div style="margin: 15px 0; padding: 0 20px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
+        <el-form-item label="科室" prop="orgIdList">
+            <el-select
+              v-model="queryParams.orgIdList"
+              placeholder="请选择科室"
+              clearable
+              multiple
+              style="width: 480px"
+            >
+              <el-option
+                v-for="item in departmentList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        <el-form-item label="结算时间：" prop="activeFlag">
+          <el-date-picker
+            v-model="occurrenceTime"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 300px; margin-bottom: 10px; margin-left: 20px"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+            @change="getClinicRecord"
+          />
+        </el-form-item>
+        <div style="float: right">
+          <el-button type="primary" plain @click="getClinicRecord">查询</el-button>
+          <el-button type="warning" plain @click="handleReset">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <el-table :data="clinicRecord" show-summary border>
+      <!-- <el-table-column label="计算类型" align="center" prop="statusEnum_enumText" /> -->
+      <el-table-column label="序号" width="80" type="index" align="center">
+        <template #default="scope">
+            <span>{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="科室" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+      <el-table-column label="人次" align="center" prop="personCnt" :show-overflow-tooltip="true"/>
+      <el-table-column label="应收金额" align="center" prop="amount" :show-overflow-tooltip="true"/>
+      <el-table-column label="实收金额" align="center" prop="receivedAmount" width="280" :show-overflow-tooltip="true"/>
+      <el-table-column label="挂号费" align="center" prop="registrationFee" :show-overflow-tooltip="true"/>
+      <el-table-column label="处置费" align="center" prop="serviceFee" :show-overflow-tooltip="true"/>
+      <el-table-column label="药品费" align="center" prop="medFee" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="优惠金额" align="center" prop="entererName" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="日结" align="center" prop="outcomeEnum_dictText" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="月累计" align="center" prop="printCount" :show-overflow-tooltip="true"/> -->
+      <el-table-column label="备注" align="center" prop="printCount" :show-overflow-tooltip="true"/>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getLists"
+    />
+  </div>
+</template>
+
+<script setup name="incomeStatement">
+const { proxy } = getCurrentInstance();
+import { getChargeItemByOrg, getDepartmentList } from './components/api.js';
+import { formatDate } from '@/utils/index';
+const occurrenceTime = ref([formatDate(new Date()),formatDate(new Date())]);
+const total = ref(0);
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  startTime:"",
+  endTime:"",
+  searchKey:"",
+});
+const clinicRecord = ref([]);
+const paymentDetailList = ref([])
+const departmentList = ref([])
+getOrgId()
+getClinicRecord();
+function getClinicRecord() {
+  queryParams.value.startTime =
+  occurrenceTime.value && occurrenceTime.value.length == 2
+    ? occurrenceTime.value[0] + " 00:00:00"
+    : "";
+  queryParams.value.endTime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[1] + " 23:59:59"
+      : "";
+  queryParams.value.pageNo = 1;
+  getLists()
+}
+function getOrgId() {
+  getDepartmentList().then(res => {
+    departmentList.value = res.data
+  })
+}
+function getLists(){
+  getChargeItemByOrg(queryParams.value).then((res) => {
+    total.value = res.data.total;
+    clinicRecord.value = res.data.clinic;
+  });
+}
+/** 清空条件按钮操作 */
+function handleReset() {
+  // 清空查询条件
+  occurrenceTime.value = ""
+  queryParams.value.startTime = ""
+  queryParams.value.endTime = ""
+  proxy.resetForm("queryRef");
+  getLists();
+}
+</script>
+<style scoped>
+.el-dialog{
+  height: 90vh!important;
+}
+.dialog-footer {
+  text-align: right;
+}
+.el-textarea__inner {
+  resize: none;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
new file mode 100644
index 00000000..59011414
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-dialog
+    title="医嘱列表"
+    v-model="props.open"
+    width="1300px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+    @open="openDialog"
+  >
+    <div>
+      <!-- <el-row :gutter="24" class="mb8">
+        <el-col :span="12">
+          <el-input
+            v-model="queryParams.searchKey"
+            placeholder="诊断名称/拼音码"
+            clearable
+            style="width: 100%; margin-bottom: 10px"
+            @keyup.enter="queryDiagnosisUse"
+          >
+            <template #append>
+              <el-button icon="Search" @click="queryDiagnosisUse" />
+            </template>
+          </el-input>
+        </el-col>
+      </el-row> -->
+      <el-table
+        ref="refundListRef"
+        :data="props.adviceList"
+        row-key="paymentId"
+        row-class-name="parent-row"
+        v-loading="tableLoading"
+        border
+        max-height="600"
+      >
+        <el-table-column type="index" align="center"/>
+        <el-table-column label="医嘱" align="center" prop="adviceName" width="200" />
+        <el-table-column label="状态" align="center" prop="" width="90">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
+            <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning">
+              待保存
+            </el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单次剂量" align="center" prop="">
+          <template #default="scope">
+            {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总量" align="center" prop="">
+          <template #default="scope">
+            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总金额" align="right" prop="" header-align="center" width="100">
+          <template #default="scope">
+            <span style="text-align: right">
+              {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="药房/科室" align="center" prop="" width="180">
+          <template #default="scope">
+            {{ scope.row.positionName }}
+          </template>
+        </el-table-column>
+        <el-table-column label="频次/用法" align="center" prop="" width="180">
+          <template #default="scope">
+            <span style="text-align: right">
+              {{
+                scope.row.rateCode_dictText
+                  ? scope.row.rateCode_dictText +
+                    ' ' +
+                    scope.row.dispensePerDuration +
+                    '天' +
+                    ' ' +
+                    scope.row.methodCode_dictText
+                  : ''
+              }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="注射药品" align="center" prop="" width="80">
+          <template #default="scope">
+            {{ scope.row.injectFlag_enumText || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="皮试" align="center" prop="" width="80">
+          <template #default="scope">
+            {{ scope.row.skinTestFlag_enumText || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
+          <template #default="scope">
+            {{ scope.row.diagnosisName || scope.row.conditionDefinitionName }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  adviceList: {
+    type: [],
+    default: [],
+  },
+});
+const emit = defineEmits(['close']);
+
+function close() {
+  emit('close');
+}
+</script>
+
+<style lang="scss" scoped>
+.sub-table-wrapper {
+  padding: 16px 55px;
+  background: #f9fafe;
+
+  .nested-sub-table {
+    border: 1px solid #e8e8f3;
+    border-radius: 2px;
+
+    // :deep(.sub-cell) {
+    //   background: #ffffff !important;
+    //   padding: 12px 16px;
+    // }
+  }
+}
+:deep(.parent-row) {
+  td {
+    // background: #e8ece6 !important;  /* 浅蓝色背景 */
+    // border-color: #e4e7ed !important;
+    height: 48px;
+  }
+}
+
+.footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 16px;
+  border-top: 1px solid #ebeef5;
+
+  .total {
+    margin-left: 20px;
+    color: #f56c6c;
+    font-weight: 500;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/clinicmanagement/infusionrecord/component/api.js b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/api.js
similarity index 90%
rename from vue3/src/views/clinicmanagement/infusionrecord/component/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/api.js
index c5daea0a..b1dc56c3 100644
--- a/vue3/src/views/clinicmanagement/infusionrecord/component/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/api.js
@@ -76,4 +76,13 @@ export function getBottleLabel(params) {
     })
   }
 
+ //获取医嘱列表
+export function getAdvice(params) {
+    return request({
+      url: '/doctor-station/advice/request-base-info',
+      method: 'get',
+      params: params
+    })
+  }
+
     
\ No newline at end of file
diff --git a/vue3/src/views/clinicmanagement/infusionrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
similarity index 85%
rename from vue3/src/views/clinicmanagement/infusionrecord/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
index e40cde9f..fc254189 100644
--- a/vue3/src/views/clinicmanagement/infusionrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
@@ -2,14 +2,15 @@
   <div class="app-container">
     <div class="left">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-        <el-form-item label="医嘱执行时间">
+        <el-form-item label="就诊日期">
           <el-date-picker
             v-model="dateRange"
-            type="datetimerange"
+            type="daterange"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             style="width: auto"
-            value-format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD"
+            @change="handleQuery"
           />
         </el-form-item>
         <el-form-item label="基础信息" prop="searchKey">
@@ -68,12 +69,13 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
         <el-form-item>
           <el-button type="primary" icon="SuccessFilled" @click="handleSubmit">确认执行</el-button>
-          <el-button type="primary" plain icon="Printer" @click="resetQuery">打印患者卡</el-button>
+          <!-- <el-button type="primary" plain icon="Printer" @click="resetQuery">打印患者卡</el-button> -->
           <el-button type="primary" plain icon="Printer" @click="printLabel">打印瓶签</el-button>
-          <el-button type="primary" plain icon="Printer" @click="printbloodLabel"
-            >打印采血条码</el-button
-          >
-          <el-button type="primary" plain icon="Printer" @click="resetQuery">打印输液单</el-button>
+          <!-- <el-button type="primary" plain icon="Printer" @click="printbloodLabel"> -->
+          <!-- 打印采血条码 -->
+          <!-- </el-button> -->
+          <!-- <el-button type="primary" plain icon="Printer" @click="resetQuery">打印输液单</el-button> -->
+          <el-button type="primary" plain @click="geiAdviceList">查看医嘱</el-button>
         </el-form-item>
       </el-form>
       <div>
@@ -89,11 +91,11 @@
           ref="tableRef"
         >
           <el-table-column type="selection" width="55" align="center" />
-          <!-- <el-table-column label="组" width="50">
+          <el-table-column label="组" width="50">
             <template #default="scope">
               <span>{{ markers[scope.$index] }}</span>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <!-- <el-table-column prop="groupId" label="组" width="60" /> -->
           <el-table-column prop="busNo" label="编码" align="center" />
           <el-table-column prop="serviceName" label="项目" align="center" />
@@ -156,6 +158,7 @@
         </el-table>
       </div>
     </div>
+    <AdviceListDialog :open="open" :adviceList="adviceList" @close="open = false" />
   </div>
 </template>
 
@@ -170,8 +173,10 @@ import {
   getBottleLabel,
   cancelPerform,
   init,
+  getAdvice,
 } from './component/api';
-import { formatDate } from '@/utils/index';
+import AdviceListDialog from './component/adviceListDialog.vue';
+import { formatDate, formatDateStr } from '@/utils/index';
 
 const showSearch = ref(true);
 const total = ref(1);
@@ -181,7 +186,10 @@ const tableRef = ref(null);
 const selectedGroupIds = ref(new Set());
 
 const currentRow = ref(null);
-const dateRange = ref([]);
+const dateRange = ref([
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+]);
 const dateRangeRight = ref([]);
 const historyRecordsList = ref([]);
 const patientList = ref([]);
@@ -190,9 +198,11 @@ const timeRightStart = ref([]);
 const timeRightEnd = ref([]);
 const statusOptions = ref([]);
 const recordRow = ref({}); // 待执行点击行
-
+const encounterId = ref('');
 const groupColors = ['#C6E2FF', '#FFFFFF'];
 const markers = ref([]);
+const adviceList = ref([]);
+const open = ref(false);
 
 const { proxy } = getCurrentInstance();
 
@@ -215,7 +225,15 @@ function initOptions() {
 
 /** 查询门诊输液列表 */
 function getList() {
+  if (dateRange.value) {
+    queryParams.value.createTimeSTime = dateRange.value[0] + ' 00:00:00';
+    queryParams.value.createTimeETime = dateRange.value[1] + ' 23:59:59';
+  } else {
+    queryParams.value.createTimeSTime = null;
+    queryParams.value.createTimeETime = null;
+  }
   listPatients(queryParams.value).then((response) => {
+    total.value = response.data.total;
     patientList.value = response.data.records;
   });
 }
@@ -231,17 +249,8 @@ function updateTableRowStyles() {
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  if (dateRange.value) {
-    queryParams.value.createTimeSTime = dateRange.value[0];
-    queryParams.value.createTimeETime = dateRange.value[1];
-  } else {
-    queryParams.value.createTimeSTime = null;
-    queryParams.value.createTimeETime = null;
-  }
   queryParams.value.pageNo = 1;
-  listPatients(queryParams.value).then((response) => {
-    patientList.value = response.data.records;
-  });
+  getList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -272,10 +281,11 @@ async function printLabel() {
   };
   // 将对象转换为 JSON 字符串
   let jsonString = JSON.stringify(result, null, 2);
-  await window.chrome.webview.hostObjects.CSharpAccessor.PrintReport(
-    '输液瓶贴.grf',
-    jsonString
-  )
+  console.log(jsonString, '瓶贴');
+
+  await CefSharp.BindObjectAsync('boundAsync');
+  await boundAsync
+    .printReport('输液瓶贴.grf', jsonString)
     .then((response) => {
       //返回结果是jsonString，可判断其调用是否成功
       console.log(response, 'response');
@@ -312,7 +322,9 @@ async function printbloodLabel() {
   // 将对象转换为 JSON 字符串
   let jsonString = JSON.stringify(result, null, 2);
   console.log(jsonString, 'jsonstring');
-  await window.chrome.webview.hostObjects.CSharpAccessor.PrintReport('采血条码.grf', jsonString)
+  await CefSharp.BindObjectAsync('boundAsync');
+  await boundAsync
+    .printReport('采血条码.grf', jsonString)
     .then((response) => {
       //返回结果是jsonString，可判断其调用是否成功
       console.log(response, 'response');
@@ -342,6 +354,17 @@ function handleRowClick(row) {
   });
 }
 
+function geiAdviceList() {
+  if (!encounterId.value) {
+    proxy.$modal.msgWarning('请先选择患者');
+    return;
+  }
+  open.value = true;
+  getAdvice({ encounterId: encounterId.value }).then((res) => {
+    adviceList.value = res.data;
+  });
+}
+
 function getRowMarkers(groupCounts, data) {
   const markers = new Array(data.length).fill('');
 
@@ -401,7 +424,7 @@ function handleSubmit() {
   // }
   updateInfusionRecord(itemsList).then((response) => {
     proxy.$modal.msgSuccess('执行成功');
-    clearSelections();
+    // clearSelections();
   });
 }
 
@@ -446,22 +469,24 @@ function clearSelections() {
 function handleCurrentChange(row) {
   currentRow.value = row; // 更新当前选中行的数据
   console.log(row, '123123');
-
-  listInfusionRecord({ encounterId: row.encounterId, serviceStatus: row.serviceStatus }).then((response) => {
-    console.log('Full response1:', response);
-    infusionList.value = response.data.records;
-    // 为每个 groupId 分配固定颜色
-    response.data.records.forEach((item) => {
-      const colorIndex = item.groupId % 2; // 奇偶性决定颜色索引
-      item.color = groupColors[colorIndex];
-    });
-    // 更新表格行的样式
-    updateTableRowStyles();
-    // 统计每个 groupId 的行数
-    const groupCounts = countGroupRows(infusionList.value);
-    // 设置每行的标记
-    markers.value = getRowMarkers(groupCounts, infusionList.value);
-  });
+  listInfusionRecord({ encounterId: row.encounterId, serviceStatus: row.serviceStatus }).then(
+    (response) => {
+      encounterId.value = row.encounterId;
+      console.log('Full response1:', response);
+      infusionList.value = response.data.records;
+      // 为每个 groupId 分配固定颜色
+      response.data.records.forEach((item) => {
+        const colorIndex = item.groupId % 2; // 奇偶性决定颜色索引
+        item.color = groupColors[colorIndex];
+      });
+      // 更新表格行的样式
+      updateTableRowStyles();
+      // 统计每个 groupId 的行数
+      const groupCounts = countGroupRows(infusionList.value);
+      // 设置每行的标记
+      markers.value = getRowMarkers(groupCounts, infusionList.value);
+    }
+  );
   historyRecordsList.value = [];
   // listPatientInfusionPerformRecord(currentRow.value.patientId).then((response) => {
   //   historyRecordsList.value = response.data;
diff --git a/vue3/src/views/clinicmanagement/lisPascResult/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/lisPascResult/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/lisPascResult/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/lisPascResult/index.vue
diff --git a/vue3/src/views/clinicmanagement/orderViewPrint/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/orderViewPrint/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/orderViewPrint/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/orderViewPrint/index.vue
diff --git a/vue3/src/views/clinicmanagement/refundNumber/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/refundNumber/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/refundNumber/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/refundNumber/index.vue
diff --git a/vue3/src/views/clinicmanagement/requisition/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/requisition/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/requisition/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/requisition/index.vue
diff --git a/vue3/src/views/clinicmanagement/returnDrug/components/api.js b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/components/api.js
similarity index 100%
rename from vue3/src/views/clinicmanagement/returnDrug/components/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/returnDrug/components/api.js
diff --git a/vue3/src/views/clinicmanagement/returnDrug/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
similarity index 82%
rename from vue3/src/views/clinicmanagement/returnDrug/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
index baff4a78..4de22fcb 100644
--- a/vue3/src/views/clinicmanagement/returnDrug/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
@@ -173,64 +173,12 @@
         </div>
       </div>
     </el-card>
-    <el-dialog
-      title="药品追溯码"
-      v-model="openTraceNo"
-      width="800"
-      append-to-body
-      destroy-on-close
-      :draggable="true"
-      @opened="
-        () => {
-          console.log(123);
-          traceNoTempRef.focus();
-        }
-      "
-    >
-      <!-- <div>
-        <el-input
-          v-model="traceNo"
-          style="width: 260px; margin-right: 20px"
-          @change="handelTraceNo"
-        />
-        <el-button type="warning" plain icon="CircleClose" @click="handleClear">清除</el-button>
-      </div> -->
-      <div>
-        <div style="font-size: 16px">
-          选择追溯码
-          <el-input
-            ref="traceNoTempRef"
-            v-model="traceNoTemp"
-            style="width: 260px; margin-right: 20px"
-            @input="throttledGetList"
-          />
-          <el-button
-            type="warning"
-            plain
-            icon="CircleClose"
-            @click="handleClear"
-            style="float: right"
-          >
-            清除
-          </el-button>
-        </div>
-        <el-input
-          ref="inputRef"
-          v-model="traceNo"
-          type="textarea"
-          :rows="15"
-          disabled
-          @input="throttledGetList"
-          style="width: 100%; margin-top: 10px; margin-right: 20px"
-        />
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submit">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <TraceNoDialog
+      :ypName="ypName"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
   </div>
 </template>
 
@@ -239,6 +187,7 @@ import { getCurrentInstance } from 'vue';
 import { getList, getReturnDrugList, returnDrug, init, itemTraceNo } from './components/api';
 import { formatDateStr } from '@/utils/index';
 import { debounce } from 'lodash-es';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 
 const queryParams = ref({
   pageSize: 50,
@@ -249,7 +198,7 @@ const openTraceNo = ref(false);
 const traceNoList = ref([]);
 const traceNo = ref('');
 const encounterList = ref([]);
-const encounterId = ref();
+const encounterId = ref('');
 const returDrugList = ref([]);
 const selectedMedicines = ref([]);
 const statusOptions = ref([]);
@@ -257,6 +206,9 @@ const dateRange = ref([]);
 const traceNoTemp = ref('');
 const traceNoTempRef = ref();
 const totalAmount = ref(0);
+const openTraceNoDialog = ref(false);
+const ypName = ref('');
+
 const { proxy } = getCurrentInstance();
 getEncounterList();
 function getEncounterList() {
@@ -283,21 +235,14 @@ function handleGetReturnDrugList(row) {
   });
 }
 function handleScan() {
-  openTraceNo.value = true;
-  // traceNo.value = '';
-  // traceNoList.value = [];
-  // document.addEventListener('keydown', function (event) {
-  //   // 检查是否为条码输入
-  //   if (event.key === 'Enter' || event.key === 'Tab') {
-  //     // 某些扫码枪在输入后可能发送Enter或Tab键
-  //     traceNo.value = event.target.value;
-  //     traceNoList.value.push(traceNo.value);
-  //     // 处理条码数据
-  //   }
-  // });
+  openTraceNoDialog.value = true;
 }
-function submit() {
-  itemTraceNo(traceNoList.value).then((res) => {
+function submit(value) {
+  let list = [];
+  if (value) {
+    list = value.split(',');
+  }
+  itemTraceNo(list).then((res) => {
     if (res.code === 200) {
       returDrugList.value.forEach((item, index) => {
         if (res.data[item.itemId] && res.data[item.itemId].split(',') > item.quantity) {
@@ -306,8 +251,7 @@ function submit() {
         }
         returDrugList.value[index].traceNo = res.data[item.itemId];
       });
-      openTraceNo.value = false;
-      traceNoList.value = [];
+      openTraceNoDialog.value = false;
       // proxy.$modal.msgSuccess('退药成功');
       // getReturnDrugList(encounterId.value);
     }
@@ -367,7 +311,13 @@ function handleReturnDrug(row) {
   returnDrug(saveList).then((res) => {
     if (res.code === 200) {
       proxy.$modal.msgSuccess('退药成功');
-      getReturnDrugList(encounterId.value);
+      getEncounterList()
+      getReturnDrugList({
+        encounterId: encounterId.value,
+        refundStatus: queryParams.value.refundEnum,
+      }).then((res) => {
+        returDrugList.value = res.data;
+      });
     }
   });
 }
diff --git a/vue3/src/views/clinicmanagement/skinrecord/component/api.js b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/component/api.js
similarity index 100%
rename from vue3/src/views/clinicmanagement/skinrecord/component/api.js
rename to openhis-ui-vue3/src/views/clinicmanagement/skinrecord/component/api.js
diff --git a/vue3/src/views/clinicmanagement/skinrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/skinrecord/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
diff --git a/vue3/src/views/clinicmanagement/techExecute/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/techExecute/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/techExecute/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/techExecute/index.vue
diff --git a/vue3/src/views/clinicmanagement/techfundApprove/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/techfundApprove/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/techfundApprove/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/techfundApprove/index.vue
diff --git a/vue3/src/views/clinicmanagement/withdrawal/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/withdrawal/index.vue
similarity index 100%
rename from vue3/src/views/clinicmanagement/withdrawal/index.vue
rename to openhis-ui-vue3/src/views/clinicmanagement/withdrawal/index.vue
diff --git a/vue3/src/views/datadictionary/definition/components/definition.js b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js
similarity index 100%
rename from vue3/src/views/datadictionary/definition/components/definition.js
rename to openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js
diff --git a/vue3/src/views/datadictionary/definition/components/edit.vue b/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue
similarity index 100%
rename from vue3/src/views/datadictionary/definition/components/edit.vue
rename to openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue
diff --git a/vue3/src/views/datadictionary/definition/index.vue b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue
similarity index 100%
rename from vue3/src/views/datadictionary/definition/index.vue
rename to openhis-ui-vue3/src/views/datadictionary/definition/index.vue
diff --git a/vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
similarity index 79%
rename from vue3/src/views/doctorstation/components/adviceBaseList.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
index 04b76e8e..4ff0966f 100644
--- a/vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -23,10 +23,23 @@
       <!-- <el-table-column label="剂量单位" align="center" prop="doseUnitCode_dictText" /> -->
       <el-table-column label="注射药品" align="center" prop="injectFlag_enumText" />
       <el-table-column label="皮试" align="center" prop="skinTestFlag_enumText" />
+      <el-table-column label="医保码" align="center" prop="ybNo" />
+      <!-- <el-table-column label="限制使用标志" align="center" prop="useLimitFlag" /> -->
+      <el-table-column
+        label="限制使用范围"
+        align="center"
+        :show-overflow-tooltip="true"
+        prop="useScope"
+      >
+        <template #default="scope">
+          <span v-if="scope.row.useLimitFlag === 1">{{ scope.row.useScope }}</span>
+          <span v-else>{{ '-' }}</span>
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
-      
+
 <script setup>
 import { nextTick } from 'vue';
 import { getAdviceBaseInfo } from './api';
@@ -51,6 +64,7 @@ const currentSelectRow = ref({});
 const queryParams = ref({
   pageSize: 100,
   pageNum: 1,
+  adviceTypes: '1,2,3'
 });
 const adviceBaseList = ref([]);
 // 节流函数
@@ -65,7 +79,10 @@ watch(
   () => props.adviceQueryParams,
   (newValue) => {
     queryParams.value.searchKey = newValue.searchKey;
-    queryParams.value.adviceType = newValue.adviceType;
+    // queryParams.value.adviceType = newValue.adviceType;
+    if(newValue.adviceTyp){
+      queryParams.value.adviceTypes = [newValue.adviceType].join(',');
+    }
     throttledGetList();
   },
   { deep: true }
@@ -75,14 +92,20 @@ getList();
 function getList() {
   queryParams.value.organizationId = props.patientInfo.orgId;
   getAdviceBaseInfo(queryParams.value).then((res) => {
-    adviceBaseList.value = res.data.records;
-    total.value = res.data.total;
-    nextTick(() => {
-      currentIndex.value = 0;
-      if (adviceBaseList.value.length > 0) {
+    if (res.data.records.length > 0) {
+      adviceBaseList.value = res.data.records.filter((item) => {
+        if (item.adviceType == 1 || item.adviceType == 2) {
+          return handleQuantity(item) != 0;
+        } else {
+          return true;
+        }
+      });
+      total.value = res.data.total;
+      nextTick(() => {
+        currentIndex.value = 0;
         adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
-      }
-    });
+      });
+    }
   });
 }
 
@@ -118,7 +141,7 @@ const handleKeyDown = (event) => {
 };
 
 function handleQuantity(row) {
-  if (row.inventoryList) {
+  if (row.inventoryList && row.inventoryList.length > 0) {
     const totalQuantity = row.inventoryList.reduce((sum, item) => sum + (item.quantity || 0), 0);
     return totalQuantity.toString() + row.minUnitCode_dictText;
   }
diff --git a/vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js
similarity index 72%
rename from vue3/src/views/doctorstation/components/api.js
rename to openhis-ui-vue3/src/views/doctorstation/components/api.js
index 73ae04c4..6b78950e 100644
--- a/vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -179,6 +179,17 @@ export function getEncounterDiagnosis(encounterId) {
   })
 }
 
+/**
+ * 
+ * 删除就诊诊断
+ */
+export function delEncounterDiagnosis(conditionId) {
+  return request({
+    url: '/doctor-station/diagnosis/encounter-diagnosis?conditionId=' + conditionId,
+    method: 'delete',
+  })
+}
+
 // 处方相关接口
 /**
  * 获取药品列表
@@ -282,7 +293,14 @@ export function getAllMedicationInfo(queryParams) {
     params: queryParams
   })
 }
-
+// 当返回的list为空时在调用get-allMedicationInfo
+export function getAllMedicationUsualInfo(queryParams) {
+  return request({
+    url: '/doctor-station/elep/get-allMedicationUsualInfo',
+    method: 'get',
+    params: queryParams
+  })
+}
 /**
  * 电子处方下拉框
  */
@@ -467,4 +485,168 @@ export function getTcmSyndrome(params) {
     method: 'get',
     params: params
   })
-}
\ No newline at end of file
+}
+
+/**
+ * 获取本次就诊中医诊断
+ */
+export function getTcmDiagnosis(params) {
+  return request({
+    url: '/doctor-station/chinese-medical/get-tcm-encounter-diagnosis',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 保存中医诊断
+ */
+export function saveTcmDiagnosis(data) {
+  return request({
+    url: '/doctor-station/chinese-medical/save-tcm-diagnosis',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 保存中医医嘱
+ */
+export function saveTcmAdvice(data) {
+  return request({
+    url: '/doctor-station/chinese-medical/save-tcm-advice',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 签发中医医嘱
+ */
+export function signTcmAdvice(data) {
+  return request({
+    url: '/doctor-station/chinese-medical/sign-tcm-advice',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 签退中医医嘱
+ */
+export function signOutTcmAdvice(data) {
+  return request({
+    url: '/doctor-station/chinese-medical/sign-tcm-off',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取本次就诊中医医嘱
+ */
+export function getTcmAdviceList(params) {
+  return request({
+    url: '/doctor-station/chinese-medical/tcm-request-base-info',
+    method: 'get',
+    params: params
+  })
+}
+
+
+/**
+ * 获取预约记录
+ */
+export function getReservationInfo(params) {
+  return request({
+    url: '/doctor-station/reservation-record/reservation-info',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 新增预约记录
+ */
+export function addReservationInfo(data) {
+  return request({
+    url: '/doctor-station/reservation-record/save-reservation',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 修改预约记录
+ */
+export function editReservationInfo(data) {
+  return request({
+    url: '/doctor-station/reservation-record/edit-reservation',
+    method: 'put',
+    data: data
+  })
+}
+
+/**
+ * 删除预约记录
+ */
+export function delReservationInfo(id) {
+  return request({
+    url: '/doctor-station/reservation-record/del-reservation',
+    method: 'delete',
+    params: id
+  })
+}
+
+
+// 查询初期所需数据
+export function getInit() {
+  return request({
+    url: '/charge-manage/register/init',
+    method: 'get'
+  })
+}
+
+
+/**
+ * 获取科室下拉列表
+ */
+export function getOrgList() {
+  return request({
+    url: '/base-data-manage/organization/organization',
+    method: 'get',
+  })
+}
+
+/**
+ * 查询病区下拉列表
+ */
+export function wardList(params) {
+  return request({
+    url: '/app-common/ward-list',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 办理入院
+ */
+export function handleHospitalization(data) {
+  return request({
+    url: '/inhospital-charge/register/by-doctor',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取本次就诊处方单
+ */
+export function getEnPrescriptionInfo(data) {
+  return request({
+    url: '/doctor-station/main/prescription-page-info',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
new file mode 100644
index 00000000..77359f89
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
@@ -0,0 +1,421 @@
+<template>
+  <el-dialog
+    title="添加中医诊断"
+    v-model="props.openAddDiagnosisDialog"
+    width="1500px"
+    append-to-body
+    destroy-on-close
+    @open="handleOpen"
+    @close="close"
+  >
+    <div class="main-content">
+      <!-- 左侧疾病选择区 -->
+      <div class="disease-section">
+        <div class="section-title">诊断</div>
+        <div class="search-box">
+          <el-input v-model="searchDisease" placeholder="搜索疾病名称或编码" clearable>
+            <template #prefix>
+              <el-icon><search /></el-icon>
+            </template>
+          </el-input>
+        </div>
+        <el-table
+          :data="conditionList"
+          max-height="460"
+          @row-click="handleClickRow"
+          highlight-current-row
+        >
+          <el-table-column label="疾病名称" align="center" prop="name"></el-table-column>
+          <el-table-column label="医保编码" align="center" prop="ybNo"></el-table-column>
+        </el-table>
+      </div>
+      <!-- 中间疾病-证型关系区 -->
+      <div class="syndrome-section">
+        <div class="section-title">证候</div>
+        <div class="search-box">
+          <el-input v-model="searchDisease" placeholder="搜索疾病名称或编码" clearable>
+            <template #prefix>
+              <el-icon><search /></el-icon>
+            </template>
+          </el-input>
+        </div>
+        <div v-if="selectedDisease">
+          <el-table
+            :data="syndromeList"
+            max-height="460"
+            @row-click="clickSyndromeRow"
+            highlight-current-row
+          >
+            <el-table-column label="证候名称" align="center" prop="name"></el-table-column>
+            <el-table-column label="医保编码" align="center" prop="ybNo"></el-table-column>
+          </el-table>
+        </div>
+
+        <div class="empty-state" v-else>
+          <el-empty description="请从左侧选择疾病" />
+        </div>
+      </div>
+
+      <!-- 右侧诊断详情区 -->
+      <div class="diagnosis-section">
+        <div class="section-title">诊断详情</div>
+        <div class="diagnosis-list">
+          <div v-for="(item, index) in tcmDiagonsisList" :key="index" class="history-item">
+            <div class="history-diagnosis">
+              <div>
+                <strong>{{ item.conditionName }}</strong> - {{ item.syndromeName }}
+              </div>
+              <el-button
+                size="small"
+                type="danger"
+                plain
+                icon="close"
+                @click="removeDiagnosis(item, index)"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+import {
+  getTcmCondition,
+  getTcmSyndrome,
+  saveTcmDiagnosis,
+} from '@/views/doctorstation/components/api';
+
+const props = defineProps({
+  openAddDiagnosisDialog: {
+    type: Boolean,
+    default: false,
+  },
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+});
+
+const conditionList = ref([]);
+const syndromeList = ref([]);
+const tcmDiagonsisList = ref([]);
+const tcmDiagonsisSaveList = ref([]);
+const syndromeSelected = ref(false); // 当前诊断是否选择对应证候
+const timestamp = ref('');
+const selectedDisease = ref(false);
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(['close']);
+
+function handleOpen() {
+  getTcmCondition().then((res) => {
+    conditionList.value = res.data.records;
+  });
+}
+
+// 点击诊断列表处理，点击以后才显示证候列表
+function handleClickRow(row) {
+  if (syndromeSelected.value || tcmDiagonsisList.value == 0) {
+    selectedDisease.value = true;
+    syndromeSelected.value = false;
+    timestamp.value = Date.now();
+    getTcmSyndrome().then((res) => {
+      syndromeList.value = res.data.records;
+    });
+    tcmDiagonsisSaveList.value.push({
+      definitionId: row.id,
+      ybNo: row.ybNo,
+      syndromeGroupNo: timestamp.value,
+      verificationStatusEnum: 4,
+      medTypeCode: '11',
+    });
+    tcmDiagonsisList.value.push({
+      conditionName: row.name,
+      syndromeGroupNo: timestamp.value,
+    });
+  }
+}
+
+function clickSyndromeRow(row) {
+  tcmDiagonsisSaveList.value.push({
+    definitionId: row.id,
+    ybNo: row.ybNo,
+    syndromeGroupNo: timestamp.value,
+  });
+  tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
+  syndromeSelected.value = true;
+}
+
+// 删除诊断
+function removeDiagnosis(row, index) {
+  tcmDiagonsisList.value.splice(index, 1);
+  tcmDiagonsisSaveList.value = tcmDiagonsisSaveList.filter((item) => {
+    return item.syndromeGroupNo !== row.syndromeGroupNo;
+  });
+}
+
+function save() {
+  saveTcmDiagnosis({
+    patientId: props.patientInfo.patientId,
+    encounterId: props.patientInfo.encounterId,
+    diagnosisChildList: tcmDiagonsisSaveList.value,
+  }).then((res) => {
+    if (res.code == 200) {
+      emit('close');
+      proxy.$modal.msgSuccess('诊断已保存');
+    }
+  });
+}
+
+function submit() {
+  if (tcmDiagonsisSaveList.value.length > 0 && syndromeSelected.value) {
+    save();
+  } else {
+    proxy.$modal.msgWarning('请选择证候');
+  }
+}
+function close() {
+  emit('close');
+}
+</script>
+
+<style scoped>
+:deep(.pagination-container .el-pagination) {
+  right: 20px !important;
+}
+
+.app-container {
+  max-width: 1400px;
+  margin: 20px auto;
+  padding: 20px;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 2px 20px rgba(0, 0, 0, 0.08);
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 15px;
+  border-bottom: 1px solid var(--el-border-color);
+  margin-bottom: 20px;
+}
+
+.header h1 {
+  color: var(--el-color-primary);
+  font-size: 24px;
+  font-weight: 600;
+}
+
+.patient-info {
+  background: var(--el-color-primary-light-9);
+  padding: 15px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+}
+
+.patient-info .info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.patient-info .info-label {
+  width: 100px;
+  color: var(--el-text-color-secondary);
+  font-weight: 500;
+}
+
+.main-content {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1.2fr;
+  gap: 20px;
+  margin-bottom: 25px;
+}
+
+.disease-section,
+.syndrome-section,
+.diagnosis-section {
+  border: 1px solid var(--el-border-color);
+  border-radius: 8px;
+  padding: 20px;
+  background: white;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.section-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: var(--el-color-primary);
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid var(--el-border-color);
+}
+
+.disease-list {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.disease-item {
+  padding: 12px 15px;
+  border-bottom: 1px solid var(--el-border-color-lighter);
+  cursor: pointer;
+  transition: all 0.3s;
+  border-radius: 4px;
+}
+
+.disease-item:hover {
+  background-color: var(--el-color-primary-light-9);
+}
+
+.disease-item.active {
+  background-color: var(--el-color-primary-light-8);
+  border-left: 3px solid var(--el-color-primary);
+}
+
+.disease-name {
+  font-weight: 500;
+  margin-bottom: 5px;
+}
+
+.disease-code {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
+.search-box {
+  margin-bottom: 15px;
+}
+
+.disease-categories {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+
+.category-tag {
+  cursor: pointer;
+  padding: 5px 12px;
+  border-radius: 15px;
+  background: var(--el-fill-color-light);
+  font-size: 13px;
+  transition: all 0.3s;
+}
+
+.category-tag.active {
+  background: var(--el-color-primary);
+  color: white;
+}
+
+.relation-container {
+  text-align: center;
+  padding: 30px 0;
+  border: 2px dashed var(--el-border-color);
+  border-radius: 8px;
+  margin: 20px 0;
+  background: var(--el-fill-color-lighter);
+}
+
+.relation-icon {
+  margin-bottom: 15px;
+  color: var(--el-color-primary);
+}
+
+.relation-text {
+  font-size: 18px;
+  font-weight: 500;
+  color: var(--el-text-color-primary);
+}
+
+.syndrome-details {
+  padding: 15px;
+  background: var(--el-color-primary-light-9);
+  border-radius: 8px;
+  border: 1px solid var(--el-color-primary-light-5);
+}
+
+.detail-item {
+  margin-bottom: 12px;
+}
+
+.detail-label {
+  font-weight: 500;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 3px;
+}
+
+.actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 15px;
+  padding-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+}
+
+.empty-state {
+  text-align: center;
+  padding: 40px 0;
+  color: var(--el-text-color-secondary);
+}
+
+.diagnosis-history {
+  margin-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+  padding-top: 20px;
+}
+
+.history-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin-bottom: 12px;
+  color: var(--el-text-color-primary);
+}
+
+.history-item {
+  padding: 12px;
+  border-left: 3px solid var(--el-border-color);
+  margin-bottom: 10px;
+  background: var(--el-fill-color-lighter);
+  border-radius: 0 4px 4px 0;
+}
+
+.diagnosis-list {
+  max-height: 520px;
+  overflow-y: auto;
+}
+
+.history-date {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 5px;
+}
+
+.history-diagnosis {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  margin-bottom: 5px;
+}
+
+.history-note {
+  font-size: 13px;
+  color: var(--el-text-color-secondary);
+  padding-top: 5px;
+  border-top: 1px dashed var(--el-border-color);
+  margin-top: 5px;
+}
+
+.empty-list {
+  padding: 20px 0;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/doctorstation/components/diagnosis.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
similarity index 88%
rename from vue3/src/views/doctorstation/components/diagnosis.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
index 29dba44f..f9dc3c1c 100644
--- a/vue3/src/views/doctorstation/components/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -69,6 +69,7 @@
         <div style="margin-bottom: 10px">
           <el-button type="primary" plain @click="handleAddDiagnosis()"> 新增诊断 </el-button>
           <el-button type="primary" plain @click="handleSaveDiagnosis()"> 保存诊断 </el-button>
+          <el-button type="primary" plain @click="handleAddTcmDiagonsis()"> 中医诊断 </el-button>
           <el-button type="primary" plain @click="handleImport()"> 导入慢性病诊断 </el-button>
         </div>
 
@@ -134,7 +135,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="医保码" align="center" prop="ybNo" />
+            <el-table-column label="医保码" align="center" prop="ybNo" width="180" />
             <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
               <template #default="scope">
                 <el-checkbox
@@ -161,9 +162,13 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column label="操作" align="center" width="130">
               <template #default="scope">
-                <el-button link type="primary" @click="handleDeleteDiagnosis(scope.$index)">
+                <el-button
+                  link
+                  type="primary"
+                  @click="handleDeleteDiagnosis(scope.row, scope.$index)"
+                >
                   删除
                 </el-button>
               </template>
@@ -177,6 +182,11 @@
       @close="closeDiagnosisDialog"
       :radio="orgOrUser"
     />
+    <AddDiagnosisDialog
+      :openAddDiagnosisDialog="openAddDiagnosisDialog"
+      :patientInfo="props.patientInfo"
+      @close="closeDiagnosisDialog"
+    />
   </div>
 </template>
 
@@ -190,13 +200,17 @@ import {
   getEncounterDiagnosis,
   getEmrDetail,
   getChronicDisease,
-} from './api';
-import diagnosisdialog from './diagnosisdialog.vue';
-import diagnosislist from './diagnosislist.vue';
+  getTcmDiagnosis,
+  delEncounterDiagnosis,
+} from '../api';
+import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
+import AddDiagnosisDialog from './addDiagnosisDialog.vue';
+import diagnosislist from '../diagnosis/diagnosislist.vue';
 // const diagnosisList = ref([]);
 const allowAdd = ref(false);
 const tree = ref([]);
 const openDiagnosis = ref(false);
+const openAddDiagnosisDialog = ref(false);
 const diagnosisSearchkey = ref('');
 const diagnosisOptions = ref([]);
 const rowIndex = ref();
@@ -242,7 +256,21 @@ function getList() {
       console.log(form.value.diagnosisList);
     }
   });
-
+  getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
+    if (res.code == 200) {
+      if (res.data.illness.length > 0) {
+        res.data.illness.forEach((item, index) => {
+          form.value.diagnosisList.push({
+            name: item.name + '-' + res.data.symptom[index].name,
+            ybNo: item.ybNo,
+            medTypeCode: item.medTypeCode,
+          });
+        });
+      }
+      emits('diagnosisSave', false);
+      console.log(form.value.diagnosisList);
+    }
+  });
   getTree();
 }
 
@@ -268,6 +296,8 @@ function handleImport() {
               verificationStatusEnum: 4,
               definitionId: item.id,
               diagSrtNo: form.value.diagnosisList.length + 1,
+              iptDiseTypeCode: 2,
+              diagnosisDesc: '',
             },
           });
         });
@@ -343,7 +373,7 @@ function getTree() {
 }
 
 /**
- * 添加诊断
+ * 添加西医诊断
  */
 function handleAddDiagnosis() {
   proxy.$refs.formRef.validate((valid) => {
@@ -356,7 +386,10 @@ function handleAddDiagnosis() {
         showPopover: false,
         name: undefined,
         verificationStatusEnum: 4,
+        medTypeCode: '11',
         diagSrtNo: form.value.diagnosisList.length + 1,
+        iptDiseTypeCode: 2,
+        diagnosisDesc: '',
       });
       if (form.value.diagnosisList.length == 1) {
         form.value.diagnosisList[0].maindiseFlag = 1;
@@ -365,11 +398,23 @@ function handleAddDiagnosis() {
   });
 }
 
+// 添加中医诊断
+function handleAddTcmDiagonsis() {
+  openAddDiagnosisDialog.value = true;
+}
+
 /**
  * 删除诊断
  */
-function handleDeleteDiagnosis(index) {
-  form.value.diagnosisList.splice(index, 1);
+function handleDeleteDiagnosis(row, index) {
+  if (row.conditionId) {
+    delEncounterDiagnosis(row.conditionId).then(() => {
+      getList();
+      getTree();
+    });
+  } else {
+    form.value.diagnosisList.splice(index, 1);
+  }
 }
 
 function handleMaindise(value, index) {
@@ -407,6 +452,7 @@ function handleSaveDiagnosis() {
         }).then((res) => {
           if (res.code == 200) {
             getTree();
+            getList();
             emits('diagnosisSave', false);
             proxy.$modal.msgSuccess('诊断已保存');
           }
@@ -423,6 +469,8 @@ function closeDiagnosisDialog(str) {
   if (str === 'success') {
     proxy.$modal.msgSuccess('操作成功');
   }
+
+  openAddDiagnosisDialog.value = false;
   openDiagnosis.value = false;
   getTree();
 }
@@ -473,7 +521,9 @@ function handleNodeClick(data) {
     ybNo: data.ybNo,
     name: data.name,
     verificationStatusEnum: 4,
-    definitionId: data.id,
+    medTypeCode: '11',
+    diagSrtNo: form.value.diagnosisList.length + 1,
+    definitionId: data.definitionId,
   });
   if (form.value.diagnosisList.length == 1) {
     form.value.diagnosisList[0].maindiseFlag = 1;
diff --git a/vue3/src/views/doctorstation/components/diagnosisdialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosisdialog.vue
similarity index 99%
rename from vue3/src/views/doctorstation/components/diagnosisdialog.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosisdialog.vue
index 14b109c0..058f581a 100644
--- a/vue3/src/views/doctorstation/components/diagnosisdialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosisdialog.vue
@@ -61,7 +61,7 @@
   
 <script setup>
 import { computed } from "vue";
-import { getDiagnosisDefinitionList, saveDiagnosisBind } from "./api";
+import { getDiagnosisDefinitionList, saveDiagnosisBind } from "../api";
 
 const radio = ref(1);
 const props = defineProps({
diff --git a/vue3/src/views/doctorstation/components/diagnosislist.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosislist.vue
similarity index 87%
rename from vue3/src/views/doctorstation/components/diagnosislist.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosislist.vue
index bf47a865..830c742b 100644
--- a/vue3/src/views/doctorstation/components/diagnosislist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosislist.vue
@@ -9,12 +9,13 @@
     >
       <el-table-column label="诊断名称" align="center" prop="name" />
       <el-table-column label="医保编码" align="center" prop="ybNo" />
+      <el-table-column label="诊断类型" align="center" prop="typeName" width="180"/>
     </el-table>
   </div>
 </template>
     
 <script setup>
-import { getDiagnosisDefinitionList } from './api';
+import { getDiagnosisDefinitionList } from '../api';
 
 const props = defineProps({
   diagnosisSearchkey: {
@@ -27,6 +28,7 @@ const total = ref(0);
 const queryParams = ref({
   pageSize: 1000,
   pageNo: 1,
+  // typeCode: 1,
 });
 const diagnosisDefinitionList = ref([]);
 
diff --git a/vue3/src/views/doctorstation/components/emr.vue b/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue
similarity index 96%
rename from vue3/src/views/doctorstation/components/emr.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue
index f34633d3..66b45843 100644
--- a/vue3/src/views/doctorstation/components/emr.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue
@@ -14,7 +14,7 @@
       打印病历
     </el-button> -->
   </div>
-  <div style="height: 650px; overflow-y: auto; overflow-x: hidden">
+  <div style="max-height: 650px; overflow-y: auto; overflow-x: hidden">
     <el-form ref="emrRef" :model="form" :rules="rules" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="6">
@@ -116,7 +116,7 @@
       <el-form-item label="既往史" prop="pastMedicalHistory">
         <el-input v-model="form.pastMedicalHistory" type="textarea" :rows="2" placeholder="" />
       </el-form-item>
-      <el-form-item label="月经史" prop="menstrualHistory">
+      <el-form-item label="个人史" prop="menstrualHistory">
         <el-input v-model="form.menstrualHistory" type="textarea" :rows="2" placeholder="" />
       </el-form-item>
       <el-form-item label="过敏史" prop="allergyHistory">
@@ -164,9 +164,9 @@
 </template>
 
 <script setup>
-import { saveEmr, getEmrDetail, saveEmrTemplate } from './api';
-import emrTemplate from './emrtemplate.vue';
-import emrhistory from './emrhistory.vue';
+import { saveEmr, getEmrDetail, saveEmrTemplate } from '../api';
+import emrTemplate from '../emr/emrtemplate.vue';
+import emrhistory from '../emr/emrhistory.vue';
 
 const form = ref({});
 const emrTitle = ref('');
diff --git a/vue3/src/views/doctorstation/components/emrhistory.vue b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrhistory.vue
similarity index 93%
rename from vue3/src/views/doctorstation/components/emrhistory.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/emr/emrhistory.vue
index d7ef1834..ab3a6f8f 100644
--- a/vue3/src/views/doctorstation/components/emrhistory.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrhistory.vue
@@ -16,7 +16,7 @@
     >
       <!-- @cell-click="clickRow" -->
       <el-table-column type="selection" width="55" />
-      <el-table-column label="主诉" align="left" prop="name" width="460"  :show-overflow-tooltip="true"/>
+      <el-table-column label="主诉" align="left" prop="name"  :show-overflow-tooltip="true"/>
       <el-table-column label="时间" align="center" prop="createTime" width="180"  :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" width="80">
         <template #default="scope">
@@ -42,7 +42,7 @@
 
 <script setup>
 import { formatDate, formatDateymd } from '@/utils/index';
-import { getEmrHistoryList } from './api';
+import { getEmrHistoryList } from '../api';
 const queryParams = ref({
   pageNum: 1,
   pageSize: 10,
diff --git a/vue3/src/views/doctorstation/components/emrtemplate.vue b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
similarity index 96%
rename from vue3/src/views/doctorstation/components/emrtemplate.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
index 2644c91f..9d9498a2 100644
--- a/vue3/src/views/doctorstation/components/emrtemplate.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
@@ -28,7 +28,7 @@
 </template>
   
 <script setup>
-import { getEmrTemplateList, deleteEmrTemplate } from "./api";
+import { getEmrTemplateList, deleteEmrTemplate } from "../api";
 
 const queryParams = ref({});
 const emrTemplate = ref([]);
diff --git a/vue3/src/views/doctorstation/components/eprescriptiondialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
similarity index 84%
rename from vue3/src/views/doctorstation/components/eprescriptiondialog.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
index d0167197..4dfb6ab1 100644
--- a/vue3/src/views/doctorstation/components/eprescriptiondialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
@@ -5,6 +5,7 @@
     width="1840px"
     append-to-body
     destroy-on-close
+    @open="open"
     @close="close"
   >
     <div>
@@ -67,10 +68,19 @@
           <el-col :span="12">
             <el-form-item label="有效天数：" prop="validityDays" label-width="100px">
               <el-input-number
-                :min="0"
+                :min="1"
+                :max="3"
                 controls-position="right"
                 :controls="false"
                 v-model.number="infoForm.validityDays"
+                @input="
+                  (value) => {
+                    if (value > 3) {
+                      infoForm.validityDays = 3;
+                      proxy.$modal.msgWarning('电子处方有效天数最多3天');
+                    }
+                  }
+                "
                 clearable
                 style="width: 260px"
                 :disabled="title == '查看处方'"
@@ -78,6 +88,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="诊断：" prop="conditionId" label-width="100px">
+              <el-select
+                v-model="conditionId"
+                placeholder="诊断"
+                style="width: 180px"
+                :disabled="title == '查看处方'"
+              >
+                <el-option
+                  v-for="item in diagnosisList"
+                  :key="item.conditionId"
+                  :label="item.name"
+                  :value="item.conditionId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
             <el-form-item label="延长原因：" prop="extensionReason" label-width="100px">
               <el-input
                 v-model="form.extensionReason"
@@ -86,7 +113,7 @@
                 :disabled="title == '查看处方'"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
       <el-form :model="form" ref="formRef" :rules="rowRules">
@@ -174,17 +201,35 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="剂量单位" align="center" prop="medDosageUnitCode" width="80">
+          <el-table-column label="剂量单位" align="center" prop="medDosageUnitCode" width="150">
             <template #default="scope">
-              <el-form-item :prop="`medicationInfoList.${scope.$index}.dose`">
-                <span v-if="!scope.row.isEdit">
-                  {{ scope.row.medDosageUnitCode }}
-                </span>
+              <el-form-item :prop="`medicationInfoList.${scope.$index}.dose`" style="width: 100%">
+                <!-- <span v-if="!scope.row.isEdit"> -->
+                <el-select
+                  v-model="scope.row.medDosageUnitCode"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                  :disabled="!scope.row.isEdit"
+                  @change="
+                    (value) => {
+                      scope.row.unitCode = value;
+                    }
+                  "
+                >
+                  <el-option
+                    v-for="item in unit_code"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.label"
+                  />
+                </el-select>
+                <!-- </span> -->
                 <!-- <el-select v-else v-model="scope.row.medDosageUnitCode" clearable disabled>
                   <el-option v-for="category in unit_code" :key="category.value" :label="category.label"
                     :value="category.value" />
                 </el-select> -->
-                <el-input v-else v-model="scope.row.medDosageUnitCode" placeholder="" disabled />
+                <!-- <el-input v-else v-model="scope.row.medDosageUnitCode" placeholder="" disabled /> -->
               </el-form-item>
             </template>
           </el-table-column>
@@ -195,16 +240,7 @@
                 :rules="rowRules.medFrequency"
               >
                 <span v-if="!scope.row.isEdit" style="text-align: right">
-                  {{
-                    scope.row.medFrequency_dictText
-                      ? scope.row.medFrequency_dictText +
-                        ' ' +
-                        scope.row.dispensePerDuration +
-                        '天' +
-                        ' ' +
-                        scope.row.medRoute_dictText
-                      : ''
-                  }}
+                  {{ scope.row.medFrequency_dictText ? scope.row.medFrequency_dictText : '' }}
                 </span>
                 <el-select v-else v-model="scope.row.medFrequency" clearable style="width: 200px">
                   <el-option
@@ -237,7 +273,7 @@
                   format="YYYY-MM-DD HH:mm:ss"
                   value-format="YYYY-MM-DD HH:mm:ss"
                   style="width: 90%"
-                  @input="calculateEndDate(scope.$index)"
+                  @change="calculateEndDate(scope.$index)"
                 />
               </el-form-item>
             </template>
@@ -296,7 +332,7 @@
                 </span>
                 <el-select v-else v-model="scope.row.medRoute" clearable style="width: 110px">
                   <el-option
-                    v-for="dict in method_code"
+                    v-for="dict in drug_medc_way_code"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -318,17 +354,26 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="单位" align="center" prop="unitCode" width="80">
+          <el-table-column label="单位" align="center" prop="medDosageUnitCode" width="150">
             <template #default="scope">
-              <el-form-item :prop="`medicationInfoList.${scope.$index}.dose`">
-                <span v-if="!scope.row.isEdit">
-                  {{ scope.row.unitCode }}
-                </span>
-                <!-- <el-select v-else v-model="scope.row.medDosageUnitCode" clearable disabled>
-                  <el-option v-for="category in unit_code" :key="category.value" :label="category.label"
-                    :value="category.value" />
-                </el-select> -->
-                <el-input v-else v-model="scope.row.unitCode" placeholder="" disabled />
+              <el-form-item
+                :prop="`medicationInfoList.${scope.$index}.unitCode`"
+                style="width: 100%"
+              >
+                <el-select
+                  v-model="scope.row.unitCode"
+                  clearable
+                  style="width: 100%"
+                  filterable
+                  :disabled="!scope.row.isEdit"
+                >
+                  <el-option
+                    v-for="item in unit_code"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.label"
+                  />
+                </el-select>
               </el-form-item>
             </template>
           </el-table-column>
@@ -350,20 +395,22 @@
 <script setup>
 import { computed } from 'vue';
 // import { calculateQuantityByDays, formatNumber } from '@/utils/his';
-import { ref, nextTick, reactive, getCurrentInstance, defineProps, defineEmits } from 'vue';
+import { reactive } from 'vue';
 // import { useModal, useDict } from '@/hooks';
 import { parseTime, formatNumber } from '@/utils/his';
 import { queryYbCatalogue } from './api';
+import { debounce } from 'lodash-es';
 
 import {
   prescriptionNoInit,
   savePrescriptionInfo,
   getOrgTree,
   updatePrescriptionInfo,
+  getEncounterDiagnosis,
   deletePrescriptionInfo,
   getMedicationInfo,
 } from './api';
-import prescriptionMedicineList from './prescriptionMedicineList';
+import prescriptionMedicineList from './prescription/prescriptionMedicineList';
 const { proxy } = getCurrentInstance();
 const radio = ref(1);
 const props = defineProps({
@@ -392,12 +439,14 @@ const props = defineProps({
     required: true,
   },
 });
-const { method_code, unit_code, elep_rate_code, distribution_category_code } = proxy.useDict(
-  'method_code',
-  'unit_code',
-  'elep_rate_code',
-  'distribution_category_code'
-);
+const { method_code, unit_code, elep_rate_code, distribution_category_code, drug_medc_way_code } =
+  proxy.useDict(
+    'method_code',
+    'unit_code',
+    'elep_rate_code',
+    'drug_medc_way_code',
+    'distribution_category_code'
+  );
 const ids = ref([]); // 存储选择的药品信息行数据
 const selectData = ref([]); // 存储选择的药品信息行数据
 const single = ref(true);
@@ -410,7 +459,9 @@ const queryParams = ref({
 });
 const rowIndex = ref(-1);
 const medicineSearchKey = ref('');
+const conditionId = ref(undefined);
 const selectRow = ref({});
+const diagnosisList = ref([]);
 const prescriptionTypeList = ref([]);
 const form = reactive({
   medicationInfoList: [],
@@ -421,7 +472,7 @@ const infoForm = reactive({
   encounterId: '', // 就诊id
   prescriptionNo: '', // 处方号
   rxTypeCode: 1, // 处方类型编码
-  validityDays: 0, // 有效天数
+  validityDays: 1, // 有效天数
   extensionReason: '', // 延长原因
 });
 const formRef = ref(null);
@@ -473,6 +524,11 @@ const unitMap = ref({
   unit: 'unit',
 });
 
+function open() {
+  conditionId.value = props.prescriptionData.conditionId;
+  getDiagnosisInfo();
+}
+
 /**
  * 取得处方号
  */
@@ -502,6 +558,19 @@ function getPrescriptionNoInit() {
   form.medicationInfoList = props.medicationInfo;
 }
 
+function getDiagnosisInfo() {
+  getEncounterDiagnosis(props.patient.encounterId).then((res) => {
+    diagnosisList.value = res.data;
+    let diagnosisInfo = diagnosisList.value.filter((item) => {
+      return item.maindiseFlag == 1;
+    });
+    diagnosisInfo.value = diagnosisInfo[0];
+    if (title.value === '新增处方') {
+      conditionId.value = diagnosisInfo[0].conditionId;
+    }
+  });
+}
+
 /**
  * 计算用药信息的结束日期
  *
@@ -583,8 +652,10 @@ function selectMedRow(key, row, index) {
   form.medicationInfoList[rowIndex.value] = data;
   form.medicationInfoList[rowIndex.value].medicationId = row.medicalCatalogCode;
   form.medicationInfoList[rowIndex.value].medicationName = row.registeredName;
-  form.medicationInfoList[rowIndex.value].unitCode = row.minPackageUnit;
+  // form.medicationInfoList[rowIndex.value].unitCode = row.minPackageUnit;
   form.medicationInfoList[rowIndex.value].medDosageUnitCode = row.minPreparationUnit;
+  form.medicationInfoList[rowIndex.value].unitCode = row.minPreparationUnit;
+  form.medicationInfoList[rowIndex.value].version = row.version;
   proxy.$nextTick(() => {
     form.medicationInfoList[rowIndex.value].showPopover = false;
     const param = {
@@ -603,7 +674,20 @@ function selectMedRow(key, row, index) {
       });
       //debugger
       if (item.length > 0) {
-        form.medicationInfoList[rowIndex.value].rxTypeCode = item[0].medChrgitmType;
+        if (item[0].medChrgitmType != '11' && item[0].medChrgitmType != '09') {
+          form.medicationInfoList.shift();
+          proxy.$modal.msgWarning('请选择西药或中成药');
+        } else {
+          if (item[0].medChrgitmType == '11') {
+            form.medicationInfoList[rowIndex.value].rxItemTypeCode = 12;
+          } else if (item[0].medChrgitmType == '09') {
+            form.medicationInfoList[rowIndex.value].rxItemTypeCode = 11;
+          }
+          form.medicationInfoList[rowIndex.value].rxTypeCode = 1;
+        }
+      } else {
+        form.medicationInfoList.shift();
+        proxy.$modal.msgWarning('此药品已停供');
       }
       console.log(res, 'queryYbCatalogue医保目录信息查询');
       // 处方类别为医保信息的医疗收费项目类别
@@ -645,10 +729,12 @@ function submit() {
     console.log('失败字段:', fields);
     if (valid) {
       console.log(' 新增处方updateParam');
+      console.log(form.medicationInfoList);
       const updateParam = {
         patientId: infoForm.patientId,
         encounterId: infoForm.encounterId,
         prescriptionNo: infoForm.prescriptionNo,
+        conditionId: conditionId.value,
         // rxTypeCode: infoForm.rxTypeCode,
         validityDays: infoForm.validityDays,
         extensionReason: infoForm.extensionReason,
@@ -748,6 +834,7 @@ function deletePrescription(index) {
       getMedicationInfo(queryMedicationParams.value).then((response) => {
         console.log('shanchuhouchaxun', response);
         form.medicationInfoList = response.data.records;
+        infoForm.conditionId = form.medicationInfoList[0].conditionId;
         form.medicationInfoList.forEach((medicationInfo) => {
           medicationInfo.isEdit = false;
         });
@@ -773,7 +860,7 @@ function reset() {
   infoForm.encounterId = '';
   infoForm.prescriptionNo = '';
   infoForm.rxTypeCode = 1;
-  infoForm.validityDays = 0;
+  infoForm.validityDays = 1;
   infoForm.extensionReason = '';
 }
 
diff --git a/vue3/src/views/doctorstation/components/eprescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
similarity index 98%
rename from vue3/src/views/doctorstation/components/eprescriptionlist.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
index 2b4e41cc..428142d2 100644
--- a/vue3/src/views/doctorstation/components/eprescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
@@ -17,7 +17,6 @@
       :data="prescriptionList"
       row-key="prescriptionNo"
       border
-      @row-dblclick="clickPrescriptionRow"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="50" align="center" :selectable="selectable" />
@@ -144,7 +143,7 @@
             type="primary"
             icon="Edit"
             @click="handleEdit(scope.row)"
-            :disabled="scope.row.statusEnum == 2"
+            :disabled="scope.row.statusEnum == 2 || scope.row.statusEnum == 3"
             >编辑</el-button
           >
           <el-button
@@ -366,8 +365,9 @@ function handleView(row) {
     medicationInfoList.value.forEach((medicationInfo) => {
       medicationInfo.isEdit = false;
     });
-  
-      openPrescriptionDialog();
+
+    prescriptionInfo.value.conditionId = response.data.records[0].conditionId;
+    openPrescriptionDialog();
 
     console.log(response, '处方详细的药品信息', medicationInfoList.value);
   });
@@ -391,6 +391,7 @@ function handleEdit(row) {
     medicationInfoList.value.forEach((medicationInfo) => {
       medicationInfo.isEdit = false;
     });
+    prescriptionInfo.value.conditionId = response.data.records[0].conditionId;
     openPrescriptionDialog();
     console.log(response, '处方详细的药品信息', medicationInfoList.value);
   });
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
new file mode 100644
index 00000000..16e3220e
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
@@ -0,0 +1,323 @@
+<template>
+  <el-dialog
+    title="住院登记"
+    v-model="props.open"
+    width="1000px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+    @open="openDialog"
+  >
+    <div class="operate">
+      <div>患者信息</div>
+    </div>
+    <el-row>
+      <el-col :span="2" class="descriptions-item-label">
+        <el-text truncated>患者姓名：</el-text>
+      </el-col>
+      <el-col :span="3" class="patInfo-value">
+        <el-text truncated>{{ patientInfo.patientName }}</el-text>
+      </el-col>
+      <el-col :span="2" class="descriptions-item-label">
+        <el-text truncated>年龄：</el-text>
+      </el-col>
+      <el-col :span="3" class="patInfo-value">
+        <el-text truncated>{{ patientInfo.age }}</el-text>
+      </el-col>
+      <el-col :span="2" class="descriptions-item-label">
+        <el-text truncated>性别：</el-text>
+      </el-col>
+      <el-col :span="3" class="patInfo-value">
+        <el-text truncated>{{ patientInfo.genderEnum_enumText }}</el-text>
+      </el-col>
+      <el-col :span="2" class="descriptions-item-label">
+        <el-text truncated>费用性质：</el-text>
+      </el-col>
+      <el-col :span="3" class="patInfo-value">
+        <el-text truncated>{{ patientInfo.contractName }}</el-text>
+      </el-col>
+    </el-row>
+    <div class="operate">
+      <div>住院信息</div>
+    </div>
+    <el-form
+      class="register-from"
+      :model="submitForm"
+      style="padding-left: 8px"
+      ref="registerRef"
+      label-width="80px"
+      :rules="rules"
+    >
+      <el-row :gutter="8">
+        <el-col :span="6">
+          <el-form-item label="入院科室" prop="inHospitalOrgId">
+            <el-tree-select
+              clearable
+              style="width: 100%"
+              v-model="submitForm.inHospitalOrgId"
+              filterable
+              :data="organization"
+              :props="{
+                value: 'id',
+                label: 'name',
+                children: 'children',
+              }"
+              value-key="id"
+              check-strictly
+              :check-strictly-except-leaf="false"
+              :default-expand-all="true"
+              placeholder="请选择入院科室"
+              @change="handleChange"
+              @node-click="handleNodeClick"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="入院病区" prop="wardLocationId">
+            <el-select v-model="submitForm.wardLocationId">
+              <el-option
+                v-for="item in wardListOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+              <template #empty>
+                <div>请先选择入院科室</div>
+              </template>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="患者病情">
+            <el-select v-model="submitForm.priorityEnum">
+              <el-option
+                v-for="item in priorityLevelOptionOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="6">
+          <el-form-item label="入院类型" prop="admitSourceCode">
+            <el-select v-model="submitForm.admitSourceCode">
+              <el-option
+                v-for="item in admit_source_code"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="入院方式" prop="inWayCode">
+            <el-select v-model="submitForm.inWayCode">
+              <el-option
+                v-for="item in in_way_code"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+         -->
+      </el-row>
+      <el-row :gutter="8">
+        <el-col :span="6">
+          <el-form-item label="诊断类别" prop="medTypeCode">
+            <el-select
+              v-model="submitForm.medTypeCode"
+              placeholder="诊断"
+              clearable
+              filterable
+              @change="
+                (value) => {
+                  submitForm.ybClassEnum = value;
+                }
+              "
+            >
+              <el-option
+                v-for="item in med_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入院诊断" prop="diagnosisDefinitionId">
+            <el-select
+              v-model="submitForm.diagnosisDefinitionId"
+              placeholder="诊断"
+              clearable
+              filterable
+              remote
+              :remote-method="getDiagnosisInfo"
+              style="width: 400px"
+            >
+              <el-option
+                v-for="item in diagnosisDefinitionList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                @click="handleDiagnosisChange(item)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+import {
+  getInit,
+  getOrgList,
+  wardList,
+  getDiagnosisDefinitionList,
+  handleHospitalization,
+} from './api.js';
+
+const submitForm = reactive({
+  medTypeCode: '21',
+});
+
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  patientInfo: {
+    type: Object,
+  },
+});
+const emit = defineEmits(['close']);
+
+const priorityLevelOptionOptions = ref(undefined);
+const organization = ref([]);
+const wardListOptions = ref([]);
+const diagnosisDefinitionList = ref([]);
+let diagnosisDefinitionId = '';
+let diagnosisYbNo = '';
+
+const { proxy } = getCurrentInstance();
+
+const { med_type } = proxy.useDict('med_type');
+const rules = reactive({
+  diagnosisDefinitionId: [
+    {
+      required: true,
+      message: '入院诊断未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  medTypeCode: [
+    {
+      required: true,
+      message: '诊断类别未选择',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  inHospitalOrgId: [
+    {
+      required: true,
+      message: '入院科室未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+});
+
+function openDialog() {
+  getOrgList().then((res) => {
+    organization.value = res.data.records;
+  });
+  // wardList().then((res) => {
+  //   wardListOptions.value = res.data;
+  // });
+  getInit().then((response) => {
+    console.log(response, 'response');
+    priorityLevelOptionOptions.value = response.data.priorityLevelOptionOptions; // 优先级
+  });
+  console.log(props.patientInfo, 'patientInfo');
+  getDiagnosisInfo(undefined);
+}
+
+function getDiagnosisInfo(value) {
+  getDiagnosisDefinitionList({ pageSize: 500, pageNo: 1, searchKey: value }).then((res) => {
+    diagnosisDefinitionList.value = res.data.records;
+  });
+}
+
+function handleDiagnosisChange(item) {
+  diagnosisYbNo = item.ybNo;
+  diagnosisDefinitionId = item.id;
+}
+
+function handleNodeClick(orgInfo) {
+  wardList({ orgId: orgInfo.id }).then((res) => {
+    wardListOptions.value = res.data;
+  });
+}
+
+function handleChange(value) {
+  if (!value) {
+    wardListOptions.value = [];
+    submitForm.wardLocationId = undefined;
+  }
+}
+
+function submit() {
+  proxy.$refs['registerRef'].validate((valid) => {
+    if (valid) {
+      let saveData = {
+        ...submitForm,
+        diagnosisYbNo: diagnosisYbNo,
+        diagnosisDefinitionId: diagnosisDefinitionId,
+        ambEncounterId: props.patientInfo.encounterId,
+        patientId: props.patientInfo.patientId,
+      };
+      handleHospitalization(saveData).then((res) => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('办理成功');
+          close();
+        }
+      });
+    }
+  });
+}
+
+function close() {
+  emit('close');
+}
+</script>
+
+<style lang="scss" scoped>
+.operate {
+  font-size: 16px;
+  background: rgba(37, 109, 149, 0.05);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 32px;
+  border-radius: 4px 4px 0px 0px;
+  padding-left: 16px;
+  color: var(--hip-color-primary-light);
+  font-weight: bold;
+  margin: 10px 0;
+}
+
+.patInfo-value {
+  width: 100px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/doctorstation/components/patientlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue
similarity index 98%
rename from vue3/src/views/doctorstation/components/patientlist.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/patientList.vue
index bf76209e..225e7ca2 100644
--- a/vue3/src/views/doctorstation/components/patientlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue
@@ -75,13 +75,13 @@
       </template>
     </el-table-column>
   </el-table>
-  <!-- <pagination
+  <pagination
     v-show="total > 0"
     :total="total"
-    v-model:page="queryParams.pageNum"
+    v-model:page="queryParams.pageNo"
     v-model:limit="queryParams.pageSize"
     @pagination="getPatientList"
-  /> -->
+  />
 </template>
 
 <script setup>
@@ -90,7 +90,7 @@ import { formatDate, formatDateStr } from '@/utils/index';
 
 const date = ref(formatDate(new Date()));
 const queryParams = ref({
-  pageNum: 1,
+  pageNo: 1,
   pageSize: 50,
   statusEnum: 1,
   registerTimeSTime: formatDateStr(new Date(), 'YYYY-MM-DD') + ' 00:00:00',
diff --git a/vue3/src/views/doctorstation/components/orderGroupDrawer.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
similarity index 98%
rename from vue3/src/views/doctorstation/components/orderGroupDrawer.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
index 02f8618a..cb1d62b8 100644
--- a/vue3/src/views/doctorstation/components/orderGroupDrawer.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script setup>
-import { getOrderGroupList } from './api';
+import { getOrderGroupList } from '../api';
 
 const props = defineProps({
   diagnosis: {
diff --git a/vue3/src/views/doctorstation/components/prescriptionHistory.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionHistory.vue
similarity index 98%
rename from vue3/src/views/doctorstation/components/prescriptionHistory.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionHistory.vue
index c50ce430..aed8250b 100644
--- a/vue3/src/views/doctorstation/components/prescriptionHistory.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionHistory.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script setup>
-import { getAdviceHistoryInfo } from './api';
+import { getAdviceHistoryInfo } from '../api';
 import { formatNumber } from '@/utils/his';
 
 const props = defineProps({
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
new file mode 100644
index 00000000..05a8ef35
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
@@ -0,0 +1,205 @@
+<template>
+  <el-dialog
+    title="处方单"
+    v-model="props.open"
+    width="1600px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+    @open="openDialog"
+  >
+    <div class="prescription-dialog-wrapper">
+      <div
+        class="prescription-container"
+        v-for="item in precriptionInfo"
+        :key="item.prescriptionNo"
+      >
+        <div>
+          <span>处方号：</span>
+          <span>{{ item.prescriptionNo }}</span>
+        </div>
+        <div style="text-align: center">
+          <h2>长春大学医院</h2>
+        </div>
+        <div style="text-align: center">
+          <h3>处方单</h3>
+        </div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">姓名：</span>
+            <span class="item-value">{{ item.patientName }}</span>
+          </div>
+          <div>
+            <span class="item-label">年龄：</span>
+            <span class="item-value">20岁</span>
+          </div>
+          <div>
+            <span class="item-label">性别：</span>
+            <span class="item-value">男</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">科室：</span>
+            <span class="item-value">门诊内科</span>
+          </div>
+          <div>
+            <span class="item-label">费用性质：</span>
+            <span class="item-value">自费</span>
+          </div>
+          <div>
+            <span class="item-label">日期：</span>
+            <span class="item-value">{{ formatDateStr(item.requestTime, 'YYYY-MM-DD') }}</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">门诊号：</span>
+            <span class="item-value">M0000000001</span>
+          </div>
+          <div>
+            <span class="item-label">开单医生：</span>
+            <span class="item-value">徐丹</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">诊断：</span>
+            <span class="item-value">{{ item.conditionDefinitionName }}</span>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="font-size: 16px; font-weight: 700; margin-bottom: 3px">Rp</div>
+        <div class="medicen-list">
+          <div
+            style="margin-bottom: 3px"
+            v-for="(medItem, index) in item.prescriptionInfoDetail"
+            :key="medItem.requestId"
+          >
+            <span>{{ index + 1 + '. ' }}</span>
+            <span>{{ medItem.adviceName }}</span>
+            <span>{{ '(' + medItem.volume + ')' }}</span>
+            <span>{{ medItem.quantity + ' ' + medItem.unitCode_dictText }}</span>
+            <span>{{ '批次号：' + medItem.lotNumber }}</span>
+            <div>
+              <span>用法用量：</span>
+              <span>
+                {{
+                  medItem?.methodCode_dictText +
+                  ' / ' +
+                  medItem?.dose +
+                  +' ' +
+                  medItem?.doseUnitCode_dictText +
+                  ' / ' +
+                  medItem?.rateCode_dictText
+                }}
+              </span>
+            </div>
+          </div>
+        </div>
+        <div class="divider"></div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">医师：</span>
+            <span class="item-value"></span>
+          </div>
+          <div>
+            <span class="item-label">收费：</span>
+            <span class="item-value"></span>
+          </div>
+          <div>
+            <span class="item-label">合计：</span>
+            <span class="item-value"></span>
+          </div>
+        </div>
+        <div style="display: flex; justify-content: space-between">
+          <div>
+            <span class="item-label">调配：</span>
+            <span class="item-value"></span>
+          </div>
+          <div>
+            <span class="item-label">核对：</span>
+            <span class="item-value"></span>
+          </div>
+          <div>
+            <span class="item-label">发药：</span>
+            <span class="item-value"></span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+import { formatDateStr } from '@/utils/index';
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  precriptionInfo: {
+    type: [],
+    default: [],
+  },
+});
+const emit = defineEmits(['close']);
+
+function close() {
+  emit('close');
+}
+
+function clickRow(row) {
+  selectRow.value = row;
+}
+</script>
+<style lang="scss" scoped>
+.prescription-dialog-wrapper {
+  height: 700px;
+  display: flex;
+  overflow-x: auto;
+  flex-wrap: wrap;
+  gap: 20px;
+  // background-color: #d7d7d7;
+  // padding: 10px
+}
+.prescription-container {
+  height: 660px;
+  width: 500px;
+  border: solid 2px #757575;
+  font-size: 13px;
+  color: #000000;
+  background-color: #f3f3f3;
+  padding: 10px;
+}
+.divider {
+  height: 2px;
+  background-color: #757575;
+  margin: 5px 0 5px 0;
+}
+.medicen-list {
+  height: 330px;
+}
+.item-label {
+  width: 70px;
+  text-align: left;
+  font-weight: 700;
+  color: #000000;
+  display: inline-block;
+}
+.item-value {
+  color: #393a3b;
+  font-weight: 500;
+  width: 87px;
+  display: inline-block;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/doctorstation/components/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
similarity index 89%
rename from vue3/src/views/doctorstation/components/prescriptionlist.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 93127151..6adb5439 100644
--- a/vue3/src/views/doctorstation/components/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -26,9 +26,7 @@
       <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
       <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button>
       <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
-      <span style="color: #606266; font-size: 14px; font-weight: 700; margin-left: 15px">
-        诊断：
-      </span>
+      <span class="descriptions-item-label"> 诊断： </span>
       <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
         <el-option
           v-for="item in diagnosisList"
@@ -38,9 +36,7 @@
           @click="handleDiagnosisChange(item)"
         />
       </el-select>
-      <span style="color: #606266; font-size: 14px; font-weight: 700; margin-left: 15px">
-        费用性质：
-      </span>
+      <span class="descriptions-item-label"> 费用性质： </span>
       <el-select v-model="accountId" placeholder="费用性质" style="width: 180px">
         <el-option
           v-for="item in contractList"
@@ -49,9 +45,12 @@
           :value="item.accountId"
         />
       </el-select>
-      <span style="color: #606266; font-size: 14px; font-weight: 700; margin-left: 15px">
+      <span class="descriptions-item-label">
         合计金额：{{ totalAmount ? totalAmount.toFixed(2) : 0 }}元
       </span>
+      <el-button type="primary" style="float: right" @click="refresh()" :disabled="false">
+        刷新
+      </el-button>
     </div>
     <el-table
       max-height="650"
@@ -116,8 +115,12 @@
                           item.lotNumber +
                           '  ' +
                           '  库存：' +
-                          item.quantity / scope.row.partPercent +
-                          item.unitCode_dictText +
+                          stockFormat(
+                            scope.row.partPercent,
+                            scope.row.unitCode_dictText,
+                            scope.row.minUnitCode_dictText,
+                            item.quantity
+                          ) +
                           '  单价：' +
                           item.price.toFixed(2) +
                           '/' +
@@ -156,7 +159,7 @@
                     <!-- 单次剂量 -->
                     <el-form-item
                       label="单次用量："
-                      prop="dose"
+                      prop="doseQuantity"
                       class="required-field"
                       data-prop="doseQuantity"
                     >
@@ -166,9 +169,9 @@
                         controls-position="right"
                         :controls="false"
                         style="width: 70px; margin-right: 20px"
-                        :ref="(el) => (inputRefs.dose = el)"
+                        :ref="(el) => (inputRefs.doseQuantity = el)"
                         @input="convertValues(scope.row, scope.$index)"
-                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index)"
                       />
                     </el-form-item>
                     <!-- 剂量单位 -->
@@ -191,13 +194,15 @@
                     </el-select>
                     <span>=</span>
                     <!-- 单次剂量 -->
-                    <el-form-item prop="dose">
+                    <el-form-item prop="dose" class="required-field" data-prop="dose">
                       <el-input-number
                         v-model="scope.row.dose"
                         controls-position="right"
                         :controls="false"
                         style="width: 70px; margin: 0 20px"
+                        :ref="(el) => (inputRefs.dose = el)"
                         @input="convertDoseValues(scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index)"
                       />
                     </el-form-item>
                     <!-- 全部单位 -->
@@ -217,7 +222,7 @@
                   </div>
                   <div class="form-group">
                     <el-form-item
-                      label=" "
+                      label="给药途径："
                       prop="methodCode"
                       class="required-field"
                       data-prop="methodCode"
@@ -250,7 +255,7 @@
                       </el-select>
                     </el-form-item>
                     <el-form-item
-                      label=" "
+                      label="用药频次："
                       prop="rateCode"
                       class="required-field"
                       data-prop="rateCode"
@@ -283,6 +288,18 @@
                         />
                       </el-select>
                     </el-form-item>
+                  </div>
+                </div>
+                <div
+                  style="
+                    display: flex;
+                    align-items: center;
+                    gap: 12px;
+                    flex-wrap: wrap;
+                    margin-top: 10px;
+                  "
+                >
+                  <div class="form-group">
                     <el-form-item
                       label="用药天数："
                       prop="dispensePerDuration"
@@ -299,7 +316,6 @@
                         @keyup.enter.prevent="
                           handleEnter('dispensePerDuration', scope.row, scope.$index)
                         "
-                        @input="calculateTotalAmount(scope.row, scope.$index)"
                       >
                         <template #suffix>天</template>
                       </el-input-number>
@@ -371,8 +387,12 @@
                           item.lotNumber +
                           '  ' +
                           '  库存：' +
-                          item.quantity / scope.row.partPercent +
-                          item.unitCode_dictText +
+                          stockFormat(
+                            scope.row.partPercent,
+                            scope.row.unitCode_dictText,
+                            scope.row.minUnitCode_dictText,
+                            item.quantity
+                          ) +
                           '  单价：' +
                           item.price.toFixed(2) +
                           '/' +
@@ -467,6 +487,7 @@
                         value-key="id"
                         check-strictly
                         default-expand-all
+                        @change="(value) => handleOrgChange(value, scope.$index)"
                         placeholder="请选择执行科室"
                       />
                     </el-form-item>
@@ -518,6 +539,7 @@
           <!-- <div v-if="groupMarkers[scope.$index] === 'all'">┗</div> -->
         </template>
       </el-table-column>
+      <el-table-column label="序号" align="center" width="60" prop="sortNumber"> </el-table-column>
       <el-table-column label="医嘱" align="center" prop="productName" width="400">
         <template #default="scope">
           <template v-if="getRowDisabled(scope.row)">
@@ -589,21 +611,21 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="" width="90">
         <template #default="scope">
-          <el-tag v-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
-          <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning"
-            >待保存</el-tag
-          >
+          <el-tag v-if="scope.row.chargeStatus == 5" type="info">
+            {{ scope.row.chargeStatus_enumText }}
+          </el-tag>
+          <el-tag v-else-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
+          <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning">
+            待保存
+          </el-tag>
           <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+          <el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="单次剂量" align="center" prop="">
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
-            {{
-              scope.row.dose
-                ? formatNumber(scope.row.doseQuantity) + ' ' + scope.row.doseUnitCode_dictText
-                : ''
-            }}
+            {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
           </span>
         </template>
       </el-table-column>
@@ -614,14 +636,14 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="总金额" align="right" prop="" header-align="center">
+      <el-table-column label="总金额" align="right" prop="" header-align="center" width="100">
         <template #default="scope">
           <span v-if="!scope.row.isEdit" style="text-align: right">
             {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="药房/科室" align="center" prop="" width="240">
+      <el-table-column label="药房/科室" align="center" prop="" width="200">
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.positionName }}
@@ -665,6 +687,12 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column label="操作" align="center" width="100" fixed="right">
+        <template #default="scope">
+          <el-icon @click="up(scope.row)"><Upload /></el-icon>
+          <el-icon @click="down(scope.row)"><Download /></el-icon>
+        </template>
+      </el-table-column>
     </el-table>
     <OrderGroupDrawer
       ref="orderFroupRef"
@@ -689,16 +717,19 @@ import {
   getOrgTree,
   savePrescriptionSign,
   singOut,
+  saveEmr,
+  getEmrDetail,
   updateGroupId,
   getContract,
   getAdviceBaseInfo,
-} from './api';
-import adviceBaseList from './adviceBaseList';
+} from '../api';
+import adviceBaseList from '../adviceBaseList';
 import { computed, getCurrentInstance, nextTick, watch } from 'vue';
 import { calculateQuantityByDays, formatNumber } from '@/utils/his';
 import OrderGroupDrawer from './orderGroupDrawer';
 import PrescriptionHistory from './prescriptionHistory';
 import Decimal from 'decimal.js';
+import useUserStore from '@/store/modules/user';
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
@@ -721,6 +752,7 @@ const encounterDiagnosisId = ref('');
 const diagnosisName = ref('');
 const diagnosisInfo = ref({});
 const loading = ref(false);
+const userStore = useUserStore();
 const rowRules = ref({
   conditionDefinitionId: [{ required: true, message: '请选择诊断', trigger: 'change' }],
   dose: [{ required: true, message: '请输入单次剂量', trigger: 'change' }],
@@ -801,6 +833,7 @@ watch(
         const index = prescriptionList.value.findIndex((row) => row.uniqueKey === newValue[0]);
         const items = proxy.$refs['formRef' + index]?.$el?.querySelectorAll('[data-prop]');
         requiredProps.value = Array.from(items).map((item) => item.dataset.prop);
+        console.log(requiredProps.value, 'requiredProps.value');
       });
     } else {
       requiredProps.value = {};
@@ -811,6 +844,7 @@ watch(
   () => prescriptionList.value,
   (newVlaue) => {
     if (newVlaue && newVlaue.length > 0) {
+      console.log(prescriptionList.value, 'prescriptionList.value');
       handleTotalAmount();
     }
   },
@@ -818,11 +852,11 @@ watch(
 );
 function handleTotalAmount() {
   totalAmount.value = prescriptionList.value.reduce((accumulator, currentRow) => {
-    // if (currentRow.statusEnum != 2) {
-    return accumulator + (Number(currentRow.totalPrice) || 0);
-    // } else {
-    // return accumulator || 0;
-    // }
+    if (currentRow.chargeStatus != 8) {
+      return accumulator + (Number(currentRow.totalPrice) || 0);
+    } else {
+      return 0;
+    }
   }, 0);
 }
 getList();
@@ -832,7 +866,9 @@ function getList() {
     total.value = res.data.total;
   });
 }
-
+function refresh() {
+  getListInfo(false);
+}
 function getListInfo(addNewRow) {
   isAdding.value = false;
   getPrescriptionList(props.patientInfo.encounterId).then((res) => {
@@ -883,6 +919,7 @@ function handleAddPrescription() {
     proxy.$modal.msgWarning('请先保存当前医嘱');
     return;
   }
+  debugger;
   isAdding.value = true;
   // 在数组最前方添加一行，让新增行显示在最上边
   prescriptionList.value.unshift({
@@ -917,6 +954,10 @@ function clickRowDb(row) {
   }
 }
 
+function up(index, row) {}
+
+function down(index, row) {}
+
 function handleDiagnosisChange(item) {
   diagnosisName.value = item.name;
   conditionId.value = item.conditionId;
@@ -943,13 +984,13 @@ function selectAdviceBase(key, row) {
   getOrgList();
   unitCodeList.value = [];
   unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
-  if (row.doseUnitCode != row.minUnitCode) {
-    unitCodeList.value.push({
-      value: row.doseUnitCode,
-      label: row.doseUnitCode_dictText,
-      type: 'dose',
-    });
-  }
+  // if (row.doseUnitCode != row.minUnitCode) {
+  unitCodeList.value.push({
+    value: row.doseUnitCode,
+    label: row.doseUnitCode_dictText,
+    type: 'dose',
+  });
+  // }
   if (
     (row.partAttributeEnum == 1 || row.partAttributeEnum == 3) &&
     row.minUnitCode != row.unitCode
@@ -981,6 +1022,7 @@ function selectAdviceBase(key, row) {
   prescriptionList.value[rowIndex.value].minUnitCode = row.minUnitCode;
   prescriptionList.value[rowIndex.value].unitCode =
     row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode;
+  prescriptionList.value[rowIndex.value].categoryEnum = row.categoryCode;
   // prescriptionList.value[rowIndex.value].doseUnitCode_dictText = row.minUnitCode_dictText;
   prescriptionList.value[rowIndex.value].definitionId = JSON.parse(
     JSON.stringify(row)
@@ -1010,6 +1052,9 @@ function selectAdviceBase(key, row) {
       prescriptionList.value[rowIndex.value].inventoryId = stock.inventoryId;
       prescriptionList.value[rowIndex.value].locationId = stock.locationId;
       prescriptionList.value[rowIndex.value].unitPrice = stock.price;
+      prescriptionList.value[rowIndex.value].minUnitPrice = new Decimal(stock.price)
+        .div(row.partPercent)
+        .toFixed(2);
       prescriptionList.value[rowIndex.value].positionName = stock.locationName;
     }
   } else {
@@ -1022,7 +1067,7 @@ function selectAdviceBase(key, row) {
       if (row.injectFlag == 1) {
         inputRefs.value['executeNum']?.focus();
       } else {
-        inputRefs.value['dose']?.focus();
+        inputRefs.value['doseQuantity']?.focus();
       }
     } else {
       inputRefs.value['quantity']?.focus();
@@ -1045,11 +1090,13 @@ function handleDelete() {
     return;
   }
   let deleteList = [];
+  let sum = 0; // 未保存总数量
   for (let i = prescriptionList.value.length - 1; i >= 0; i--) {
     let deleteItem = prescriptionList.value[i];
     // 通过requestId判断是否已保存，如果选中项未保存 直接从数组中移除，如果已保存，调接口删除
     if (deleteItem.check && deleteItem.statusEnum == 1 && !deleteItem.requestId) {
       prescriptionList.value.splice(i, 1);
+      sum++;
     } else if (deleteItem.check && deleteItem.statusEnum == 1 && deleteItem.requestId) {
       deleteList.push({
         requestId: deleteItem.requestId,
@@ -1059,10 +1106,18 @@ function handleDelete() {
     }
   }
 
+  handleEmrTreatment();
+  expandOrder.value = [];
+  isAdding.value = false;
+  adviceQueryParams.value.adviceType = undefined;
+  if (sum == selectRow.length) {
+    proxy.$modal.msgSuccess('删除成功');
+    return;
+  }
   if (deleteList.length > 0) {
     savePrescription({ adviceSaveList: deleteList }).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess('操作成功');
+        proxy.$modal.msgSuccess('删除成功');
         getListInfo(false);
       }
     });
@@ -1070,20 +1125,23 @@ function handleDelete() {
     proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
     return;
   }
-  expandOrder.value = [];
-  isAdding.value = false;
-  adviceQueryParams.value.adviceType = undefined;
   groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
 }
 
+// 选择药房/耗材房处理
 function handleNumberClick(item, index) {
   prescriptionList.value[index].unitPrice = item.price;
-  // prescriptionList.value[index].lotNumber = item.lotNumber;
+  prescriptionList.value[index].lotNumber = item.lotNumber;
   prescriptionList.value[index].locationId = item.locationId;
   prescriptionList.value[index].positionId = item.locationId;
   prescriptionList.value[index].positionName = item.locationName;
 }
 
+// 选择执行科室处理
+function handleOrgChange(value, index) {
+  prescriptionList.value[index].positionId = value;
+}
+
 /**
  * 签发处方
  */
@@ -1158,6 +1216,52 @@ function handleSave() {
     .finally(() => {
       loading.value = false;
     });
+  // 长春大学要求
+  if (userStore.fixmedinsCode == 'H22010200672') {
+    handleEmrTreatment();
+  }
+}
+
+// 把开过的处方加到病历的处理中
+function handleEmrTreatment() {
+  // 病历处理字符串拼接
+  let treatment = '';
+  let treatmentIndex = 1;
+  // 病历辅助检查字符串拼接
+  let auxiliaryExamination = '';
+  let auxiliaryExaminationIndex = 1;
+  prescriptionList.value.forEach((item, index) => {
+    if (item.chargeStatus != 8) {
+      if (item.adviceType == 1) {
+        treatment += '处方[' + (index + 1) + ']' + '  ';
+        treatment += item.adviceName + '  ' + item.volume + '  ';
+        treatment +=
+          '用法：' +
+          item.dose +
+          item.doseUnitCode_dictText +
+          '  ' +
+          item.rateCode_dictText +
+          '  ' +
+          item.methodCode_dictText +
+          '；  ';
+        treatmentIndex++;
+      } else if (item.adviceType == 3) {
+        treatment += '[' + (index + 1) + ']' + '  ';
+        treatment += item.adviceName + '；  ';
+        auxiliaryExaminationIndex++;
+      }
+    }
+  });
+  getEmrDetail(props.patientInfo.encounterId).then((res) => {
+    saveEmr({
+      patientId: props.patientInfo.patientId,
+      encounterId: props.patientInfo.encounterId,
+      contextJson: {
+        ...JSON.parse(res.data.contextJson),
+        treatment: treatment,
+      },
+    });
+  });
 }
 
 function handleClickOutside(row, index) {
@@ -1166,6 +1270,17 @@ function handleClickOutside(row, index) {
   });
 }
 
+function stockFormat(partPercent, unit, minUnit, quantity) {
+  let a = quantity % partPercent;
+  let b = Math.floor(quantity / partPercent);
+  console.log(partPercent, unit, minUnit, quantity);
+
+  if (a == 0) {
+    return b + ' ' + unit;
+  }
+  return b + ' ' + unit + ' ' + a + ' ' + minUnit;
+}
+
 // 单行处方保存
 function handleSaveSign(row, index) {
   proxy.$refs['formRef' + index].validate((valid) => {
@@ -1179,34 +1294,51 @@ function handleSaveSign(row, index) {
       row.accountId = accountId.value;
       if (row.adviceType == 1) {
         row.minUnitQuantity =
-          row.doseUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;
+          row.minUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;
       } else {
         row.minUnitQuantity = row.quantity;
       }
       row.conditionId = conditionId.value;
-      row.unitPrice =
-        row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit'
-          ? row.unitPrice
-          : new Decimal(row.unitPrice).div(row.partPercent).toFixed(2);
+      if (row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit') {
+        row.unitPrice = row.unitPrice;
+      } else {
+        row.unitCode_dictText = row.unitCodeList.find(
+          (item) => item.value == row.minUnitCode
+        ).label;
+        row.unitPrice = row.minUnitPrice;
+      }
       row.conditionDefinitionId = conditionDefinitionId.value;
       row.encounterDiagnosisId = encounterDiagnosisId.value;
       row.diagnosisName = diagnosisName.value;
+      row.sortNumber = row.sortNumber ? row.sortNumber : prescriptionList.value.length;
       // row.dose = row.doseQuantity;
       // row.doseUnitCode = unitCodeList.value.find((item) => item.type == 'dose').value;
       // row.doseUnitCode = JSON.parse(JSON.stringify(row.minUnitCode)); // 页面显示与赋值不符，此处先简单处理，后续修改
       row.contentJson = JSON.stringify(row);
-      // savePrescription({ adviceSaveList: prescriptionList.value }).then((res) => {
-      //   if (res.code === 200) {
-      //     proxy.$modal.msgSuccess('保存成功');
-      //     getListInfo(true);
-      //     nextId.value == 1;
-      //   }
-      // });
+      if (row.requestId) {
+        row.dbOpType = '2';
+        savePrescription({ adviceSaveList: [row] }).then((res) => {
+          if (res.code === 200) {
+            proxy.$modal.msgSuccess('保存成功');
+            getListInfo(true);
+            nextId.value == 1;
+          }
+        });
+      } else {
+        if (prescriptionList.value[0].adviceName) {
+          handleAddPrescription();
+        }
+      }
     }
   });
 }
 
 function handleSaveBatch() {
+  if (prescriptionList.value[0].isEdit && !prescriptionList.value[0].adviceType) {
+    prescriptionList.value.shift();
+    isAdding.value = false;
+    expandOrder.value = [];
+  }
   let saveList = prescriptionList.value
     .filter((item) => {
       return item.statusEnum == 1 && !item.requestId;
@@ -1224,7 +1356,7 @@ function handleSaveBatch() {
   savePrescription({ adviceSaveList: saveList }).then((res) => {
     if (res.code === 200) {
       proxy.$modal.msgSuccess('保存成功');
-      getListInfo(true);
+      getListInfo(false);
       nextId.value == 1;
     }
   });
@@ -1393,6 +1525,7 @@ const handleEnter = (currentProp, row, rowIndex, e) => {
   proxy.$refs['formRef' + rowIndex].validateField(currentProp, (valid) => {
     if (valid) {
       const index = requiredProps.value.indexOf(currentProp);
+      console.log(index);
       if (index === -1) return;
       // 跳转下一个或提交
       const nextIndex = index + 1;
@@ -1466,15 +1599,23 @@ function combination() {
   // 相同分组诊断需要相同
   let uniqInjectFlag = new Set();
   let status = false;
+  let isSave = false;
   groupIndexList.value.forEach((index) => {
     if (prescriptionList.value[index].statusEnum == 2) {
       status = true;
     }
+    if (prescriptionList.value[index].statusEnum == 1 && !prescriptionList.value[index].requestId) {
+      isSave = true;
+    }
     uniqueValues.add(prescriptionList.value[index].methodCode);
     uniqDiagnosis.add(prescriptionList.value[index].diagnosisName);
     uniqInjectFlag.add(prescriptionList.value[index].injectFlag);
   });
   // 校验是否有已签发的医嘱
+  if (isSave) {
+    proxy.$modal.msgWarning('请先保存当前医嘱后再进行分组');
+    return;
+  }
   if (status) {
     proxy.$modal.msgWarning('已签发医嘱不允许分组');
     return;
@@ -1629,9 +1770,9 @@ const groupMarkers = ref([]);
 function calculateTotalPrice(row, index) {
   nextTick(() => {
     if (row.unitCode == row.minUnitCode) {
-      row.totalPrice = (row.unitPrice * row.quantity * 100) / 100;
-    } else {
       row.totalPrice = new Decimal(row.unitPrice).div(row.partPercent) * row.quantity;
+    } else {
+      row.totalPrice = (row.unitPrice * row.quantity * 100) / 100;
     }
   });
 }
@@ -1690,7 +1831,7 @@ function calculateTotalAmount(row, index) {
         if (row.unitCodeList.find((k) => k.value == row.unitCode).type == 'unit') {
           row.totalPrice = row.quantity * row.unitPrice;
         } else {
-          row.totalPrice = ((row.quantity * row.unitPrice) / row.partPercent).toFixed(2);
+          row.totalPrice = (row.quantity * row.minUnitPrice).toFixed(2);
         }
       }
     } else if (row.adviceType == 1) {
@@ -1702,12 +1843,14 @@ function calculateTotalAmount(row, index) {
           if (row.unitCode == row.minUnitCode) {
             quantity = calculateQuantityBySplitType(row.partAttributeEnum, row.doseQuantity, count);
             prescriptionList.value[index].quantity = quantity;
-            prescriptionList.value[index].totalPrice = (
-              (quantity * row.unitPrice) /
-              row.partPercent
-            ).toFixed(2);
+            prescriptionList.value[index].totalPrice = (quantity * row.minUnitPrice).toFixed(2);
           } else {
-            quantity = calculateQuantity(row.partAttributeEnum, row.doseQuantity, count, row.partPercent);
+            quantity = calculateQuantity(
+              row.partAttributeEnum,
+              row.doseQuantity,
+              count,
+              row.partPercent
+            );
             prescriptionList.value[index].quantity = quantity;
             prescriptionList.value[index].totalPrice = (quantity * row.unitPrice).toFixed(2);
           }
diff --git a/vue3/src/views/doctorstation/components/prescriptionmedicineList.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionmedicineList.vue
similarity index 78%
rename from vue3/src/views/doctorstation/components/prescriptionmedicineList.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionmedicineList.vue
index 1b66b363..4775e4a8 100644
--- a/vue3/src/views/doctorstation/components/prescriptionmedicineList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionmedicineList.vue
@@ -33,7 +33,7 @@
 </template>
         
 <script setup>
-import { getAllMedicationInfo } from './api';
+import { getAllMedicationInfo,getAllMedicationUsualInfo} from '../api';
 import { watch } from 'vue';
 import { throttle } from 'lodash-es';
 
@@ -76,10 +76,18 @@ watch(
 
 getList();
 function getList() {
-  getAllMedicationInfo(queryParams.value).then((res) => {
-    console.log(res, 'wwwwwwwwwwwwwwwww药品列表', queryParams.value, 'queryParams.value');
-    medicineList.value = res.data.records;
-    total.value = res.data.total;
+  getAllMedicationUsualInfo(queryParams.value).then((res) => {
+    console.log(res, '药品列表', queryParams.value, 'queryParams.value');
+    if(res.data&&res.data.records&&res.data.records.length>0){
+      medicineList.value = res.data.records;
+      total.value = res.data.total;
+    }else{
+      getAllMedicationInfo(queryParams.value).then((res) => {
+        console.log(res, 'wwwwwwwwwwwwwwwww药品列表', queryParams.value, 'queryParams.value');
+        medicineList.value = res.data.records;
+        total.value = res.data.total;
+      });
+    }
   });
 }
 
diff --git a/vue3/src/views/doctorstation/components/refundListDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
similarity index 96%
rename from vue3/src/views/doctorstation/components/refundListDialog.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
index f8b11d9d..411d4e31 100644
--- a/vue3/src/views/doctorstation/components/refundListDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
@@ -97,7 +97,7 @@
 </template>
   
 <script setup>
-import { getEncounterPatientPayment, refundPayment } from './api';
+import { getEncounterPatientPayment, refundPayment } from '../api';
 import { handleColor } from '@/utils/his';
 
 const props = defineProps({
@@ -151,7 +151,8 @@ function submit() {
     .map((row) => ({
       paymentId: row.paymentId,
       chargeItemId: row.chargeItemId,
-      refundFlg: selectedRows.some((selectedRow) => selectedRow.chargeItemId === row.chargeItemId), // 是否选中
+      // refundFlg: selectedRows.some((selectedRow) => selectedRow.chargeItemId === row.chargeItemId), // 是否选中
+      refundFlg: true, // todo 半退暂时不处理 此处先写死，等需要用半退的时候再放开上边的代码
     }));
 
   console.log('组装后的数据:', result);
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/reservationRecord.vue b/openhis-ui-vue3/src/views/doctorstation/components/reservationRecord.vue
new file mode 100644
index 00000000..f640f1b2
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/reservationRecord.vue
@@ -0,0 +1,382 @@
+<template>
+  <div class="app-container">
+    <div style="width: 50%">
+      <el-calendar
+        v-model="selectedDate"
+        @panel-change="
+          (value) => {
+            console.log(value);
+          }
+        "
+      >
+        <template #date-cell="{ data }">
+          <div class="calendar-cell" @click="selectDate(data)">
+            {{ data.day.split('-').slice(2).join('-') }}
+            <div v-if="hasAppointment(data.day)" class="appointment-dot"></div>
+          </div>
+        </template>
+      </el-calendar>
+    </div>
+    <div class="appointment-section">
+      <div class="section-header">
+        <h3>{{ selectedDateFormatted }} 的预约</h3>
+        <el-button type="primary" @click="showAddForm">新增预约</el-button>
+      </div>
+      <div v-if="showForm" class="appointment-form">
+        <el-form :model="appointmentForm" label-width="80px">
+          <el-form-item label="患者姓名">
+            <el-input v-model="appointmentForm.patientName" />
+          </el-form-item>
+          <el-form-item label="联系方式">
+            <el-input v-model="appointmentForm.patientTel" />
+          </el-form-item>
+          <el-form-item label="预约时间">
+            <el-time-select
+              v-model="appointmentForm.reservationTime"
+              start="08:30"
+              step="00:30"
+              end="18:00"
+              placeholder="选择时间"
+            />
+          </el-form-item>
+          <!-- <el-form-item label="预约类型">
+            <el-select v-model="appointmentForm.chiefComplaint" placeholder="请选择">
+              <el-option label="初诊" value="初诊" />
+              <el-option label="复诊" value="复诊" />
+              <el-option label="检查" value="检查" />
+              <el-option label="取药" value="取药" />
+            </el-select>
+          </el-form-item> -->
+          <el-form-item label="备注">
+            <el-input v-model="appointmentForm.remark" type="textarea" />
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="cancelForm">取消</el-button>
+            <el-button type="primary" @click="saveAppointment">保存</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <div class="appointment-list">
+        <div v-if="currentAppointments.length === 0" class="empty-tips">当日无预约</div>
+        <div
+          v-for="appointment in currentAppointments"
+          :key="appointment.id"
+          class="appointment-card"
+        >
+          <div class="card-header">
+            <span class="time">{{ appointment.reservationTime }}</span>
+            <!-- <el-tag :type="getTagType(appointment.type)" size="small">
+              {{ appointment.type }}
+            </el-tag> -->
+          </div>
+
+          <div class="card-body">
+            <div class="patient-info">
+              <el-icon><User /></el-icon>
+              <span>{{ appointment.patientName }}</span>
+            </div>
+            <div class="patient-info">
+              <el-icon><Phone /></el-icon>
+              <span>{{ appointment.patientTel }}</span>
+            </div>
+            <div v-if="appointment.remark" class="remark">
+              <el-icon><Comment /></el-icon>
+              <span>{{ appointment.remark }}</span>
+            </div>
+          </div>
+
+          <div class="card-actions">
+            <el-button type="primary" size="small" @click="editAppointment(appointment)">
+              编辑
+            </el-button>
+            <el-button type="danger" size="small" @click="deleteAppointment(appointment.id)">
+              删除
+            </el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, reactive } from 'vue';
+import {
+  getReservationInfo,
+  addReservationInfo,
+  editReservationInfo,
+  delReservationInfo,
+} from './api';
+import { formatDateStr } from '@/utils/index';
+
+const showForm = ref(false);
+const selectedDate = ref(new Date());
+const selectedDateStr = ref(formatDateStr(new Date(), 'YYYY-MM-DD'));
+const isEditing = ref(false);
+const editingId = ref(null);
+const queryParams = ref({});
+const currentAppointments = ref([]);
+const { proxy } = getCurrentInstance();
+// 预约数据
+const appointments = ref([]);
+
+// 预约表单
+const appointmentForm = reactive({
+  id: '',
+  patientName: '',
+  reservationTime: '',
+  patientTel: '',
+  remark: '',
+});
+getRecords(selectedDate.value);
+getTodayRecords(selectedDateStr.value);
+watch(
+  () => selectedDate.value,
+  (newValue) => {
+    getRecords(newValue);
+  },
+  { immediate: true }
+);
+function getRecords(date) {
+  let month = formatDateStr(date, 'YYYY-MM');
+  getReservationInfo({
+    pageNo: 1,
+    pageSize: 1000,
+    reservationTimeSTime: month + '01 00:00:00',
+    reservationTimeETime: month + '31 23:59:59',
+  }).then((res) => {
+    appointments.value = res.data.records.map((item) => {
+      return formatDateStr(item.reservationTime, 'YYYY-MM-DD');
+    });
+    console.log(appointments.value);
+  });
+}
+
+// 格式化选中的日期
+const selectedDateFormatted = computed(() => {
+  return selectedDate.value.toLocaleDateString('zh-CN', {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    weekday: 'long',
+  });
+});
+// 检查某天是否有预约
+const hasAppointment = (date) => {
+  return appointments.value.includes(date);
+};
+
+// 选择日期
+const selectDate = (date) => {
+  selectedDateStr.value = date.day;
+  getTodayRecords(date.day);
+  showForm.value = false;
+};
+
+function getTodayRecords(date) {
+  queryParams.value.reservationTimeSTime = date + ' 00:00:00';
+  queryParams.value.reservationTimeETime = date + ' 23:59:59';
+  getReservationInfo(queryParams.value).then((res) => {
+    currentAppointments.value = res.data.records;
+  });
+}
+
+// 显示添加表单
+const showAddForm = () => {
+  resetForm();
+  isEditing.value = false;
+  showForm.value = true;
+};
+
+// 编辑预约
+const editAppointment = (appointment) => {
+  Object.assign(appointmentForm, appointment);
+  appointmentForm.reservationTime = formatDateStr(appointmentForm.reservationTime, 'HH:mm');
+  isEditing.value = true;
+  editingId.value = appointment.id;
+  showForm.value = true;
+};
+
+// 删除预约
+const deleteAppointment = (id) => {
+  delReservationInfo({ id: id }).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+    }
+    getTodayRecords(selectedDateStr.value);
+  });
+};
+
+// 保存预约
+const saveAppointment = () => {
+  if (isEditing.value) {
+    let updateParams = {
+      ...appointmentForm,
+      reservationTime: selectedDateStr.value + ' ' + appointmentForm.reservationTime + ':00',
+    };
+    editReservationInfo(updateParams).then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess('操作成功');
+      }
+      getTodayRecords(selectedDateStr.value);
+    });
+  } else {
+    let saveParams = {
+      ...appointmentForm,
+      reservationTime: selectedDateStr.value + ' ' + appointmentForm.reservationTime + ':00',
+    };
+    addReservationInfo(saveParams).then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess('操作成功');
+      }
+      getTodayRecords(selectedDateStr.value);
+    });
+  }
+  cancelForm();
+};
+
+// 取消表单
+const cancelForm = () => {
+  showForm.value = false;
+  resetForm();
+};
+
+// 重置表单
+const resetForm = () => {
+  Object.assign(appointmentForm, {
+    patientName: '',
+    reservationTime: '',
+    patientTel: '',
+    remark: '',
+  });
+  isEditing.value = false;
+  editingId.value = null;
+};
+
+// 获取标签类型
+const getTagType = (appointmentType) => {
+  const types = {
+    初诊: 'primary',
+    复诊: 'success',
+    检查: 'warning',
+    取药: 'info',
+  };
+  return types[appointmentType] || '';
+};
+</script>
+
+<style scoped>
+.app-container {
+  margin: 20px 100px;
+  padding: 20px;
+  display: flex;
+  justify-content: space-between;
+  gap: 24px;
+}
+
+.calendar-cell {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  cursor: pointer;
+}
+
+.appointment-dot {
+  position: absolute;
+  bottom: 5px;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #f56c6c;
+}
+
+.appointment-section {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  width: 45%;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+
+.appointment-form {
+  margin-bottom: 24px;
+  padding: 16px;
+  background-color: #f8f8f8;
+  border-radius: 8px;
+}
+
+.appointment-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 16px;
+  max-height: 450px;
+  overflow-y: auto;
+}
+
+.appointment-card {
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  padding: 16px;
+  background-color: #fff;
+  transition: box-shadow 0.3s;
+}
+
+.appointment-card:hover {
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.time {
+  font-weight: bold;
+  font-size: 16px;
+}
+
+.card-body {
+  margin-bottom: 16px;
+}
+
+.patient-info,
+.remark {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.patient-info .el-icon,
+.remark .el-icon {
+  margin-right: 8px;
+  color: #909399;
+}
+
+.card-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+.empty-tips {
+  text-align: center;
+  color: #999;
+  padding: 40px 0;
+  grid-column: 1 / -1;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
similarity index 81%
rename from vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
index e56c2e75..912b6e3a 100644
--- a/vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
@@ -1,121 +1,95 @@
 <template>
-  <div>
-    <div style="margin-bottom: 5px">
-      <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
-        新增
-      </el-button>
-      <el-button type="primary" @click="openDialog()" :disabled="false"> 诊断 </el-button>
-      <el-button type="primary" @click="handleSaveBatch()" :disabled="false"> 保存 </el-button>
-      <el-button type="primary" @click="handleSave()" :disabled="false"> 签发 </el-button>
-      <el-button type="warning" plain @click="handleSingOut()" :disabled="false"> 撤回 </el-button>
-      <!-- <el-button
-        type="primary"
-        plain
-        @click="proxy.$refs.orderFroupRef.handleOpen()"
-        :disabled="false"
-      >
-        组套
-      </el-button>
-      <el-button
-        type="primary"
-        plain
-        :disabled="false"
-        @click="proxy.$refs.prescriptionHistoryRef.handleOpen()"
-      >
-        历史
-      </el-button>
-      <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
-      <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button> -->
-      <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
-      <!-- <span class="doctor-station">
-        诊断：
-      </span>
-      <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
-        <el-option
-          v-for="item in diagnosisList"
-          :key="item.conditionId"
-          :label="item.name"
-          :value="item.definitionId"
-          @click="handleDiagnosisChange(item)"
-        />
-      </el-select> -->
-      <span class="doctor-station"> 费用性质： </span>
-      <el-select v-model="accountId" placeholder="费用性质" style="width: 120px">
-        <el-option
-          v-for="item in contractList"
-          :key="item.accountId"
-          :label="item.contractName"
-          :value="item.accountId"
-        />
-      </el-select>
-      <span class="doctor-station"> 用药途径： </span>
-      <el-select v-model="methodCode" placeholder="费用性质" style="width: 120px">
-        <el-option
-          v-for="dict in method_code"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-      <span class="doctor-station"> 频次： </span>
-      <el-select v-model="rateCode" placeholder="费用性质" style="width: 120px">
-        <el-option
-          v-for="dict in rate_code"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-      <span class="doctor-station"> 用药天数： </span>
-      <el-input v-model="dispensePerDuration" placeholder=" " style="width: 70px" />
-      <span class="doctor-station"> 副数： </span>
-      <el-input
-        v-model="chineseHerbsDoseQuantity"
-        placeholder=" "
-        style="width: 70px"
-        @input="
-          (value) => {
-            let price = 0;
-            prescriptionList.forEach((item) => {
-              price += item.totalPrice;
-            });
-            totalAmount = dispensePerDuration * value * price;
-          }
-        "
-      />
-      <span class="doctor-station"> 是否代煎： </span>
-      <el-checkbox v-model="sufferingFlag" placeholder=" " />
-    </div>
-    <div style="display: flex; width: 100%; gap: 5px">
-      <div style="width: 25%">
-        <div
-          class="doctor-station"
-          style="padding: 10px 10px; margin-left: 0; font-size: 15px; border: 1px solid #eee"
-        >
-          中医诊断
+  <div style="max-height: 750px; overflow-y: auto;">
+    <div class="prescription-section" v-for="(item, index) in tcmPrescriptionList" :key="index">
+      <div class="section-header">
+        <div class="title first-prescription">
+          <i class="el-icon-notebook-2"></i>
+          <span>{{ '处方' + (index + 1) }}</span>
+          <el-icon
+            class="add-icon"
+            title="新增处方"
+            @click="addNewPrescription()"
+            style="font-size: 26px !important; margin-left: 10px; color: #409eff"
+          >
+            <plus />
+          </el-icon>
+        </div>
+        <div class="summary">
+          <span class="summary-item">药品数: {{ '1' }}种</span>
+          <span class="summary-item">总价: ¥ {{ 100 }}</span>
         </div>
-        <el-table :data="tcmDiagnosisList" border>
-          <el-table-column label="诊断" align="center" prop="condition" />
-          <el-table-column label="证候" align="center" prop="syndrome" />
-          <el-table-column label="操作" align="center" width="80">
-            <template #default="scope">
-              <el-button type="primary" link @click="deleteDiagnosisBind(scope.row.id)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
       </div>
-      <div style="width: 75%">
+      <div>
+        <div style="margin-top: 10px">
+          <el-button type="primary" @click="handleAddMedicine()" plain> 添加药品 </el-button>
+          <el-button type="primary" @click="handleSaveBatch()" plain> 保存 </el-button>
+          <el-button type="primary" @click="handleSave()" plain> 签发 </el-button>
+          <el-button type="warning" plain @click="handleSingOut()"> 撤回 </el-button>
+          <el-button type="danger" plain @click="handleDelete()" :disabled="false">
+            删除
+          </el-button>
+        </div>
         <div
           class="doctor-station"
-          style="padding: 10px 10px; margin-left: 0; font-size: 15px; border: 1px solid #eee"
+          style="padding: 10px 10px 10px 0; margin-left: 0; font-size: 15px"
         >
-          中药处方
-
-          <span class="doctor-station" style="float: right">
-            合计金额：{{ totalAmount ? totalAmount.toFixed(2) : 0 }}元
-          </span>
+          <span class="doctor-station" style="margin-left: 0"> 诊断： </span>
+          <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
+            <el-option
+              v-for="item in diagnosisList"
+              :key="item.definitionId"
+              :label="item.name"
+              :value="item.definitionId"
+              @click="handleDiagnosisChange(item)"
+            />
+          </el-select>
+          <span class="doctor-station"> 费用性质： </span>
+          <el-select v-model="accountId" placeholder="费用性质" style="width: 120px">
+            <el-option
+              v-for="item in contractList"
+              :key="item.accountId"
+              :label="item.contractName"
+              :value="item.accountId"
+            />
+          </el-select>
+          <span class="doctor-station"> 用药途径： </span>
+          <el-select v-model="methodCode" placeholder="费用性质" style="width: 120px">
+            <el-option
+              v-for="dict in method_code"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <span class="doctor-station"> 频次： </span>
+          <el-select v-model="rateCode" placeholder="费用性质" style="width: 120px">
+            <el-option
+              v-for="dict in rate_code"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <span class="doctor-station"> 用药天数： </span>
+          <el-input v-model="dispensePerDuration" placeholder=" " style="width: 70px" />
+          <span class="doctor-station"> 付数： </span>
+          <el-input
+            v-model="chineseHerbsDoseQuantity"
+            placeholder=" "
+            style="width: 70px"
+            @input="
+              (value) => {
+                let price = 0;
+                prescriptionList.forEach((item) => {
+                  price += item.totalPrice;
+                });
+                totalAmount = dispensePerDuration * value * price;
+              }
+            "
+          />
+          <span class="doctor-station"> 是否代煎： </span>
+          <el-checkbox v-model="sufferingFlag" placeholder=" " />
+          <span class="doctor-station" style="float: right"> </span>
         </div>
         <el-table
           max-height="650"
@@ -183,11 +157,11 @@
                           label="数量："
                           prop="dose"
                           class="required-field"
-                          data-prop="doseQuantity"
+                          data-prop="minUnitQuantity"
                         >
                           <el-input-number
                             :min="0"
-                            v-model="scope.row.doseQuantity"
+                            v-model="scope.row.minUnitQuantity"
                             controls-position="right"
                             :controls="false"
                             style="width: 70px; margin-right: 20px"
@@ -196,7 +170,7 @@
                               () => {
                                 nextTick(() => {
                                   scope.row.totalPrice =
-                                    scope.row.doseQuantity * scope.row.unitPrice;
+                                    scope.row.minUnitQuantity * scope.row.unitPrice;
                                 });
                               }
                             "
@@ -316,8 +290,13 @@
             <template #default="scope">
               <span v-if="!scope.row.isEdit">
                 {{
-                  scope.row.dose
-                    ? formatNumber(scope.row.doseQuantity) + ' ' + scope.row.doseUnitCode_dictText
+                  scope.row.quantity
+                    ? formatNumber(scope.row.quantity) +
+                      ' ' +
+                      scope.row.doseUnitCode_dictText +
+                      '  (' +
+                      scope.row.chineseHerbsDoseQuantity +
+                      '付)'
                     : ''
                 }}
               </span>
@@ -370,15 +349,17 @@
 <script setup>
 import {
   getDiagnosisDefinitionList,
-  savePrescription,
   getEncounterDiagnosis,
-  getPrescriptionList,
+  saveTcmAdvice,
+  getTcmAdviceList,
   getOrgTree,
-  savePrescriptionSign,
-  singOut,
+  signTcmAdvice,
+  getTcmDiagnosis,
+  signOutTcmAdvice,
   updateGroupId,
   getContract,
   getAdviceBaseInfo,
+  savePrescription,
 } from '@/views/doctorstation/components/api';
 import tcmMedicineList from './tcmMedicineList';
 import { computed, getCurrentInstance, nextTick, watch } from 'vue';
@@ -387,7 +368,6 @@ import { calculateQuantityByDays, formatNumber } from '@/utils/his';
 // import PrescriptionHistory from './prescriptionHistory';
 import Decimal from 'decimal.js';
 import tcmdiagnosisDialog from './tcmdiagnosisDialog';
-import { itemTraceNo } from '../../../clinicmanagement/returnDrug/components/api';
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
@@ -401,6 +381,7 @@ const rowIndex = ref(-1);
 const groupIndex = ref(1);
 const groupIndexList = ref([]);
 const diagnosisList = ref([]);
+const tcmPrescriptionList = ref([1]);
 const nextId = ref(1);
 const unitCodeList = ref([]);
 const adviceTableRef = ref([]);
@@ -531,26 +512,36 @@ function getList() {
 
 function getListInfo(addNewRow) {
   isAdding.value = false;
-  let list = getFromLocalStorage(props.patientInfo.encounterId);
-  prescriptionList.value = list == null ? [] : list.list;
-  sufferingFlag.value = list?.sufferingFlag;
-  dispensePerDuration.value = list?.dispensePerDuration;
-  chineseHerbsDoseQuantity.value = list?.chineseHerbsDoseQuantity;
-  rateCode.value = list?.rateCode;
-  methodCode.value = list?.methodCode;
-  // getPrescriptionList(props.patientInfo.encounterId).then((res) => {
-  //   prescriptionList.value = res.data.map((item) => {
-  //     return {
-  //       ...JSON.parse(item.contentJson),
-  //       ...item,
-  //       doseQuantity: JSON.parse(item.contentJson)?.doseQuantity,
-  //       doseUnitCode_dictText: JSON.parse(item.contentJson)?.doseUnitCode_dictText,
-  //     };
-  //   });
-  //   if (props.activeTab == 'prescription' && addNewRow) {
-  //     handleAddPrescription();
+  // getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
+  //   if (res.data) {
+  //     let tcmDiagnosis = {};
+  //     res.data.illness.forEach((item, index) => {
+  //       tcmDiagnosis.condition = item.name;
+  //       tcmDiagnosis.syndrome = res.data.symptom[index].name;
+  //       tcmDiagnosisList.value.push(tcmDiagnosis);
+  //     });
   //   }
   // });
+  // let list = getFromLocalStorage(props.patientInfo.encounterId);
+  // prescriptionList.value = list == null ? [] : list.list;
+  // sufferingFlag.value = list?.sufferingFlag;
+  // dispensePerDuration.value = list?.dispensePerDuration;
+  // chineseHerbsDoseQuantity.value = list?.chineseHerbsDoseQuantity;
+  // rateCode.value = list?.rateCode;
+  // methodCode.value = list?.methodCode;
+  getTcmAdviceList({ encounterId: props.patientInfo.encounterId }).then((res) => {
+    prescriptionList.value = res.data.map((item) => {
+      return {
+        // ...JSON.parse(item.contentJson),
+        ...item,
+        doseQuantity: JSON.parse(item.contentJson)?.doseQuantity,
+        doseUnitCode_dictText: JSON.parse(item.contentJson)?.doseUnitCode_dictText,
+      };
+    });
+    if (props.activeTab == 'prescription' && addNewRow) {
+      handleAddMedicine();
+    }
+  });
   tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId);
   getContract({ encounterId: props.patientInfo.encounterId }).then((res) => {
     contractList.value = res.data;
@@ -559,16 +550,23 @@ function getListInfo(addNewRow) {
 }
 
 function getDiagnosisInfo() {
-  getEncounterDiagnosis(props.patientInfo.encounterId).then((res) => {
-    diagnosisList.value = res.data;
-    let diagnosisInfo = diagnosisList.value.filter((item) => {
-      return item.maindiseFlag == 1;
-    });
-    diagnosisInfo.value = diagnosisInfo[0];
-    conditionDefinitionId.value = diagnosisInfo[0].definitionId;
-    conditionId.value = diagnosisInfo[0].conditionId;
-    encounterDiagnosisId.value = diagnosisInfo[0].encounterDiagnosisId;
-    diagnosisName.value = diagnosisInfo[0].name;
+  diagnosisList.value = [];
+  getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
+    if (res.data.illness.length > 0) {
+      res.data.illness.forEach((item, index) => {
+        diagnosisList.value.push({
+          name: item.name + '-' + res.data.symptom[index].name,
+          definitionId: item.definitionId,
+          encounterDiagnosisId: item.encounterDiagnosisId,
+          conditionId: item.conditionId,
+        });
+      });
+    }
+    diagnosisInfo.value = diagnosisList.value[0];
+    conditionDefinitionId.value = diagnosisInfo.value.definitionId;
+    conditionId.value = diagnosisInfo.value.conditionId;
+    encounterDiagnosisId.value = diagnosisInfo.value.encounterDiagnosisId;
+    diagnosisName.value = diagnosisInfo.value.name;
   });
 }
 
@@ -577,7 +575,7 @@ function getRowDisabled(row) {
 }
 
 // 新增医嘱
-function handleAddPrescription() {
+function handleAddMedicine() {
   // if (diagnosisList.value.length == 0) {
   //   proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
   //   return;
@@ -658,6 +656,10 @@ function deleteDiagnosisBind(id) {
   getListInfo();
 }
 
+function addNewPrescription(){
+  tcmPrescriptionList.value.push({})
+}
+
 /**
  * 选择药品回调
  */
@@ -769,7 +771,6 @@ function handleDelete() {
   let deleteList = [];
   for (let i = prescriptionList.value.length - 1; i >= 0; i--) {
     let deleteItem = prescriptionList.value[i];
-    localStorage.removeItem(`prescription_${deleteItem.encounterId}`);
     // 通过requestId判断是否已保存，如果选中项未保存 直接从数组中移除，如果已保存，调接口删除
     if (deleteItem.check && deleteItem.statusEnum == 1 && !deleteItem.requestId) {
       prescriptionList.value.splice(i, 1);
@@ -783,13 +784,13 @@ function handleDelete() {
   }
 
   if (deleteList.length > 0) {
+    savePrescription({ adviceSaveList: deleteList }).then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess('操作成功');
+        getListInfo(false);
+      }
+    });
     getListInfo();
-    // savePrescription({ adviceSaveList: deleteList }).then((res) => {
-    //   if (res.code == 200) {
-    //     proxy.$modal.msgSuccess('操作成功');
-    //     getListInfo(false);
-    //   }
-    // });
   } else {
     proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
     return;
@@ -839,25 +840,6 @@ function handleSave() {
   if (!validateGroups(saveList)) {
     return;
   }
-  // let itemName = '';
-  // saveList.forEach((item) => {
-  //   if (item.injectFlag == 1 && item.groupId == undefined) {
-  //     itemName = itemName ? itemName + ', ' : '';
-  //     itemName += item.adviceName;
-  //   }
-  // });
-  // if (itemName != '') {
-  //   proxy.$modal.msgWarning(itemName + '为输液项目，请进行分组');
-  //   return;
-  // }
-  // saveList.forEach((item) => {
-  //   item.patientId = props.patientInfo.patientId;
-  //   item.encounterId = props.patientInfo.encounterId;
-  //   item.accountId = props.patientInfo.accountId;
-  //   item.dbOpType = '1';
-  // });
-  // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
-  // loading.value = true;
   let list = saveList.map((item) => {
     return {
       ...item,
@@ -869,22 +851,20 @@ function handleSave() {
       statusEnum: 2,
     };
   });
-  saveToLocalStorage(list);
-  proxy.$modal.msgSuccess('签发成功');
-  // savePrescriptionSign({
-  //   organizationId: props.patientInfo.orgId,
-  //   adviceSaveList: list,
-  // })
-  //   .then((res) => {
-  //     if (res.code === 200) {
-  //       proxy.$modal.msgSuccess('保存成功');
-  //       getListInfo(false);
-  //       nextId.value == 1;
-  //     }
-  //   })
-  //   .finally(() => {
-  //     loading.value = false;
-  //   });
+  signTcmAdvice({
+    organizationId: props.patientInfo.orgId,
+    adviceSaveList: list,
+  })
+    .then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('保存成功');
+        getListInfo(false);
+        nextId.value == 1;
+      }
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 }
 
 function handleClickOutside(row, index) {
@@ -896,40 +876,41 @@ function handleClickOutside(row, index) {
 // 单行处方保存
 function handleSaveSign(row, index) {
   proxy.$refs['formRef' + index].validate((valid) => {
-    if (valid) {
-      row.isEdit = false;
-      isAdding.value = false;
-      expandOrder.value = [];
-      row.contentJson = undefined;
-      row.patientId = props.patientInfo.patientId;
-      row.encounterId = props.patientInfo.encounterId;
-      row.accountId = accountId.value;
-      if (row.adviceType == 1) {
-        row.minUnitQuantity =
-          row.doseUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;
-      } else {
-        row.minUnitQuantity = row.quantity;
-      }
-      row.conditionId = conditionId.value;
-      row.unitPrice =
-        row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit'
-          ? row.unitPrice
-          : new Decimal(row.unitPrice).div(row.partPercent).toFixed(2);
-      row.conditionDefinitionId = conditionDefinitionId.value;
-      row.encounterDiagnosisId = encounterDiagnosisId.value;
-      row.diagnosisName = diagnosisName.value;
-      // row.dose = row.doseQuantity;
-      // row.doseUnitCode = unitCodeList.value.find((item) => item.type == 'dose').value;
-      // row.doseUnitCode = JSON.parse(JSON.stringify(row.minUnitCode)); // 页面显示与赋值不符，此处先简单处理，后续修改
-      row.contentJson = JSON.stringify(row);
-      // savePrescription({ adviceSaveList: prescriptionList.value }).then((res) => {
-      //   if (res.code === 200) {
-      //     proxy.$modal.msgSuccess('保存成功');
-      //     getListInfo(true);
-      //     nextId.value == 1;
-      //   }
-      // });
-    }
+    // if (valid) {
+    row.isEdit = false;
+    isAdding.value = false;
+    expandOrder.value = [];
+    row.contentJson = undefined;
+    row.patientId = props.patientInfo.patientId;
+    row.encounterId = props.patientInfo.encounterId;
+    row.accountId = accountId.value;
+    // if (row.adviceType == 1) {
+    //   row.minUnitQuantity =
+    //     row.doseUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;
+    // } else {
+    //   row.minUnitQuantity = row.quantity;
+    // }
+    row.quantity = row.minUnitQuantity;
+    row.conditionId = conditionId.value;
+    row.unitPrice =
+      row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit'
+        ? row.unitPrice
+        : new Decimal(row.unitPrice).div(row.partPercent).toFixed(2);
+    row.conditionDefinitionId = conditionDefinitionId.value;
+    row.encounterDiagnosisId = encounterDiagnosisId.value;
+    row.diagnosisName = diagnosisName.value;
+    // row.dose = row.doseQuantity;
+    // row.doseUnitCode = unitCodeList.value.find((item) => item.type == 'dose').value;
+    // row.doseUnitCode = JSON.parse(JSON.stringify(row.minUnitCode)); // 页面显示与赋值不符，此处先简单处理，后续修改
+    row.contentJson = JSON.stringify(row);
+    // savePrescription({ adviceSaveList: prescriptionList.value }).then((res) => {
+    //   if (res.code === 200) {
+    //     proxy.$modal.msgSuccess('保存成功');
+    //     getListInfo(true);
+    //     nextId.value == 1;
+    //   }
+    // });
+    // }
   });
 }
 
@@ -941,58 +922,25 @@ function handleSaveBatch() {
     .map((item, index) => {
       return {
         ...item,
+        chineseHerbsDoseQuantity: chineseHerbsDoseQuantity.value,
         dbOpType: item.requestId ? '2' : '1',
-        requestId: (index + 1).toString(),
       };
     });
   if (saveList.length == 0) {
     proxy.$modal.msgWarning('当前没有可保存医嘱');
     return;
   }
-
-  saveToLocalStorage(saveList);
-  proxy.$modal.msgSuccess('保存成功');
-  // savePrescription({ adviceSaveList: saveList }).then((res) => {
-  //   if (res.code === 200) {
-  //     proxy.$modal.msgSuccess('保存成功');
-  //     getListInfo(true);
-  //     nextId.value == 1;
-  //   }
-  // });
-}
-// 保存 saveList 到本地缓存
-function saveToLocalStorage(saveList) {
-  try {
-    // 使用 encounterId 作为 key 的一部分
-    const storageKey = `prescription_${saveList[0]?.encounterId}`;
-    localStorage.removeItem(storageKey);
-    localStorage.setItem(
-      storageKey,
-      JSON.stringify({
-        list: saveList,
-        sufferingFlag: sufferingFlag.value,
-        dispensePerDuration: dispensePerDuration.value,
-        chineseHerbsDoseQuantity: chineseHerbsDoseQuantity.value,
-        rateCode: rateCode.value,
-        methodCode: methodCode.value,
-      })
-    );
-    getListInfo();
-  } catch (error) {
-    console.error('本地缓存保存失败:', error);
-  }
-}
-
-// 从本地缓存读取数据
-function getFromLocalStorage(encounterId) {
-  try {
-    const storageKey = `prescription_${encounterId}`;
-    const data = localStorage.getItem(storageKey);
-    return data ? JSON.parse(data) : null;
-  } catch (error) {
-    console.error('从本地缓存读取失败:', error);
-    return null;
+  if (chineseHerbsDoseQuantity.value == undefined || chineseHerbsDoseQuantity.value == 0) {
+    proxy.$modal.msgWarning('请输入付数');
+    return;
   }
+  saveTcmAdvice({ adviceSaveList: saveList }).then((res) => {
+    if (res.code === 200) {
+      proxy.$modal.msgSuccess('保存成功');
+      getListInfo(true);
+      nextId.value == 1;
+    }
+  });
 }
 
 // 获取诊断列表
@@ -1208,22 +1156,18 @@ function handleSingOut() {
       return item.check && item.statusEnum == 2;
     })
     .map((item) => {
-      return {
-        ...item,
-        statusEnum: 1,
-      };
+      item.requestId;
     });
   if (requestIdList.length == 0) {
     proxy.$modal.msgWarning('请选择已签发医嘱撤回');
   }
 
-  saveToLocalStorage(requestIdList);
-  // singOut(requestIdList).then((res) => {
-  //   if (res.code == 200) {
-  //     proxy.$modal.msgSuccess('操作成功');
-  //     getListInfo(false);
-  //   }
-  // });
+  signOutTcmAdvice(requestIdList).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+      getListInfo(false);
+    }
+  });
 }
 
 function handleGroupId(paramList) {
@@ -1712,4 +1656,59 @@ defineExpose({ getListInfo, getDiagnosisInfo });
   font-weight: 700;
   margin-left: 15px;
 }
+
+.prescription-section {
+  background: white;
+  padding: 0 10px 10px 10px;
+  margin-bottom: 20px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+}
+
+.first-prescription {
+  border-left: 2px solid #409eff;
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #eee;
+}
+
+.section-header .title {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+  font-weight: bold;
+  color: #1a2b6d;
+}
+
+.section-header .title i {
+  margin-right: 10px;
+  font-size: 24px;
+}
+
+.summary {
+  display: flex;
+  gap: 25px;
+}
+
+.summary-item {
+  background: #f8f9fa;
+  padding: 8px 15px;
+  border-radius: 20px;
+  font-size: 15px;
+  color: #555;
+}
+
+.add-icon {
+  cursor: pointer;
+  border-radius: 50%;
+  padding: 4px;
+  transition: background-color 0.3s ease;
+}
+
+.add-icon:hover {
+  background-color: #ecf5ff;
+}
 </style>
\ No newline at end of file
diff --git a/vue3/src/views/doctorstation/components/tcm/tcmMedicineList.vue b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmMedicineList.vue
similarity index 100%
rename from vue3/src/views/doctorstation/components/tcm/tcmMedicineList.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmMedicineList.vue
diff --git a/vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue
similarity index 49%
rename from vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue
rename to openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue
index 9baafac8..ec01dd0d 100644
--- a/vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue
@@ -57,7 +57,7 @@
 
 <script setup>
 import { ref } from 'vue';
-import { getTcmCondition, getTcmSyndrome } from '@/views/doctorstation/components/api';
+import { getTcmCondition, getTcmSyndrome, saveTcmDiagnosis } from '@/views/doctorstation/components/api';
 
 const condition = ref('');
 const syndrome = ref('');
@@ -161,4 +161,223 @@ defineExpose({ openDialog });
 :deep(.pagination-container .el-pagination) {
   right: 20px !important;
 }
-</style>
\ No newline at end of file
+
+.app-container {
+  max-width: 1400px;
+  margin: 20px auto;
+  padding: 20px;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 2px 20px rgba(0, 0, 0, 0.08);
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 15px;
+  border-bottom: 1px solid var(--el-border-color);
+  margin-bottom: 20px;
+}
+
+.header h1 {
+  color: var(--el-color-primary);
+  font-size: 24px;
+  font-weight: 600;
+}
+
+.patient-info {
+  background: var(--el-color-primary-light-9);
+  padding: 15px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+}
+
+.patient-info .info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.patient-info .info-label {
+  width: 100px;
+  color: var(--el-text-color-secondary);
+  font-weight: 500;
+}
+
+.main-content {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1.2fr;
+  gap: 20px;
+  margin-bottom: 25px;
+}
+
+.disease-section, .syndrome-section, .diagnosis-section {
+  border: 1px solid var(--el-border-color);
+  border-radius: 8px;
+  padding: 20px;
+  background: white;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.section-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: var(--el-color-primary);
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid var(--el-border-color);
+}
+
+.disease-list {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.disease-item {
+  padding: 12px 15px;
+  border-bottom: 1px solid var(--el-border-color-lighter);
+  cursor: pointer;
+  transition: all 0.3s;
+  border-radius: 4px;
+}
+
+.disease-item:hover {
+  background-color: var(--el-color-primary-light-9);
+}
+
+.disease-item.active {
+  background-color: var(--el-color-primary-light-8);
+  border-left: 3px solid var(--el-color-primary);
+}
+
+.disease-name {
+  font-weight: 500;
+  margin-bottom: 5px;
+}
+
+.disease-code {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
+.search-box {
+  margin-bottom: 15px;
+}
+
+.disease-categories {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+
+.category-tag {
+  cursor: pointer;
+  padding: 5px 12px;
+  border-radius: 15px;
+  background: var(--el-fill-color-light);
+  font-size: 13px;
+  transition: all 0.3s;
+}
+
+.category-tag.active {
+  background: var(--el-color-primary);
+  color: white;
+}
+
+.relation-container {
+  text-align: center;
+  padding: 30px 0;
+  border: 2px dashed var(--el-border-color);
+  border-radius: 8px;
+  margin: 20px 0;
+  background: var(--el-fill-color-lighter);
+}
+
+.relation-icon {
+  margin-bottom: 15px;
+  color: var(--el-color-primary);
+}
+
+.relation-text {
+  font-size: 18px;
+  font-weight: 500;
+  color: var(--el-text-color-primary);
+}
+
+.syndrome-details {
+  padding: 15px;
+  background: var(--el-color-primary-light-9);
+  border-radius: 8px;
+  border: 1px solid var(--el-color-primary-light-5);
+}
+
+.detail-item {
+  margin-bottom: 12px;
+}
+
+.detail-label {
+  font-weight: 500;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 3px;
+}
+
+.actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 15px;
+  padding-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+}
+
+.empty-state {
+  text-align: center;
+  padding: 40px 0;
+  color: var(--el-text-color-secondary);
+}
+
+.diagnosis-history {
+  margin-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+  padding-top: 20px;
+}
+
+.history-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin-bottom: 12px;
+  color: var(--el-text-color-primary);
+}
+
+.history-item {
+  padding: 12px;
+  border-left: 3px solid var(--el-border-color);
+  margin-bottom: 10px;
+  background: var(--el-fill-color-lighter);
+  border-radius: 0 4px 4px 0;
+}
+
+.history-date {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 5px;
+}
+
+.history-diagnosis {
+  font-size: 14px;
+  margin-bottom: 5px;
+}
+
+.history-note {
+  font-size: 13px;
+  color: var(--el-text-color-secondary);
+  padding-top: 5px;
+  border-top: 1px dashed var(--el-border-color);
+  margin-top: 5px;
+}
+
+.empty-list {
+  padding: 20px 0;
+  text-align: center;
+}
+</style>
diff --git a/vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue
similarity index 87%
rename from vue3/src/views/doctorstation/index.vue
rename to openhis-ui-vue3/src/views/doctorstation/index.vue
index efbcf818..97c2afea 100644
--- a/vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -97,7 +97,7 @@
           <el-descriptions-item label="医生：" width="150">{{
             userStore.name
           }}</el-descriptions-item>
-          <el-descriptions-item label="" width="150">
+          <el-descriptions-item label="" width="300">
             <el-button type="primary" plain @click.stop="handleFinish(patientInfo.encounterId)">
               完诊
             </el-button>
@@ -107,6 +107,24 @@
             <el-button type="primary" plain @click.stop="handleRefund(patientInfo.encounterId)">
               退费
             </el-button>
+            <el-button
+              type="primary"
+              plain
+              @click.stop="getEnPrescription(patientInfo.encounterId)"
+            >
+              处方单
+            </el-button>
+            <el-button
+              type="primary"
+              plain
+              @click.stop="
+                () => {
+                  openDialog = true;
+                }
+              "
+            >
+              办理住院
+            </el-button>
           </el-descriptions-item>
         </el-descriptions>
       </div>
@@ -158,23 +176,41 @@
       </div>
     </div>
     <el-drawer v-model="drawer" title="患者队列" direction="ltr" @open="handleOpen">
-      <Patientlist ref="patientDrawerRef" @toCurrent="handleReceive" />
+      <PatientList ref="patientDrawerRef" @toCurrent="handleReceive" />
     </el-drawer>
     <RefundListDialog
       :open="openRefundListDialog"
       :encounterId="currentEncounterId"
       @close="openRefundListDialog = false"
     />
+    <HospitalizationDialog
+      :open="openDialog"
+      :patientInfo="patientInfo"
+      :encounterId="currentEncounterId"
+      @close="openDialog = false"
+    />
+    <PrescriptionInfo
+      :open="openPrescriptionDialog"
+      :precriptionInfo="prescriptionInfo"
+      @close="openPrescriptionDialog = false"
+    />
   </div>
 </template>
 <script setup>
-import Emr from './components/emr.vue';
-import { getList, leaveEncounter, completeEncounter } from './components/api.js';
-import prescriptionlist from './components/prescriptionlist.vue';
-import RefundListDialog from './components/refundListDialog.vue';
-import Patientlist from './components/patientlist.vue';
-import Diagnosis from './components/diagnosis.vue';
+import Emr from './components/emr/emr.vue';
+import {
+  getList,
+  leaveEncounter,
+  completeEncounter,
+  getEnPrescriptionInfo,
+} from './components/api.js';
+import prescriptionlist from './components/prescription/prescriptionlist.vue';
+import RefundListDialog from './components/prescription/refundListDialog.vue';
+import PatientList from './components/patientList.vue';
+import Diagnosis from './components/diagnosis/diagnosis.vue';
+import PrescriptionInfo from './components/prescription/prescriptionInfo.vue';
 import eprescriptionlist from './components/eprescriptionlist.vue';
+import HospitalizationDialog from './components/hospitalizationDialog.vue';
 import tcmAdvice from './components/tcm/tcmAdvice.vue';
 import { formatDate, formatDateStr } from '@/utils/index';
 import useUserStore from '@/store/modules/user';
@@ -198,17 +234,22 @@ defineOptions({
 const userStore = useUserStore();
 const bedfont = 'bed-font';
 const queryParams = ref({
+  pageNo: 1,
+  pageSize: 50,
   registerTimeSTime: formatDateStr(new Date(), 'YYYY-MM-DD') + ' 00:00:00',
   registerTimeETime: formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59',
 });
 const drawer = ref(false);
 const openRefundListDialog = ref(false);
+const openDialog = ref(false);
+const openPrescriptionDialog = ref(false);
 const saveStatus = ref(false);
 const currentEncounterId = ref('');
 const emits = defineEmits(['click']);
 const activeTab = ref('emr');
 const patientList = ref([]);
 const patientInfo = ref({});
+const prescriptionInfo = ref([]);
 const registerTime = ref(formatDate(new Date()));
 const patientDrawerRef = ref();
 const prescriptionRef = ref();
@@ -221,6 +262,7 @@ const { proxy } = getCurrentInstance();
 const disabled = computed(() => {
   return Object.keys(patientInfo.value).length === 0;
 });
+
 const eprescriptionRef = ref();
 onMounted(() => {
   getWaitPatient();
@@ -258,6 +300,10 @@ function handleClick(tab) {
       break;
     case 'prescription':
       prescriptionRef.value.getDiagnosisInfo();
+      break;
+    case 'tcm':
+      tcmRef.value.getDiagnosisInfo();
+      break;
     case 'eprescription':
       eprescriptionRef.value.getList();
       break;
@@ -276,7 +322,13 @@ function handleClick(tab) {
   // }
 }
 
-function handleQuery() {}
+// 查看本次就诊处方单
+function getEnPrescription(encounterId) {
+  getEnPrescriptionInfo({ encounterId: encounterId }).then((res) => {
+    prescriptionInfo.value = res.data;
+    openPrescriptionDialog.value = true;
+  });
+}
 
 function handleRefund(encounterId) {
   currentEncounterId.value = encounterId;
diff --git a/vue3/src/views/error/401.vue b/openhis-ui-vue3/src/views/error/401.vue
similarity index 100%
rename from vue3/src/views/error/401.vue
rename to openhis-ui-vue3/src/views/error/401.vue
diff --git a/vue3/src/views/error/404.vue b/openhis-ui-vue3/src/views/error/404.vue
similarity index 100%
rename from vue3/src/views/error/404.vue
rename to openhis-ui-vue3/src/views/error/404.vue
diff --git a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js
similarity index 50%
rename from vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js
index 7081c8b3..dfd3f93f 100644
--- a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/api.js
@@ -1,19 +1,20 @@
 import request from '@/utils/request'
 
 // 获取预交金信息初期数据列表
-export function getDepositInfoPage(query) {
+export function getDepositInfo(query) {
   return request({
-    url: '/deposit-manage/deposit-page',
+    url: '/inhospital-charge/advance-payment/advance-payment-info',
     method: 'get',
     params: query
   })
 }
 
 // 获取预交金信息初期数据列表
-export function getDepositInfoInit() {
+export function getDepositInfoPage(params) {
   return request({
-    url: '/deposit-manage/init',
-    method: 'get'
+    url: '/inhospital-charge/advance-payment/advance-payment-flow',
+    method: 'get',
+    params: params
   })
 }
 
@@ -26,13 +27,23 @@ export function getPatientInfoPage(query) {
   })
 }
 
-
 /**
  * 收费
  */
 export function savePayment(data) {
     return request({
-      url: '/deposit-manage/charge',
+      url: '/inhospital-charge/advance-payment/in-advance-payment',
+      method: 'post',
+      data: data
+    })
+}
+
+/**
+ * 退费
+ */
+export function refund(data) {
+    return request({
+      url: '/inhospital-charge/advance-payment/out-advance-payment',
       method: 'post',
       data: data
     })
diff --git a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue
similarity index 78%
rename from vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue
index 2252f90a..5f06321e 100644
--- a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/chargeDialog.vue
@@ -16,11 +16,11 @@
         label-position="left"
       >
         <el-text size="large">
-          <el-form-item label="费用性质：" prop="currentDate"> {{ '自费' }} </el-form-item>
+          <!-- <el-form-item label="费用性质：" prop="currentDate"> {{ '自费' }} </el-form-item> -->
         </el-text>
         <!-- 自费支付 -->
         <div class="payment-container">
-          <el-form-item label="支付方式：" prop="payEnum" style="display: flex">
+          <!-- <el-form-item label="支付方式：" prop="payEnum" style="display: flex">
             <el-select
               v-model="form.payEnum"
               placeholder="选择支付方式"
@@ -35,7 +35,7 @@
                 :disabled="isMethodDisabled(payEnum.value)"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="支付金额：" prop="amount">
             <div class="suffix-wrapper">
               <el-input-number
@@ -55,11 +55,10 @@
         <div class="summary">
           <el-space :size="30">
             <div class="summary-item">
-              <!-- <el-text type="info">实收合计：</el-text> -->
               <el-form-item label="实收合计：" prop="displayAmount">
-                <el-text type="success">{{
-                  form.displayAmount ? form.displayAmount : 0 + ' 元'
-                }}</el-text>
+                <el-text type="success">
+                  {{ form.displayAmount ? form.displayAmount : 0 + ' 元' }}
+                </el-text>
               </el-form-item>
             </div>
           </el-space>
@@ -78,7 +77,6 @@
 <script setup>
 import { savePayment } from './api';
 import { computed, watch, reactive, ref, getCurrentInstance, nextTick } from 'vue';
-import { Delete } from '@element-plus/icons-vue';
 
 const props = defineProps({
   open: {
@@ -111,30 +109,12 @@ const emit = defineEmits(['close']);
 const payMethods = ref(undefined);
 
 async function submit() {
-  // if (parseFloat(displayAmount.value) < formData.totalAmount.toFixed(2)) {
-  //   proxy.$modal.msgError('请输入正确的结算金额');
-  //   return;
-  // }
-
-  console.log(form.value, 'aaaaaaaaaaaaaaaaaaaaaaaaaa');
-
-  // if ( chrome.webview === undefined) {
-  //   alert('当前版本不支持银联支付');
-  // } else {
-  //   try {
-  //     let jsonResult = await window.chrome.webview.hostObjects.CSharpAccessor.ReadCardAsync();
-  //     let cardInfo = JSON.parse(jsonResult);
-  //     console.log(cardInfo.CardType);
-  //   } catch (error) {
-  //     console.error('调用失败:', error);
-  //   }
-  // }
   form.value.patientId = props.patientInfo.patientId;
   form.value.encounterId = props.patientInfo.encounterId;
-  console.log(props.patientInfo, 'patientInfo')
+  form.value.accountId = props.patientInfo.accountId;
+  console.log(props.patientInfo, 'patientInfo');
   savePayment(form.value).then((res) => {
     if (res.code == 200) {
-      // (formData.selfPay = [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }]),
       reset();
       emit('close', 'success');
     }
@@ -180,13 +160,6 @@ function close() {
   emit('close');
 }
 
-// function show() {
-//   // formData.selfPay[index].amount = value;
-// }
-
-// defineExpose({
-//   show,
-// });
 </script>
 
 <style scoped>
diff --git a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue
similarity index 59%
rename from vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue
index cb407876..e66d7140 100644
--- a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/patientList.vue
@@ -4,7 +4,12 @@
       <!-- 筛选区域 -->
       <el-form :inline="true" :model="queryParams" class="filter-form">
         <el-form-item label="在院病区" prop="wardLocationId">
-          <el-select v-model="queryParams.wardLocationId" placeholder="请选择" clearable style="width:160px">
+          <el-select
+            v-model="queryParams.wardLocationId"
+            placeholder="请选择"
+            clearable
+            style="width: 160px"
+          >
             <el-option
               v-for="ward in wardListOptions"
               :key="ward.value"
@@ -31,23 +36,22 @@
         :data="patientData"
         style="width: 100%"
         class="patient-table"
-        @row-click="handleRowClick"
         :row-class-name="tableRowClassName"
+        border
       >
-        <el-table-column prop="wardLocationId_dictText" label="病区" min-width="180" />
-        <el-table-column prop="bedLocationId_dictText" label="床号" min-width="100" />
-        <el-table-column prop="patientName" label="姓名" min-width="120" />
-        <el-table-column prop="admissionNo" label="住院号" min-width="120" />
-        <!-- <el-table-column prop="statusEnum_enumText" label="票据状态" min-width="120" /> -->
-        <el-table-column label="操作" min-width="100">
+        <el-table-column type="index" align="center" label="序号" width="60" />
+        <el-table-column prop="patientName" align="center" label="姓名" />
+        <el-table-column prop="wardName" align="center" label="病区" />
+        <el-table-column prop="bedName" align="center" label="床号" />
+        <el-table-column prop="busNo" align="center" label="住院号" />
+        <el-table-column label="操作" width="80" align="center">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click.stop="viewPatient(scope.row)"
-              >查看</el-button
-            >
+            <el-button link type="primary" size="small" @click.stop="viewPatient(scope.row)">
+              查看
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
-
       <!-- 分页区域 -->
       <pagination
         v-show="total > 0"
@@ -60,9 +64,9 @@
   </el-drawer>
 </template>
 
-<script setup >
-import { defineModel, defineProps, defineEmits, reactive, ref } from 'vue';
-import { getPatientInfoPage } from './api';
+<script setup>
+import { reactive } from 'vue';
+import { getDepositInfo } from './api';
 
 // Props
 const props = defineProps({
@@ -107,141 +111,7 @@ const filterForm = reactive({
   searchText: '',
 });
 
-// 表格数据
-const allPatientData = reactive([
-  {
-    id: 1,
-    ward: '综合外科病区',
-    bedNumber: '18床',
-    name: '张明月',
-    admissionNumber: '100034',
-    masterIndex: '100034',
-  },
-  {
-    id: 2,
-    ward: '综合外科病区',
-    bedNumber: '+2床',
-    name: '王敏',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 3,
-    ward: '综合外科病区',
-    bedNumber: '9床',
-    name: '王丽芬',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 4,
-    ward: '综合外科病区',
-    bedNumber: '10床',
-    name: '古力娜扎',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 5,
-    ward: '综合外科病区',
-    bedNumber: '3床',
-    name: '王新月',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 6,
-    ward: '综合外科病区',
-    bedNumber: '+1床',
-    name: '张明敏',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 7,
-    ward: '综合外科病区',
-    bedNumber: '走10床',
-    name: '胡欣妮',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 8,
-    ward: '综合外科病区',
-    bedNumber: '11床',
-    name: '张明红',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 9,
-    ward: '综合外科病区',
-    bedNumber: '12床',
-    name: '刘邦',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 10,
-    ward: '综合外科病区',
-    bedNumber: '13床',
-    name: '诸葛亮',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 11,
-    ward: '综合外科病区',
-    bedNumber: '14床',
-    name: '曹操',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 12,
-    ward: '综合外科病区',
-    bedNumber: '15床',
-    name: '司马懿',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 13,
-    ward: '综合外科病区',
-    bedNumber: '16床',
-    name: '孙权',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  {
-    id: 14,
-    ward: '综合外科病区',
-    bedNumber: '20床',
-    name: '周瑜',
-    admissionNumber: '109872',
-    masterIndex: '109872',
-  },
-  // 添加更多数据以测试分页
-  {
-    id: 15,
-    ward: '内科病区',
-    bedNumber: '1床',
-    name: '患者A',
-    admissionNumber: '200001',
-    masterIndex: '200001',
-  },
-  {
-    id: 16,
-    ward: '内科病区',
-    bedNumber: '2床',
-    name: '患者B',
-    admissionNumber: '200002',
-    masterIndex: '200002',
-  },
-]);
-
-const patientData = ref([...allPatientData.slice(0, 10)]); // 当前页显示的数据
-const totalPatients = ref(allPatientData.length);
+const patientData = ref([]); // 当前页显示的数据
 const currentPage = ref(1);
 const pageSize = ref(10); // 和图片中每页大约10-15条类似，这里设为10
 const wardListOptions = ref([]);
@@ -325,14 +195,9 @@ function show() {
  */
 function getList() {
   console.log('queryParams', queryParams.value);
-  getPatientInfoPage(queryParams.value).then((res) => {
-    if (res.data && res.data.records && res.data.records.length > 0) {
-      // form.value = JSON.parse(JSON.stringify(res.data.records[0]));
-    }
-    console.log(res, '=================================');
+  getDepositInfo().then((res) => {
     patientData.value = res.data.records;
     total.value = res.data.total;
-    console.log(res, '================================= ');
   });
 }
 function reset() {
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/refundDialog.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/refundDialog.vue
new file mode 100644
index 00000000..61291560
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/components/refundDialog.vue
@@ -0,0 +1,259 @@
+<template>
+  <el-dialog
+    title="确认退费"
+    v-model="props.open"
+    width="700px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+    @open="open"
+  >
+    <div>
+      <el-form
+        :model="form"
+        :rules="rules"
+        ref="chargeDialogRef"
+        label-width="110px"
+        label-position="left"
+      >
+        <el-text size="large">
+          <!-- <el-form-item label="费用性质：" prop="currentDate"> {{ '自费' }} </el-form-item> -->
+        </el-text>
+        <!-- 自费支付 -->
+        <div class="payment-container">
+          <!-- <el-form-item label="支付方式：" prop="payEnum" style="display: flex">
+            <el-select
+              v-model="form.payEnum"
+              placeholder="选择支付方式"
+              style="width: 160px"
+              @change="clearAmount(index)"
+            >
+              <el-option
+                v-for="payEnum in props.payLists"
+                :key="payEnum.value"
+                :label="payEnum.label"
+                :value="payEnum.value"
+                :disabled="isMethodDisabled(payEnum.value)"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-form-item label="退费金额：" prop="amount">
+            <div class="suffix-wrapper">
+              <el-input-number
+                v-model="form.amount"
+                :precision="2"
+                :min="0"
+                :max="props.patientInfo.balanceAmount"
+                :controls="false"
+                placeholder="金额"
+                class="amount-input"
+                @change="handleAmountChange"
+              />
+              <span class="suffix-text">元</span>
+            </div>
+          </el-form-item>
+        </div>
+        <!-- 金额汇总 -->
+        <div class="summary">
+          <el-space :size="30">
+            <div class="summary-item">
+              <el-form-item label="实退合计：" prop="displayAmount">
+                <el-text type="success">
+                  {{ form.displayAmount ? form.displayAmount : 0 + ' 元' }}
+                </el-text>
+              </el-form-item>
+            </div>
+          </el-space>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+import { refund } from './api';
+import { reactive, ref, getCurrentInstance, nextTick } from 'vue';
+
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  totalAmount: {
+    type: Number,
+    default: 0.0,
+  },
+  patientInfo: {
+    type: Object,
+    default: undefined,
+  },
+  payLists: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const { proxy } = getCurrentInstance();
+const data = reactive({
+  form: {},
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const emit = defineEmits(['close']);
+const payMethods = ref(undefined);
+
+async function submit() {
+  form.value.patientId = props.patientInfo.patientId;
+  form.value.encounterId = props.patientInfo.encounterId;
+  form.value.accountId = props.patientInfo.accountId;
+  console.log(props.patientInfo, 'patientInfo');
+  refund(form.value).then((res) => {
+    if (res.code == 200) {
+      reset();
+      emit('close', 'success');
+    }
+  });
+}
+
+function open() {
+  form.value.amount = props.patientInfo.balanceAmount;
+}
+
+/** 重置操作表单 */
+function reset() {
+  form.value = {
+    patientId: undefined,
+    encounterId: undefined,
+    displayAmount: 0,
+    payEnum: undefined,
+    amount: undefined,
+  };
+  proxy.resetForm('chargeDialogRef');
+}
+
+/**
+ * 处理金额变化事件
+ *
+ * 当表单中的金额发生变化时，将显示金额设置为实际金额
+ */
+function handleAmountChange() {
+  form.value.displayAmount = form.value.amount;
+}
+
+function close() {
+  reset();
+  emit('close');
+}
+</script>
+
+<style scoped>
+:deep(.pagination-container .el-pagination) {
+  right: 20px !important;
+}
+.charge-container {
+  max-width: 600px;
+  margin: 20px auto;
+  padding: 20px 30px;
+}
+
+.header {
+  margin-bottom: 10px;
+}
+
+.amount-row {
+  display: flex;
+  align-items: center;
+  gap: 15px;
+  margin: 15px 0;
+}
+
+.amount {
+  font-size: 20px;
+  font-weight: bold;
+}
+
+.payment-type {
+  margin: 15px 0;
+}
+
+.payment-container {
+  margin: 15px 0;
+}
+
+.payment-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 12px;
+}
+
+.amount-input {
+  width: 140px;
+}
+
+.add-payment {
+  margin-top: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.tip {
+  font-size: 12px;
+}
+
+.summary {
+  margin: 25px 0;
+  padding: 15px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+}
+
+.summary-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.action-buttons {
+  text-align: center;
+  margin-top: 25px;
+}
+
+.el-text.el-text--success {
+  font-size: 18px !important;
+  font-weight: 500;
+}
+
+.el-text.el-text--warning {
+  font-size: 18px !important;
+  font-weight: 500;
+}
+
+.suffix-wrapper {
+  position: relative;
+  display: inline-block; /* 保持行内布局 */
+}
+
+.suffix-text {
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #999;
+  pointer-events: none; /* 避免点击干扰 */
+}
+
+/* 调整输入框内边距 */
+.amount-input .el-input__inner {
+  padding-right: 30px !important;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
similarity index 41%
rename from vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
index bb7f628a..c986382e 100644
--- a/vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
@@ -4,35 +4,22 @@
     <el-card class="header-card" shadow="never">
       <el-row :gutter="20" align="middle">
         <el-col :span="6">
-          <el-form
-            :model="queryParams"
-            ref="queryRef"
-            :inline="true"
-            v-show="showSearch"
-            label-width="90px"
-            @submit.prevent
-          >
-            <el-form-item label="住院号：" prop="searchKey">
-              <el-input
-                v-model="queryParams.searchKey"
-                placeholder="请输入内容"
-                clearable
-                style="width: 240px"
-                @keyup.enter="getPatientInfo"
-              />
-              <el-button type="primary" @click="getPatientInfo">查询</el-button>
-            </el-form-item>
-          </el-form>
+          <span class="descriptions-item-label">住院号：</span>
+          <el-input
+            v-model="queryParams.searchKey"
+            placeholder="请输入内容"
+            clearable
+            style="width: 300px"
+            @keyup.enter="getPatientInfo"
+          />
+          <el-button type="primary" @click="getPatientInfo" style="margin-left: 10px">
+            查询
+          </el-button>
         </el-col>
         <el-col :span="18" style="text-align: right">
           <el-space>
-            <!-- <span style="margin-right: 20px">当前数据号: C8866190HT</span>
-            <el-button>跳号</el-button>
-            <el-button>票据启停</el-button> -->
             <el-button type="primary" @click="confirmCharge()">收预交金</el-button>
-            <el-icon :size="20" style="cursor: pointer" @click="showPatient">
-              <UserFilled />
-            </el-icon>
+            <el-button type="primary" @click="showPatient()">在院患者</el-button>
           </el-space>
         </el-col>
       </el-row>
@@ -40,75 +27,57 @@
 
     <!-- 患者信息区域 -->
     <el-card class="patient-info-card" shadow="never">
-      <el-form :model="form" :rules="rules" ref="formRef" label-width="110px" label-position="left">
-        <el-row align="middle" :gutter="20">
-          <el-col :span="1">
-            <el-avatar
-              :size="50"
-              src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png"
-            />
-          </el-col>
-          <el-col :span="15">
-            <div class="select_wrapper_div">
-              <el-form-item label="" prop="" label-width="0px">
-                <span style="font-size: 18px; font-weight: bold; margin-right: 10px">{{
-                  form.bedLocationId_dictText
-                }}</span>
-                <span style="margin-right: 10px">{{ form.patientName }}</span>
-                <span style="margin-right: 10px"
-                  >{{ form.genderEnum_enumText }} / {{ form.ageString }}</span
-                >
-                <el-tag type="info" size="small">{{ form.payWay }}</el-tag>
-                <span style="margin-left: 20px"
-                  >住院号: {{ form.admissionNo }}
-                  <el-icon style="cursor: pointer; vertical-align: middle"
-                    ><el-icon-document-copy @click="copyText" /></el-icon
-                ></span>
-              </el-form-item>
-            </div>
-          </el-col>
-          <el-col :span="8" style="text-align: right">
-            <el-form-item label="" prop="" label-width="0px">
-              <span style="margin-right: 5px">科室: {{ form.wardLocationId_dictText }}</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="8" style="text-align: left; margin-top: 10px">
-            <el-form-item label="总额:" prop="" class="custom-label">
-              <!-- <span class="amount-highlight">18999.33</span> -->
-              <el-input
-                class="amount-highlight"
-                v-model="form.totalPrice"
-                disabled
-                style="width: 50%"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" style="text-align: left; margin-top: 10px">
-            <el-form-item label="预交金:" prop="" class="custom-label">
-              <!-- <span class="amount-highlight">18909.33</span> -->
-              <el-input
-                class="amount-highlight"
-                v-model="form.deposit"
-                disabled
-                style="width: 50%"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" style="text-align: left; margin-top: 10px">
-            <el-form-item label="余额:" prop="" class="custom-label">
-              <el-input
-                class="amount-highlight"
-                v-model="form.balanceAmount"
-                disabled
-                style="width: 50%"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <el-row align="middle" :gutter="20">
+        <el-avatar
+          :size="40"
+          src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png"
+          style="margin-left: 20px"
+        />
+        <el-col :span="10">
+          <div>
+            <span
+              class="descriptions-item-label"
+              style="font-size: 16px; margin: 0 0"
+              v-if="patientInfo.patientName"
+            >
+              {{ patientInfo.patientName }} / {{ patientInfo.genderEnum_enumText }} /
+              {{ patientInfo.age }}
+            </span>
+            <span class="descriptions-item-label"> 住院号: </span>
+            <span class="descriptions-item-value"> {{ patientInfo.busNo }} </span>
+          </div>
+        </el-col>
+        <el-col :span="4" style="text-align: left; margin-top: 10px">
+          <span class="descriptions-item-label">预交金总额：</span>
+          <el-text type="primary" size="large">
+            {{ patientInfo.totalAmount ? patientInfo.totalAmount.toFixed(2) + ' 元' : '0.00 元' }}
+          </el-text>
+        </el-col>
+        <el-col :span="4" style="text-align: left; margin-top: 10px">
+          <span class="descriptions-item-label">余额：</span>
+          <el-text type="primary" size="large">
+            {{
+              patientInfo.balanceAmount ? patientInfo.balanceAmount.toFixed(2) + ' 元' : '0.00 元'
+            }}
+          </el-text>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 10px">
+        <el-col :span="23">
+          <span class="descriptions-item-label">在院科室/病区: </span>
+          <span class="descriptions-item-value" v-if="patientInfo.inHospitalOrgName">
+            {{ patientInfo.inHospitalOrgName }} /
+            {{
+              patientInfo.wardName +
+              formatValue(patientInfo.houseName) +
+              formatValue(patientInfo.bedName)
+            }}
+          </span>
+        </el-col>
+        <el-col :span="1">
+          <el-button type="primary" @click="refund()">退费</el-button>
+        </el-col>
+      </el-row>
     </el-card>
 
     <!-- 表格区域 -->
@@ -118,42 +87,43 @@
         style="width: 100%"
         :row-class-name="tableRowClassName"
         v-loading="loading"
+        border
       >
-        <el-table-column prop="payWay" label="支付方式" />
-        <el-table-column prop="paymentEnum_enumText" label="状态" />
-        <el-table-column prop="tenderedAmount" label="金额">
+        <!-- <el-table-column prop="payWay" label="支付方式" /> -->
+        <!-- <el-table-column prop="paymentEnum_enumText" label="状态" /> -->
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column prop="paymentNo" label="收据号" width="280" align="center" />
+        <el-table-column prop="tenderedAmount" label="金额" align="center">
           <template #default="scope">
-            <span :class="{ 'negative-amount': scope.row.tenderedAmount < 0 }">{{
-              scope.row.tenderedAmount
-                ? scope.row.tenderedAmount.toFixed(2)
-                : scope.row.tenderedAmount
-            }}</span>
+            <span :class="{ 'negative-amount': scope.row.tenderedAmount < 0 }">
+              {{
+                scope.row.tenderedAmount ? scope.row.tenderedAmount.toFixed(2) + ' 元' : '0.00 元'
+              }}
+            </span>
           </template>
         </el-table-column>
-        <el-table-column prop="busNo" label="收据号" width="280" />
-        <el-table-column prop="statusEnum_enumText" label="票据状态" min-width="120" />
-        <el-table-column prop="afterBalance" label="可退金额" min-width="120">
+        <el-table-column
+          prop="paymentEnum_enumText"
+          label="票据类型"
+          align="center"
+          min-width="120"
+        />
+        <!-- <el-table-column prop="afterBalance" label="可退金额" min-width="120">
           <template #default="scope">
-            <span>{{
-              scope.row.afterBalance ? scope.row.afterBalance.toFixed(2) : scope.row.afterBalance
-            }}</span>
+            <span>
+              {{
+                scope.row.afterBalance ? scope.row.afterBalance.toFixed(2) : scope.row.afterBalance
+              }}
+            </span>
           </template>
-        </el-table-column>
-        <el-table-column prop="payTime" label="收款时间" min-width="180" />
-        <el-table-column prop="entererId_dictText" label="收款员" min-width="100" />
-        <!-- <el-table-column prop="remarks" label="备注" min-width="100" /> -->
-        <el-table-column label="操作" min-width="150" fixed="right">
+        </el-table-column> -->
+        <el-table-column prop="operateTime" label="收款时间" align="center" min-width="180" />
+        <el-table-column prop="enterer" label="收款员" align="center" min-width="100" />
+        <!-- <el-table-column label="操作" min-width="100" align="center" fixed="right">
           <template #default="scope">
             <el-button link type="primary" size="small">补打</el-button>
-            <el-button
-              link
-              type="primary"
-              size="small"
-              :class="{ 'action-red': scope.row.amount < 0 }"
-              >退还</el-button
-            >
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination
         v-show="total > 0"
@@ -177,141 +147,39 @@
       :patientInfo="patientInfo"
       :payLists="payLists"
     />
-    <!-- :category="patientInfo.categoryEnum" -->
+    <RefundDialog
+      :open="openRefundDialog"
+      @close="handleClose"
+      :patientInfo="patientInfo"
+      :payLists="payLists"
+    />
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, nextTick } from 'vue';
-import { Menu as ElIconMenu, DocumentCopy as ElIconDocumentCopy } from '@element-plus/icons-vue'; // 引入图标
-import { getDepositInfoPage, getDepositInfoInit } from './components/api';
-import PatientList from './components/patientList.vue'; // 引入同文件夹下的 patientList 文件
+import { ref, nextTick } from 'vue';
+import { getDepositInfo, getDepositInfoPage } from './components/api';
+import PatientList from './components/patientList.vue';
 import ChargeDialog from './components/chargeDialog.vue';
-const search = ref('');
+import RefundDialog from './components/refundDialog.vue';
 const showPatientList = ref(false);
 const showPatientRef = ref();
 const openDialog = ref(false);
+const openRefundDialog = ref(false);
 const chargeListRef = ref();
 const loading = ref(false);
 const tableData = ref([]);
 const wardListOptions = ref(undefined);
 const payLists = ref(undefined);
 const total = ref(0);
-const showSearch = ref(true);
-const patientInfo = ref({});
-// const tableData = reactive([
-//   {
-//     paymentMethod: '微信',
-//     status: '正常',
-//     amount: 500.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '银行卡 (1775)',
-//     status: '退费',
-//     amount: 1500.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '银行卡 (1775)',
-//     status: '退费',
-//     amount: -1500.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '现金',
-//     status: '补打',
-//     amount: 50.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '现金',
-//     status: '补打',
-//     amount: -50.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '现金',
-//     status: '正常',
-//     amount: 1500.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '银行卡 (1775)',
-//     status: '正常',
-//     amount: 500.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '已结算',
-//     refundableAmount: 0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '转押金',
-//     status: '正常',
-//     amount: 1000.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '未结算',
-//     refundableAmount: 1000.0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-//   {
-//     paymentMethod: '现金',
-//     status: '正常',
-//     amount: 2000.0,
-//     receiptNumber: 'C8856108HT',
-//     invoiceStatus: '未结算',
-//     refundableAmount: 2000.0,
-//     paymentTime: '2024/03/01 11:40',
-//     cashier: '小慕',
-//     remarks: '',
-//   },
-// ]);
 const { proxy } = getCurrentInstance();
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNo: 1,
-    pageSize: 10,
-    searchKey: undefined, // 供应商名称
-  },
-  rules: {},
+const patientInfo = ref({});
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  searchKey: undefined, // 供应商名称
+  searchKey: 'ZY202507310001',
 });
-
-const { queryParams, form, rules } = toRefs(data);
 const tableRowClassName = ({ row, rowIndex }) => {
   if (row.amount < 0) {
     // 根据图片，当金额为负数时，整行（或特定列）文字变红
@@ -322,24 +190,6 @@ const tableRowClassName = ({ row, rowIndex }) => {
   return '';
 };
 
-init();
-
-/**
- * 取得初期下拉选
- */
-function init() {
-  getDepositInfoInit().then((res) => {
-    console.log(res, '*************************', res.wardListOptions);
-    if (res.data) {
-      wardListOptions.value = res.data.wardListOptions;
-      payLists.value = res.data.payLists;
-      console.log(wardListOptions.value);
-    }
-  });
-
-  // onSearch();
-}
-
 /**
  * 获取患者信息
  */
@@ -349,19 +199,14 @@ function getPatientInfo() {
     proxy.$modal.msgError('请先输入住院号！');
     return;
   }
-  loading.value = true;
   console.log(queryParams.value, 'queryParams.value');
-  getDepositInfoPage(queryParams.value).then((res) => {
-    if (res.data && res.data.records && res.data.records.length > 0) {
-      form.value = JSON.parse(JSON.stringify(res.data.records[0]));
+  getDepositInfo({ busNo: queryParams.value.searchKey }).then((res) => {
+    if (res.code == 200 && res.data.records[0].encounterId) {
+      patientInfo.value = res.data.records[0];
+      getDepositInfoPage({ encounterId: res.data.records[0].encounterId }).then((res) => {
+        tableData.value = res.data;
+      });
     }
-    console.log(res, 'resqqqqqqqqqqqqqqqqqqqqqqq', form.value, 'form.value');
-    // 过滤掉金额为空的记录
-    const list = res.data.records.filter((item) => item.tenderedAmount != null);
-    tableData.value = list;
-    total.value = res.data.total;
-    loading.value = false;
-    console.log(res, 'resqqqqqqqqqqqqqqqqqqqqqqq');
   });
 }
 
@@ -385,6 +230,14 @@ function confirmCharge() {
   }
 }
 
+function refund() {
+  if (patientInfo.value.patientId) {
+    openRefundDialog.value = true;
+  } else {
+    proxy.$modal.msgError('请先选择病人！');
+  }
+}
+
 /** 选择病人 */
 function handlePatientSelected(row) {
   console.log(row, 'rowwwwwwwwhandlePatientSelected');
@@ -424,6 +277,10 @@ async function copyText() {
   }
 }
 
+function formatValue(value) {
+  return value ? '-' + value : '';
+}
+
 /**
  * 处理关闭事件
  *
@@ -431,26 +288,19 @@ async function copyText() {
  */
 function handleClose(str) {
   openDialog.value = false;
+  openRefundDialog.value = false;
   if (str === 'success') {
     getPatientInfo();
     proxy.$modal.msgSuccess('操作成功！');
   }
 }
-
-// const { proxy } = getCurrentInstance() // 如果不需要可以移除
-// const emits = defineEmits([]) // 如果不需要可以移除
-// const props = defineProps({}) // 如果不需要可以移除
-// const state = reactive({}) // 如果不需要可以移除
-// onBeforeMount(() => {}) // 如果不需要可以移除
-// onMounted(() => {}) // 如果不需要可以移除
-// defineExpose({ state }) // 如果不需要可以移除
 </script>
 
 <style lang="scss" scoped>
 .container {
   padding: 15px;
   background-color: #f0f2f5; // 类似图片背景色
-  min-height: 100vh;
+  min-height: 90vh;
 }
 
 .header-card,
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/api.js b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/api.js
new file mode 100644
index 00000000..1b8c500f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/api.js
@@ -0,0 +1,100 @@
+import request from '@/utils/request'
+
+/**
+ * 收费患者列表
+ */
+export function getList(queryParams) {
+    return request({
+      url: '/charge-manage/inpa-charge/encounter-patient-page',
+      method: 'get',
+      params: queryParams
+    })
+}
+  
+/**
+ * 患者处方列表
+ */
+export function getChargeList(row) {
+    return request({
+      url: `/charge-manage/inpa-charge/patient-prescription?encounterId=${row.encounterId}&startTime=${row.startTime}&endTime=${row.endTime}`,
+      method: 'get',
+    })
+}
+  
+  
+/**
+ * 医保转自费
+ */
+export function changeToSelfPay(encounterId) {
+    return request({
+      url: '/charge-manage/inpa-charge/self-pay?encounterId=' + encounterId,
+      method: 'put',
+    })
+}
+  
+  
+/**
+ * 自费转医保
+ */
+export function changeToMedicalInsurance(encounterId) {
+    return request({
+      url: '/charge-manage/inpa-charge/medical-insurance?encounterId=' + encounterId,
+      method: 'put',
+    })
+}
+
+/**
+ * 收费
+ */
+export function savePayment(data) {
+    return request({
+      url: '/payment/payment/inpa-pay',
+      method: 'post',
+      data: data
+    })
+}
+
+/**
+ * 初始化
+ */
+export function init() {
+    return request({
+      url: '/charge-manage/charge/init',
+      method: 'get',
+    })
+}
+
+/**
+ * 收费预结算
+ */
+export function precharge(data) {
+    return request({
+      url: '/payment/payment/inpa-pre-pay',
+      method: 'post',
+      data: data
+    })
+}
+
+/**
+ * 取消预结算
+ */
+export function unprecharge(data) {
+    return request({
+      url: '/payment/payment/unprecharge',
+      method: 'post',
+      params: data
+    })
+}
+  
+
+/**
+ * 发耗材
+ */
+export function dispenseMedicalConsumables(data) {
+    return request({
+      url: '/pharmacy-manage/medical-consumables-dispense/consumables-dispense',
+      method: 'put',
+      data: data
+    })
+}
+  
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/chargeDialog.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/chargeDialog.vue
new file mode 100644
index 00000000..a062d807
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/components/chargeDialog.vue
@@ -0,0 +1,536 @@
+<template>
+  <el-dialog
+    :title="props.paymentEnum == 1 ? '确认退费' : '确认收费'"
+    v-model="props.open"
+    width="700px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+  >
+    <div v-loading="dialogLoading">
+      <el-text size="large" style="display: block; margin-bottom: 15px">
+        收费日期：{{ currentDate }}
+      </el-text>
+      <el-text size="large">费用性质：{{ '自费' }}</el-text>
+      <div class="amount-row">
+        <el-text size="large">应收金额：</el-text>
+        <el-text size="large" type="primary" class="amount">
+          {{ props.totalAmount.toFixed(2) + ' 元' }}
+        </el-text>
+      </div>
+
+      <!-- 自费支付 -->
+      <div class="payment-container">
+        <div v-for="(item, index) in formData.selfPay" :key="index" class="payment-item">
+          <span>支付方式：</span>
+          <el-select
+            v-model="item.payEnum"
+            placeholder="选择支付方式"
+            style="width: 160px"
+            @change="clearAmount(index)"
+          >
+            <el-option
+              v-for="payEnum in selfPayMethods"
+              :key="payEnum.value"
+              :label="payEnum.label"
+              :value="payEnum.value"
+              :disabled="isMethodDisabled(payEnum.value)"
+            />
+          </el-select>
+          <span>支付金额：</span>
+          <div class="suffix-wrapper">
+            <el-input-number
+              v-model="item.amount"
+              :precision="2"
+              :min="0"
+              :max="getMax(index)"
+              :controls="false"
+              placeholder="金额"
+              class="amount-input"
+              @change="handleAmountChange"
+            />
+            <span class="suffix-text">元</span>
+          </div>
+          <el-button
+            type="danger"
+            circle
+            :icon="Delete"
+            @click="removePayment(index)"
+            v-if="index > 0"
+          />
+        </div>
+        <div class="add-payment">
+          <el-button
+            type="primary"
+            plain
+            @click="addPayment"
+            :disabled="formData.selfPay.length >= 4 || remainingAmount <= 0"
+          >
+            添加支付方式
+          </el-button>
+          <el-text v-if="remainingAmount <= 0" type="danger" class="tip">
+            金额已满足应收，不可继续添加
+          </el-text>
+        </div>
+      </div>
+      <div>
+        <el-table :data="props.details" max-height="200" border>
+          <el-table-column prop="payEnumText" label="支付类型" align="center" />
+          <el-table-column
+            prop="amount"
+            label="金额"
+            header-align="center"
+            align="right"
+            width="200"
+          >
+            <template #default="scope">
+              {{ scope.row.amount ? scope.row.amount + ' 元' : '-' }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 金额汇总 -->
+      <div class="summary">
+        <el-space :size="30">
+          <div class="summary-item">
+            <el-text type="info">{{ props.paymentEnum == 1 ? '退费合计：' : '收费合计：' }}</el-text>
+            <el-text type="success">{{ displayAmount + ' 元' }}</el-text>
+          </div>
+          <div class="summary-item">
+            <el-text type="info">应找零：</el-text>
+            <el-text type="warning">{{ returnedAmount + ' 元' }}</el-text>
+          </div>
+        </el-space>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="throttledGetList" :disabled="dialogLoading"
+          >确 定</el-button
+        >
+        <el-button @click="close" :disabled="dialogLoading">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { savePayment, unprecharge, dispenseMedicalConsumables } from './api';
+import { computed, watch, reactive, ref, getCurrentInstance, nextTick } from 'vue';
+import { Delete } from '@element-plus/icons-vue';
+import { debounce } from 'lodash-es';
+import useUserStore from '@/store/modules/user';
+
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  totalAmount: {
+    type: Number,
+    default: 0.0,
+  },
+  category: {
+    type: String,
+  },
+  paymentId: {
+    type: String,
+  },
+  userCardInfo: {
+    type: Object,
+  },
+  patientInfo: {
+    type: Object,
+    default: undefined,
+  },
+  chargeItemIds: {
+    type: [],
+    default: [],
+  },
+  consumablesIdList: {
+    type: [],
+    default: [],
+  },
+  chrgBchnoList: {
+    type: [],
+    default: [],
+  },
+  details: {
+    type: Object,
+    default: undefined,
+  },
+  paymentEnum: {
+    type: String,
+  },
+  newId: {
+    type: String,
+  },
+  oldId: {
+    type: String,
+  }
+});
+
+const { proxy } = getCurrentInstance();
+
+const userStore = useUserStore();
+
+const formData = reactive({
+  totalAmount: 0,
+  selfPay: [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }],
+  medicalInsurance: {
+    account: '',
+    poolPay: 0,
+    personalPay: 0,
+  },
+});
+const dialogLoading = ref(false);
+
+watch(
+  () => props.totalAmount,
+  (newValue) => {
+    nextTick(() => {});
+    formData.totalAmount = newValue;
+    formData.selfPay[0].amount = newValue;
+  }
+);
+
+const emit = defineEmits(['close']);
+async function printReceipt(param) {
+  console.log(param, 'param');
+  console.log(props.patientInfo, 'props.patientInfo');
+
+  // 构造一个新的对象，添加头 "data"
+  const result = {
+    data: [
+      {
+        ...param,
+        // 基础支付类型
+        YB_FUND_PAY: param.detail.find((t) => t.payEnum === 100000)?.amount ?? 0, // 基金支付总额
+        SELF_PAY: param.detail.find((t) => t.payEnum === 200000)?.amount ?? 0, // 个人负担总金额
+        OTHER_PAY: param.detail.find((t) => t.payEnum === 300000)?.amount ?? 0, // 其他（如医院负担金额）
+
+        // 基本医保统筹基金支出
+        YB_TC_FUND_AMOUNT: param.detail.find((t) => t.payEnum === 110000)?.amount ?? 0, // 基本医保统筹基金支出
+        YB_BC_FUND_AMOUNT: param.detail.find((t) => t.payEnum === 120000)?.amount ?? 0, // 补充医疗保险基金支出
+        YB_JZ_FUND_AMOUNT: param.detail.find((t) => t.payEnum === 130000)?.amount ?? 0, // 医疗救助基金支出
+        YB_OTHER_AMOUNT: param.detail.find((t) => t.payEnum === 140000)?.amount ?? 0, // 其他支出
+
+        // 职工基本医疗保险
+        YB_TC_ZG_FUND_VALUE: param.detail.find((t) => t.payEnum === 110100)?.amount ?? 0, // 职工基本医疗保险
+        YB_TC_JM_FUND_VALUE: param.detail.find((t) => t.payEnum === 110200)?.amount ?? 0, // 居民基本医疗保险（修正原错误注释）
+
+        // 补充医疗保险基金支出细分
+        YB_BC_JM_DB_VALUE: param.detail.find((t) => t.payEnum === 120100)?.amount ?? 0, // 全体参保人的居民大病保险
+        YB_BC_DE_BZ_VALUE: param.detail.find((t) => t.payEnum === 120200)?.amount ?? 0, // 大额医疗费用补助
+        YB_BC_ZG_DE_BZ_VALUE: param.detail.find((t) => t.payEnum === 120300)?.amount ?? 0, // 企业职工大额医疗费用补助
+        YB_BC_GWY_BZ_VALUE: param.detail.find((t) => t.payEnum === 120400)?.amount ?? 0, // 公务员医疗补助
+
+        // 其他支出细分
+        OTHER_PAY_DD_FUND_VALUE: param.detail.find((t) => t.payEnum === 300001)?.amount ?? 0, // 兜底基金支出
+        OTHER_PAY_YW_SH_FUND_VALUE: param.detail.find((t) => t.payEnum === 300002)?.amount ?? 0, // 意外伤害基金支出
+        OTHER_PAY_LX_YL_FUND_VALUE: param.detail.find((t) => t.payEnum === 300003)?.amount ?? 0, // 离休人员医疗保障金支出
+        OTHER_PAY_LX_YH_FUND_VALUE: param.detail.find((t) => t.payEnum === 300004)?.amount ?? 0, // 离休人员优惠金支出
+        OTHER_PAY_CZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300005)?.amount ?? 0, // 财政基金支出
+        OTHER_PAY_CZ_YZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300006)?.amount ?? 0, // 财政预支支出
+        OTHER_PAY_ZG_DB_FUND_VALUE: param.detail.find((t) => t.payEnum === 300007)?.amount ?? 0, // 职工大病基金支出
+        OTHER_PAY_EY_FUND_VALUE: param.detail.find((t) => t.payEnum === 300008)?.amount ?? 0, // 二乙基金支出
+        OTHER_PAY_QX_JZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300009)?.amount ?? 0, // 倾斜救助支出
+        OTHER_PAY_YL_JZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300010)?.amount ?? 0, // 医疗救助再救助基金
+        HOSP_PART_AMT: param.detail.find((t) => t.payEnum === 300011)?.amount ?? 0, // 医院负担金额
+
+        // 医保结算返回值
+        FULAMT_OWNPAY_AMT: param.detail.find((t) => t.payEnum === 1)?.amount ?? 0, // 全自费金额
+        OVERLMT_SELFPAY: param.detail.find((t) => t.payEnum === 3)?.amount ?? 0, // 超限价自费费用
+        PRESELFPAY_AMT: param.detail.find((t) => t.payEnum === 4)?.amount ?? 0, // 先行自付金额
+        INSCP_SCP_AMT: param.detail.find((t) => t.payEnum === 5)?.amount ?? 0, // 符合政策范围金额
+        ACT_PAY_DEDC: param.detail.find((t) => t.payEnum === 6)?.amount ?? 0, // 实际支付起付线
+        POOL_PROP_SELFPAY: param.detail.find((t) => t.payEnum === 7)?.amount ?? 0, // 基本医疗保险统筹基金支付比例
+        BALC: param.detail.find((t) => t.payEnum === 8)?.amount ?? 0, // 余额
+
+        // 特殊支付方式
+        SELF_YB_ZH_PAY: param.detail.find((t) => t.payEnum === 210000)?.amount ?? 0, // 个人医保账户支付
+        SELF_YB_ZH_GJ_VALUE: param.detail.find((t) => t.payEnum === 210100)?.amount ?? 0, // 账户共济支付金额
+        SELF_CASH_PAY: param.detail.find((t) => t.payEnum === 220000)?.amount ?? 0, // 个人现金支付金额
+        SELF_VX_PAY: param.detail.find((t) => t.payEnum === 230000)?.amount ?? 0, // 微信支付金额
+        SELF_ALI_PAY: param.detail.find((t) => t.payEnum === 240000)?.amount ?? 0, // 阿里支付金额
+
+        // 现金支付细分
+        SELF_CASH_VALUE: param.detail.find((t) => t.payEnum === 220400)?.amount ?? 0, // 个人现金支付金额(现金)
+        SELF_CASH_VX_VALUE: param.detail.find((t) => t.payEnum === 220100)?.amount ?? 0, // 个人现金支付金额(微信)
+        SELF_CASH_ALI_VALUE: param.detail.find((t) => t.payEnum === 220200)?.amount ?? 0, // 个人现金支付金额(支付宝)
+        SELF_CASH_UNION_VALUE: param.detail.find((t) => t.payEnum === 220300)?.amount ?? 0, // 个人现金支付金额(银联)
+
+        // 基金类型（扩展）
+        BIRTH_FUND: param.detail.find((t) => t.payEnum === 510100)?.amount ?? 0, // 生育基金
+        RETIREE_MEDICAL: param.detail.find((t) => t.payEnum === 340100)?.amount ?? 0, // 离休人员医疗保障基金
+        URBAN_BASIC_MEDICAL: param.detail.find((t) => t.payEnum === 390100)?.amount ?? 0, // 城乡居民基本医疗保险基金
+        URBAN_SERIOUS_ILLNESS: param.detail.find((t) => t.payEnum === 390200)?.amount ?? 0, // 城乡居民大病医疗保险基金
+        MEDICAL_ASSISTANCE: param.detail.find((t) => t.payEnum === 610100)?.amount ?? 0, // 医疗救助基金
+        GOVERNMENT_SUBSIDY: param.detail.find((t) => t.payEnum === 640100)?.amount ?? 0, // 政府兜底基金
+        ACCIDENT_INSURANCE: param.detail.find((t) => t.payEnum === 390400)?.amount ?? 0, // 意外伤害基金
+        CARE_INSURANCE: param.detail.find((t) => t.payEnum === 620100)?.amount ?? 0, // 照护保险基金
+        FINANCIAL_FUND: param.detail.find((t) => t.payEnum === 360100)?.amount ?? 0, // 财政基金
+        HOSPITAL_ADVANCE: param.detail.find((t) => t.payEnum === 999900)?.amount ?? 0, // 医院垫付
+        SUPPLEMENTARY_INSURANCE: param.detail.find((t) => t.payEnum === 390300)?.amount ?? 0, // 城乡居民大病补充保险基金
+        HEALTHCARE_PREPAYMENT: param.detail.find((t) => t.payEnum === 360300)?.amount ?? 0, // 保健预支基金
+        Mr_QR_Code: param.regNo,
+        sex: props.patientInfo.genderEnum_enumText,
+        age: props.patientInfo.age,
+        personType: '职工医保',
+        fixmedinsName: param.fixmedinsName + '门诊收费明细',
+      },
+    ],
+    // feeDetial: param.detail, //收费项目，后端还未返回
+  };
+  // 将对象转换为 JSON 字符串
+  let jsonString = JSON.stringify(result, null, 2);
+  console.log(jsonString, 'jsonString');
+  await CefSharp.BindObjectAsync('boundAsync');
+  await boundAsync.printReport(
+    '门诊收费明细单.grf',
+    jsonString
+  )
+    .then((response) => {
+      //返回结果是jsonString，可判断其调用是否成功
+      console.log(response, 'response');
+      var res = JSON.parse(response);
+      if (!res.IsSuccess) {
+        proxy.$modal.msgError('调用打印插件失败:' + res.ErrorMessage);
+      }
+    })
+    .catch((error) => {
+      proxy.$modal.msgError('调用打印插件失败:' + error);
+    });
+}
+
+const throttledGetList = debounce(submit, 300);
+
+async function submit() {
+  console.log(parseFloat(displayAmount.value), 'parseFloat(displayAmount.value)');
+  console.log(formData.totalAmount, 'formData.totalAmount');
+
+  if (parseFloat(displayAmount.value) < formData.totalAmount.toFixed(2)) {
+    proxy.$modal.msgError('请输入正确的结算金额');
+    return;
+  }
+
+  // if(chrome.webview === undefined) {
+  //   alert('当前版本不支持银联支付');
+  // }
+  // else {
+  //   try {
+  //     let jsonResult = await window.chrome.webview.hostObjects.CSharpAccessor.ReadCardAsync();
+  //     let cardInfo = JSON.parse(jsonResult);
+  //     console.log(cardInfo.CardType);
+  //   } catch (error) {
+  //     console.error('调用失败:', error);
+  //   }
+  // }
+  dialogLoading.value = true;
+  savePayment({
+    encounterId: props.patientInfo.encounterId,
+    id: props.paymentId,
+    oldId: props.oldId,
+    newId: props.newId,
+    chargeItemIds: props.chargeItemIds,
+    paymentDetails: formData.selfPay,
+    ybMdtrtCertType: props.userCardInfo.psnCertType,
+    busiCardInfo: props.userCardInfo.busiCardInfo,
+  })
+    .then((res) => {
+      if (res.code == 200) {
+        printReceipt(res.data);
+        (formData.selfPay = [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }]),
+          emit('close', 'success', res.msg);
+        // 长春大学自动发耗材
+        if (userStore.fixmedinsCode == 'H22010200672' && props.consumablesIdList.length > 0) {
+          dispenseMedicalConsumables(props.consumablesIdList);
+        }
+      }
+    })
+    .finally(() => {
+      dialogLoading.value = false;
+    });
+}
+
+const currentDate = ref(new Date().toLocaleString());
+
+const selfPayMethods = [
+  { label: '现金', value: 220400 },
+  { label: '微信', value: 220100 },
+  { label: '支付宝', value: 220200 },
+  { label: '银联', value: 220300 },
+];
+
+// 计算剩余可输入金额
+const remainingAmount = computed(() => {
+  return (
+    formData.totalAmount - formData.selfPay.reduce((sum, item) => sum + Number(item.amount), 0)
+  );
+});
+
+// 获取单个支付方式的最大可输入金额
+const getMax = (index) => {
+  const otherSum = formData.selfPay.reduce(
+    (sum, item, i) => (i !== index ? sum + Number(item.amount) : sum),
+    0
+  );
+  if (formData.selfPay[index].payEnum == 220400) {
+    return formData.totalAmount + 100 - otherSum;
+  }
+  return formData.totalAmount - otherSum;
+};
+
+// 检查支付方式是否已使用
+const isMethodDisabled = (payEnum) => {
+  return formData.selfPay.some((item) => item.payEnum === payEnum);
+};
+
+const handleAmountChange = () => {
+  // 不需要在这里直接设置 returnedAmount，依赖 computed 属性
+};
+
+const addPayment = () => {
+  if (remainingAmount.value <= 0) {
+    return;
+  }
+  formData.selfPay.push({ payEnum: '', amount: remainingAmount.value });
+};
+
+const removePayment = (index) => {
+  formData.selfPay.splice(index, 1);
+};
+
+const clearAmount = (index) => {
+  // formData.selfPay[index].amount = 0;
+};
+
+// 计算属性
+const displayAmount = computed(() => {
+  return formData.selfPay.reduce((sum, item) => sum + (Number(item.amount) || 0), 0).toFixed(2);
+});
+
+const returnedAmount = computed(() => {
+  const display = parseFloat(displayAmount.value);
+  if (isNaN(display) || display <= 0) {
+    return '0.00';
+  }
+  const returned = display - formData.totalAmount;
+  return returned >= 0 ? returned.toFixed(2) : '0.00';
+});
+
+function close() {
+  // unprecharge({ encounterId: props.patientInfo.encounterId }).then((res) => {
+  //   if (res.code == 200) {
+  //     emit('close');
+  //   } else {
+  //     proxy.$modal.msgError(res.message);
+  //   }
+  // });
+  emit('close');
+}
+</script>
+
+<style scoped>
+:deep(.pagination-container .el-pagination) {
+  right: 20px !important;
+}
+.charge-container {
+  max-width: 600px;
+  margin: 20px auto;
+  padding: 20px 30px;
+}
+
+.header {
+  margin-bottom: 10px;
+}
+
+.amount-row {
+  display: flex;
+  align-items: center;
+  gap: 15px;
+  margin: 15px 0;
+}
+
+.amount {
+  font-size: 20px;
+  font-weight: bold;
+}
+
+.payment-type {
+  margin: 15px 0;
+}
+
+.payment-container {
+  margin: 15px 0;
+}
+
+.payment-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 12px;
+}
+
+.amount-input {
+  width: 140px;
+}
+
+.add-payment {
+  margin-top: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.tip {
+  font-size: 12px;
+}
+
+.summary {
+  margin: 25px 0;
+  padding: 15px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+}
+
+.summary-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.action-buttons {
+  text-align: center;
+  margin-top: 25px;
+}
+
+.el-text.el-text--success {
+  font-size: 18px !important;
+  font-weight: 500;
+}
+
+.el-text.el-text--warning {
+  font-size: 18px !important;
+  font-weight: 500;
+}
+
+.suffix-wrapper {
+  position: relative;
+  display: inline-block; /* 保持行内布局 */
+}
+
+.suffix-text {
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #999;
+  pointer-events: none; /* 避免点击干扰 */
+}
+
+/* 调整输入框内边距 */
+.amount-input .el-input__inner {
+  padding-right: 30px !important;
+}
+</style>
diff --git a/vue3/src/views/charge/cliniccharge/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/index.vue
similarity index 87%
rename from vue3/src/views/charge/cliniccharge/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/index.vue
index a50d9152..598f67f7 100644
--- a/vue3/src/views/charge/cliniccharge/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeSettlement/index.vue
@@ -126,7 +126,9 @@
           >
             自费转医保
           </el-button>
-          <span style="float: right;">合计金额：{{ totalAmounts?totalAmounts.toFixed(2):0 }}元</span>
+          <span style="float: right"
+            >合计金额：{{ totalAmounts ? totalAmounts.toFixed(2) : 0 }}元</span
+          >
         </div>
         <el-table
           ref="chargeListRef"
@@ -170,10 +172,14 @@
       :totalAmount="totalAmount"
       :patientInfo="patientInfo"
       :chargeItemIds="chargeItemIdList"
+      :consumablesIdList="consumablesIdList"
       :chrgBchnoList="chrgBchnoList"
       :userCardInfo="userCardInfo"
       :paymentId="paymentId"
+      :newId="newId"
+      :oldId="oldId"
       :details="details"
+      :paymentEnum="paymentEnum"
     />
   </div>
 </template>
@@ -199,7 +205,7 @@ const queryParams = ref({
   statusEnum: 1,
 });
 const totalAmounts = ref(0);
-const selectedRows = ref([])
+const selectedRows = ref([]);
 const patientList = ref([]);
 const chargeList = ref([]);
 const chargeItemIdList = ref([]);
@@ -213,10 +219,14 @@ const totalAmount = ref(0);
 const chargeListRef = ref();
 const details = ref({});
 const chargeStatusOptions = ref([]);
+const consumablesIdList = ref([]);
 const receptionTime = ref([
   formatDateStr(new Date(), 'YYYY-MM-DD'),
   formatDateStr(new Date(), 'YYYY-MM-DD'),
 ]);
+const newId = ref('');
+const oldId = ref('');
+const paymentEnum = ref(1);
 const buttonDisabled = computed(() => {
   return Object.keys(patientInfo.value).length === 0;
 });
@@ -224,8 +234,8 @@ const buttonDisabled = computed(() => {
 watch(
   () => selectedRows.value,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-      handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      handleTotalAmount();
     }
   },
   { immediate: true }
@@ -234,12 +244,9 @@ function handleSelectionChange(selection) {
   selectedRows.value = selection;
 }
 function handleTotalAmount() {
-  totalAmounts.value = selectedRows.value.reduce(
-    (accumulator, currentRow) => {
-      return (accumulator + (Number(currentRow.totalPrice) || 0))
-    },
-    0
-  );
+  totalAmounts.value = selectedRows.value.reduce((accumulator, currentRow) => {
+    return accumulator + (Number(currentRow.totalPrice) || 0);
+  }, 0);
 }
 getPatientList();
 initOption();
@@ -248,11 +255,11 @@ initOption();
  */
 function getPatientList() {
   if (receptionTime.value.length > 0) {
-    queryParams.value.receptionTimeSTime = receptionTime.value[0] + ' 00:00:00';
-    queryParams.value.receptionTimeETime = receptionTime.value[1] + ' 23:59:59';
+    queryParams.value.startTimeSTime = receptionTime.value[0] + ' 00:00:00';
+    queryParams.value.startTimeETime = receptionTime.value[1] + ' 23:59:59';
   } else {
-    queryParams.value.receptionTimeSTime = undefined;
-    queryParams.value.receptionTimeETime = undefined;
+    queryParams.value.startTimeSTime = undefined;
+    queryParams.value.startTimeETime = undefined;
   }
   getList(queryParams.value).then((res) => {
     patientList.value = res.data.data.records;
@@ -277,7 +284,8 @@ function clickRow(row) {
   patientInfo.value = row;
   chargeLoading.value = true;
   encounterId.value = row.encounterId;
-  getChargeList(row.encounterId).then((res) => {
+  const date = row.startTime.split('T')[0].split('-').join('');
+  getChargeList({encounterId: row.encounterId, startTime:date, endTime: formatDateStr(new Date(), 'YYYYMMDD'),}).then((res) => {
     chargeList.value = res.data;
     setTimeout(() => {
       chargeLoading.value = false;
@@ -291,7 +299,7 @@ function handleClose(value, msg) {
   if (value == 'success') {
     proxy.$modal.msgSuccess(msg);
     chargeLoading.value = true;
-    getChargeList(patientInfo.value.encounterId).then((res) => {
+    getChargeList({encounterId: patientInfo.value.encounterId, startTime:date, endTime: formatDateStr(new Date(), 'YYYYMMDD'),}).then((res) => {
       chargeList.value = res.data;
       setTimeout(() => {
         chargeLoading.value = false;
@@ -300,6 +308,7 @@ function handleClose(value, msg) {
   }
 }
 
+
 // 确认收费
 function confirmCharge() {
   let selectRows = chargeListRef.value.getSelectionRows();
@@ -310,6 +319,14 @@ function confirmCharge() {
   chargeItemIdList.value = selectRows.map((item) => {
     return item.id;
   });
+  consumablesIdList.value = selectRows
+    .filter((item) => {
+      return item.serviceTable == 'wor_device_request';
+    })
+    .map((item) => {
+      return item.id;
+    });
+
   // totalAmount.value = selectRows.reduce((accumulator, currentRow) => {
   //   return accumulator + (currentRow.totalPrice || 0);
   // }, 0);
@@ -320,11 +337,20 @@ function confirmCharge() {
   }).then((res) => {
     if (res.code == 200) {
       // totalAmount.value = res.data.psnCashPay;
-      paymentId.value = res.data.paymentId;
-      chrgBchnoList.value = res.data.chrgBchnoList;
-      totalAmount.value = res.data.details.find((item) => item.payEnum == 220000).amount;
-      details.value = res.data.details;
-      openDialog.value = true;
+      if(res.data.newPayment) {
+        paymentEnum.value = res.data.newPayment.paymentEnum;
+        paymentId.value = res.data.id.toString();
+        newId.value = res.data.newId.toString();
+        oldId.value = res.data.oldId.toString();
+        encounterId.value = patientInfo.value.encounterId,
+        chrgBchnoList.value = res.data.paymentRecDetailDtoList;
+        totalAmount.value = res.data.newPayment.tenderedAmount;
+        details.value = res.data.paymentRecDetailDtoList;
+        openDialog.value = true;
+      }else {
+
+      }
+
     } else {
       proxy.$modal.msgError(res.msg);
     }
@@ -360,7 +386,7 @@ async function handleReadCard(value) {
           await webView
             .GetInfoByQrCodeAsync(
               'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
-              'H22017200667',
+              'H22010200672',
               '01101',
               userStore.id,
               userStore.name,
@@ -476,6 +502,11 @@ async function handleReadCard(value) {
             totalAmount.value = res.data.details.find((item) => item.payEnum == 220000).amount;
             details.value = res.data.details;
             // chrgBchnoList.value = res.data.chrgBchnoList;
+            consumablesIdList.value = selectRows.filter((item) => {
+                return item.serviceTable == 'wor_device_request';
+              }).map((item) => {
+                return item.id;
+              });
             openDialog.value = true;
           } else {
             proxy.$modal.msgError(res.msg);
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue
similarity index 81%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue
index e162a1d8..6beb3b70 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/BasicForm.vue
@@ -63,37 +63,37 @@
 <script setup >
 import { ref } from 'vue';
 
-interface FormData {
-  patientId: string;
-  name: string;
-  idType: string;
-  idNumber: string;
-  gender: string;
-  birthDate: string;
-  age: string;
-  balance: string;
-  insuranceType: string;
-  personType: string;
-  insuredArea: string;
-  companyName: string;
-  originalFeeType: string;
-}
+// interface FormData {
+//   patientId: string;
+//   name: string;
+//   idType: string;
+//   idNumber: string;
+//   gender: string;
+//   birthDate: string;
+//   age: string;
+//   balance: string;
+//   insuranceType: string;
+//   personType: string;
+//   insuredArea: string;
+//   companyName: string;
+//   originalFeeType: string;
+// }
 
-const formData = ref<FormData>({
-  patientId: '12112',
-  name: '张三',
-  idType: '身份证',
-  idNumber: '210381198702200034',
-  gender: '男',
-  birthDate: '1996/05/28',
-  age: '10岁',
-  balance: '2645.08',
-  insuranceType: '商业保险',
-  personType: '',
-  insuredArea: '沈阳市',
-  companyName: '哈药大厂',
-  originalFeeType: '市医保',
-});
+// const formData = ref<FormData>({
+//   patientId: '12112',
+//   name: '张三',
+//   idType: '身份证',
+//   idNumber: '210381198702200034',
+//   gender: '男',
+//   birthDate: '1996/05/28',
+//   age: '10岁',
+//   balance: '2645.08',
+//   insuranceType: '商业保险',
+//   personType: '',
+//   insuredArea: '沈阳市',
+//   companyName: '哈药大厂',
+//   originalFeeType: '市医保',
+// });
 </script>
 <style lang="scss" scoped>
 .basic-form {
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue
similarity index 81%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue
index bb156440..17847234 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/InsuranceForm.vue
@@ -100,44 +100,44 @@
 <script setup >
 import { ref } from 'vue';
 
-interface FormData {
-  medicalType: string;
-  diseaseName: string;
-  admissionDate: string;
-  insuredPlace: string;
-  admissionDiagnosis: string;
-  isRepeatHospitalization: boolean;
-  hasOutsideStandard: boolean;
-  isEmergency: boolean;
-  hasOverseasStandard: boolean;
-}
+// interface FormData {
+//   medicalType: string;
+//   diseaseName: string;
+//   admissionDate: string;
+//   insuredPlace: string;
+//   admissionDiagnosis: string;
+//   isRepeatHospitalization: boolean;
+//   hasOutsideStandard: boolean;
+//   isEmergency: boolean;
+//   hasOverseasStandard: boolean;
+// }
 
-const formData = ref<FormData>({
-  medicalType: '',
-  diseaseName: '',
-  admissionDate: '',
-  insuredPlace: '',
-  admissionDiagnosis: '',
-  isRepeatHospitalization: false,
-  hasOutsideStandard: false,
-  isEmergency: false,
-  hasOverseasStandard: false,
-});
+// const formData = ref<FormData>({
+//   medicalType: '',
+//   diseaseName: '',
+//   admissionDate: '',
+//   insuredPlace: '',
+//   admissionDiagnosis: '',
+//   isRepeatHospitalization: false,
+//   hasOutsideStandard: false,
+//   isEmergency: false,
+//   hasOverseasStandard: false,
+// });
 
-const rules = {
-  medicalType: [
-    { required: true, message: '请选择医疗类别', trigger: 'change' },
-  ],
-  diseaseName: [
-    { required: true, message: '请选择病种名称', trigger: 'change' },
-  ],
-  admissionDate: [
-    { required: true, message: '请选择入院日期', trigger: 'change' },
-  ],
-  admissionDiagnosis: [
-    { required: true, message: '请输入入院诊断', trigger: 'blur' },
-  ],
-};
+// const rules = {
+//   medicalType: [
+//     { required: true, message: '请选择医疗类别', trigger: 'change' },
+//   ],
+//   diseaseName: [
+//     { required: true, message: '请选择病种名称', trigger: 'change' },
+//   ],
+//   admissionDate: [
+//     { required: true, message: '请选择入院日期', trigger: 'change' },
+//   ],
+//   admissionDiagnosis: [
+//     { required: true, message: '请输入入院诊断', trigger: 'blur' },
+//   ],
+// };
 
 const handleSubmit = () => {
   // 处理表单提交
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue
similarity index 89%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue
index 802ef309..a8e09c64 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientDetail.vue
@@ -64,13 +64,13 @@ onMounted(() => {
   visitCode.value = 'IPD0000188';
 })
 
-function updatePatientInfo(params: string) {
-  console.log('updatePatientInfo', updatePatientInfo);
-}
+// function updatePatientInfo(params: string) {
+//   console.log('updatePatientInfo', updatePatientInfo);
+// }
 
-defineProps<{
-  patientInfo: any;
-}>();
+// defineProps<{
+//   patientInfo: any;
+// }>();
 </script>
 
 <style lang="scss" scoped>
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
similarity index 87%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
index fa21ad31..163ceb4f 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
@@ -17,15 +17,15 @@
 </template>
 
 <script setup >
-defineProps<{
-  data: any[];
-}>();
+// defineProps<{
+//   data: any[];
+// }>();
 
-const emit = defineEmits(['current-change']);
+// const emit = defineEmits(['current-change']);
 
-const handleCurrentChange = (row: any) => {
-  emit('current-change', row);
-};
+// const handleCurrentChange = (row: any) => {
+//   emit('current-change', row);
+// };
 </script>
 
 <style lang="scss" scoped>
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue
similarity index 73%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue
index ed296e7d..07695b27 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/SearchForm.vue
@@ -23,36 +23,35 @@
 
 <script setup >
 import { ref, onMounted } from 'vue';
-import { getGroupApi } from '@/api/patientLimitDrug';
 // import { store } from '@hip/portal';
 
 // const { userInfo } = store.useGlobalStore();
-const emit = defineEmits(['search', 'reset']);
+// const emit = defineEmits(['search', 'reset']);
 
-const form = ref({
-  nurseDeptCode: '',
-  name: '',
-  inpatientCode: '',
-});
+// const form = ref({
+//   nurseDeptCode: '',
+//   name: '',
+//   inpatientCode: '',
+// });
 
-const nursingGroupList = ref<any[]>([]);
+// const nursingGroupList = ref<any[]>([]);
 
-onMounted(() => {
-  //   获取科室
-});
+// onMounted(() => {
+//   //   获取科室
+// });
 
-const handleSearch = () => {
-  emit('search', form.value);
-};
+// const handleSearch = () => {
+//   emit('search', form.value);
+// };
 
-const handleReset = () => {
-  form.value = {
-    nurseDeptCode: '',
-    name: '',
-    inpatientCode: '',
-  };
-  emit('reset');
-};
+// const handleReset = () => {
+//   form.value = {
+//     nurseDeptCode: '',
+//     name: '',
+//     inpatientCode: '',
+//   };
+//   emit('reset');
+// };
 </script>
 
 <style scoped>
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
similarity index 96%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
index fbd8ff1d..49e659a7 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
@@ -27,8 +27,8 @@
 import { ref, inject } from 'vue';
 import { FormInstance } from 'element-plus';
 
-const form = inject('formState') as any;
-const formRef = ref<FormInstance>();
+// const form = inject('formState') as any;
+// const formRef = ref<FormInstance>();
 const handleReset = () => {
   formRef.value?.resetFields();
 };
diff --git a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue
similarity index 84%
rename from vue3/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue
index cb372bc0..3b324077 100644
--- a/vue3/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/index.vue
@@ -30,34 +30,34 @@ import InsuranceForm from './components/InsuranceForm.vue';
 import TopForm from './components/TopForm.vue';
 import BasicForm from './components/BasicForm.vue';
 
-const patientList = ref<any[]>([
-  {}
-]);
+// const patientList = ref<any[]>([
+//   {}
+// ]);
 const currentPatient = ref();
 
 const formState = reactive({});
 const loading = ref(false);
 
 provide('formState', formState);
-const handleSearch = (params: any) => {
-  loading.value = true;
-  // getPatientListApi(params)
-  //   .then((res) => {
-  //     patientList.value = res;
-  //   })
-  //   .finally(() => {
-  //     loading.value = false;
-  //   });
-};
+// const handleSearch = (params: any) => {
+//   loading.value = true;
+//   // getPatientListApi(params)
+//   //   .then((res) => {
+//   //     patientList.value = res;
+//   //   })
+//   //   .finally(() => {
+//   //     loading.value = false;
+//   //   });
+// };
 
 const handleReset = () => {
   currentPatient.value = null;
   patientList.value = [];
 };
 
-const handleCurrentChange = (patient: any) => {
-  currentPatient.value = patient;
-};
+// const handleCurrentChange = (patient: any) => {
+  // currentPatient.value = patient;
+// };
 </script>
 
 <style lang="scss" scoped>
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
similarity index 52%
rename from vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
index 5eb3cda1..7df18833 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
@@ -3,18 +3,11 @@
     <div class="operate">
       <el-space>
         <el-input
-          v-model="searchForm.searchVal"
+          v-model="queryParams.searchKey"
           style="max-width: 600px"
           placeholder="请输入内容"
           class="input-with-select"
         >
-          <template #prepend>
-            <el-select v-model="searchForm.searchType" placeholder="" style="width: 115px">
-              <el-option label="患者姓名" value="name" />
-              <el-option label="诊疗卡号" value="MED_ID" />
-              <el-option label="身份证号" value="1" />
-            </el-select>
-          </template>
         </el-input>
         <el-button @click="resetQuery">重置</el-button>
         <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -31,67 +24,96 @@
         height="100%"
         show-overflow-tooltip
       >
-        <el-table-column type="index" width="54" label="序号" />
-        <el-table-column prop="patientClass" label="申请来源"> </el-table-column>
-        <el-table-column prop="createTime" label="申请时间" min-width="160" />
-        <el-table-column prop="name" label="申请患者" />
-        <el-table-column prop="wardLocationId_dictText" label="入院病区" />
-        <el-table-column prop="genderEnum_enumText" label="性别" align="right" />
-        <el-table-column prop="ageString" label="年龄" align="center"> </el-table-column>
-        <el-table-column prop="createBy" label="登记员" />
-        <el-table-column fixed="right" label="操作" width="88">
+        <el-table-column type="index" width="54" align="center" label="序号" />
+        <el-table-column prop="patientName" align="center" label="申请患者" />
+        <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
+        <el-table-column prop="age" label="年龄" align="center" />
+        <el-table-column prop="sourceName" align="center" label="申请来源">
+          <template #default="scope">
+            {{ scope.row.sourceName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="requestTime" align="center" label="申请时间" />
+        <el-table-column prop="wardName" align="center" label="入院病区" />
+        <el-table-column prop="registrar" align="center" label="登记员" />
+        <el-table-column fixed="right" align="center" label="操作" width="88">
           <template #default="scope">
-            <el-button type="primary" text @click="doEdit(scope.row)"> 编辑 </el-button>
+            <el-button type="primary" text @click="doEdit(scope.row)"> 查看 </el-button>
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
     </div>
   </div>
-  <PatientRegister v-model="patientRegisterVisible" :patientInfo="patient" title="登记" :registrationType="registrationType" @okAct="patientRegisterOK" />
+  <PatientRegister
+    v-model="patientRegisterVisible"
+    :patientInfo="patient"
+    :inHospitalInfo="inHospitalInfo"
+    title="登记"
+    :registrationType="registrationType"
+    :alreadyEdit="alreadyEdit"
+    :noFile="noFile"
+    @okAct="patientRegisterOK"
+    @cancelAct="cancelAct"
+  />
 </template>
 <script setup >
-// import { TabsPaneContext } from 'element-plus';
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
 import PatientRegister from './patientRegister.vue';
-import { getAdmissionPage } from "./api";
+import { getAdmissionPage, getPatientBasicInfo, getInHospitalInfo } from './api';
 //const { proxy } = getCurrentInstance();
 const emits = defineEmits([]);
 // const props = defineProps({});
 const searchForm = reactive({
   searchType: 'name',
-  searchVal: '',
+  searchKey: '',
 });
 const total = ref();
+const inHospitalInfo = ref({});
+const alreadyEdit = ref(true);
 const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
   searchKey: undefined,
-  statusEnum: 2,
-  searchVal: '',
-  searchType: 'name',
-})
+  registeredFlag: '1',
+  searchKey: '',
+});
 
 const treatHospitalizedData = ref([]);
 const patientRegisterVisible = ref(false);
+const noFile = ref(false);
 const registrationType = ref(true);
-const patient = ref({})
+const patient = ref({});
 const doEdit = (row) => {
-  patient.value = row
-  patientRegisterVisible.value = true;
-}; //
+  getPatientBasicInfo(row.patientId).then((res) => {
+    patient.value = res.data;
+  });
+  getInHospitalInfo(row.encounterId).then((res) => {
+    inHospitalInfo.value = res.data;
+    patientRegisterVisible.value = true;
+    noFile.value = false;
+  });
+};
 onBeforeMount(() => {});
 onMounted(() => {
-  getList()
+  getList();
 });
-// defineExpose({ state });
-
 const activeName = ref('first');
 
 const patientRegisterOK = () => {
   patientRegisterVisible.value = false;
-  queryParams.value.searchVal = '';
+  queryParams.value.searchKey = '';
   emits('okList');
-  queryData();
+  resetQuery();
+};
+
+const cancelAct = () => {
+  patientRegisterVisible.value = false;
 };
 
 /** 搜索按钮操作 */
@@ -105,23 +127,18 @@ function resetQuery() {
     pageNo: 1,
     pageSize: 10,
     searchKey: undefined,
-    statusEnum: 2,
-    searchVal: '',
-    searchType: 'name',
-  }
+    registeredFlag: '1',
+    searchKey: '',
+  };
   getList();
 }
 
 const getList = () => {
-  getAdmissionPage(queryParams.value).then(res => {
-    treatHospitalizedData.value = res.data.records
+  getAdmissionPage(queryParams.value).then((res) => {
+    treatHospitalizedData.value = res.data.records;
     total.value = res.data.total;
-  })
+  });
 };
-
-// const handleClick = (tab: TabsPaneContext, event: Event) => {
-//   console.log(tab, event);
-// };
 </script>
 <style lang="scss" scoped>
 .awaitList-container {
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/api.js b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js
similarity index 45%
rename from vue3/src/views/inHospitalManagement/charge/register/components/api.js
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js
index 59b1f2af..15571979 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/api.js
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js
@@ -10,9 +10,17 @@ export function getInit(query) {
 }
 
 // 获取住院信息 分页显示
+// export function getAdmissionPage(query) {
+//   return request({
+//     url: '/inpatient-manage/admission-page',
+//     method: 'get',
+//     params: query
+//   })
+// }
+// 获取住院信息 分页显示 新
 export function getAdmissionPage(query) {
   return request({
-    url: '/inpatient-manage/admission-page',
+    url: '/inhospital-charge/register/register-info',
     method: 'get',
     params: query
   })
@@ -83,10 +91,79 @@ export function doctorList(id) {
 }
 
 // 查询患者相关
-export function getPatientInfo(id) {
+export function getPatientInfo(id, statusEnum) {
   return request({
-    url: '/inpatient-manage/admission-one?id=' + id,
+    url: `/inpatient-manage/admission-one?id=${id}&statusEnum=${statusEnum}`,
     method: 'get'
   })
 }
 
+
+// 获取患者基础信息
+export function getPatientBasicInfo(patientId) {
+  return request({
+    url: `/inhospital-charge/register/patient-info?patientId=${patientId}`,
+    method: 'get'
+  })
+}
+
+// 获取患者入院信息
+export function getInHospitalInfo(encounterId) {
+  return request({
+    url: `/inhospital-charge/register/in-hospital-info?encounterId=${encounterId}`,
+    method: 'get'
+  })
+}
+
+// 获取病区床位信息
+export function getBedInfo(wardBusNo) {
+  return request({
+    url: `/inhospital-charge/register/beds-num?wardBusNo=${wardBusNo}`,
+    method: 'get'
+  })
+}
+
+// 住院登记
+export function registerInHospital(data) {
+  return request({
+    url: '/inhospital-charge/register/by-cashier',
+    method: 'post',
+    data: data
+  })
+}
+
+// 无档登记
+export function noFilesRegister(data) {
+  return request({
+    url: '/inhospital-charge/register/no-files',
+    method: 'post',
+    data: data
+  })
+}
+
+// 表单初始化
+export function patientFormInit() {
+  return request({
+    url: '/patient-manage/information/init',
+    method: 'get'
+  })
+}
+
+// 合同
+export function getContractList() {
+  return request({
+    url: '/app-common/contract-list',
+    method: 'get',
+  })
+}
+
+/**
+ * 获取诊断定义列表
+ */
+export function getDiagnosisDefinitionList(queryParams) {
+  return request({
+    url: '/doctor-station/diagnosis/condition-definition-metadata',
+    method: 'get',
+    params: queryParams
+  })
+}
\ No newline at end of file
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
similarity index 50%
rename from vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
index e3cb019e..2078561e 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
@@ -3,18 +3,12 @@
     <div class="operate">
       <el-space>
         <el-input
-          v-model="queryParams.searchVal"
+          v-model="queryParams.searchKey"
           style="max-width: 600px"
           placeholder="请输入内容"
           class="input-with-select"
+          @keydown.enter="handleQuery"
         >
-          <template #prepend>
-            <el-select v-model="queryParams.searchType" placeholder="" style="width: 115px">
-              <el-option label="患者姓名" value="name" />
-              <el-option label="诊疗卡号" value="MED_ID" />
-              <el-option label="身份证号" value="1" />
-            </el-select>
-          </template>
         </el-input>
         <el-button @click="resetQuery">重置</el-button>
         <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -31,16 +25,16 @@
         height="100%"
         show-overflow-tooltip
       >
-      <el-table-column type="index" width="54" label="序号" />
-        <el-table-column prop="patientClass" label="申请来源"> </el-table-column>
-        <el-table-column prop="createTime" label="申请时间" min-width="160" />
-        <el-table-column prop="name" label="申请患者" />
-        <el-table-column prop="wardLocationId_dictText" label="入院病区" />
-        <el-table-column prop="genderEnum_enumText" label="性别" align="right" />
-        <el-table-column prop="ageString" label="年龄" align="right"> </el-table-column>
-        <el-table-column fixed="right" label="操作" width="88">
+        <el-table-column type="index" width="54" align="center" label="序号" />
+        <el-table-column prop="patientName" align="center" label="患者姓名" />
+        <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
+        <el-table-column prop="age" label="年龄" align="center" />
+        <el-table-column prop="requestTime" align="center" label="申请时间" />
+        <el-table-column prop="sourceName" align="center" label="申请来源" />
+        <el-table-column prop="wardName" align="center" label="入院病区" />
+        <el-table-column fixed="right" align="center" label="操作" width="88">
           <template #default="scope">
-            <el-button type="primary" text @click="doRegistering(scope.row)"> 登记 </el-button>
+            <el-button type="primary" link @click="doRegistering(scope.row)"> 登记 </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -52,52 +46,59 @@
         @pagination="getList"
       />
     </div>
-    <!-- // :code="currentPatientCode" -->
-    <PatientRegister v-model="patientRegisterVisible" :patientInfo="patient" title="登记" :registrationType="registrationType" @okAct="patientRegisterOK" />
+    <PatientRegister
+      v-model="patientRegisterVisible"
+      :patientInfo="patient"
+      :inHospitalInfo="inHospitalInfo"
+      title="登记"
+      :registrationType="registrationType"
+      @okAct="patientRegisterOK"
+      @cancelAct="cancelAct"
+      :noFile="noFile"
+    />
   </div>
 </template>
-<script setup >
-// import { TabsPaneContext } from 'element-plus';
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
-//const { proxy } = getCurrentInstance();
+<script setup>
 import PatientRegister from './patientRegister.vue';
-import { getInit, getAdmissionPage } from "./api";
+import { getAdmissionPage, getPatientBasicInfo, getInHospitalInfo } from './api';
 const emits = defineEmits(['okList']);
-// const props = defineProps({});
 
 const total = ref();
-const patient = ref({})
+const patient = ref({});
+const inHospitalInfo = ref({});
+const noFile = ref(false);
 const registrationType = ref(true);
 const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
   searchKey: undefined,
-  statusEnum: 1,
-  searchVal: '',
-  searchType: 'name',
-})
+  registeredFlag: '0',
+  searchKey: '',
+});
 
 const treatHospitalizedData = ref([]);
 const doRegistering = (row) => {
-  if(row === 'no-file') {
-    registrationType.value = false
-  }else {
-    registrationType.value = true
-    patient.value = row
+  if (row == 'no-file') {
+    patientRegisterVisible.value = true;
+    noFile.value = true;
+    inHospitalInfo.value = {};
+  } else {
+    getPatientBasicInfo(row.patientId).then((res) => {
+      patient.value = res.data;
+    });
+    getInHospitalInfo(row.encounterId).then((res) => {
+      inHospitalInfo.value = res.data;
+      patientRegisterVisible.value = true;
+      noFile.value = false;
+    });
   }
-  patientRegisterVisible.value = true;
 };
-onBeforeMount(() => {});
-onMounted(() => {
-  getList()
-});
-// defineExpose({ state });
 
 const getList = () => {
-  getAdmissionPage(queryParams.value).then(res => {
-    treatHospitalizedData.value = res.data.records
+  getAdmissionPage(queryParams.value).then((res) => {
+    treatHospitalizedData.value = res.data.records;
     total.value = res.data.total;
-  })
+  });
 };
 
 /** 搜索按钮操作 */
@@ -111,28 +112,25 @@ function resetQuery() {
     pageNo: 1,
     pageSize: 10,
     searchKey: undefined,
-    statusEnum: 2,
-    searchVal: '',
-    searchType: 'name',
-  }
+    registeredFlag: '0',
+    searchKey: '',
+  };
   getList();
 }
-
-const activeName = ref('first');
-
 const patientRegisterVisible = ref(false);
+const patientYbRegisterVisible = ref(false);
 
 const patientRegisterOK = () => {
   patientRegisterVisible.value = false;
-  queryParams.value.searchVal = '';
+  queryParams.value.searchKey = '';
   emits('okList');
-  queryData();
 };
-const queryData = () => {};
 
-// const handleClick = (tab: TabsPaneContext, event: Event) => {
-//   console.log(tab, event);
-// };
+const cancelAct = () => {
+  patientRegisterVisible.value = false;
+};
+
+getList();
 </script>
 <style lang="scss" scoped>
 .awaitList-container {
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/existList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/existList.vue
similarity index 87%
rename from vue3/src/views/inHospitalManagement/charge/register/components/existList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/existList.vue
index ae3a9832..e7514ef4 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/existList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/existList.vue
@@ -43,9 +43,7 @@
   </div>
 </template>
 <script setup >
-// import { TabsPaneContext } from 'element-plus';
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
-import { getAdmissionPage } from "./api";
+import { getAdmissionPage } from './api';
 //const { proxy } = getCurrentInstance();
 const emits = defineEmits([]);
 // const props = defineProps({});
@@ -54,19 +52,27 @@ const searchForm = reactive({
   searchVal: '',
 });
 
-const treatHospitalizedData = ref([{}, {}, {}, {}, {}, {}]);
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  searchKey: undefined,
+  registeredFlag: '1',
+  searchKey: '',
+});
+const total = ref(0);
+const treatHospitalizedData = ref([]);
 const doRegistering = (row) => {};
 onBeforeMount(() => {});
 onMounted(() => {
-  getList()
+  getList();
 });
 // defineExpose({ state });
 
 const getList = () => {
-  getAdmissionPage(queryParams.value).then(res => {
-    treatHospitalizedData.value = res.data.records
+  getAdmissionPage(queryParams.value).then((res) => {
+    treatHospitalizedData.value = res.data.records;
     total.value = res.data.total;
-  })
+  });
 };
 
 const activeName = ref('first');
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/index.js b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/index.js
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/register/components/index.js
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/index.js
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue
similarity index 37%
rename from vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue
index 8793dfda..20b45092 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue
@@ -2,33 +2,51 @@
   <div class="patientInfo-container">
     <div class="operate">
       <div>基础信息</div>
-      <div v-if="props.registrationType" type="primary" @click="toggleEdit" style="margin-right: 0;cursor: pointer;margin-right: 12px;">
+      <!-- <div
+        v-if="props.registrationType"
+        type="primary"
+        @click="toggleEdit"
+        style="margin-right: 0; cursor: pointer; margin-right: 12px"
+      >
         {{ isEditing ? '取消' : '编辑' }}
+      </div> -->
+      <div>
+        <el-radio-group v-model="typeCode">
+          <el-radio label="电子凭证" value="01"></el-radio>
+          <el-radio label="医保卡" value="03"></el-radio>
+          <el-radio label="身份证" value="02"></el-radio>
+        </el-radio-group>
+        <span
+          @click="handleReadCard(typeCode)"
+          style="cursor: pointer; margin: 0 12px 0 30px; color: #409eff"
+        >
+          {{ '读卡' }}
+        </span>
       </div>
     </div>
 
     <!-- 展示模式 -->
-    <div v-if="!isEditing">
+    <div v-if="!noFile" style="margin-left: 30px">
       <el-row class="patientInfos">
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>患者编码：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.patientBusNo }}</el-text>
+          <el-text truncated>{{ patientInfo?.busNo || '-' }}</el-text>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>患者姓名：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.name }}</el-text>
+          <el-text truncated>{{ patientInfo?.name || '-' }}</el-text>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>费别类型：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.feeTypeName }}</el-text>
+          <el-text truncated>{{ patientInfo?.ybClassEnum_enumText || '-' }}</el-text>
           <!-- TODO -->
-          <svg-icon size="20" icon-class="hipEdit" style="cursor: pointer" @click="changFeeType" /> 
+          <svg-icon size="20" icon-class="hipEdit" style="cursor: pointer" @click="changFeeType" />
         </el-col>
       </el-row>
       <el-row class="patientInfos">
@@ -37,25 +55,25 @@
         </el-col>
         <!-- TODO -->
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.cardTypeName }}</el-text>
+          <el-text truncated>{{ patientInfo?.patientTypeCode_dictText || '-' }}</el-text>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>证件号：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.idCard }}</el-text>
+          <el-text truncated>{{ patientInfo?.idCard || '-' }}</el-text>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>出生日期：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.birthDate }}</el-text>
+          <el-text truncated>{{ patientInfo?.birthDate || '-' }}</el-text>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>年龄：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.ageString }}</el-text>
+          <el-text truncated>{{ patientInfo?.ageString || '-' }}</el-text>
         </el-col>
       </el-row>
       <el-row class="patientInfos">
@@ -63,25 +81,25 @@
           <el-text truncated>性别：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.genderEnum_enumText }}</el-text>
+          <div>{{ patientInfo?.genderEnum_enumText || '-' }}</div>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>民族：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.nationName }}</el-text>
+          <div>{{ patientInfo?.nationalityCode || '-' }}</div>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>国籍：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.nationalityName }}</el-text>
+          <div>{{ patientInfo?.countryCode || '-' }}</div>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>婚姻：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.maritalStatusEnum }}</el-text>
+          <div>{{ patientInfo?.maritalStatusEnum_enumText || '-' }}</div>
         </el-col>
       </el-row>
       <el-row class="patientInfos">
@@ -89,281 +107,92 @@
           <el-text truncated>职业：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.workName" />
+          <div>{{ patientInfo?.prfsEnum_enumText || '-' }}</div>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>手机：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.tel" />
+          <div>{{ patientInfo.phone || '-' }}</div>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>现住址：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.liveAddr" />
+          <div>{{ patientInfo?.address || '-' }}</div>
         </el-col>
       </el-row>
       <el-row class="patientInfos">
-        <el-col :span="2" class="patInfo-label">
+        <!-- <el-col :span="2" class="patInfo-label">
           <el-text truncated>户口地址：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.nativeExactAddr" />
-        </el-col>
+          <div>{{ patientInfo?.nativeExactAddr }}</div>
+        </el-col> -->
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>籍贯：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.nativePlaceName" />
+          <div>{{ patientInfo?.nativePlace || '-' }}</div>
         </el-col>
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>病人来源：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.sourceName" />
-        </el-col>
-        <el-col :span="2" class="patInfo-label">
-          <el-text truncated>出生地：</el-text>
-        </el-col>
-        <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.birthPlaceName" />
+          <div>{{ patientInfo?.organizationId_dictText || '-' }}</div>
         </el-col>
-      </el-row>
-      <el-row class="patientInfos">
         <el-col :span="2" class="patInfo-label">
           <el-text truncated>单位名称：</el-text>
         </el-col>
         <el-col :span="4" class="patInfo-value">
-          <el-text :text="patientInfo?.companyName" />
-        </el-col>
-        <el-col :span="2" class="patInfo-label">
-          <el-text truncated>贫困患者：</el-text>
-        </el-col>
-        <el-col :span="4" class="patInfo-value">
-          <el-text truncated>{{ patientInfo?.poorTypeName }}</el-text>
+          <div>{{ patientInfo?.workCompany || '-' }}</div>
         </el-col>
       </el-row>
     </div>
-
-    <!-- 编辑模式 -->
     <div v-else>
-      <el-form :model="form" ref="registerRef" label-width="100px" :rules="rules" style="width: 95%">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="患者编码">
-              <el-input v-model="form.patientBusNo" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="患者姓名" prop="name">
-              <el-input v-model="form.name" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="费别类型" prop="feeType">
-              <el-select v-model="form.feeType" placeholder="请选择" style="width: 100%">
-                <el-option label="医保" value="1" />
-                <el-option label="自费" value="2" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="证件类型">
-              <el-select v-model="form.cardType" placeholder="请选择" style="width: 100%">
-                <el-option
-                  v-for="item in typeList.identityDocumentType"
-                  :key="item.value"
-                  :label="item.info"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="证件号" prop="idCard">
-              <el-input v-model="form.idCard" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="出生日期">
-              <el-date-picker v-model="form.birthDate" type="date" placeholder="选择日期" style="width: 100%" value-format="YYYY-MM-DD HH:mm:ss" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="年龄">
-              <el-input v-model="form.age" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="性别">
-              <el-select v-model="form.sex" placeholder="请选择" style="width: 100%">
-                <el-option
-                  v-for="item in typeList.sex"
-                  :key="item.value"
-                  :label="item.info"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="民族">
-              <el-input v-model="form.nation" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="国籍">
-              <el-input v-model="form.nationality" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="婚姻">
-              <el-select v-model="form.maritalStatusEnum" placeholder="请选择" style="width: 100%">
-                <el-option
-                  v-for="item in typeList.maritalStatus"
-                  :key="item.value"
-                  :label="item.info"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="职业">
-              <el-select v-model="form.workName" placeholder="请选择" style="width: 100%">
-                <el-option
-                  v-for="item in typeList.occupationType"
-                  :key="item.value"
-                  :label="item.info"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="手机号" prop="tel">
-              <el-input v-model="form.tel" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item label="现住址">
-              <el-input v-model="form.liveAddr" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="户口地址">
-              <el-input v-model="form.nativeExactAddr" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="籍贯">
-              <el-input v-model="form.nativePlaceName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="病人来源">
-              <el-input v-model="form.sourceName" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="出生地">
-              <el-input v-model="form.birthPlaceName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="单位名称">
-              <el-input v-model="form.companyName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="贫困患者">
-              <el-select v-model="form.poorType" placeholder="请选择" style="width: 100%">
-                <el-option label="是" value="1" />
-                <el-option label="否" value="0" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <PatientInfoForm ref="patientInfoFormRef" />
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, watch } from 'vue'
-import { patientlLists } from "./api";
+import { ref, reactive, watch } from 'vue';
+import PatientInfoForm from './patientInfoForm.vue';
+import { patientlLists, getOrgList } from './api';
 
-const typeList = ref({})
+const typeList = ref({});
+const patientInfoFormRef = ref();
 const props = defineProps({
   patientInfo: {
     type: Object,
     require: true,
-    default: () => ({ code: '', name: '', feeTypeName: '' })
+    default: () => ({}),
   },
   registrationType: {
     type: [String, Boolean, Number], // 根据实际类型调整
-    default: null // 或者 false、'' 等
-  }
-})
-
-const rules = reactive({
-  name: [
-    {
-      required: true,
-      message: '患者姓名未填写',
-      trigger: ['blur', 'change'],
-    },
-  ],
-  feeType: [
-    {
-      required: true,
-      message: '费别类型未填写',
-      trigger: ['blur', 'change'],
-    },
-  ],
-  cardType: [
-    {
-      required: true,
-      message: '证件类型未填写',
-      trigger: ['blur', 'change'],
-    },
-  ],
-  idCard: [
-    {
-      required: true,
-      message: '证件号未填写',
-      trigger: ['blur', 'change'],
-    },
-  ],
-  tel: [
-    {
-      required: true,
-      message: '手机号未填写',
-      trigger: ['blur', 'change'],
-    },
-  ]
-})
-
-const emits = defineEmits(['onChangFeeType'])
+    default: null, // 或者 false、'' 等
+  },
+  initOptions: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  noFile: {
+    type: Boolean,
+    default: false,
+  },
+});
+const emits = defineEmits(['onChangFeeType']);
 const registerRef = ref();
+const typeCode = ref('01');
+const organization = ref([]);
 
 onMounted(() => {
-  getInitOptions()
+  getInitOptions();
 });
 
 // 编辑状态
-const isEditing = ref(false)
+const isEditing = ref(false);
 
 watch(
   () => props.registrationType,
@@ -373,29 +202,36 @@ watch(
   { immediate: true }
 );
 
+watch(
+  () => props.patientInfo,
+  (newValue) => {},
+  { immediate: true }
+);
 
 function getInitOptions() {
-  patientlLists().then(res => {
+  patientlLists().then((res) => {
     typeList.value = res.data;
-  })
+  });
+  getOrgList().then((res) => {
+    organization.value = res.data.records;
+  });
 }
 
-
 // 表单数据
-const form = reactive({})
+const form = reactive({});
 
 // 切换编辑状态
 const toggleEdit = () => {
   if (!isEditing.value) {
     // 取消时恢复原值
-    Object.assign(form, props.patientInfo)
+    Object.assign(form, props.patientInfo);
   }
-  isEditing.value = !isEditing.value
-}
+  isEditing.value = !isEditing.value;
+};
 
 // 提交表单
 const submitForm = async (callback) => {
-  console.log('提交更新:', form)
+  console.log('提交更新:', form);
   if (!registerRef.value) return false;
   registerRef.value.validate((valid) => {
     if (valid) {
@@ -405,13 +241,138 @@ const submitForm = async (callback) => {
       return false;
     }
   });
+};
+async function handleReadCard(value) {
+  if (window.CefSharp === undefined) {
+    alert('请在医保版本中调用读卡功能！');
+  } else {
+    try {
+      await CefSharp.BindObjectAsync('boundAsync');
+      // string url,
+      // string fixmedins_code,
+      // string businessType,
+      // string operatorCode,
+      // string operatorName,
+      // string officeId,
+      // string officeName
+
+      // readCardLoading.value = true;
+      let jsonResult;
+      let cardInfo;
+      let userMessage = undefined;
+      switch (value) {
+        case '01': // 电子凭证
+          // readCardLoading.value = true;
+          await boundAsync
+            .getInfoByQrCodeAsync(
+              'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
+              'H22010200672',
+              '01101',
+              userStore.id,
+              userStore.name,
+              'D83',
+              '财务科'
+            )
+            .then((res) => {
+              readCardLoading.value = true;
+              loadingText.value = '正在读取...';
+              jsonResult = res;
+            })
+            .catch(() => {
+              readCardLoading.value = false;
+            });
+          cardInfo = JSON.parse(jsonResult);
+          let message = JSON.parse(cardInfo.message);
+          userMessage = {
+            certType: '02', // 证件类型
+            certNo: message.data.idNo, // 身份证号
+            psnCertType: '02', // 居民身份证
+          };
+          break;
+        case '02':
+          break;
+        case '03': // 社保卡
+          readCardLoading.value = true;
+          loadingText.value = '正在读取...';
+          await boundAsync
+            .readHeaSecCardAsync(
+              JSON.stringify({
+                IP: 'ddjk.jlhs.gov.cn',
+                PORT: 20215,
+                TIMEOUT: 60,
+                SFZ_DRIVER_TYPE: 1,
+              })
+            )
+            .then((res) => {
+              jsonResult = res;
+            })
+            .finally(() => {
+              readCardLoading.value = false;
+            });
+          // console.log(
+          //   'jsonResult',
+          //   JSON.parse({
+          //     IssuingAreaCode: '310000',
+          //     SocialSecurityNumber: '371324198810224515',
+          //     CardNumber: 'M501A1A78',
+          //     CardIdentificationCode: '310000D15600000535925154E880AB97',
+          //     Name: '\u5218\u5CF0',
+          //     CardResetInfo: '00814A444686603100333E4FA9',
+          //     SpecificationVersion: '3.00',
+          //     IssuingDate: '20190313',
+          //     ExpirationDate: '20290313',
+          //     TerminalNumber: '000000000000',
+          //     TerminalDeviceNumber: '00041161201901000005',
+          //     Code: 0,
+          //     ErrorMessage: null,
+          //   })
+          // );
+          let message1 = JSON.parse(jsonResult);
+          userMessage = {
+            certType: '02', // 证件类型
+            certNo: message1.SocialSecurityNumber, // 身份证号
+            psnCertType: '02', // 居民身份证
+          };
+          break;
+        case '99':
+          break;
+      }
+      readCardLoading.value = true;
+      if (userMessage.certNo) {
+        gerPreInfo(userMessage)
+          .then((res) => {
+            if (res.code == 200) {
+              form.value.patientId = res.data.id;
+              form.value.name = res.data.name;
+              form.value.age = res.data.age;
+              form.value.idCard = res.data.idCard;
+              form.value.card = res.data.id;
+              form.value.contractNo = res.data.contractBusNo;
+              form.value.genderEnum = res.data.genderEnum;
+              form.value.ybAreaNo = res.data.contractName;
+            }
+          })
+          .finally(() => {
+            readCardLoading.value = false;
+          });
+      }
+    } catch (error) {
+      console.error('调用失败:', error);
+      readCardLoading.value = false;
+    }
+  }
+}
+function getPatientForm() {
+  console.log(patientInfoFormRef.value.form);
+
+  return patientInfoFormRef.value.form;
 }
 
 // 患者费别变更
 const changFeeType = () => {
-  emits('onChangFeeType')
-}
-defineExpose({ submitForm, form });
+  emits('onChangFeeType');
+};
+defineExpose({ submitForm, form, isEditing, getPatientForm });
 </script>
 
 <style lang="scss" scoped>
@@ -432,13 +393,15 @@ defineExpose({ submitForm, form });
   > .patientInfos {
     margin-bottom: 16px;
 
-    .patInfo-label {
-      text-align: right;
-    }
-
     &:not(.patientInfo-container :has(+ .patientInfos)) {
       margin-bottom: 0px;
     }
   }
 }
+.patInfo-label {
+  color: #606266 !important;
+  font-size: 14px;
+  font-weight: 700 !important;
+  margin-bottom: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
new file mode 100644
index 00000000..9730e335
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
@@ -0,0 +1,392 @@
+<template>
+  <el-form ref="patientRef" :model="form" :rules="rules" label-width="100px">
+    <el-row>
+      <el-col :span="6">
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="性别" prop="genderEnum">
+          <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
+            <el-radio
+              v-for="item in administrativegenderList"
+              :key="item.value"
+              :label="item.value"
+            >
+              {{ item.info }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
+      <!-- <el-col :span="6">
+          <el-form-item label="活动标识" prop="tempFlag">
+            <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
+              <el-radio v-for="dict in patient_temp_flag" :key="dict.value" :label="dict.value">
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col> -->
+      <el-col :span="6">
+        <el-form-item label="联系方式" prop="phone">
+          <el-input v-model="form.phone" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="年龄" prop="age">
+          <el-input
+            v-model="form.age"
+            :disabled="isViewMode"
+            @input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="卡类别" prop="typeCode">
+          <el-select v-model="form.typeCode" placeholder="卡类别" clearable :disabled="isViewMode">
+            <el-option
+              v-for="dict in sys_idtype"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="证件号码" prop="idCard">
+          <el-input v-model="form.idCard" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="就诊卡号" prop="identifierNo">
+          <el-input v-model="form.identifierNo" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="民族" prop="nationalityCode">
+          <el-select v-model="form.nationalityCode" clearable filterable :disabled="isViewMode">
+            <el-option
+              v-for="item in nationality_code"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!-- <el-col :span="6">
+						<el-form-item label="年龄" prop="age">
+						   <el-input v-model="form.age" clearable :disabled="isViewMode"/>
+						</el-form-item>
+				</el-col> -->
+    <el-row>
+      <el-col :span="6">
+        <el-form-item label="国家编码" prop="countryCode">
+          <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="职业" prop="prfsEnum">
+          <el-select v-model="form.prfsEnum" placeholder="职业" clearable :disabled="isViewMode">
+            <el-option
+              v-for="item in occupationtypeList"
+              :key="item.value"
+              :label="item.info"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="工作单位" prop="workCompany">
+          <el-input v-model="form.workCompany" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="6">
+        <el-form-item label="联系人" prop="linkName">
+          <el-input v-model="form.linkName" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="联系人关系" prop="linkRelationCode">
+          <el-select
+            v-model="form.linkRelationCode"
+            placeholder="联系人关系"
+            clearable
+            :disabled="isViewMode"
+          >
+            <el-option
+              v-for="item in familyrelationshiptypeList"
+              :key="item.value"
+              :label="item.info"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="联系人电话" prop="linkRelationCode">
+          <el-input v-model="form.linkTelcom" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="6">
+        <el-form-item label="地址选择" prop="addressSelect">
+          <el-cascader
+            :options="options"
+            :props="{ checkStrictly: true, value: 'code', label: 'name' }"
+            v-model="selectedOptions"
+            @change="handleChange"
+            :disabled="isViewMode"
+          >
+            <template #default="{ node, data }">
+              <span>{{ data.name }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" clearable :disabled="isViewMode" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="6">
+        <el-form-item label="血型ABO" prop="bloodAbo">
+          <el-select v-model="form.bloodAbo" placeholder="血型ABO" clearable :disabled="isViewMode">
+            <el-option
+              v-for="item in bloodtypeaboList"
+              :key="item.value"
+              :label="item.info"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="血型RH" prop="bloodRh">
+          <el-select v-model="form.bloodRh" placeholder="血型RH" clearable :disabled="isViewMode">
+            <el-option
+              v-for="item in bloodtypearhList"
+              :key="item.value"
+              :label="item.info"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="婚姻状态" prop="maritalStatusEnum">
+          <el-select
+            v-model="form.maritalStatusEnum"
+            placeholder="婚姻状态"
+            clearable
+            :disabled="isViewMode"
+          >
+            <el-option
+              v-for="item in maritalstatusList"
+              :key="item.value"
+              :label="item.info"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="死亡时间" prop="deceasedDate">
+          <el-date-picker
+            v-model="form.deceasedDate"
+            type="datetime"
+            placeholder="请选择时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            :disabled="isViewMode"
+            value-format="YYYY/MM/DD HH:mm:ss"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script setup>
+import { watch } from 'vue';
+import pcas from 'china-division/dist/pcas-code.json';
+import { patientFormInit } from './api';
+
+const { proxy } = getCurrentInstance();
+const {
+  patient_gender_enum,
+  sys_idtype,
+  prfs_enum,
+  blood_rh,
+  blood_abo,
+  marital_status_enum,
+  patient_temp_flag,
+  link_relation_code,
+  nationality_code,
+} = proxy.useDict(
+  'patient_gender_enum',
+  'sys_idtype',
+  'prfs_enum',
+  'blood_rh',
+  'blood_abo',
+  'marital_status_enum',
+  'patient_temp_flag',
+  'link_relation_code',
+  'nationality_code'
+);
+
+const selectedOptions = ref([]); // v-model 绑定的选中值
+const maritalstatusList = ref([]); //婚姻
+const occupationtypeList = ref([]); //职业
+const administrativegenderList = ref([]); //性别
+const bloodtypeaboList = ref([]); //血型abo
+const bloodtypearhList = ref([]); //血型RH
+const familyrelationshiptypeList = ref([]); //家庭关系
+// 使用 ref 定义查询所得用户信息数据
+const patientInfo = ref(undefined);
+const addressCom = ref(''); //地址
+
+const options = ref(pcas); // 地区数据
+const emits = defineEmits(['submit']); // 声明自定义事件
+
+const data = reactive({
+  isViewMode: false,
+  form: {
+    typeCode: '01',
+  },
+  rules: {
+    name: [{ required: true, message: '姓名不能为空', trigger: 'change' }],
+    genderEnum: [{ required: true, message: '请选择性别', trigger: 'change' }],
+    age: [{ required: true, message: '年龄不能为空', trigger: 'change' }],
+    phone: [{ required: true, message: '联系方式不能为空', trigger: 'change' }],
+  },
+});
+
+const { queryParams, form, rules, isViewMode } = toRefs(data);
+
+const props = defineProps({
+  item: {
+    type: Object,
+    required: false,
+  },
+});
+
+watch(
+  () => form.value.idCard,
+  (newIdCard) => {
+    if (newIdCard && newIdCard.length === 18) {
+      const birthYear = parseInt(newIdCard.substring(6, 10));
+      const birthMonth = parseInt(newIdCard.substring(10, 12));
+      const birthDay = parseInt(newIdCard.substring(12, 14));
+
+      const today = new Date();
+      const currentYear = today.getFullYear();
+      const currentMonth = today.getMonth() + 1;
+      const currentDay = today.getDate();
+
+      let age = currentYear - birthYear;
+
+      // 如果当前月份小于出生月份，或者月份相同但当前日期小于出生日期，则年龄减1
+      if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
+        age--;
+      }
+
+      form.value.age = age;
+    }
+  }
+);
+getList();
+/** 查询菜单列表 */
+function getList() {
+  patientFormInit().then((response) => {
+    console.log(response);
+    occupationtypeList.value = response.data.occupationType;
+    administrativegenderList.value = response.data.sex;
+    bloodtypeaboList.value = response.data.bloodTypeABO;
+    bloodtypearhList.value = response.data.bloodTypeRH;
+    familyrelationshiptypeList.value = response.data.familyRelationshipType;
+    maritalstatusList.value = response.data.maritalStatus;
+  });
+}
+
+//地址选择
+const handleChange = () => {
+  const checkedNodes = selectedOptions.value.map((code) => {
+    const node = findNodeByCode(options.value, code);
+    return node ? node.name : null;
+  });
+  form.value.addressProvince = checkedNodes[0] || '';
+  form.value.addressCity = checkedNodes[1] || '';
+  form.value.addressDistrict = checkedNodes[2] || '';
+  form.value.addressStreet = checkedNodes[3] || '';
+  form.value.address = '';
+};
+
+// 递归查找节点
+const findNodeByCode = (data, code) => {
+  for (const item of data) {
+    if (item.code === code) return item;
+    if (item.children) {
+      const result = findNodeByCode(item.children, code);
+      if (result) return result;
+    }
+  }
+  return null;
+};
+/** 表单重置 */
+function reset() {
+  form.value = {
+    name: undefined,
+    nameJson: undefined,
+    menuName: undefined,
+    age: undefined,
+    genderEnum: undefined,
+    typeCode: '01',
+    idCard: undefined,
+    phone: undefined,
+    prfsEnum: undefined,
+    address: undefined,
+    tempFlag: undefined,
+    countryCode: undefined,
+    bloodRh: undefined,
+    bloodAbo: undefined,
+    nationalityCode: undefined,
+    deceasedDate: undefined,
+    linkName: undefined,
+    linkRelationCode: undefined,
+    linkTelcom: undefined,
+    workCompany: undefined,
+    addressCity: undefined,
+    addressDistrict: undefined,
+    addressStreet: undefined,
+    addressProvince: undefined,
+    maritalStatusEnum: undefined,
+    busNo: undefined,
+    organizationId: undefined,
+  };
+  proxy.resetForm('patientRef');
+}
+defineExpose({ form });
+</script>
+<style scoped>
+.el-form--inline .el-form-item {
+  display: inline-flex;
+  vertical-align: middle;
+  margin-right: 10px !important;
+}
+
+/* 使用深度选择器 */
+.custom-label-spacing :deep(.el-form-item__label) {
+  line-height: 1.2; /* 调整行间距 */
+  margin-bottom: 4px; /* 调整 label 和输入框之间的间距 */
+}
+</style>
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/patientRegister.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientRegister.vue
similarity index 53%
rename from vue3/src/views/inHospitalManagement/charge/register/components/patientRegister.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientRegister.vue
index 78029f84..cc08aaea 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/patientRegister.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientRegister.vue
@@ -7,11 +7,14 @@
     @open="openAct"
     @closed="closedAct"
     :z-index="20"
+    destroy-on-close
   >
-    <el-scrollbar height="700px">
-      <PatientInfoComp 
-        :patientInfo="patientApiInfo"
+    <el-scrollbar height="650px">
+      <PatientInfoComp
+        :patientInfo="props.patientInfo"
         :registrationType="props.registrationType"
+        :initOptions="initOptions"
+        :noFile="noFile"
         ref="patientInfoRef"
         @onChangFeeType="onChangFeeType"
       />
@@ -21,7 +24,15 @@
         ref="PatientRelationListRef"
       /> -->
       <!--联系人组件  -->
-      <RegisterForm :code="code" ref="RegisterFormRef" :patientInfo="patientApiInfo" />
+      <RegisterForm
+        :code="code"
+        ref="RegisterFormRef"
+        :patientInfo="patientApiInfo"
+        :initOptions="initOptions"
+        :alreadyEdit="alreadyEdit"
+        :inHospitalInfo="inHospitalInfo"
+        :noFile="noFile"
+      />
     </el-scrollbar>
     <template v-slot:footer>
       <div class="advance-container">
@@ -48,49 +59,50 @@
               height="18px"
               width="18px"
               style="margin-right: 4px"
-            />{{ typeitem.label }}
+            />
+            {{ typeitem.label }}
           </div>
         </el-space>
       </div>
-      <el-button size="fixed" class="margin-left-auto" @click="closedAct">取消 </el-button>
+      <el-button size="fixed" class="margin-left-auto" @click="cancelAct">取消 </el-button>
       <el-button size="fixed" type="primary" @click="handleSubmit">登记</el-button>
       <!-- <hip-button size="fixed" type="primary" @click="supplementMi">医保登记</hip-button> -->
       <!-- <AdvancePayment
         v-model="advancePaymentVisible"
         @submitOk="advancePaymentSubmitOk"
-        :money="advance"
+        :money="advance"3
       /> -->
     </template>
   </el-dialog>
 </template>
 <script setup>
-import {
-  getCurrentInstance,
-  onBeforeMount,
-  onMounted,
-  provide,
-  reactive,
-  ref,
-  unref,
-  watch,
-  watchEffect,
-  defineModel,
-} from 'vue';
-// const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance();
+import { ElMessageBox } from 'element-plus';
 import PatientInfoComp from './patientInfo.vue';
 import RegisterForm from './registerForm.vue';
-import { addAdmissionInfo, getPatientInfo } from "./api";
-const emits = defineEmits(['okAct']);
+import { noFilesRegister, registerInHospital, getInit } from './api';
+const emits = defineEmits(['okAct', 'cancelAct']);
 
 const props = defineProps({
   title: '',
   registrationType: {
     type: [String, Boolean, Number], // 根据实际类型调整
-    default: null // 或者 false、'' 等
+    default: null, // 或者 false、'' 等
   },
   patientInfo: {
-    type: Object
-  }
+    type: Object,
+  },
+  inHospitalInfo: {
+    type: Object,
+  },
+  alreadyEdit: {
+    type: Boolean,
+    default: false,
+  },
+  noFile: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 watch(
@@ -109,116 +121,118 @@ const code = defineModel('code');
 import { ElMessage } from 'element-plus';
 const width = '1128px';
 const patientApiInfo = ref({});
+const initOptions = ref({});
 
 /* 取消 */
 const cancelAct = () => {
-  dialogVisible.value = false;
+  emits('cancelAct');
 };
-const patientInfoRef = ref()
+const patientInfoRef = ref();
 
 /* 预交金 */
 const advancePaymentVisible = ref(false);
 /* 保存 */
 const handleSubmit = () => {
-  let params = {}
-  RegisterFormRef.value.validateData(async () => {
-    params = { ...params, ...RegisterFormRef.value.submitForm };
-    patientInfoRef.value.submitForm(async () => {
-      params = { ...params, ...patientInfoRef.value.form };
-      params.advance = advance.value
-      params.typeCode = currentFeeType.value
-      addAdmissionInfo(params).then(res => {
-        if (res.code == 200) {
-          emits('okAct');
-          ElMessage.success(res.message);
-          advancePaymentVisible.value = true;
-        } else {
-          ElMessage.error(res.message);
+  let params = {};
+  if (props.noFile) {
+    RegisterFormRef.value.validateData(async () => {
+      params.inHospitalInfo = RegisterFormRef.value.submitForm;
+      params.patientInformation = patientInfoRef.value.getPatientForm();
+      if (params.patientInformation.idCard) {
+        // 验证身份证号长度是否为18位
+        const idCard = params.patientInformation.idCard.toString();
+        if (idCard.length === 18) {
+          params.patientInformation.birthDate =
+            idCard.substring(6, 10) +
+            '-' +
+            idCard.substring(10, 12) +
+            '-' +
+            idCard.substring(12, 14);
         }
-      })
-    })
-    // if (patientInfo.value?.feeType == '08') {
-    //   if (currentFeeType.value == 'hipCash' && Number.parseFloat(advance.value) > 0) {
-    //     advancePaymentVisible.value = true;
-    //   } else {
-    //     createRegistration();
-    //   }
-    // } else {
-    //   medicalInsuranceTitle.value = '医保登记'; //医保信息、医保登记
-    //   medicalInsuranceVisible.value = true;
-    // }
-  });
-
-
-};
+      }
+      console.log('params', params);
+      params.inHospitalInfo.balanceAmount = advance.value;
+      const performRegistration = () => {
+        noFilesRegister(params).then((res) => {
+          if (res.code == 200) {
+            emits('okAct');
+            ElMessage.success(res.msg);
+            advancePaymentVisible.value = true;
+          } else {
+            ElMessage.error(res.msg);
+          }
+        });
+      };
+      if (advance.value == 0) {
+        ElMessageBox.confirm('住院预交金额未填写，确认登记吗', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            performRegistration();
+          })
+          .catch(() => {});
+      } else {
+        performRegistration();
+      }
+    });
+  } else {
+    params.balanceAmount = advance.value;
+    params.patientId = props.patientInfo.patientId;
+    RegisterFormRef.value.validateData(async () => {
+      params = { ...params, ...RegisterFormRef.value.submitForm };
+      console.log('params', params);
+      const performRegistration = () => {
+        registerInHospital(params).then((res) => {
+          if (res.code == 200) {
+            emits('okAct');
+            ElMessage.success(res.msg);
+            advancePaymentVisible.value = true;
+          } else {
+            ElMessage.error(res.msg);
+          }
+        });
+      };
 
-const advancePaymentSubmitOk = () => {
-  advancePaymentVisible.value = false;
-  createRegistration();
-};
-/* 登记 */
-const createRegistration = async () => {
-  // 住院登记
-  //   try {
-  //     const response = await postCreatePatIpdRegistrationApi({
-  //       ...RegisterFormRef.value.submitForm,
-  //       patCode: unref(code),
-  //       sex: patientInfo.value.sex,
-  //       sexName: patientInfo.value.sexName,
-  //       name: patientInfo.value.name,
-  //       payWay: currentFeeType.value,
-  //       prepayAmount: advance.value,
-  //       /* 医保 */
-  //       medType: medicalInsuranceForm.value.miMedType,
-  //     });
-  //     ElMessage({
-  //       message: '登记成功！',
-  //       type: 'success',
-  //       grouping: true,
-  //       showClose: true,
-  //     });
-  //     emits('okAct');
-  //   } catch (error: any) {
-  //     console.log('error', error);
-  //     const msg = error.message.splice(error.message.findLastIndex(':'));
-  //     ElMessage({
-  //       message: msg,
-  //       type: 'error',
-  //       grouping: true,
-  //       showClose: true,
-  //     });
-  //   }
+      if (advance.value == 0) {
+        ElMessageBox.confirm('住院预交金额未填写，确认登记吗', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            performRegistration();
+          })
+          .catch(() => {});
+      } else {
+        performRegistration();
+      }
+    });
+  }
 };
 
 const openAct = () => {
+  console.log(props.patientInfo, 'patientRegister.vue');
+  console.log(props.inHospitalInfo, 'inHospitalInfo.vue');
   /* 初始化数据 */
-  advance.value = '0.00';
+  advance.value = props.inHospitalInfo.balanceAmount || 0;
   advancePaymentVisible.value = false;
-  // PatientRelationListRef.value.setPatientRelationList([]);
-  queryPatientData();
   RegisterFormRef.value.init();
 };
 const closedAct = () => {
   dialogVisible.value = false;
+  if (patientInfoRef.value?.isEditing) {
+    patientInfoRef.value.isEditing = false;
+  }
 };
 
-onMounted(() => {});
-const state = reactive({});
-const PatientRelationListRef = ref();
+onMounted(() => {
+  getInit().then((res) => {
+    initOptions.value = res.data;
+  });
+});
 
-/* 查询患者 */
-const queryPatientData = () => {
-  // TODO 查询患者信息
-    getPatientInfo(props.patientInfo.id)
-      .then((res) => {
-        if (res) {
-          patientApiInfo.value = res.data
-        }
-      })
-      .catch(() => {
-        console.log();
-      });
-};
 /* 登记 */
 const RegisterFormRef = ref();
 
@@ -264,29 +278,6 @@ const onChangFeeType = () => {
   medicalInsuranceTitle.value = '医保信息'; //医保信息、医保登记
   medicalInsuranceVisible.value = true;
 };
-/* 患者费别变更 ,成功之后 */
-const chargeTypeOk = (data) => {
-  if (data.chargeType) {
-    patientInfo.value.feeType = data.chargeType;
-    patientInfo.value.feeTypeName = getName('ChargeType', data.chargeType);
-    medicalInsuranceVisible.value = false;
-  }
-};
-const medicalInsuranceForm = ref({});
-const registerOk = (data) => {
-  // debugger;
-  medicalInsuranceForm.value = unref(data);
-  if (currentFeeType.value == 'hipCash' && Number.parseFloat(advance.value) > 0) {
-    advancePaymentVisible.value = true;
-  } else {
-    createRegistration();
-  }
-};
-/*  */
-const supplementMi = () => {
-  medicalInsuranceTitle.value = '医保登记'; //医保信息、医保登记
-  medicalInsuranceVisible.value = true;
-};
 
 /*  */
 </script>
diff --git a/vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
similarity index 42%
rename from vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
index f614887c..652a373a 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
@@ -8,26 +8,26 @@
       :model="submitForm"
       style="padding-left: 8px"
       ref="registerRef"
-      label-width="100px"
+      label-width="80px"
       :rules="rules"
     >
       <el-row :gutter="8">
         <el-col :span="6">
-          <el-form-item label="住院号:" prop="inPatientId">
-            {{ submitForm.inPatientId ? submitForm.inPatientId : '-' }}
+          <el-form-item label="住院号:" prop="encounterBusNo">
+            {{ submitForm.busNo ? submitForm.busNo : '-' }}
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="住院次数:" prop="hospitalizationCount" autocomplete="off">
-            {{ submitForm.hospitalizationCount ? submitForm.hospitalizationCount : '-' }}
+            {{ submitForm.inHospitalCount }}
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="入院科室" prop="organizationId">
+          <el-form-item label="入院科室" prop="inHospitalOrgId">
             <el-tree-select
               clearable
               style="width: 100%"
-              v-model="submitForm.organizationId"
+              v-model="submitForm.inHospitalOrgId"
               filterable
               :data="organization"
               :props="{
@@ -39,33 +39,52 @@
               check-strictly
               :check-strictly-except-leaf="false"
               :default-expand-all="true"
-              placeholder="请选择上级科室/病区/床位"
+              placeholder="请选择入院科室"
               @change="handleChange"
+              @node-click="handleNodeClick"
             />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="入院病区" prop="wardLocationId">
-            <el-select v-model="submitForm.wardLocationId">
+            <el-select :disabled="props.alreadyEdit" v-model="submitForm.wardLocationId">
               <el-option
                 v-for="item in wardListOptions"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
+                @click="handleWardClick(item)"
               />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="床位数:" prop="bedCount">
-            {{ submitForm.bedCount ? submitForm.bedCount : '-' }}
+            {{
+              submitForm.totalBedsNum ? submitForm.idleBedsNum + '/' + submitForm.totalBedsNum : '-'
+            }}
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="门诊医生" prop="applyDoctorCode">
-            <el-select v-model="submitForm.applyDoctorCode">
+          <el-form-item label="门诊医生" prop="ambDoctorPractitionerName">
+            <el-input disabled v-model="submitForm.ambDoctorPractitionerName" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="诊断类别" prop="medTypeCode">
+            <el-select
+              v-model="submitForm.medTypeCode"
+              placeholder="诊断类别"
+              clearable
+              filterable
+              @change="
+                (value) => {
+                  submitForm.ybClassEnum = value;
+                }
+              "
+            >
               <el-option
-                v-for="item in doctorListOptions"
+                v-for="item in med_type"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -73,24 +92,41 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="6">
-          <el-form-item label="门诊诊断" prop="diagnosisCode">
-            <el-select v-model="submitForm.diagnosisCode">
+        <el-col :span="6" v-if="!props.noFile">
+          <el-form-item label="入院诊断" prop="ambDiagnosisName">
+            <el-input v-model="submitForm.ambDiagnosisName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" v-else>
+          <el-form-item label="入院诊断" prop="diagnosisDefinitionId">
+            <el-select
+              v-model="submitForm.diagnosisDefinitionId"
+              placeholder="入院诊断"
+              clearable
+              filterable
+              remote
+              :remote-method="getDiagnosisInfo"
+            >
               <el-option
-                v-for="item in verificationStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                v-for="item in diagnosisDefinitionList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                @click="handleDiagnosisChange(item)"
               />
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="props.noFile">
+          <el-form-item label="诊断描述" prop="diagnosisDesc">
+            <el-input v-model="submitForm.diagnosisDesc" />
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
-          <el-form-item label="患者病情" prop="patAdmCondition">
-            <el-select v-model="submitForm.patAdmCondition">
+          <el-form-item label="患者病情">
+            <el-select v-model="submitForm.priorityEnum">
               <el-option
-                v-for="item in priorityEnumListOptions"
+                v-for="item in props.initOptions.priorityEnumList"
                 :key="item.value"
                 :label="item.info"
                 :value="item.value"
@@ -102,9 +138,9 @@
           <el-form-item label="入院类型" prop="admitSourceCode">
             <el-select v-model="submitForm.admitSourceCode">
               <el-option
-                v-for="item in admissionMethodList"
+                v-for="item in admit_source_code"
                 :key="item.value"
-                :label="item.info"
+                :label="item.label"
                 :value="item.value"
               />
             </el-select>
@@ -114,80 +150,97 @@
           <el-form-item label="入院方式" prop="inWayCode">
             <el-select v-model="submitForm.inWayCode">
               <el-option
-                v-for="item in admissionTypeList"
+                v-for="item in in_way_code"
                 :key="item.value"
-                :label="item.info"
+                :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="入院日期" prop="inDate">
+          <el-form-item label="费用性质">
+            <el-select
+              v-model="submitForm.contractNo"
+              placeholder="费用性质"
+              clearable
+              @change="getValue"
+            >
+              <el-option
+                v-for="item in contractList"
+                :key="item.busNo"
+                :label="item.contractName"
+                :value="item.busNo"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="入院日期" prop="startTime">
             <el-date-picker
-              v-model="submitForm.inDate"
-              value-format="YYYY-MM-DD"
+              v-model="submitForm.startTime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               type="date"
               placeholder="请选择日期"
             />
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="6">
-          <el-form-item label="来源机构" prop="sourceAgency">
-            <hip-dic-sel
-              dictCode="CF08.10.996"
-              clearable
-              class="w-200"
-              v-model="submitForm.sourceAgency"
-              placeholder="请输入"
-            ></hip-dic-sel>
-          </el-form-item>
-        </el-col> -->
       </el-row>
     </el-form>
   </div>
 </template>
-<script setup >
+<script setup>
 import {
-  getCurrentInstance,
-  onActivated,
-  onBeforeMount,
-  onMounted,
-  reactive,
-  ref,
-  unref,
-  watch,
-} from 'vue';
-import { ElMessage } from 'element-plus';
-import { getInit, getOrgList, wardList, diagnosisInit, doctorList } from "./api";
+  getInit,
+  getOrgList,
+  wardList,
+  diagnosisInit,
+  getBedInfo,
+  getContractList,
+  getDiagnosisDefinitionList,
+} from './api';
+const { proxy } = getCurrentInstance();
+const { in_way_code, admit_source_code, med_type } = proxy.useDict(
+  'in_way_code',
+  'admit_source_code',
+  'med_type'
+);
 
-import dayjs from 'dayjs';
-// const { proxy } = getCurrentInstance();
+import { formatDateStr } from '@/utils';
 const emits = defineEmits([]);
 const props = defineProps({
   patientInfo: {
     type: Object,
     require: true,
-    default: () => ({})
+    default: () => ({}),
   },
-})
-
-
-const dataSourceDoctor = ref([
-  {
-    name: '',
-    id: '',
+  inHospitalInfo: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  initOptions: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  alreadyEdit: {
+    type: Boolean,
+    default: false,
   },
-]);
-const admissionMethodList = ref([])
-const admissionTypeList = ref([])
-const organization = ref([])
-const wardListOptions = ref([])
-const verificationStatusOptions = ref([])
-const priorityEnumListOptions = ref([])
-const doctorListOptions = ref([])
+  noFile: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const organization = ref([]);
+const wardListOptions = ref([]);
+const contractList = ref([]);
+const verificationStatusOptions = ref([]);
+const diagnosisDefinitionList = ref([]);
 const rules = reactive({
-  organizationId: [
+  inHospitalOrgId: [
     {
       required: true,
       message: '入院科室未填写',
@@ -201,57 +254,46 @@ const rules = reactive({
       trigger: ['blur', 'change'],
     },
   ],
-  patAdmCondition: [
+  startTime: [
     {
       required: true,
-      message: '患者病情未填写',
+      message: '入院日期未填写',
       trigger: ['blur', 'change'],
     },
   ],
-  inDate: [
+  diagnosisDefinitionId: [
     {
       required: true,
-      message: '入院日期未填写',
+      message: '入院诊断未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  diagnosisDesc: [
+    {
+      required: true,
+      message: '诊断描述未填写',
       trigger: ['blur', 'change'],
     },
   ],
 });
 
-/*  下拉表格设置*/
-const inDeptCodeClick = (row) => {
-  // submitForm.inDeptCode = unref(row).id
-  // submitForm.inDeptName = unref(row).name
-  submitForm.inDocterWorkGroupCode = unref(row).deptCode;
-};
-const inDeptCodeClearActs = (row) => {
-  submitForm.inDeptCode = '';
-  submitForm.inDeptName = '';
-  submitForm.inDocterWorkGroupCode = '';
-};
-// <Partial<IRegistration>>
 /* 提交表单 */
 const submitForm = reactive({
-  inDeptCode: '', // 	入院科室
-  wardLocationId: '', // 入院护理组编码
+  inHospitalOrgId: props.inHospitalInfo.inHospitalOrgId,
+  ambDoctorPractitionerName: props.inHospitalInfo.ambDoctorPractitionerName,
+  wardLocationId: props.inHospitalInfo.wardLocationId, // 入院护理组编码
   admitSourceCode: '', // 患者入院类型（字典：PatientSource）
   inWayCode: '', // 入院方式（字典InpWay）
-  inDate: dayjs(new Date()).format('YYYY-MM-DD 00:00:00'), // 	入院日期
-  patAdmCondition: '', // 患者病情（字典：PatAdmCondition）
-  applyDoctorCode: '', // 	申请入院医生
-  inPatientId: '',
-  inTimes: '',
-  diagnosisCode: '',
-  bedCount: '',
+  startTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'), // 	入院日期
+  priorityEnum: props.inHospitalInfo.priorityEnum, // 患者病情（字典：PatAdmCondition）
+  ambDiagnosisName: props.inHospitalInfo.ambDiagnosisName,
+  medTypeCode: '21',
 });
 /* 科室 病区 */
 watch(
   () => submitForm.inDocterWorkGroupCode,
   (newValue) => {
     if (newValue) {
-      // TODO 监听科室重新查询病区
-      //   getDataWorkGroup(newValue).then(() => {
-      //     hipSelTabelInNurseDeptCodeRef.value.setData(dataSourceWorkGroup.value);
-      //   });
       if (newValue == '') {
         submitForm.wardLocationId = '';
       }
@@ -261,15 +303,6 @@ watch(
   }
 );
 
-watch(
-  () => props.patientInfo,
-  (newValue) => {
-    Object.assign(submitForm, newValue)
-    handleChange(props.patientInfo.organizationId)
-  },
-  { immediate: true }
-);
-
 watch(
   () => submitForm.inNurseDeptCode,
   (newValue) => {
@@ -280,64 +313,83 @@ watch(
 );
 
 onMounted(() => {
-  getInitOptions()
+  getInitOptions();
+  setValue();
 });
 
-function getInitOptions() {
-  getInit().then((res) => {
-    admissionMethodList.value = res.data.admissionMethodList;
-    admissionTypeList.value = res.data.admissionTypeList;
-    priorityEnumListOptions.value = res.data.priorityEnumList
+function handleWardClick(item) {
+  submitForm.wardBusNo = item.busNo;
+  getBedInfo(submitForm.wardBusNo).then((res) => {
+    submitForm.totalBedsNum = res.data.totalBedsNum;
+    submitForm.idleBedsNum = res.data.idleBedsNum;
   });
+}
+
+function getInitOptions() {
   getOrgList().then((res) => {
     organization.value = res.data.records;
   });
-  wardList().then(res => {
-    wardListOptions.value = res.data;
-  })
-  diagnosisInit().then(res => {
+  if (!props.noFile) {
+    wardList().then((res) => {
+      wardListOptions.value = res.data;
+    });
+  }
+  diagnosisInit().then((res) => {
     verificationStatusOptions.value = res.data.verificationStatusOptions;
-  })
+  });
+  getContractList().then((response) => {
+    contractList.value = response.data;
+    setValue();
+  });
+  getDiagnosisInfo(undefined);
 }
-
-function handleChange(e) {
-  if(e) {
-    doctorList(e).then(res => {
-      doctorListOptions.value = res.data;
-    })
-  }
+function getDiagnosisInfo(value) {
+  getDiagnosisDefinitionList({ pageSize: 500, pageNo: 1, searchKey: value }).then((res) => {
+    diagnosisDefinitionList.value = res.data.records;
+  });
 }
 
-/* 预登记 */
-const preRegister = (res) => {
-  if (res) {
-    setTimeout(() => {
-      submitForm.inPatientId = res.inpatientNo;
-      submitForm.inTimes = res.inTimes;
-      submitForm.applyDoctorCode = res?.ipdApplyTo?.patApplyDiagnosiss?.diagnosisName;
-      submitForm.inDeptCode = res?.ipdApplyTo?.applyDeptCode;
-      submitForm.wardLocationId = res?.ipdApplyTo?.nurseDeptCode;
-      submitForm.patAdmCondition = res?.ipdApplyTo?.patAdmCondition.toString();
-      submitForm.admitSourceCode = res?.ipdApplyTo?.admitSourceCode;
-      submitForm.inWayCode = res?.ipdApplyTo?.inWayCode;
-      submitForm.diagnosisCode = res?.ipdApplyTo?.patApplyDiagnosiss?.diagnosisCode || [];
-    }, 1000);
+function handleNodeClick(orgInfo) {
+  wardList({ orgId: orgInfo.id }).then((res) => {
+    wardListOptions.value = res.data;
+  });
+}
 
-    // sourceAgency
+function handleChange(value) {
+  if (!value) {
+    wardListOptions.value = [];
+    submitForm.wardLocationId = undefined;
   }
-};
+}
 
-/* 预登记 */
-const getBedInfo = (inNurseDeptCode) => {
-  // TODO 预登记接口
-  //   getBedsAvailableApi(inNurseDeptCode)
-  //     .then((res: any) => {
-  //       submitForm.bedCount = res;
-  //     })
-  //     .catch((error: any) => {
-  //       console.log(error);
-  //     });
-};
+function handleDiagnosisChange(item) {
+  submitForm.diagnosisYbNo = item.ybNo;
+  submitForm.diagnosisDefinitionId = item.id;
+}
+
+function setValue() {
+  submitForm.encounterId = props.inHospitalInfo?.encounterId;
+  submitForm.busNo = props.inHospitalInfo?.busNo;
+  submitForm.contractNo = props.inHospitalInfo?.contractNo;
+  submitForm.inHospitalCount = props.inHospitalInfo?.inHospitalCount;
+  submitForm.inHospitalOrgId = props.inHospitalInfo?.inHospitalOrgId;
+  submitForm.inHospitalOrgName = props.inHospitalInfo?.inHospitalOrgName;
+  submitForm.wardLocationId = props.inHospitalInfo?.wardLocationId;
+  submitForm.wardName = props.inHospitalInfo?.wardName;
+  submitForm.wardBusNo = props.inHospitalInfo?.wardBusNo;
+  submitForm.totalBedsNum = props.inHospitalInfo?.totalBedsNum;
+  submitForm.idleBedsNum = props.inHospitalInfo?.idleBedsNum;
+  submitForm.ambEncounterId = props.inHospitalInfo?.ambEncounterId;
+  submitForm.ambDoctorPractitionerId = props.inHospitalInfo?.ambDoctorPractitionerId;
+  submitForm.ambDoctorPractitionerName = props.inHospitalInfo?.ambDoctorPractitionerName;
+  submitForm.ambDiagnosisName = props.inHospitalInfo?.ambDiagnosisName;
+  submitForm.priorityEnum = props.inHospitalInfo?.priorityEnum;
+  submitForm.priorityEnum_enumText = props.inHospitalInfo?.priorityEnum_enumText;
+  submitForm.admitSourceCode = props.inHospitalInfo?.admitSourceCode;
+  submitForm.admitSourceCode_dictText = props.inHospitalInfo?.admitSourceCode_dictText;
+  submitForm.inWayCode = props.inHospitalInfo?.inWayCode;
+  submitForm.inWayCode_dictText = props.inHospitalInfo?.inWayCode_dictText;
+}
 
 const registerRef = ref();
 /* 登记 */
@@ -352,35 +404,19 @@ const validateData = async (callback) => {
     }
   });
 };
-// onBeforeMount(() => {
 
-// })
-const hipSelTabelInDeptCodeRef = ref();
-const hipSelTabelInNurseDeptCodeRef = ref();
-onMounted(() => {
-  // 获取科室数据
-  //   getDataDept().then(() => {
-  //     hipSelTabelInDeptCodeRef.value.setData(dataSourceDept.value || []);
-  //   });
-});
-onActivated(() => {
-  // 获取科室数据
-  //   getDataDept().then(() => {
-  //     hipSelTabelInDeptCodeRef.value.setData(dataSourceDept.value);
-  //   });
-});
 const init = () => {
   submitForm.inDocterWorkGroupCode = '';
   submitForm.wardLocationId = '';
 };
-defineExpose({ validateData, submitForm, preRegister, init });
+defineExpose({ validateData, submitForm, init });
 </script>
 <style lang="scss" scoped>
 .registerForm-container {
-  background: rgba(37, 109, 149, 0.05);
   margin-top: 16px;
 
   .operate {
+    background: rgba(37, 109, 149, 0.05);
     display: flex;
     justify-content: space-between;
     align-items: center;
diff --git a/vue3/src/views/inHospitalManagement/charge/register/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/index.vue
similarity index 69%
rename from vue3/src/views/inHospitalManagement/charge/register/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/register/index.vue
index 847bd958..b6fd4097 100644
--- a/vue3/src/views/inHospitalManagement/charge/register/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="container">
-    <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
+  <div class="app-container">
+    <el-tabs v-model="activeName" type="card" class="demo-tabs">
       <el-tab-pane label="待登记入院" name="first">
         <AwaitList v-if="activeName === 'first'" @okList="activeName = 'second'" />
       </el-tab-pane>
@@ -13,23 +13,16 @@
     </el-tabs>
   </div>
 </template>
-<script setup >
-// import { TabsPaneContext } from 'element-plus';
+<script setup>
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
 import { AwaitList, AccomplishList, ExistList } from './components/index.js';
-//const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 const emits = defineEmits([]);
 const props = defineProps({});
 const state = reactive({});
-onBeforeMount(() => {});
-onMounted(() => {});
 defineExpose({ state });
-
 const activeName = ref('first');
 
-// const handleClick = (tab: TabsPaneContext, event: Event) => {
-//   console.log(tab, event);
-// };
 </script>
 <style lang="scss" scoped>
 .sds {
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/components/api.js b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/components/api.js
new file mode 100644
index 00000000..2ff6812a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/components/api.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 获取支付记录列表
+export function getList(query) {
+  return request({
+    url: '/payment/payment/page',
+    method: 'get',
+    params: query
+  })
+}
+export function invoiceMzInvoice(data) {
+  return request({
+    url: '/invoice/mzInvoice',
+    method: 'post',
+    data: data
+  })
+}
+export function invoiceReissue(data) {
+  return request({
+    url: '/invoice/invoiceReissue',
+    method: 'post',
+    data: data
+  })
+}
+export function invoiceWriteoff(data) {
+  return request({
+    url: '/invoice/invoiceWriteoff',
+    method: 'post',
+    data: data
+  })
+}
+export function invoiceOpen(invoiceId) {
+  return request({
+    url: '/invoice/invoiceOpen?invoiceId=' + invoiceId,
+    method: 'put',
+  })
+}
+// 收费详情
+export function paymentDetail(data) {
+  return request({
+    url: '/payment/payment/detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 退费
+export function inpaUnPay(data) {
+  return request({
+    url: '/payment/payment/inpa-un-pay',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue
new file mode 100644
index 00000000..107e688d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue
@@ -0,0 +1,363 @@
+<!--
+ * @Author: X_bo v-hss@tbpartners.local
+ * @Date: 2025-08-15 10:00:37
+ * @LastEditTime: 2025-08-15 14:18:01
+ * @LastEditors: X_bo v-hss@tbpartners.local
+ * @Description: 
+ * @FilePath: \openhis-ui-vue3\src\views\inHospitalManagement\charge\settleAccounts\index.vue
+-->
+<template>
+  <div class="app-continer">
+    <div style="margin: 15px 0; padding: 0 20px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
+        <el-form-item label="患者姓名：" prop="searchKey">
+          <el-input
+            v-model="queryParams.searchKey"
+            placeholder="患者姓名"
+            clearable
+            style="width: 240px"
+            @keyup.enter="getClinicRecord"
+          />
+        </el-form-item>
+        <el-form-item label="发票号：" prop="invoiceNo" label-width="120px">
+          <el-input
+            v-model="queryParams.invoiceNo"
+            placeholder="发票号"
+            clearable
+            style="width: 240px"
+            @keyup.enter="getClinicRecord"
+          />
+        </el-form-item>
+        <el-form-item label="结算时间：" prop="activeFlag">
+          <el-date-picker
+            v-model="occurrenceTime"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 300px; margin-bottom: 10px; margin-left: 20px"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+            @change="getClinicRecord"
+          />
+        </el-form-item>
+        <div style="float: right">
+          <el-button type="primary" plain @click="getClinicRecord">查询</el-button>
+          <el-button type="warning" plain @click="handleReset">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <el-table :data="clinicRecord" border>
+      <!-- <el-table-column label="计算类型" align="center" prop="statusEnum_enumText" /> -->
+      <el-table-column label="患者姓名" align="center" prop="patientName" :show-overflow-tooltip="true"/>
+      <el-table-column label="支付状态" align="center" prop="statusEnum_dictText" :show-overflow-tooltip="true"/>
+      <el-table-column label="费用类型" align="center" prop="paymentEnum_dictText" :show-overflow-tooltip="true"/>
+      <el-table-column label="医保结算Id" align="center" prop="ybSettleIds" :show-overflow-tooltip="true"/>
+      <el-table-column label="收费流水号" align="center" prop="paymentNo" width="280" :show-overflow-tooltip="true"/>
+      <el-table-column label="发票号" align="center" prop="invoiceNo" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="结算金额"
+        align="right"
+        prop="tenderedAmount"
+        header-align="center"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row.tenderedAmount + ' 元' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="支付金额"
+        align="right"
+        prop="displayAmount"
+        header-align="center"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row.displayAmount + ' 元' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="结算时间"
+        align="center"
+        key="billDate"
+        prop="billDate"
+       
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.billDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="收款人" align="center" prop="entererName" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="医生" align="center" prop="paymentEnum_enumText" /> -->
+      <el-table-column label="支付结果" align="center" prop="outcomeEnum_dictText" :show-overflow-tooltip="true"/>
+      <el-table-column label="打印次数" align="center" prop="printCount" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" prop="paymentEnum_enumText" width="400">
+        <template #default="scope">
+          <!-- <el-button type="primary" link @click="handlePrint(scope.row)">单据</el-button> -->
+          <!-- <el-button type="primary" link @click="handleEdit(scope.row)">冲红</el-button> -->
+          <el-button type="primary" link @click="handleRefund(scope.row)" :disabled="scope.row.paymentEnum != 0 || scope.row.outcomeEnum == 3">退费</el-button>
+          <el-button type="primary" link @click="handleOpen(scope.row,4)">收费详情</el-button>
+          <el-button type="primary" link @click="handleOpen(scope.row,1)" :disabled="scope.row.invoiceNo || scope.row.statusEnum == 3">开具电子发票</el-button>
+          <el-button :disabled="!scope.row.relationId" type="primary" link @click="handleOpenReasonDialog(scope.row)">冲销发票</el-button>
+          <el-button type="primary" link @click="handleOpen(scope.row,3)" :disabled="!scope.row.invoiceNo">调阅发票</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getLists"
+    />
+    <el-dialog title="收费详情" v-model="paymentDetailShow" width="1000" append-to-body style="height:90vh">
+      <el-table :data="paymentDetailList" border style="height: 80vh">
+      <el-table-column label="支付类型" align="center" prop="payEnum_dictText" :show-overflow-tooltip="true"/>
+      <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true"/>
+      <el-table-column label="找零" align="center" prop="returnAmount" :show-overflow-tooltip="true"/>
+      <el-table-column label="交款" align="center" prop="chargeAmount" :show-overflow-tooltip="true"/>
+    </el-table>
+    </el-dialog>
+    <el-dialog title="请输入原因" v-model="reasonDialogVisible" width="30%">
+      <el-form :model="reasonForm" label-width="80px">
+        <el-form-item label="冲销原因">
+          <el-input v-model="reasonForm.reason" placeholder="请输入原因" type="textarea" :rows="3" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="reasonDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitReason">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 退费原因弹窗 -->
+    <el-dialog title="退费原因" v-model="refundDialogVisible" width="30%">
+      <el-form :model="refundForm" label-width="80px">
+        <el-form-item 
+          label="退费原因" 
+          prop="reason"
+          :rules="[
+            { required: true, message: '请输入退费原因', trigger: 'blur' },
+            { min: 1, max: 200, message: '长度在1到200个字符之间', trigger: 'blur' }
+          ]"
+        >
+          <el-input v-model="refundForm.reason" placeholder="请输入退费原因" type="textarea" :rows="3" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="refundDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitRefund">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ClinicRecord">
+const { proxy } = getCurrentInstance();
+import { getList ,invoiceMzInvoice,invoiceReissue,invoiceWriteoff,invoiceOpen,paymentDetail,inpaUnPay} from './components/api.js';
+import { formatDate } from '@/utils/index';
+const occurrenceTime = ref([
+  formatDate(new Date(new Date().getFullYear(), new Date().getMonth() - 1, new Date().getDate())),
+  formatDate(new Date())
+]);
+
+const total = ref(0);
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  billDateSTime:"",
+  billDateETime:"",
+  searchKey:"",
+  kinsEnum: 2
+});
+
+// 初始化时设置时间参数
+queryParams.value.billDateSTime = occurrenceTime.value[0] + " 00:00:00";
+queryParams.value.billDateETime = occurrenceTime.value[1] + " 23:59:59";
+
+const paymentDetailShow = ref(false)
+const clinicRecord = ref([]);
+const reasonDialogVisible = ref(false);
+const reasonForm = ref({
+  reason: ''
+});
+const currentRow = ref(null);
+const paymentDetailList = ref([])
+const refundDialogVisible = ref(false);
+const refundForm = ref({
+  reason: '',
+  paymentId: '',
+  encounterId: ''
+});
+const currentRefundRow = ref(null);
+
+getLists();
+function getClinicRecord() {
+  queryParams.value.billDateSTime =
+  occurrenceTime.value && occurrenceTime.value.length == 2
+    ? occurrenceTime.value[0] + " 00:00:00"
+    : "";
+  queryParams.value.billDateETime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[1] + " 23:59:59"
+      : "";
+  queryParams.value.pageNo = 1;
+  getLists()
+}
+function getLists(){
+  getList(queryParams.value).then((res) => {
+    total.value = res.data.total;
+    clinicRecord.value = res.data.records;
+  });
+}
+function handleOpenReasonDialog(row) {
+  // 可选：保存当前行数据以便后续使用
+  currentRow.value = row;
+  reasonForm.value.reason = ''; // 清空上次输入
+  reasonDialogVisible.value = true;
+}
+// 提交原因
+function submitReason() {
+  if (!reasonForm.value.reason.trim()) {
+    proxy.$message.warning('请输入原因');
+    return;
+  }
+
+  invoiceWriteoff({paymentId:currentRow.value.relationIdStr,reason:reasonForm.value.reason}).then((res) => {
+    if (res.data) {
+      if(res.data.includes(" 电子票据红冲失败")){
+        proxy.$message.error(res.data);
+      }else{
+          proxy.$message.success('红冲成功');
+          // 关闭弹窗
+            reasonDialogVisible.value = false;
+
+          // 可选：重置表单
+          reasonForm.value.reason = '';
+        window.open(res.data)
+      }
+    }
+    getLists();
+  }).catch((err)=>{
+  })
+}
+/** 清空条件按钮操作 */
+function handleReset() {
+  // 清空查询条件
+  occurrenceTime.value = ""
+  queryParams.value.billDateSTime = ""
+  queryParams.value.billDateETime = ""
+  proxy.resetForm("queryRef");
+  getLists();
+}
+// function handlePrint(row){
+
+// }
+// function handleEdit(row){
+  
+// }
+function handleOpen(row,type){
+  if(type==1){
+    invoiceReissue({paymentId:row.id,encounterId:row.encounterId?row.encounterId:""}).then((res) => {
+      if (res.data) {
+        // 门诊电子发票开具失败 住院电子发票开具失败 电子发票类型不明确
+        if(res.data.includes(" 挂号电子发票开具失败")||res.data.includes(" 住院电子发票开具失败")||res.data.includes(" 门诊电子发票开具失败")||res.data.includes(" 电子发票类型不明确")){
+          proxy.$message.error(res.data);
+        }else{
+          window.open(res.data)
+        }
+      }
+      if(res.code == 200) {
+        getLists();
+      }
+      proxy.$message.error(res.data);
+    }).catch((err)=>{
+    })
+  }else if(type==2) {
+    invoiceWriteoff({paymentId:row.id,encounterId:row.encounterId?row.encounterId:""}).then((res) => {
+      if (res.data) {
+        if(res.data.includes(" 电子票据红冲失败")){
+          proxy.$message.error(res.data);
+        }else{
+          window.open(res.data)
+        }
+      }
+    }).catch((err)=>{
+    })
+  }else if(type==3){
+    // 调阅电子发票
+    invoiceOpen(row.invoiceId?row.invoiceId:"").then((res) => {
+      if (res.data) {
+        window.open(res.data)
+      }
+    }).catch((err)=>{
+    })
+  }else{
+    paymentDetail({id:row.id?row.id:""}).then((res) => {
+      if (res.data) {
+        paymentDetailShow.value = true
+        paymentDetailList.value = res.data
+      }
+    }).catch((err)=>{
+    })
+  }
+   
+}
+
+function handleRefund(row) {
+  currentRefundRow.value = row;
+  refundForm.value.reason = '';
+  refundForm.value.paymentId = row.paymentId || row.id;
+  refundForm.value.encounterId = row.encounterId || '';
+  refundDialogVisible.value = true;
+}
+
+function submitRefund() {
+  // 使用表单验证
+  if (!refundForm.value.reason || refundForm.value.reason.trim() === '') {
+    proxy.$message.warning('请输入退费原因');
+    return;
+  }
+  
+  if (refundForm.value.reason.length > 200) {
+    proxy.$message.warning('退费原因长度不能超过200个字符');
+    return;
+  }
+
+  const refundData = {
+    id: refundForm.value.paymentId,
+    reason: refundForm.value.reason,
+    encounterId: refundForm.value.encounterId ? refundForm.value.encounterId : ""
+  };
+
+  inpaUnPay(refundData).then((res) => {
+    if (res.code == 200) {
+      proxy.$message.success('退费成功');
+      refundDialogVisible.value = false;
+      getLists();
+    }else {
+      proxy.$message.error(res.data);
+    }
+  }).catch((err) => {
+    console.error(err);
+  });
+}
+
+</script>
+<style scoped>
+.el-dialog{
+  height: 90vh!important;
+}
+.dialog-footer {
+  text-align: right;
+}
+.el-textarea__inner {
+  resize: none;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue
similarity index 91%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue
index 34bebc41..e180c1e2 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/cancel/index.vue
@@ -30,16 +30,9 @@
         <el-table-column prop="name" label="姓名" min-width="131" />
         <el-table-column prop="inpatientCode" label="住院号" width="167" />
         <el-table-column prop="settleNo" label="发票号" min-width="210" />
-        <el-table-column prop="costs" label="金额" width="160" align="right" header-align="left" :formatter="(row: any) => {
-          return row.costs && round(row.costs, 2).toFixed(2)
-        }
-          " />
+
         <el-table-column prop="feeTypeName" label="类别" min-width="155" />
         <el-table-column prop="settleTypeName" label="结算类型" min-width="174" />
-        <el-table-column prop="createdDate" label="结算时间" min-width="194" :formatter="(row: any) => {
-          return row.createdDate && dayjs(row.createdDate).format('YYYY/MM/DD HH:mm')
-        }
-          " />
         <el-table-column prop="createdStaffName" label="结算人" min-width="145" />
         <template v-slot:empty>
           <div>
@@ -137,8 +130,8 @@ const queryForm = reactive({
   searchType: 'receipt',
 })
 const patientsBarRef = ref()
-const queryPpatientList = ref<Array<any>>([])
-const currentPatient = ref<Partial<any>>() // 当前
+// const queryPpatientList = ref<Array<any>>([])
+// const currentPatient = ref<Partial<any>>() // 当前
 /* 查询患者 */
 const queryPatient = () => {
   // TODO 查询患者接口
@@ -147,19 +140,19 @@ const queryPatient = () => {
 }
 
 /* 患者费用信息 */
-const econDetailsInfo = ref<{
-  bpubTypeList: []
-  econIpdSettlePayAsToList: Array<any>
-  payAmount: 0
-  prepayAmount: 0
-  totalAmount: 0
-}>({
-  bpubTypeList: [],
-  econIpdSettlePayAsToList: [],
-  payAmount: 0,
-  prepayAmount: 0,
-  totalAmount: 0,
-})
+// const econDetailsInfo = ref<{
+//   bpubTypeList: []
+//   econIpdSettlePayAsToList: Array<any>
+//   payAmount: 0
+//   prepayAmount: 0
+//   totalAmount: 0
+// }>({
+//   bpubTypeList: [],
+//   econIpdSettlePayAsToList: [],
+//   payAmount: 0,
+//   prepayAmount: 0,
+//   totalAmount: 0,
+// })
 const getEconDetails = () => {
   if (currentPatient.value && currentPatient.value.settleId) {
 
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue
similarity index 71%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue
index 2ef4f2ec..75c88e15 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/derate.vue
@@ -14,25 +14,6 @@
             :key="bpubType" />
         </el-select>
       </el-form-item>
-      <el-form-item label="减免金额" placeholder="请输入减免金额" prop="amount">
-        <el-input v-model="form.amount" @input="(value: any) => {
-          // 第一步：去掉非数字和小数点的字符
-          let cleanedValue = value.replace(/[^0-9.]/g, '')
-          // 第二步：处理多余的小数点，只保留第一个小数点
-          const parts = cleanedValue.split('.');
-          if (parts.length > 2) {
-            // 只保留第一个小数点及其后面的部分
-            cleanedValue = parts[0] + '.' + parts.slice(1).join('');
-          }
-          // 第三步：限制小数位数为两位
-          const dotIndex = cleanedValue.indexOf('.');
-          if (dotIndex !== -1) {
-            cleanedValue = cleanedValue.slice(0, dotIndex + 3);
-          }
-          form.amount = cleanedValue
-        }" />
-        <!-- (/[^\d{1,3}(,\d{3})*(\.\d{1,2})?$]/g, '') -->
-      </el-form-item>
     </el-form>
     <template v-slot:tool>
       <el-button @click="close" class="margin-left-auto" type="plain">取消</el-button>
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.ts b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.ts
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.ts
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.ts
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue
similarity index 96%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue
index c6abd29c..68cf8af8 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/index.vue
@@ -124,7 +124,6 @@
 </template>
 <script setup >
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue'
-import { getPatInfo, getPatInpatientEconInfo, cancelSettle } from '@/api/inpatient/cancelSettlement'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { round } from 'lodash-es'
@@ -140,8 +139,8 @@ const queryForm = reactive({
   searchType: 'receipt',
 })
 const patientsBarRef = ref()
-const queryPpatientList = ref<Array<any>>([])
-const currentPatient = ref<Partial<any>>() // 当前
+// const queryPpatientList = ref<Array<any>>([])
+// const currentPatient = ref<Partial<any>>() // 当前
 /* 查询患者 */
 const queryPatient = () => {
   // TODO 查询患者接口
@@ -184,19 +183,19 @@ const queryPatient = () => {
 }
 
 /* 患者费用信息 */
-const econDetailsInfo = ref<{
-  bpubTypeList: []
-  econIpdSettlePayAsToList: Array<any>
-  payAmount: 0
-  prepayAmount: 0
-  totalAmount: 0
-}>({
-  bpubTypeList: [],
-  econIpdSettlePayAsToList: [],
-  payAmount: 0,
-  prepayAmount: 0,
-  totalAmount: 0,
-})
+// const econDetailsInfo = ref<{
+//   bpubTypeList: []
+//   econIpdSettlePayAsToList: Array<any>
+//   payAmount: 0
+//   prepayAmount: 0
+//   totalAmount: 0
+// }>({
+//   bpubTypeList: [],
+//   econIpdSettlePayAsToList: [],
+//   payAmount: 0,
+//   prepayAmount: 0,
+//   totalAmount: 0,
+// })
 const getEconDetails = () => {
   if (currentPatient.value && currentPatient.value.settleId) {
     getPatInpatientEconInfo(currentPatient.value.settleId).then((res) => {
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue
similarity index 91%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue
index 1c23fa8c..d88de063 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/invoiceSkip.vue
@@ -48,11 +48,11 @@ const emits = defineEmits([])
 const props = defineProps({})
 const visible = defineModel('visible', { type: Boolean, default: false })
 
-function okActTh(row: any) {
-  // if (thFlag.value === true || currentDataNumberPZH.value === '无启用收据') {
-  //     ElMessage.warning('无在用收据或使用共享号段时不能操作跳号!');
-  // }
-}
+// function okActTh(row: any) {
+//   // if (thFlag.value === true || currentDataNumberPZH.value === '无启用收据') {
+//   //     ElMessage.warning('无在用收据或使用共享号段时不能操作跳号!');
+//   // }
+// }
 const closedAct = () => {
   visible.value = false
 }
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue
similarity index 85%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue
index 3cb93e71..066898f8 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientList.vue
@@ -68,7 +68,7 @@
     </div>
   </el-drawer>
 </template>
-<script setup >
+<script setup lang="ts">
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, h } from 'vue'
 // const { proxy } = getCurrentInstance();
 
@@ -100,38 +100,6 @@ const initData = () => {
   // TODO 获取科室
 }
 
-const statusFormatter = (row: any) => {
-  switch ('1') {
-    case '1':
-      return h(
-        'div',
-        {
-          style: { color: '#999999' },
-        },
-        '费用未审核',
-      )
-    case '2':
-      return h(
-        'div',
-        {
-          style: { color: '#5585E3' },
-        },
-        '待结算',
-      )
-    case '3':
-      return h(
-        'div',
-        {
-          style: { color: '#945D3D' },
-        },
-        '待缴费',
-      )
-    case '4':
-      return h('div', {}, '已支付')
-    default:
-      break
-  }
-}
 const settle = (row: any) => {
   emits('settling', row)
 }
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/preSettlement.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/preSettlement.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/preSettlement.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/preSettlement.vue
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue
similarity index 88%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue
index 81b3db62..aee9c4ba 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/receipt.vue
@@ -37,11 +37,6 @@
         :style="{ 'border-right': '1px solid #eeeeee', height: '100%' }">
         <el-table-column prop="paywayName" label="缴费方式" width="99" />
         <el-table-column prop="amount" label="金额" width="117" align="right" header-align="left" />
-        <el-table-column class-name="amount" prop="nameRight" label="状态" width="124" :formatter="(row: any) => {
-          if (row.transactionType == 'IN') return '已缴费'
-          if (row.transactionType == 'OUT') return '已退费'
-        }
-          " />
         <el-table-column prop="costRight" label="退款方式" min-width="124" align="right" header-align="left">
           <template #default="{ row }">
             <el-select v-if="row.transactionType == 'IN'" v-model="row.returnWay" placeholder="返还方式"
@@ -98,7 +93,7 @@
     <invoiceSkip v-model:visible="invoiceSkipVisible" />
   </el-dialog>
 </template>
-<script setup >
+<script setup lang="ts">
 import { getCurrentInstance, onActivated, onBeforeMount, onMounted, reactive, ref } from 'vue'
 import { invoiceSkip } from './index'
 
@@ -151,44 +146,14 @@ const changeType = (elementCode: string) => {
 const payData = ref([])
 const getPayData = () => {
   if (props.settleId) {
-    getSettlePay(props.settleId).then((res: any) => {
-      payData.value = res.map((i: any) => {
-        return {
-          ...i,
-          returnWay: '1',
-        }
-      })
-    })
   }
 }
 /* 收费 */
 const collectFee = () => {
   payForm.econPosBusinessAddto.posAmount = payForm.amount
   payForm.visitCode = props.visitCode
-  settlePay(payForm).then((res: any) => {
-    payForm.amount = 0
-    getPayData()
-  })
 }
 /* 退费 */
-const collectFeeCancel = (row: any) => {
-  settleRefundPay(row.id, {
-    settleId: props.settleId,
-    returnWay: row.returnWay,
-    payway: row.payway, //支付方式
-    amount: row.amount, //金额
-    bankCard: '', //银行卡号
-    posId: '',
-    visitCode: props.visitCode,
-    econPosBusinessAddto: {
-      patCode: props.patCode,
-      posAmount: row.amount,
-    },
-  }).then((res: any) => {
-    payForm.amount = 0
-    getPayData()
-  })
-}
 const closedAct = () => {
   visible.value = false
 }
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue
similarity index 99%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue
index 8f8fc4c7..7e343277 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/refund.vue
@@ -78,7 +78,7 @@
     </template>
   </el-dialog>
 </template>
-<script setup >
+<script setup lang="ts">
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, h } from 'vue'
 // const { proxy } = getCurrentInstance();
 const emits = defineEmits([])
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/home/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/home/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/index.vue
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/index.ts b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/index.ts
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/index.ts
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/index.ts
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue
similarity index 79%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue
index 8f32cd5c..b3701ac0 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/patientList.vue
@@ -60,7 +60,7 @@ import {
 const emits = defineEmits(['settling', 'paying']);
 const props = defineProps({});
 const state = reactive({});
-const showDrawer = defineModel('showDrawer', { type: Boolean, default: false });
+// const showDrawer = defineModel('showDrawer', { type: Boolean, default: false });
 // onBeforeMount(() => {
 
 // })
@@ -71,7 +71,7 @@ const searchForm = reactive({
   inpatientCode: '',
   patName: '',
 });
-const patientListData = ref<Array<any>>([]);
+// const patientListData = ref<Array<any>>([]);
 const search = () => {
 
 };
@@ -82,36 +82,36 @@ onMounted(() => {
 const initData = () => {
 };
 
-const statusFormatter = (row: any) => {
-  switch (row.status) {
-    case '2':
-      return h(
-        'div',
-        {
-          style: { color: '#5585E3' },
-        },
-        '待结算'
-      );
-    case '3':
-      return h(
-        'div',
-        {
-          style: { color: '#945D3D' },
-        },
-        '待缴费'
-      );
-    case '4':
-      return h('div', {}, '已支付');
-    default:
-      break;
-  }
-};
-const settle = (row: any) => {
-  emits('settling', row);
-};
-const pay = (row: any) => {
-  emits('paying', row);
-};
+// const statusFormatter = (row: any) => {
+//   switch (row.status) {
+//     case '2':
+//       return h(
+//         'div',
+//         {
+//           style: { color: '#5585E3' },
+//         },
+//         '待结算'
+//       );
+//     case '3':
+//       return h(
+//         'div',
+//         {
+//           style: { color: '#945D3D' },
+//         },
+//         '待缴费'
+//       );
+//     case '4':
+//       return h('div', {}, '已支付');
+//     default:
+//       break;
+//   }
+// };
+// const settle = (row: any) => {
+//   emits('settling', row);
+// };
+// const pay = (row: any) => {
+//   emits('paying', row);
+// };
 defineExpose({ state });
 </script>
 <style lang="scss">
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue
similarity index 89%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue
index 0245f914..9e0cbad2 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/components/selectSettlement.vue
@@ -14,8 +14,6 @@
       <el-table :data="selectSettlementData" style="width: 100%" height="100%" align="center" show-overflow-tooltip
         ref="selectSettlementDataRef">
         <el-table-column type="selection" width="38" fixed />
-        <el-table-column prop="chargingDate" label="收费日期" width="108" align="center"
-          :formatter="(row: any) => { return row.chargingDate && dayjs(row.chargingDate).format('YYYY/MM/DD') }" />
         <el-table-column prop="costsSum" label="实收总金额" width="100" align="center" />
         <el-table-column class-name="nameRight" prop="amountSum" label="应付总金额" width="100" align="center" />
         <el-table-column class-name="nameRight" prop="settleAmountSum" label="已结算金额" width="100" align="center" />
@@ -40,9 +38,9 @@ import {
 import dayjs from 'dayjs';
 const emits = defineEmits(['selectOk']);
 const showDrawer = defineModel('showDrawer', { type: Boolean, default: false });
-const props = defineProps<{
-  visitCode: string;
-}>();
+// const props = defineProps<{
+//   visitCode: string;
+// }>();
 const state = reactive({});
 // onBeforeMount(() => {
 
@@ -59,7 +57,7 @@ const search = () => {
   if (searchDateRange.value) {
   }
 };
-const selectSettlementData = ref<Array<any>>([]);
+// const selectSettlementData = ref<Array<any>>([]);
 const selectSettlementDataRef = ref();
 const initData = () => {
   search();
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue
similarity index 95%
rename from vue3/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue
index e9776274..a8901bc9 100644
--- a/vue3/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/midway/index.vue
@@ -192,10 +192,10 @@
     <patientList v-model:showDrawer="patientListDrawer" @settling="settling" @paying="paying" />
     <!--preSettlement 的 isEdit 提交状态 -->
     <selectSettlement v-model:showDrawer="selectSettlementDrawer" :visit-code="currentPatient?.visitCode || ''"
-      @select-ok="selectOk" />
+      />
   </div>
 </template>
-<script setup >
+<script setup lang="ts">
 import { computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue'
 import dayjs from 'dayjs'
 
@@ -225,26 +225,26 @@ const queryPatient = () => {
   //1. 根据输入精确匹配，根据主索引查找患者时，如果有多条住院记录，弹出患者选择控件
 }
 /* 当前选择的待结算信息 */
-const currentSelectSettlement = reactive<any>({
-  selectSettlementData: [],
-  deduAmount: 0,
-})
-const selectOk = (res: any) => {
-  selectSettlementDrawer.value = false
-  currentSelectSettlement.selectSettlementData = res
-  getEconDetails(currentSelectSettlement.selectSettlementData)
-}
-const isHaveSettleId = () => {
-  if (currentPatient.value) {
-    if (currentPatient.value.settleId) {
-      feeInformationSettle(currentPatient.value).then((res: any) => {
-        econDetailsInfo.value = res
-      })
-    } else {
-      selectSettlementDrawer.value = true
-    }
-  }
-}
+// const currentSelectSettlement = reactive<any>({
+//   selectSettlementData: [],
+//   deduAmount: 0,
+// })
+// const selectOk = (res: any) => {
+//   selectSettlementDrawer.value = false
+//   currentSelectSettlement.selectSettlementData = res
+//   getEconDetails(currentSelectSettlement.selectSettlementData)
+// }
+// const isHaveSettleId = () => {
+//   if (currentPatient.value) {
+//     if (currentPatient.value.settleId) {
+//       feeInformationSettle(currentPatient.value).then((res: any) => {
+//         econDetailsInfo.value = res
+//       })
+//     } else {
+//       selectSettlementDrawer.value = true
+//     }
+//   }
+// }
 /* 患者费用信息 */
 const econDetailsInfo = ref({
   // groupSystemClassTo: {
@@ -274,11 +274,11 @@ const econDetailsInfo = ref({
   ],
   econIpdBillIdList: [], //住院账单标识列表,
 })
-const getEconDetails = (res: any) => {
-  feeInformationUnSettle(res).then((res: any) => {
-    econDetailsInfo.value = res
-  })
-}
+// const getEconDetails = (res: any) => {
+//   feeInformationUnSettle(res).then((res: any) => {
+//     econDetailsInfo.value = res
+//   })
+// }
 
 /*预交金信息 */
 const prePayData = reactive({
@@ -297,14 +297,14 @@ const getPrePayData = () => {
 
 /*费用 */
 const treatHospitalizedData = ref([])
-const systemClassCostMap = computed(() => {
-  const classCost: any = econDetailsInfo.value?.systemClassCostMap
-  return classCost
-    ? Object.keys(classCost).map((key) => {
-      return { name: key, cost: classCost[key] }
-    })
-    : []
-})
+// const systemClassCostMap = computed(() => {
+//   const classCost: any = econDetailsInfo.value?.systemClassCostMap
+//   return classCost
+//     ? Object.keys(classCost).map((key) => {
+//       return { name: key, cost: classCost[key] }
+//     })
+//     : []
+// })
 /* 项目数据 */
 const itemSettlementData = computed(() => {
   const exchangeData: any[] = []
diff --git a/vue3/src/views/inHospitalManagement/charge/settlement/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/charge/settlement/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/index.vue
diff --git a/vue3/src/views/inHospitalManagement/inpatientDiagnosis/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/inpatientDiagnosis/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/inpatientDiagnosis/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/inpatientDiagnosis/index.vue
diff --git a/vue3/src/views/inHospitalManagement/inpatientRecord/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/inpatientRecord/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/inpatientRecord/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/inpatientRecord/index.vue
diff --git a/vue3/src/views/inHospitalManagement/listFee/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/listFee/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/listFee/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/listFee/index.vue
diff --git a/vue3/src/views/inHospitalManagement/medicalRecord/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/medicalRecord/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/medicalRecord/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/medicalRecord/index.vue
diff --git a/vue3/src/views/inHospitalManagement/orderManage/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/orderManage/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/orderManage/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/orderManage/index.vue
diff --git a/vue3/src/views/inHospitalManagement/portal/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/portal/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/portal/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/portal/index.vue
diff --git a/vue3/src/views/inHospitalManagement/readme.md b/openhis-ui-vue3/src/views/inHospitalManagement/readme.md
similarity index 100%
rename from vue3/src/views/inHospitalManagement/readme.md
rename to openhis-ui-vue3/src/views/inHospitalManagement/readme.md
diff --git a/vue3/src/views/inHospitalManagement/surgeryManage/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/surgeryManage/index.vue
similarity index 100%
rename from vue3/src/views/inHospitalManagement/surgeryManage/index.vue
rename to openhis-ui-vue3/src/views/inHospitalManagement/surgeryManage/index.vue
diff --git a/vue3/src/views/index.vue b/openhis-ui-vue3/src/views/index.vue
similarity index 63%
rename from vue3/src/views/index.vue
rename to openhis-ui-vue3/src/views/index.vue
index ec21b29d..a5e025f7 100644
--- a/vue3/src/views/index.vue
+++ b/openhis-ui-vue3/src/views/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="container">
+    <div class="awaitingBtn">
+      <el-button @click="awaitingMedicineBtn">效期预警 <span>{{total}}</span></el-button>
+    </div>
     <!-- <div class="logo">
       <img src="/src/assets/images/jlau.jpg" />
     </div> -->
@@ -7,11 +10,25 @@
 </template>
 
 <script setup name="Index">
-const version = ref('3.8.7');
+import {
+  getExpirationWarning,
+} from "./medicationmanagement/statisticalManagement/statisticalManagent";
 
+const router = useRouter();
+const version = ref('3.8.7');
+const total = ref(0)
+function awaitingMedicineBtn(){
+  router.push({ path: '/medicationmanagement/statisticalManagement/earlyWarning' })
+}
 function goTarget(url) {
   window.open(url, '__blank');
 }
+function getExpirationWarningCount(){
+  getExpirationWarning({pageNo: 1,pageSize: 10}).then((res) => {
+    total.value = res.data.total||0
+  });
+}
+getExpirationWarningCount()
 </script>
 
 <style scoped lang="scss">
@@ -83,6 +100,26 @@ function goTarget(url) {
   height: 70vh; /* 确保容器高度至少为视口高度 */
   width: 100%;
 }
+.awaitingBtn{
+  .el-button{
+    border: 1px #166773 solid;
+    span{
+      color: red;
+      margin-left: 5px;
+    }
+  }
+  .el-button:hover{
+    border: 1px #166773 solid;
+    color: #166773;
+    span{
+      color: red;
+      margin-left: 5px;
+    }
+  }
+  position: absolute;
+  top:20px;
+  left: 20px;
+}
 .logo {
   width: 1000px;
   margin: 0 auto;
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue
new file mode 100644
index 00000000..a6e056c9
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue
@@ -0,0 +1,179 @@
+<template>
+  <div @keyup="handleKeyDown" tabindex="0" ref="tableWrapper">
+    <el-table
+      ref="adviceBaseRef"
+      height="400"
+      :data="adviceBaseList"
+      highlight-current-row
+      @current-change="handleCurrentChange"
+      row-key="patientId"
+      @cell-click="clickRow"
+    >
+      <el-table-column label="名称" align="center" prop="adviceName" />
+      <el-table-column label="类型" align="center" prop="activityType_enumText" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="volume" />
+      <el-table-column label="用法" align="center" prop="methodCode_dictText" />
+      <el-table-column label="库存数量" align="center">
+        <template #default="scope">{{ handleQuantity(scope.row) }}</template>
+      </el-table-column>
+      <el-table-column label="频次" align="center" prop="rateCode_dictText" />
+      <!-- <el-table-column label="单次剂量" align="center" prop="dose" /> -->
+      <!-- <el-table-column label="剂量单位" align="center" prop="doseUnitCode_dictText" /> -->
+      <el-table-column label="注射药品" align="center" prop="injectFlag_enumText" />
+      <el-table-column label="皮试" align="center" prop="skinTestFlag_enumText" />
+      <el-table-column label="医保码" align="center" prop="ybNo" />
+      <!-- <el-table-column label="限制使用标志" align="center" prop="useLimitFlag" /> -->
+      <el-table-column
+        label="限制使用范围"
+        align="center"
+        :show-overflow-tooltip="true"
+        prop="useScope"
+      >
+        <template #default="scope">
+          <span v-if="scope.row.useLimitFlag === 1">{{ scope.row.useScope }}</span>
+          <span v-else>{{ '-' }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script setup>
+import { nextTick } from 'vue';
+import { getAdviceBaseInfo } from './api';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  adviceQueryParams: {
+    type: Object,
+    default: '',
+  },
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+});
+const emit = defineEmits(['selectAdviceBase']);
+const total = ref(0);
+const adviceBaseRef = ref();
+const tableWrapper = ref();
+const currentIndex = ref(0); // 当前选中行索引
+const currentSelectRow = ref({});
+const queryParams = ref({
+  pageSize: 100,
+  pageNum: 1,
+  adviceTypes: '1,3'
+});
+const adviceBaseList = ref([]);
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+watch(
+  () => props.adviceQueryParams,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    // queryParams.value.adviceType = newValue.adviceType;
+    queryParams.value.adviceTypes = [newValue.adviceType].join(',');
+    throttledGetList();
+  },
+  { deep: true }
+);
+
+getList();
+function getList() {
+  queryParams.value.organizationId = props.patientInfo.inHospitalOrgId;
+  getAdviceBaseInfo(queryParams.value).then((res) => {
+    if (res.data.records.length > 0) {
+      adviceBaseList.value = res.data.records.filter((item) => {
+        if (item.adviceType == 1 || item.adviceType == 2) {
+          return handleQuantity(item) != 0;
+        } else {
+          return true;
+        }
+      });
+      total.value = res.data.total;
+      nextTick(() => {
+        currentIndex.value = 0;
+        adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+      });
+    }
+  });
+}
+
+// 处理键盘事件
+const handleKeyDown = (event) => {
+  const key = event.key;
+  const data = adviceBaseList.value;
+
+  switch (key) {
+    case 'ArrowUp': // 上箭头
+      event.preventDefault(); // 阻止默认滚动行为
+      if (currentIndex.value > 0) {
+        currentIndex.value--;
+        setCurrentRow(data[currentIndex.value]);
+      }
+      break;
+    case 'ArrowDown': // 下箭头`
+      event.preventDefault();
+      if (currentIndex.value < data.length - 1) {
+        currentIndex.value++;
+        setCurrentRow(data[currentIndex.value]);
+      }
+      break;
+    case 'Enter': // 回车键
+      // const currentRow = adviceBaseRef.value.getSelectionRows();
+      event.preventDefault();
+      if (currentSelectRow.value) {
+        // 这里可以触发自定义逻辑，如弹窗、跳转等
+        emit('selectAdviceBase', currentSelectRow.value);
+      }
+      break;
+  }
+};
+
+function handleQuantity(row) {
+  if (row.inventoryList && row.inventoryList.length > 0) {
+    const totalQuantity = row.inventoryList.reduce((sum, item) => sum + (item.quantity || 0), 0);
+    return totalQuantity.toString() + row.minUnitCode_dictText;
+  }
+  return 0;
+}
+
+// 设置选中行（带滚动）
+const setCurrentRow = (row) => {
+  adviceBaseRef.value.setCurrentRow(row);
+  // 滚动到选中行
+  const tableBody = adviceBaseRef.value.$el.querySelector('.el-table__body-wrapper');
+  const currentRowEl = adviceBaseRef.value.$el.querySelector('.current-row');
+  if (tableBody && currentRowEl) {
+    currentRowEl.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+  }
+};
+
+// 当前行变化时更新索引
+const handleCurrentChange = (currentRow) => {
+  currentIndex.value = adviceBaseList.value.findIndex((item) => item === currentRow);
+  currentSelectRow.value = currentRow;
+};
+
+function clickRow(row) {
+  emit('selectAdviceBase', row);
+}
+
+defineExpose({
+  handleKeyDown,
+});
+</script>
+    
+<style scoped>
+.popover-table-wrapper:focus {
+  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js
new file mode 100644
index 00000000..3195eaf4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js
@@ -0,0 +1,242 @@
+import request from '@/utils/request'
+
+export function getPatientList(queryParams) {
+  return request({
+    url: '/reg-doctorstation/advice-manage/reg-patient-zk',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+// 诊断相关接口
+/**
+ * 保存诊断
+ */
+export function saveDiagnosis(data) {
+  return request({
+    url: '/doctor-station/diagnosis/save-doctor-diagnosis',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 添加诊断绑定
+ */
+export function saveDiagnosisBind(data) {
+  return request({
+    url: '/doctor-station/diagnosis/diagnosis-belong-binding',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 删除诊断绑定
+ */
+export function deleteDiagnosisBind(id) {
+  return request({
+    url: '/doctor-station/diagnosis/diagnosis-belong-binding?id=' + id,
+    method: 'delete',
+  })
+}
+
+/**
+ * 获取诊断定义列表
+ */
+export function getDiagnosisDefinitionList(queryParams) {
+  return request({
+    url: '/doctor-station/diagnosis/condition-definition-metadata',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 获取诊断分类数据，历史诊断/个人常用诊断/科室常用诊断
+ */
+export function getConditionDefinitionInfo(patientId) {
+  return request({
+    url: '/doctor-station/diagnosis/get-condition-definition-class?patientId=' + patientId,
+    method: 'get',
+  })
+}
+
+/**
+ * 获取诊断基础下拉数据
+ */
+export function diagnosisInit() {
+  return request({
+    url: '/doctor-station/diagnosis/init',
+    method: 'get',
+  })
+}
+
+/**
+ * 
+ * 获取诊断回显数据
+ */
+export function getEncounterDiagnosis(encounterId) {
+  return request({
+    url: '/doctor-station/diagnosis/get-encounter-diagnosis?encounterId=' + encounterId,
+    method: 'get',
+  })
+}
+
+/**
+ * 
+ * 删除就诊诊断
+ */
+export function delEncounterDiagnosis(conditionId) {
+  return request({
+    url: '/doctor-station/diagnosis/encounter-diagnosis?conditionId=' + conditionId,
+    method: 'delete',
+  })
+}
+
+/**
+ * 获取中医诊断
+ */
+export function getTcmCondition(params) {
+  return request({
+    url: '/doctor-station/chinese-medical/condition-info',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 获取辩证分型
+ */
+export function getTcmSyndrome(params) {
+  return request({
+    url: '/doctor-station/chinese-medical/syndrome-info',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 获取本次就诊中医诊断
+ */
+export function getTcmDiagnosis(params) {
+  return request({
+    url: '/doctor-station/chinese-medical/get-tcm-encounter-diagnosis',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 保存中医诊断
+ */
+export function saveTcmDiagnosis(data) {
+  return request({
+    url: '/doctor-station/chinese-medical/save-tcm-diagnosis',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 获取人员慢性病诊断
+ */
+export function getChronicDisease(params) {
+  return request({
+    url: '/yb-request/getConditionDefinition',
+    method: 'get',
+    params: params
+  })
+}
+
+
+/**
+ * 获取药品列表
+ */
+export function getAdviceBaseInfo(queryParams) {
+  return request({
+    url: '/doctor-station/advice/advice-base-info',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 保存处方(单条)
+ */
+export function savePrescription(data) {
+  return request({
+    url: '/reg-doctorstation/advice-manage/save-reg-advice',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 签发处方
+ */
+export function savePrescriptionSign(data) {
+  return request({
+    url: '/reg-doctorstation/advice-manage/sign-reg-advice',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 处方签退
+ */
+export function singOut(data) {
+  return request({
+    url: '/reg-doctorstation/advice-manage/sign-off-reg',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 停嘱
+ */
+export function stopAdvice(data) {
+  return request({
+    url: '/reg-doctorstation/advice-manage/stop-reg-advice',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 获取患者本次就诊处方
+ */
+export function getPrescriptionList(encounterId) {
+  return request({
+    url: '/reg-doctorstation/advice-manage/reg-request-base-info?encounterId=' + encounterId,
+    method: 'get',
+  })
+}
+
+/**
+ * 获取费用性质
+ */
+export function getContract(params) {
+  return request({
+    url: '/doctor-station/advice/get-encounter-contract',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 获取科室列表
+ */
+export function getOrgTree() {
+  return request({
+    url: '/base-data-manage/organization/organization',
+    method: 'get',
+  })
+}
+
+/**
+ * 组合/拆组
+ */
+export function updateGroupId(data) {
+  return request({
+    url: '/doctor-station/advice/update-groupid',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/bloodTtransfusionAapplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/bloodTtransfusionAapplication.vue
new file mode 100644
index 00000000..158d72f7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/bloodTtransfusionAapplication.vue
@@ -0,0 +1,5 @@
+<template>
+
+</template>
+<script>
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/examineApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/examineApplication.vue
new file mode 100644
index 00000000..158d72f7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/examineApplication.vue
@@ -0,0 +1,5 @@
+<template>
+
+</template>
+<script>
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/surgeryApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/surgeryApplication.vue
new file mode 100644
index 00000000..158d72f7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/surgeryApplication.vue
@@ -0,0 +1,5 @@
+<template>
+
+</template>
+<script>
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/testApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/testApplication.vue
new file mode 100644
index 00000000..158d72f7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationForm/testApplication.vue
@@ -0,0 +1,5 @@
+<template>
+
+</template>
+<script>
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/addDiagnosisDialog.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/addDiagnosisDialog.vue
new file mode 100644
index 00000000..77359f89
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/addDiagnosisDialog.vue
@@ -0,0 +1,421 @@
+<template>
+  <el-dialog
+    title="添加中医诊断"
+    v-model="props.openAddDiagnosisDialog"
+    width="1500px"
+    append-to-body
+    destroy-on-close
+    @open="handleOpen"
+    @close="close"
+  >
+    <div class="main-content">
+      <!-- 左侧疾病选择区 -->
+      <div class="disease-section">
+        <div class="section-title">诊断</div>
+        <div class="search-box">
+          <el-input v-model="searchDisease" placeholder="搜索疾病名称或编码" clearable>
+            <template #prefix>
+              <el-icon><search /></el-icon>
+            </template>
+          </el-input>
+        </div>
+        <el-table
+          :data="conditionList"
+          max-height="460"
+          @row-click="handleClickRow"
+          highlight-current-row
+        >
+          <el-table-column label="疾病名称" align="center" prop="name"></el-table-column>
+          <el-table-column label="医保编码" align="center" prop="ybNo"></el-table-column>
+        </el-table>
+      </div>
+      <!-- 中间疾病-证型关系区 -->
+      <div class="syndrome-section">
+        <div class="section-title">证候</div>
+        <div class="search-box">
+          <el-input v-model="searchDisease" placeholder="搜索疾病名称或编码" clearable>
+            <template #prefix>
+              <el-icon><search /></el-icon>
+            </template>
+          </el-input>
+        </div>
+        <div v-if="selectedDisease">
+          <el-table
+            :data="syndromeList"
+            max-height="460"
+            @row-click="clickSyndromeRow"
+            highlight-current-row
+          >
+            <el-table-column label="证候名称" align="center" prop="name"></el-table-column>
+            <el-table-column label="医保编码" align="center" prop="ybNo"></el-table-column>
+          </el-table>
+        </div>
+
+        <div class="empty-state" v-else>
+          <el-empty description="请从左侧选择疾病" />
+        </div>
+      </div>
+
+      <!-- 右侧诊断详情区 -->
+      <div class="diagnosis-section">
+        <div class="section-title">诊断详情</div>
+        <div class="diagnosis-list">
+          <div v-for="(item, index) in tcmDiagonsisList" :key="index" class="history-item">
+            <div class="history-diagnosis">
+              <div>
+                <strong>{{ item.conditionName }}</strong> - {{ item.syndromeName }}
+              </div>
+              <el-button
+                size="small"
+                type="danger"
+                plain
+                icon="close"
+                @click="removeDiagnosis(item, index)"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+import {
+  getTcmCondition,
+  getTcmSyndrome,
+  saveTcmDiagnosis,
+} from '@/views/doctorstation/components/api';
+
+const props = defineProps({
+  openAddDiagnosisDialog: {
+    type: Boolean,
+    default: false,
+  },
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+});
+
+const conditionList = ref([]);
+const syndromeList = ref([]);
+const tcmDiagonsisList = ref([]);
+const tcmDiagonsisSaveList = ref([]);
+const syndromeSelected = ref(false); // 当前诊断是否选择对应证候
+const timestamp = ref('');
+const selectedDisease = ref(false);
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(['close']);
+
+function handleOpen() {
+  getTcmCondition().then((res) => {
+    conditionList.value = res.data.records;
+  });
+}
+
+// 点击诊断列表处理，点击以后才显示证候列表
+function handleClickRow(row) {
+  if (syndromeSelected.value || tcmDiagonsisList.value == 0) {
+    selectedDisease.value = true;
+    syndromeSelected.value = false;
+    timestamp.value = Date.now();
+    getTcmSyndrome().then((res) => {
+      syndromeList.value = res.data.records;
+    });
+    tcmDiagonsisSaveList.value.push({
+      definitionId: row.id,
+      ybNo: row.ybNo,
+      syndromeGroupNo: timestamp.value,
+      verificationStatusEnum: 4,
+      medTypeCode: '11',
+    });
+    tcmDiagonsisList.value.push({
+      conditionName: row.name,
+      syndromeGroupNo: timestamp.value,
+    });
+  }
+}
+
+function clickSyndromeRow(row) {
+  tcmDiagonsisSaveList.value.push({
+    definitionId: row.id,
+    ybNo: row.ybNo,
+    syndromeGroupNo: timestamp.value,
+  });
+  tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
+  syndromeSelected.value = true;
+}
+
+// 删除诊断
+function removeDiagnosis(row, index) {
+  tcmDiagonsisList.value.splice(index, 1);
+  tcmDiagonsisSaveList.value = tcmDiagonsisSaveList.filter((item) => {
+    return item.syndromeGroupNo !== row.syndromeGroupNo;
+  });
+}
+
+function save() {
+  saveTcmDiagnosis({
+    patientId: props.patientInfo.patientId,
+    encounterId: props.patientInfo.encounterId,
+    diagnosisChildList: tcmDiagonsisSaveList.value,
+  }).then((res) => {
+    if (res.code == 200) {
+      emit('close');
+      proxy.$modal.msgSuccess('诊断已保存');
+    }
+  });
+}
+
+function submit() {
+  if (tcmDiagonsisSaveList.value.length > 0 && syndromeSelected.value) {
+    save();
+  } else {
+    proxy.$modal.msgWarning('请选择证候');
+  }
+}
+function close() {
+  emit('close');
+}
+</script>
+
+<style scoped>
+:deep(.pagination-container .el-pagination) {
+  right: 20px !important;
+}
+
+.app-container {
+  max-width: 1400px;
+  margin: 20px auto;
+  padding: 20px;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 2px 20px rgba(0, 0, 0, 0.08);
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 15px;
+  border-bottom: 1px solid var(--el-border-color);
+  margin-bottom: 20px;
+}
+
+.header h1 {
+  color: var(--el-color-primary);
+  font-size: 24px;
+  font-weight: 600;
+}
+
+.patient-info {
+  background: var(--el-color-primary-light-9);
+  padding: 15px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+}
+
+.patient-info .info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.patient-info .info-label {
+  width: 100px;
+  color: var(--el-text-color-secondary);
+  font-weight: 500;
+}
+
+.main-content {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1.2fr;
+  gap: 20px;
+  margin-bottom: 25px;
+}
+
+.disease-section,
+.syndrome-section,
+.diagnosis-section {
+  border: 1px solid var(--el-border-color);
+  border-radius: 8px;
+  padding: 20px;
+  background: white;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.section-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: var(--el-color-primary);
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid var(--el-border-color);
+}
+
+.disease-list {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.disease-item {
+  padding: 12px 15px;
+  border-bottom: 1px solid var(--el-border-color-lighter);
+  cursor: pointer;
+  transition: all 0.3s;
+  border-radius: 4px;
+}
+
+.disease-item:hover {
+  background-color: var(--el-color-primary-light-9);
+}
+
+.disease-item.active {
+  background-color: var(--el-color-primary-light-8);
+  border-left: 3px solid var(--el-color-primary);
+}
+
+.disease-name {
+  font-weight: 500;
+  margin-bottom: 5px;
+}
+
+.disease-code {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
+.search-box {
+  margin-bottom: 15px;
+}
+
+.disease-categories {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+
+.category-tag {
+  cursor: pointer;
+  padding: 5px 12px;
+  border-radius: 15px;
+  background: var(--el-fill-color-light);
+  font-size: 13px;
+  transition: all 0.3s;
+}
+
+.category-tag.active {
+  background: var(--el-color-primary);
+  color: white;
+}
+
+.relation-container {
+  text-align: center;
+  padding: 30px 0;
+  border: 2px dashed var(--el-border-color);
+  border-radius: 8px;
+  margin: 20px 0;
+  background: var(--el-fill-color-lighter);
+}
+
+.relation-icon {
+  margin-bottom: 15px;
+  color: var(--el-color-primary);
+}
+
+.relation-text {
+  font-size: 18px;
+  font-weight: 500;
+  color: var(--el-text-color-primary);
+}
+
+.syndrome-details {
+  padding: 15px;
+  background: var(--el-color-primary-light-9);
+  border-radius: 8px;
+  border: 1px solid var(--el-color-primary-light-5);
+}
+
+.detail-item {
+  margin-bottom: 12px;
+}
+
+.detail-label {
+  font-weight: 500;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 3px;
+}
+
+.actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 15px;
+  padding-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+}
+
+.empty-state {
+  text-align: center;
+  padding: 40px 0;
+  color: var(--el-text-color-secondary);
+}
+
+.diagnosis-history {
+  margin-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+  padding-top: 20px;
+}
+
+.history-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin-bottom: 12px;
+  color: var(--el-text-color-primary);
+}
+
+.history-item {
+  padding: 12px;
+  border-left: 3px solid var(--el-border-color);
+  margin-bottom: 10px;
+  background: var(--el-fill-color-lighter);
+  border-radius: 0 4px 4px 0;
+}
+
+.diagnosis-list {
+  max-height: 520px;
+  overflow-y: auto;
+}
+
+.history-date {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 5px;
+}
+
+.history-diagnosis {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  margin-bottom: 5px;
+}
+
+.history-note {
+  font-size: 13px;
+  color: var(--el-text-color-secondary);
+  padding-top: 5px;
+  border-top: 1px dashed var(--el-border-color);
+  margin-top: 5px;
+}
+
+.empty-list {
+  padding: 20px 0;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inpatientDoctor/home/components/diagnose/chineseMedicineDialog.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/chineseMedicineDialog.vue
similarity index 93%
rename from vue3/src/views/inpatientDoctor/home/components/diagnose/chineseMedicineDialog.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/chineseMedicineDialog.vue
index 9fa70400..91cb50c0 100644
--- a/vue3/src/views/inpatientDoctor/home/components/diagnose/chineseMedicineDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/chineseMedicineDialog.vue
@@ -17,11 +17,10 @@
 </template>
 <script  setup>
 import { reactive, ref, onMounted, inject } from 'vue'
-import { FormInstance, FormRules } from 'element-plus'
 import { dayjs, ElMessage } from 'element-plus'
-import { IInPatient } from '@/model/IInPatient'
+// import { IInPatient } from '@/model/IInPatient'
 
-const currentInPatient = ref<Partial<IInPatient>>({})
+const currentInPatient = ref({})
 const initCurrentInPatient = () => {
   currentInPatient.value = {
     feeType: '08',
@@ -49,7 +48,7 @@ const signForm = ref({
   inDeptDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), //入院时间
   signsId: '',
 })
-const rules = reactive<FormRules>({
+const rules = reactive({
   admittedDoctor: [{ required: true, message: '请选择住院医生', trigger: ['blur', 'change'] }],
   masterNurse: [{ required: true, message: '请选择责任护士', trigger: ['blur', 'change'] }],
 })
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
new file mode 100644
index 00000000..81f120f8
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -0,0 +1,545 @@
+<template>
+  <div>
+    <el-row :gutter="24">
+      <el-col :span="4" :xs="24">
+        <div style="height: 44px; display: flex; align-items: center; flex: none">
+          <el-input
+            v-model="diagnosis"
+            placeholder="诊断名称"
+            clearable
+            style="width: 100%"
+            @keyup.enter="queryDiagnosisUse"
+          >
+            <template #append>
+              <el-button icon="Search" @click="queryDiagnosisUse" />
+            </template>
+          </el-input>
+        </div>
+        <el-tree
+          ref="treeRef"
+          :data="tree"
+          node-key="id"
+          :props="{ label: 'name', children: 'children' }"
+          highlight-current
+          default-expand-all
+          :filter-node-method="filterNode"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <div class="custom-tree-node">
+              <span>{{ node.label }}</span>
+              <span class="tree-node-actions">
+                <template v-if="node.level === 1 && data.name != '常用' && data.name != '历史'">
+                  <el-button
+                    style="color: #000000"
+                    type="text"
+                    size="small"
+                    @click.stop="addChild(data)"
+                  >
+                    <el-icon><Plus /></el-icon>
+                  </el-button>
+                </template>
+                <el-popconfirm
+                  width="200"
+                  :hide-after="10"
+                  title="确认删除此常用诊断吗"
+                  placement="top-start"
+                  @confirm="deleteChild(data)"
+                >
+                  <template #reference>
+                    <el-button
+                      style="color: #000000"
+                      v-if="
+                        node.level === 2 &&
+                        node.parent.data.name != '常用' &&
+                        node.parent.data.name != '历史'
+                      "
+                      type="text"
+                      size="small"
+                      @click.stop=""
+                    >
+                      <el-icon><Minus /></el-icon>
+                    </el-button>
+                  </template>
+                </el-popconfirm>
+              </span>
+            </div>
+          </template>
+        </el-tree>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <div style="height: 44px; display: flex; align-items: center; flex: none">
+          <el-button type="primary" plain @click="handleAddDiagnosis()"> 新增诊断 </el-button>
+          <el-button type="primary" plain @click="handleSaveDiagnosis()"> 保存诊断 </el-button>
+          <el-button type="primary" plain @click="handleAddTcmDiagonsis()"> 中医诊断 </el-button>
+          <el-button type="primary" plain @click="handleImport()"> 导入慢性病诊断 </el-button>
+        </div>
+        <el-form :model="form" :rules="rules" ref="formRef">
+          <el-table ref="diagnosisTableRef" :data="form.diagnosisList" height="650">
+            <el-table-column label="序号" type="index" width="50" />
+            <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="180">
+              <template #default="scope">
+                <el-form-item
+                  :prop="`diagnosisList.${scope.$index}.diagSrtNo`"
+                  :rules="rules.diagSrtNo"
+                >
+                  <el-input-number
+                    v-model="scope.row.diagSrtNo"
+                    controls-position="right"
+                    :controls="false"
+                    style="width: 80px"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="诊断类别" align="center" prop="diagSrtNo" width="180">
+              <template #default="scope">
+                <el-form-item
+                  :prop="`diagnosisList.${scope.$index}.medTypeCode`"
+                  :rules="rules.medTypeCode"
+                >
+                  <el-select v-model="scope.row.medTypeCode" placeholder=" " style="width: 150px">
+                    <el-option
+                      v-for="item in med_type"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="诊断名称" align="center" prop="name">
+              <template #default="scope">
+                <el-form-item :prop="`diagnosisList.${scope.$index}.name`" :rules="rules.name">
+                  <el-popover
+                    :popper-style="{ padding: '0' }"
+                    placement="bottom-start"
+                    :visible="scope.row.showPopover"
+                    trigger="manual"
+                    :width="800"
+                  >
+                    <diagnosislist
+                      :diagnosisSearchkey="diagnosisSearchkey"
+                      @selectDiagnosis="handleSelsectDiagnosis"
+                    />
+                    <template #reference>
+                      <el-input
+                        v-model="scope.row.name"
+                        placeholder="请选择诊断"
+                        @input="handleChange"
+                        @focus="handleFocus(scope.row, scope.$index)"
+                        @blur="handleBlur(scope.row)"
+                      />
+                    </template>
+                  </el-popover>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="医保码" align="center" prop="ybNo" width="180" />
+            <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
+              <template #default="scope">
+                <el-checkbox
+                  label="主诊断"
+                  :trueLabel="1"
+                  :falseLabel="0"
+                  v-model="scope.row.maindiseFlag"
+                  border
+                  size="small"
+                  @change="(value) => handleMaindise(value, scope.$index)"
+                />
+                <el-select
+                  v-model="scope.row.verificationStatusEnum"
+                  placeholder=" "
+                  style="width: 40%; padding-bottom: 5px; padding-left: 10px"
+                  size="small"
+                >
+                  <el-option
+                    v-for="item in diagnosisOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="130">
+              <template #default="scope">
+                <el-button
+                  link
+                  type="primary"
+                  @click="handleDeleteDiagnosis(scope.row, scope.$index)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+    </el-row>
+    <diagnosisdialog
+      :openDiagnosis="openDiagnosis"
+      @close="closeDiagnosisDialog"
+      :radio="orgOrUser"
+    />
+    <AddDiagnosisDialog
+      :openAddDiagnosisDialog="openAddDiagnosisDialog"
+      :patientInfo="patientInfo"
+      @close="closeDiagnosisDialog"
+    />
+  </div>
+</template>
+
+<script setup>
+import { getCurrentInstance } from 'vue';
+import {
+  getConditionDefinitionInfo,
+  saveDiagnosis,
+  diagnosisInit,
+  deleteDiagnosisBind,
+  getEncounterDiagnosis,
+  getChronicDisease,
+  getTcmDiagnosis,
+  delEncounterDiagnosis,
+} from '../api';
+import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
+import AddDiagnosisDialog from './addDiagnosisDialog.vue';
+import diagnosislist from '../diagnosis/diagnosislist.vue';
+import { patientInfo } from '../../store/patient.js';
+// const diagnosisList = ref([]);
+const allowAdd = ref(false);
+const tree = ref([]);
+const openDiagnosis = ref(false);
+const openAddDiagnosisDialog = ref(false);
+const diagnosisSearchkey = ref('');
+const diagnosisOptions = ref([]);
+const rowIndex = ref();
+const diagnosis = ref();
+const orgOrUser = ref();
+const form = ref({
+  diagnosisList: [],
+});
+const props = defineProps({
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+});
+const emits = defineEmits(['diagnosisSave']);
+const { proxy } = getCurrentInstance();
+const { med_type } = proxy.useDict('med_type');
+const rules = ref({
+  name: [{ required: true, message: '请选择诊断', trigger: 'change' }],
+  medTypeCode: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
+  diagSrtNo: [{ required: true, message: '请输入诊断序号', trigger: 'change' }],
+});
+
+watch(
+  () => form.value.diagnosisList,
+  () => {
+    emits('diagnosisSave', false);
+  },
+  { deep: true }
+);
+
+// function getDetail(encounterId) {
+//   getEmrDetail(encounterId).then((res) => {
+//     allowAdd.value = res.data ? true : false;
+//   });
+// }
+
+function getList() {
+  getEncounterDiagnosis(patientInfo.value.encounterId).then((res) => {
+    if (res.code == 200) {
+      form.value.diagnosisList = res.data;
+      emits('diagnosisSave', false);
+      console.log(form.value.diagnosisList);
+    }
+  });
+  getTcmDiagnosis({ encounterId: patientInfo.value.encounterId }).then((res) => {
+    if (res.code == 200) {
+      if (res.data.illness.length > 0) {
+        res.data.illness.forEach((item, index) => {
+          form.value.diagnosisList.push({
+            name: item.name + '-' + res.data.symptom[index].name,
+            ybNo: item.ybNo,
+            medTypeCode: item.medTypeCode,
+          });
+        });
+      }
+      emits('diagnosisSave', false);
+      console.log(form.value.diagnosisList);
+    }
+  });
+  getTree();
+}
+
+init();
+function init() {
+  diagnosisInit().then((res) => {
+    if (res.code == 200) {
+      diagnosisOptions.value = res.data.verificationStatusOptions;
+    }
+  });
+}
+
+function handleImport() {
+  if (patientInfo.value.contractName != '自费') {
+    // 获取患者慢性病信息
+    getChronicDisease({ encounterId: patientInfo.value.encounterId }).then((res) => {
+      if (res.data.length > 0) {
+        res.data.forEach((item, index) => {
+          form.value.diagnosisList.push({
+            ...item,
+            ...{
+              medTypeCode: '140104',
+              verificationStatusEnum: 4,
+              definitionId: item.id,
+              diagSrtNo: form.value.diagnosisList.length + 1,
+            },
+          });
+        });
+      }
+    });
+  }
+}
+
+/**
+ * 添加子节点
+ */
+function addChild(data) {
+  orgOrUser.value = data.name;
+  openDiagnosis.value = true;
+}
+
+/**
+ * 删除子节点
+ */
+function deleteChild(data) {
+  deleteDiagnosisBind(data.id).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('删除成功');
+      getTree();
+    }
+  });
+}
+watch(diagnosis, (val) => {
+  proxy.$refs['treeRef'].filter(val);
+});
+
+/** 通过条件过滤节点  */
+const filterNode = (value, data) => {
+  console.log('filterNode', value, data);
+
+  if (!value) return true;
+  return data.name.indexOf(value) !== -1;
+};
+
+/**
+ * 获取诊断树列表
+ */
+function getTree() {
+  getConditionDefinitionInfo(patientInfo.value ? patientInfo.value.patientId : '').then((res) => {
+    if (res.code == 200) {
+      let list = [];
+      list = res.data.patientHistoryList;
+      list.children = [];
+      // 手动构造树列表;
+      tree.value[0] = {
+        id: '1',
+        name: '历史',
+        children: list,
+      };
+      tree.value[1] = {
+        id: '2',
+        name: '常用',
+        children: res.data.doctorCommonUseList,
+      };
+      tree.value[2] = {
+        id: '3',
+        name: '个人',
+        children: res.data.userPersonalList,
+      };
+      tree.value[3] = {
+        id: '4',
+        name: '科室',
+        children: res.data.organizationList,
+      };
+      console.log(tree.value);
+    }
+  });
+}
+
+/**
+ * 添加西医诊断
+ */
+function handleAddDiagnosis() {
+  proxy.$refs.formRef.validate((valid) => {
+    if (valid) {
+      form.value.diagnosisList.push({
+        showPopover: false,
+        name: undefined,
+        verificationStatusEnum: 4,
+        medTypeCode: '21',
+        diagSrtNo: form.value.diagnosisList.length + 1,
+        iptDiseTypeCode: 31,
+        diagnosisDesc: '',
+      });
+      if (form.value.diagnosisList.length == 1) {
+        form.value.diagnosisList[0].maindiseFlag = 1;
+      }
+    }
+  });
+}
+
+// 添加中医诊断
+function handleAddTcmDiagonsis() {
+  openAddDiagnosisDialog.value = true;
+}
+
+/**
+ * 删除诊断
+ */
+function handleDeleteDiagnosis(row, index) {
+  if (row.conditionId) {
+    delEncounterDiagnosis(row.conditionId).then(() => {
+      getList();
+      getTree();
+    });
+  } else {
+    form.value.diagnosisList.splice(index, 1);
+  }
+}
+
+function handleMaindise(value, index) {
+  if (value == 1) {
+    let flag = 0;
+    form.value.diagnosisList.forEach((item) => {
+      console.log(item);
+      if (item.maindiseFlag == 1) {
+        flag++;
+      }
+    });
+    if (flag > 1) {
+      form.value.diagnosisList[index].maindiseFlag = 0;
+      proxy.$modal.msgWarning('只能有一条主诊断');
+    }
+  }
+}
+
+/**
+ * 保存诊断
+ */
+function handleSaveDiagnosis() {
+  proxy.$refs.formRef.validate((valid) => {
+    if (valid) {
+      if (form.value.diagnosisList.length == 0) {
+        proxy.$modal.msgWarning('诊断不能为空');
+        return false;
+      } else if (!form.value.diagnosisList.some((diagnosis) => diagnosis.maindiseFlag === 1)) {
+        proxy.$modal.msgWarning('至少添加一条主诊断');
+      } else {
+        saveDiagnosis({
+          patientId: patientInfo.value.patientId,
+          encounterId: patientInfo.value.encounterId,
+          diagnosisChildList: form.value.diagnosisList,
+        }).then((res) => {
+          if (res.code == 200) {
+            getTree();
+            getList();
+            emits('diagnosisSave', false);
+            proxy.$modal.msgSuccess('诊断已保存');
+          }
+        });
+      }
+    }
+  });
+}
+
+/**
+ * 关闭诊断弹窗
+ */
+function closeDiagnosisDialog(str) {
+  if (str === 'success') {
+    proxy.$modal.msgSuccess('操作成功');
+  }
+
+  openAddDiagnosisDialog.value = false;
+  openDiagnosis.value = false;
+  getTree();
+}
+
+function queryDiagnosisUse(value) {}
+
+function handleChange(value) {
+  diagnosisSearchkey.value = value;
+}
+/**
+ * 选择诊断并赋值到列表
+ */
+function handleSelsectDiagnosis(row) {
+  console.log(row);
+  form.value.diagnosisList[rowIndex.value].ybNo = row.ybNo;
+  form.value.diagnosisList[rowIndex.value].name = row.name;
+  form.value.diagnosisList[rowIndex.value].definitionId = row.id;
+}
+/**获取焦点时 打开列表 */
+function handleFocus(row, index) {
+  rowIndex.value = index;
+  row.showPopover = true;
+}
+/**失去焦点时 关闭列表 */
+function handleBlur(row) {
+  row.showPopover = false;
+}
+
+function handleNodeClick(data) {
+  console.log(data.children);
+  // 检查节点是否为根节点
+  if (data.children != undefined) {
+    // 如果是根节点，不执行任何操作
+    return;
+  }
+  if (!allowAdd.value) {
+    proxy.$modal.msgWarning('请先填写病历');
+    return;
+  }
+  const isDuplicate = form.value.diagnosisList.some(
+    (diagnosis) => diagnosis.ybNo === data.ybNo || diagnosis.name === data.name
+  );
+  if (isDuplicate) {
+    proxy.$modal.msgWarning('该诊断项已存在');
+    return;
+  }
+  form.value.diagnosisList.push({
+    ybNo: data.ybNo,
+    name: data.name,
+    verificationStatusEnum: 4,
+    medTypeCode: '11',
+    diagSrtNo: form.value.diagnosisList.length + 1,
+    definitionId: data.definitionId,
+  });
+  if (form.value.diagnosisList.length == 1) {
+    form.value.diagnosisList[0].maindiseFlag = 1;
+  }
+}
+defineExpose({ getList, handleSaveDiagnosis });
+</script>
+
+<style lang="scss" scoped>
+.el-checkbox.is-bordered.el-checkbox--small {
+  background-color: #ffffff;
+}
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.tree-node-actions {
+  display: flex;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosisdialog.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosisdialog.vue
new file mode 100644
index 00000000..058f581a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosisdialog.vue
@@ -0,0 +1,126 @@
+<template>
+  <el-dialog
+    :title="title"
+    v-model="props.openDiagnosis"
+    width="1000px"
+    append-to-body
+    destroy-on-close
+    @close="close"
+  >
+    <div>
+      <el-row :gutter="24" class="mb8">
+        <el-col :span="12">
+          <el-input
+            v-model="queryParams.searchKey"
+            placeholder="诊断名称/拼音码"
+            clearable
+            style="width: 50%; margin-bottom: 10px"
+            @keyup.enter="queryDiagnosisUse"
+          >
+            <template #append>
+              <el-button icon="Search" @click="queryDiagnosisUse" />
+            </template>
+          </el-input>
+        </el-col>
+        <!-- <el-col :span="12">
+          <span>使用范围：</span>
+          <el-radio-group v-model="radio">
+            <el-radio :label="1" size="default">个人</el-radio>
+            <el-radio :label="2" size="default">科室</el-radio>
+          </el-radio-group>
+        </el-col> -->
+      </el-row>
+
+      <el-table
+        ref="diagnosisDefinitionRef"
+        :data="diagnosisDefinitionList"
+        row-key="patientId"
+        @cell-click="clickRow"
+        highlight-current-row
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column label="诊断名称" align="center" prop="name" />
+        <el-table-column label="医保编码" align="center" prop="ybNo" />
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="close">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+  
+<script setup>
+import { computed } from "vue";
+import { getDiagnosisDefinitionList, saveDiagnosisBind } from "../api";
+
+const radio = ref(1);
+const props = defineProps({
+  openDiagnosis: {
+    type: Boolean,
+    default: false,
+  },
+  radio: {
+    type: String,
+    default: '',
+  },
+});
+const emit = defineEmits(["close"]);
+const total = ref(0);
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+const diagnosisDefinitionList = ref([]);
+const selectRow = ref({});
+const title = computed(() => {
+  return props.radio == "个人" ? "个人常用诊断" : "科室常用诊断";
+});
+
+getList();
+function getList() {
+  getDiagnosisDefinitionList(queryParams.value).then((res) => {
+    diagnosisDefinitionList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+function submit() {
+  saveDiagnosisBind({
+    definitionId: selectRow.value.id,
+    definitionName: selectRow.value.name,
+    bindingEnum: props.radio == "个人" ? 1 : 2,
+  }).then((res) => {
+    if (res.code == 200) {
+      emit("close", "success");
+    }
+  });
+}
+
+function queryDiagnosisUse() {
+  getList();
+}
+
+function close() {
+  emit("close");
+}
+
+function clickRow(row) {
+  selectRow.value = row;
+}
+</script>
+
+<style scoped>
+:deep( .pagination-container .el-pagination) {
+  right: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosislist.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosislist.vue
new file mode 100644
index 00000000..830c742b
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosislist.vue
@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <el-table
+      ref="diagnosisDefinitionRef"
+      :data="diagnosisDefinitionList"
+      row-key="patientId"
+      @cell-click="clickRow"
+      max-height="400"
+    >
+      <el-table-column label="诊断名称" align="center" prop="name" />
+      <el-table-column label="医保编码" align="center" prop="ybNo" />
+      <el-table-column label="诊断类型" align="center" prop="typeName" width="180"/>
+    </el-table>
+  </div>
+</template>
+    
+<script setup>
+import { getDiagnosisDefinitionList } from '../api';
+
+const props = defineProps({
+  diagnosisSearchkey: {
+    type: String,
+    default: '',
+  },
+});
+const emit = defineEmits(['selectDiagnosis']);
+const total = ref(0);
+const queryParams = ref({
+  pageSize: 1000,
+  pageNo: 1,
+  // typeCode: 1,
+});
+const diagnosisDefinitionList = ref([]);
+
+watch(
+  () => props.diagnosisSearchkey,
+  (newValue) => {
+    queryParams.value.searchKey = newValue;
+    getList();
+  },
+  { immdiate: true }
+);
+
+getList();
+function getList() {
+  getDiagnosisDefinitionList(queryParams.value).then((res) => {
+    diagnosisDefinitionList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+function clickRow(row) {
+  emit('selectDiagnosis', row);
+}
+</script>
+  
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inpatientDoctor/home/components/diagnose/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/index.vue
similarity index 99%
rename from vue3/src/views/inpatientDoctor/home/components/diagnose/index.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/index.vue
index b65e2c51..65b85918 100644
--- a/vue3/src/views/inpatientDoctor/home/components/diagnose/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/index.vue
@@ -73,7 +73,7 @@ import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue
 // const { proxy } = getCurrentInstance()
 // const emits = defineEmits([])
 // const props = defineProps({})
-import DiagnoseFolder from './diagnoseFolder.vue'
+// import DiagnoseFolder from './diagnoseFolder.vue'
 import WesternMedicineDialog from './westernMedicineDialog.vue'
 import ChineseMedicineDialog from './chineseMedicineDialog.vue'
 const diagnoseData = ref([
diff --git a/vue3/src/views/inpatientDoctor/home/components/diagnose/westernMedicineDialog.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/westernMedicineDialog.vue
similarity index 96%
rename from vue3/src/views/inpatientDoctor/home/components/diagnose/westernMedicineDialog.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/westernMedicineDialog.vue
index 58a9abd3..313faebd 100644
--- a/vue3/src/views/inpatientDoctor/home/components/diagnose/westernMedicineDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/westernMedicineDialog.vue
@@ -121,11 +121,9 @@
 </template>
 <script  setup>
 import { reactive, ref, onMounted, inject } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
 import { dayjs, ElMessage } from 'element-plus'
-import type { IInPatient } from '@/model/IInPatient'
 
-const currentInPatient = ref<Partial<IInPatient>>({})
+const currentInPatient = ref({})
 const initCurrentInPatient = () => {
   currentInPatient.value = {
     feeType: '08',
@@ -143,7 +141,7 @@ const diagnoseform = ref({
   user: '',
   checked1: '',
 })
-const rules = reactive<FormRules>({
+const rules = reactive({
   admittedDoctor: [{ required: true, message: '请选择住院医生', trigger: ['blur', 'change'] }],
   masterNurse: [{ required: true, message: '请选择责任护士', trigger: ['blur', 'change'] }],
 })
@@ -159,7 +157,7 @@ const cancelAct = () => {
 }
 /* 录入患者体征*/
 const signFormRef = ref()
-const handleSubmit = async (formEl: FormInstance | undefined) => {
+const handleSubmit = async (formEl) => {
   if (!formEl) return
   await formEl.validate((valid, fields) => {
     if (valid) {
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
new file mode 100644
index 00000000..4c59b68f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -0,0 +1,2111 @@
+<template>
+  <div style="width: 100%">
+    <div style="margin-bottom: 5px">
+      <div style="height: 44px; display: flex; align-items: center; flex: none">
+        <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
+          新增
+        </el-button>
+        <el-button type="primary" @click="handleSaveBatch()" :disabled="false"> 保存 </el-button>
+        <el-button type="primary" @click="handleSave()" :disabled="false"> 签发 </el-button>
+        <el-button type="warning" plain @click="handleSingOut()" :disabled="false">
+          撤回
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="proxy.$refs.orderFroupRef.handleOpen()"
+          :disabled="false"
+        >
+          组套
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          :disabled="false"
+          @click="proxy.$refs.prescriptionHistoryRef.handleOpen()"
+        >
+          历史
+        </el-button>
+        <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
+        <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button>
+        <el-button type="danger" plain @click="handleStopAdvice()" :disabled="false">
+          停嘱
+        </el-button>
+        <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
+        <span class="descriptions-item-label"> 诊断： </span>
+        <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
+          <el-option
+            v-for="item in diagnosisList"
+            :key="item.conditionId"
+            :label="item.name"
+            :value="item.definitionId"
+            @click="handleDiagnosisChange(item)"
+          />
+        </el-select>
+        <span class="descriptions-item-label"> 费用性质： </span>
+        <el-select v-model="accountId" placeholder="费用性质" style="width: 180px">
+          <el-option
+            v-for="item in contractList"
+            :key="item.accountId"
+            :label="item.contractName"
+            :value="item.accountId"
+          />
+        </el-select>
+        <span class="descriptions-item-label">
+          合计金额：{{ totalAmount ? totalAmount.toFixed(2) : 0 }}元
+        </span>
+        <!-- <el-button type="primary" style="float: right" @click="refresh()" :disabled="false">
+          刷新
+        </el-button> -->
+      </div>
+      <div class="operate-btns">
+        <el-space>
+          <el-radio-group v-model="therapyEnum">
+            <el-radio-button label="全部" value="" />
+            <el-radio-button label="长期" value="1" />
+            <el-radio-button label="临时" value="2" />
+          </el-radio-group>
+          <el-select v-model="orderClassCode" placeholder="医嘱类型" style="width: 240px">
+            <el-option
+              v-for="item in adviceTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-select v-model="orderStatus" placeholder="医嘱状态" style="width: 240px"> </el-select>
+        </el-space>
+      </div>
+    </div>
+    <el-table
+      max-height="650"
+      ref="prescriptionRef"
+      :data="prescriptionList"
+      row-key="uniqueKey"
+      border
+      @cell-click="clickRow"
+      @row-dblclick="clickRowDb"
+      v-loading="loading"
+      :expand-row-keys="expandOrder"
+    >
+      <el-table-column type="expand" width="1" style="width: 0">
+        <template #default="scope">
+          <el-form :model="scope.row" :rules="rowRules" :ref="'formRef' + scope.$index">
+            <div class="expend_div" style="padding: 16px; background: #f8f9fa; border-radius: 8px">
+              <template v-if="scope.row.adviceType == 1">
+                <div style="display: flex; align-items: center; margin-bottom: 16px; gap: 16px">
+                  <span class="medicine-title">
+                    {{
+                      scope.row.adviceName +
+                      ' ' +
+                      scope.row.volume +
+                      ' [' +
+                      Number(scope.row.unitPrice).toFixed(2) +
+                      ' 元' +
+                      '/' +
+                      scope.row.unitCode_dictText +
+                      ']'
+                    }}
+                  </span>
+
+                  <!-- <el-form-item prop="conditionDefinitionId">
+                    <el-select
+                      v-model="scope.row.conditionDefinitionId"
+                      style="width: 180px; margin: 0 20px"
+                      placeholder="诊断"
+                    >
+                      <el-option
+                        v-for="item in diagnosisList"
+                        :key="item.conditionId"
+                        :label="item.name"
+                        :value="item.definitionId"
+                        @click="handleDiagnosisChange(item, scope.row)"
+                      />
+                    </el-select>
+                  </el-form-item> -->
+                  <el-form-item prop="lotNumber" label="药房：">
+                    <el-select
+                      v-model="scope.row.inventoryId"
+                      style="width: 180px; margin-right: 20px"
+                      placeholder="药房"
+                    >
+                      <el-option
+                        v-for="item in scope.row.stockList"
+                        :key="item.inventoryId"
+                        :value="item.inventoryId"
+                        :label="
+                          item.locationName +
+                          '  ' +
+                          '批次号: ' +
+                          item.lotNumber +
+                          '  ' +
+                          '  库存：' +
+                          stockFormat(
+                            scope.row.partPercent,
+                            scope.row.unitCode_dictText,
+                            scope.row.minUnitCode_dictText,
+                            item.quantity
+                          ) +
+                          '  单价：' +
+                          item.price.toFixed(2) +
+                          '/' +
+                          item.unitCode_dictText
+                        "
+                        @click="handleNumberClick(item, scope.$index)"
+                      />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item
+                    label="执行次数："
+                    prop="executeNum"
+                    class="required-field"
+                    data-prop="executeNum"
+                    v-if="scope.row.injectFlag == 1"
+                  >
+                    <el-input-number
+                      :min="1"
+                      v-model="scope.row.executeNum"
+                      controls-position="right"
+                      :controls="false"
+                      :ref="(el) => (inputRefs.executeNum = el)"
+                      @keyup.enter.prevent="handleEnter('executeNum', scope.row, scope.$index)"
+                      style="width: 70px; margin-right: 20px"
+                    />
+                  </el-form-item>
+                  <span class="medicine-info"> 诊断：{{ diagnosisName }} </span>
+                  <span class="medicine-info"> 皮试：{{ scope.row.skinTestFlag_enumText }} </span>
+                  <span class="medicine-info"> 注射药品：{{ scope.row.injectFlag_enumText }} </span>
+                  <span class="total-amount">
+                    总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
+                  </span>
+                </div>
+                <div style="display: flex; align-items: center; gap: 12px; flex-wrap: wrap">
+                  <div class="form-group">
+                    <!-- 单次剂量 -->
+                    <el-form-item
+                      label="单次用量："
+                      prop="doseQuantity"
+                      class="required-field"
+                      data-prop="doseQuantity"
+                    >
+                      <el-input-number
+                        :min="0"
+                        v-model="scope.row.doseQuantity"
+                        controls-position="right"
+                        :controls="false"
+                        style="width: 70px; margin-right: 20px"
+                        :ref="(el) => (inputRefs.doseQuantity = el)"
+                        @input="convertValues(scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index)"
+                      />
+                    </el-form-item>
+                    <!-- 剂量单位 -->
+                    <el-select
+                      v-model="scope.row.minUnitCode"
+                      style="width: 70px; margin-right: 20px"
+                      placeholder=" "
+                    >
+                      <template v-for="item in scope.row.unitCodeList" :key="item.value">
+                        <el-option
+                          v-if="
+                            scope.row.unitCodeList.length == 3
+                              ? item.type == unitMap['minUnit']
+                              : item.type == unitMap['unit']
+                          "
+                          :value="item.value"
+                          :label="item.label"
+                        />
+                      </template>
+                    </el-select>
+                    <span>=</span>
+                    <!-- 单次剂量 -->
+                    <el-form-item prop="dose" class="required-field" data-prop="dose">
+                      <el-input-number
+                        v-model="scope.row.dose"
+                        controls-position="right"
+                        :controls="false"
+                        style="width: 70px; margin: 0 20px"
+                        :ref="(el) => (inputRefs.dose = el)"
+                        @input="convertDoseValues(scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index)"
+                      />
+                    </el-form-item>
+                    <!-- 全部单位 -->
+                    <el-select
+                      v-model="scope.row.doseUnitCode"
+                      style="width: 70px"
+                      placeholder=" "
+                      @change="convertValues(scope.row, scope.$index)"
+                    >
+                      <el-option
+                        v-for="item in scope.row.unitCodeList"
+                        :value="item.value"
+                        :label="item.label"
+                        :key="item.value"
+                      />
+                    </el-select>
+                  </div>
+                  <div class="form-group">
+                    <el-form-item
+                      label="给药途径："
+                      prop="methodCode"
+                      class="required-field"
+                      data-prop="methodCode"
+                    >
+                      <el-select
+                        v-model="scope.row.methodCode"
+                        placeholder="给药途径"
+                        clearable
+                        filterable
+                        :ref="(el) => (inputRefs.methodCode = el)"
+                        @keyup.enter.prevent="
+                          () => {
+                            inputRefs.methodCode.blur();
+                          }
+                        "
+                        @visible-change="
+                          (value) => {
+                            if (!value) {
+                              handleEnter('methodCode', scope.row, scope.$index);
+                            }
+                          }
+                        "
+                      >
+                        <el-option
+                          v-for="dict in method_code"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item
+                      label="用药频次："
+                      prop="rateCode"
+                      class="required-field"
+                      data-prop="rateCode"
+                    >
+                      <el-select
+                        v-model="scope.row.rateCode"
+                        placeholder="频次"
+                        style="width: 120px"
+                        filterable
+                        @keyup.enter.prevent="
+                          () => {
+                            inputRefs.rateCode.blur();
+                          }
+                        "
+                        @change="calculateTotalAmount(scope.row, scope.$index)"
+                        @visible-change="
+                          (value) => {
+                            if (!value) {
+                              handleEnter('rateCode', scope.row, scope.$index);
+                            }
+                          }
+                        "
+                        :ref="(el) => (inputRefs.rateCode = el)"
+                      >
+                        <el-option
+                          v-for="dict in rate_code"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </div>
+                </div>
+                <div
+                  style="
+                    display: flex;
+                    align-items: center;
+                    gap: 12px;
+                    flex-wrap: wrap;
+                    margin-top: 10px;
+                  "
+                >
+                  <div class="form-group">
+                    <el-form-item
+                      label="用药天数："
+                      prop="dispensePerDuration"
+                      class="required-field"
+                      data-prop="dispensePerDuration"
+                    >
+                      <el-input-number
+                        v-model="scope.row.dispensePerDuration"
+                        style="width: 80px"
+                        :min="1"
+                        controls-position="right"
+                        :controls="false"
+                        :ref="(el) => (inputRefs.dispensePerDuration = el)"
+                        @keyup.enter.prevent="
+                          handleEnter('dispensePerDuration', scope.row, scope.$index)
+                        "
+                      >
+                        <template #suffix>天</template>
+                      </el-input-number>
+                    </el-form-item>
+
+                    <el-form-item
+                      label="总量："
+                      prop="quantity"
+                      class="required-field"
+                      data-prop="quantity"
+                    >
+                      <el-input-number
+                        v-model="scope.row.quantity"
+                        style="width: 70px"
+                        controls-position="right"
+                        :controls="false"
+                        :ref="(el) => (inputRefs.quantity = el)"
+                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
+                        @input="calculateTotalPrice(scope.row, scope.$index)"
+                      />
+                    </el-form-item>
+                    <el-select
+                      v-model="scope.row.unitCode"
+                      style="width: 70px; margin-right: 20px"
+                      placeholder=" "
+                      @change="calculateTotalAmount(scope.row, scope.$index)"
+                    >
+                      <template v-for="item in scope.row.unitCodeList" :key="item.value">
+                        <el-option
+                          v-if="item.type != unitMap['dose']"
+                          :value="item.value"
+                          :label="item.label"
+                        />
+                      </template>
+                    </el-select>
+                  </div>
+                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                    确定
+                  </el-button>
+                </div>
+              </template>
+              <template v-else-if="scope.row.adviceType == 2">
+                <div style="display: flex; align-items: center; margin-bottom: 16px; gap: 16px">
+                  <span style="font-size: 16px; font-weight: 600">
+                    {{
+                      scope.row.adviceName +
+                      ' ' +
+                      scope.row.volume +
+                      ' ' +
+                      scope.row.unitPrice +
+                      ' 元/' +
+                      scope.row.unitCode_dictText
+                    }}
+                  </span>
+                  <div class="form-group">
+                    <el-select
+                      v-model="scope.row.lotNumber"
+                      style="width: 180px; margin-right: 20px"
+                      placeholder="药房"
+                    >
+                      <el-option
+                        v-for="item in scope.row.stockList"
+                        :key="item.lotNumber"
+                        :value="item.lotNumber"
+                        :label="
+                          item.locationName +
+                          '  ' +
+                          '批次号: ' +
+                          item.lotNumber +
+                          '  ' +
+                          '  库存：' +
+                          stockFormat(
+                            scope.row.partPercent,
+                            scope.row.unitCode_dictText,
+                            scope.row.minUnitCode_dictText,
+                            item.quantity
+                          ) +
+                          '  单价：' +
+                          item.price.toFixed(2) +
+                          '/' +
+                          item.unitCode_dictText
+                        "
+                        @click="handleNumberClick(item, scope.$index)"
+                      />
+                    </el-select>
+                    <el-form-item
+                      label="数量："
+                      prop="quantity"
+                      class="required-field"
+                      data-prop="quantity"
+                    >
+                      <el-input-number
+                        placeholder="数量"
+                        v-model="scope.row.quantity"
+                        style="width: 70px"
+                        controls-position="right"
+                        :controls="false"
+                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
+                        @input="calculateTotalAmount(scope.row, scope.$index)"
+                      />
+                    </el-form-item>
+                    <el-select
+                      v-model="scope.row.unitCode"
+                      style="width: 70px; margin-right: 20px"
+                      placeholder=" "
+                      @change="calculateTotalAmount(scope.row, scope.$index)"
+                    >
+                      <template v-for="item in scope.row.unitCodeList" :key="item.value">
+                        <el-option
+                          v-if="item.type != unitMap['dose']"
+                          :value="item.value"
+                          :label="item.label"
+                          @click="
+                            () => {
+                              scope.row.unitCode_dictText = item.label;
+                            }
+                          "
+                        />
+                      </template>
+                    </el-select>
+                    <span class="total-amount">
+                      总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
+                    </span>
+                  </div>
+                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                    确定
+                  </el-button>
+                </div>
+              </template>
+              <template v-else>
+                <div style="display: flex; align-items: center; margin-bottom: 16px; gap: 16px">
+                  <span style="font-size: 16px; font-weight: 600">
+                    {{ scope.row.adviceName }}
+                    {{
+                      scope.row.unitPrice
+                        ? Number(scope.row.unitPrice).toFixed(2) + '/次'
+                        : '-' + '元'
+                    }}
+                  </span>
+                  <div class="form-group">
+                    <el-form-item
+                      label="执行次数："
+                      prop="quantity"
+                      class="required-field"
+                      data-prop="quantity"
+                    >
+                      <el-input-number
+                        placeholder="执行次数"
+                        style="width: 100px; margin: 0 20px"
+                        v-model="scope.row.quantity"
+                        controls-position="right"
+                        :controls="false"
+                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
+                        @input="calculateTotalPrice(scope.row, scope.$index)"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      label="执行科室："
+                      prop="orgId"
+                      class="required-field"
+                      data-prop="orgId"
+                    >
+                      <el-tree-select
+                        clearable
+                        v-model="scope.row.orgId"
+                        style="width: 200px"
+                        :data="organization"
+                        :props="{ value: 'id', label: 'name', children: 'children' }"
+                        value-key="id"
+                        check-strictly
+                        default-expand-all
+                        @change="(value) => handleOrgChange(value, scope.$index)"
+                        placeholder="请选择执行科室"
+                      />
+                    </el-form-item>
+                    <span class="total-amount">
+                      总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
+                    </span>
+                    <span style="font-size: 16px; font-weight: 600">
+                      <!-- 金额: {{ scope.row.priceList[0].price }} -->
+                    </span>
+                  </div>
+                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                    确定
+                  </el-button>
+                </div>
+              </template>
+            </div>
+          </el-form>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="groupId" width="60">
+        <template #header>
+          <el-checkbox
+            v-model="checkAll"
+            @change="
+              (value) => {
+                prescriptionList.forEach((item, index) => {
+                  groupIndexList.push(index);
+                  item.check = value;
+                });
+              }
+            "
+          />
+        </template>
+        <template #default="scope">
+          <el-checkbox
+            v-model="scope.row.check"
+            @dblclick.stop=""
+            placeholder=""
+            @change="(value) => handleCheckBoxChange(value, scope.$index, scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="组" align="center" width="60">
+        <template #default="scope">
+          <div v-if="groupMarkers[scope.$index] === '┏'">┏</div>
+          <div v-if="groupMarkers[scope.$index] === '┗'">┗</div>
+          <div v-if="groupMarkers[scope.$index] === '┃'">┃</div>
+          <!-- <div v-if="groupMarkers[scope.$index] === 'all'">┏</div> -->
+          <!-- <div v-if="groupMarkers[scope.$index] === 'all'">┗</div> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="" width="120">
+        <template #default="scope">
+          <el-radio-group
+            v-model="scope.row.therapyEnum"
+            size="small"
+            v-if="getRowDisabled(scope.row)"
+          >
+            <el-radio-button label="长期" value="1" />
+            <el-radio-button label="临时" value="2" />
+          </el-radio-group>
+          <span v-else :style="scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5'">
+            {{ scope.row.therapyEnum_enumText }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="医嘱" align="center" prop="productName" width="300">
+        <template #default="scope">
+          <template v-if="getRowDisabled(scope.row)">
+            <el-select
+              style="width: 35%; margin-right: 20px"
+              v-model="scope.row.adviceType"
+              :ref="'adviceTypeRef' + scope.$index"
+              @change="
+                (value) => {
+                  expandOrder = [];
+                  prescriptionList[scope.$index].adviceName = undefined;
+                  adviceQueryParams.adviceType = value;
+                }
+              "
+            >
+              <el-option
+                v-for="item in adviceTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+                @click="
+                  () => {
+                    prescriptionList[scope.$index].adviceType = item.value;
+                    prescriptionList[scope.$index].adviceType_dictText = item.label;
+                  }
+                "
+              />
+            </el-select>
+            <el-popover
+              :popper-style="{ padding: '0' }"
+              placement="bottom-start"
+              :visible="scope.row.showPopover"
+              :width="1200"
+            >
+              <adviceBaseList
+                ref="adviceTableRef"
+                :popoverVisible="scope.row.showPopover"
+                :adviceQueryParams="adviceQueryParams"
+                :patientInfo="patientInfo"
+                @selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
+              />
+              <template #reference>
+                <el-input
+                  :ref="'adviceRef' + scope.$index"
+                  style="width: 50%"
+                  v-model="scope.row.adviceName"
+                  placeholder="请选择项目"
+                  @input="handleChange"
+                  @click="handleFocus(scope.row, scope.$index)"
+                  @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
+                  @keydown="
+                    (e) => {
+                      if (!scope.row.showPopover) return;
+                      // 拦截上下键和回车事件
+                      if (['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) {
+                        e.preventDefault();
+                        // 传递事件到弹窗容器
+                        adviceTableRef.handleKeyDown(e);
+                      }
+                    }
+                  "
+                  @blur="handleBlur(scope.row)"
+                />
+              </template>
+            </el-popover>
+          </template>
+          <span v-else>{{ scope.row.adviceName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="" width="90">
+        <template #default="scope">
+          <el-tag v-if="scope.row.chargeStatus == 5" type="info">
+            {{ scope.row.chargeStatus_enumText }}
+          </el-tag>
+          <el-tag v-else-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
+          <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning">
+            待保存
+          </el-tag>
+          <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+          <el-tag v-else-if="scope.row.statusEnum == 6" type="error">停止</el-tag>
+          <el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="单次剂量" align="center" prop="">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总量" align="center" prop="">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总金额" align="right" prop="" header-align="center" width="100">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit" style="text-align: right">
+            {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="药房/科室" align="center" prop="" width="240">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.positionName }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="频次/用法" align="center" prop="" width="180">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit && scope.row.adviceType == 1" style="text-align: right">
+            {{
+              scope.row.rateCode_dictText
+                ? scope.row.rateCode_dictText +
+                  ' ' +
+                  scope.row.dispensePerDuration +
+                  '天' +
+                  ' ' +
+                  scope.row.methodCode_dictText
+                : ''
+            }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="注射药品" align="center" prop="" width="80">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.injectFlag_enumText || '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="皮试" align="center" prop="" width="80">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.skinTestFlag_enumText || '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
+        <template #default="scope">
+          <span v-if="!scope.row.isEdit">
+            {{ scope.row.diagnosisName || scope.row.conditionDefinitionName }}
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- <OrderGroupDrawer
+      ref="orderFroupRef"
+      :diagnosis="diagnosisInfo"
+      @useOrderGroup="handleSaveGroup"
+    />
+    <PrescriptionHistory
+      ref="prescriptionHistoryRef"
+      :diagnosis="diagnosisInfo"
+      :patientInfo="patientInfo.value"
+      @userPrescriptionHistory="handleSaveHistory"
+    /> -->
+  </div>
+</template>
+      
+<script setup>
+import {
+  getDiagnosisDefinitionList,
+  savePrescription,
+  getEncounterDiagnosis,
+  getPrescriptionList,
+  getOrgTree,
+  savePrescriptionSign,
+  singOut,
+  updateGroupId,
+  getContract,
+  getAdviceBaseInfo,
+  stopAdvice,
+} from '../api';
+import adviceBaseList from '../adviceBaseList';
+import { calculateQuantityByDays, formatNumber } from '@/utils/his';
+import { patientInfo } from '../../store/patient.js';
+// import OrderGroupDrawer from './orderGroupDrawer';
+// import PrescriptionHistory from './prescriptionHistory';
+import Decimal from 'decimal.js';
+import useUserStore from '@/store/modules/user';
+
+const emit = defineEmits(['selectDiagnosis']);
+const total = ref(0);
+const queryParams = ref({});
+const prescriptionList = ref([]);
+const form = ref({
+  prescriptionList: prescriptionList.value,
+});
+const adviceQueryParams = ref({});
+const rowIndex = ref(-1);
+const groupIndex = ref(1);
+const groupIndexList = ref([]);
+const diagnosisList = ref([]);
+const nextId = ref(1);
+const unitCodeList = ref([]);
+const adviceTableRef = ref([]);
+const organization = ref([]);
+const conditionDefinitionId = ref('');
+const encounterDiagnosisId = ref('');
+const diagnosisName = ref('');
+const diagnosisInfo = ref({});
+const loading = ref(false);
+const userStore = useUserStore();
+const rowRules = ref({
+  conditionDefinitionId: [{ required: true, message: '请选择诊断', trigger: 'change' }],
+  dose: [{ required: true, message: '请输入单次剂量', trigger: 'change' }],
+  doseQuantity: [{ required: true, message: '请输入单次剂量', trigger: 'change' }],
+  quantity: [{ required: true, message: '请输入数量', trigger: 'change' }],
+  dispensePerDuration: [{ required: true, message: '请输入用药天数', trigger: 'change' }],
+  executeNum: [{ required: true, message: '请输入执行次数', trigger: 'change' }],
+  rateCode: [{ required: true, message: '请选择频次', trigger: 'change' }],
+  methodCode: [{ required: true, message: '请选择给药途径', trigger: 'change' }],
+  orgId: [{ required: true, message: '请选择执行科室', trigger: 'change' }],
+});
+const unitMap = ref({
+  dose: 'dose',
+  minUnit: 'minUnit',
+  unit: 'unit',
+});
+const buttonDisabled = computed(() => {
+  return !patientInfo.value;
+});
+const props = defineProps({
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+  activeTab: {
+    type: String,
+  },
+});
+const isAdding = ref(false);
+const prescriptionRef = ref();
+const expandOrder = ref([]); //目前的展开行
+const stockList = ref([]);
+const contractList = ref([]);
+const conditionId = ref('');
+const accountId = ref('');
+const checkAll = ref(false);
+const { proxy } = getCurrentInstance();
+const inputRefs = ref({}); // 存储输入框实例
+const requiredProps = ref([]); // 存储必填项 prop 顺序
+const totalAmount = ref(0);
+const therapyEnum = ref('');
+const { method_code, unit_code, rate_code, distribution_category_code } = proxy.useDict(
+  'method_code',
+  'unit_code',
+  'rate_code',
+  'distribution_category_code'
+);
+
+const adviceTypeList = ref([
+  {
+    label: '西药中成药',
+    value: 1,
+  },
+  {
+    label: '诊疗',
+    value: 3,
+  },
+  {
+    label: '全部',
+    value: '',
+  },
+]);
+onMounted(() => {
+  document.addEventListener('keydown', escKeyListener);
+});
+
+onBeforeUnmount(() => {
+  document.removeEventListener('keydown', escKeyListener);
+});
+watch(
+  () => expandOrder.value,
+  (newValue) => {
+    if (newValue.length > 0) {
+      nextTick(() => {
+        const index = prescriptionList.value.findIndex((row) => row.uniqueKey === newValue[0]);
+        const items = proxy.$refs['formRef' + index]?.$el?.querySelectorAll('[data-prop]');
+        requiredProps.value = Array.from(items).map((item) => item.dataset.prop);
+        console.log(requiredProps.value, 'requiredProps.value');
+      });
+    } else {
+      requiredProps.value = {};
+    }
+  }
+);
+watch(
+  () => prescriptionList.value,
+  (newVlaue) => {
+    if (newVlaue && newVlaue.length > 0) {
+      console.log(prescriptionList.value, 'prescriptionList.value');
+      handleTotalAmount();
+    }
+  },
+  { immediate: true }
+);
+function handleTotalAmount() {
+  totalAmount.value = prescriptionList.value.reduce((accumulator, currentRow) => {
+    if (currentRow.chargeStatus != 8) {
+      return accumulator + (Number(currentRow.totalPrice) || 0);
+    } else {
+      return 0;
+    }
+  }, 0);
+}
+getList();
+function getList() {
+  getDiagnosisDefinitionList(queryParams.value).then((res) => {
+    // prescriptionList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+function refresh() {
+  getListInfo(false);
+}
+function getListInfo(addNewRow) {
+  isAdding.value = false;
+  getPrescriptionList(patientInfo.value.encounterId).then((res) => {
+    prescriptionList.value = res.data.map((item) => {
+      return {
+        ...JSON.parse(item.contentJson),
+        ...item,
+        doseQuantity: JSON.parse(item.contentJson)?.doseQuantity,
+        doseUnitCode_dictText: JSON.parse(item.contentJson)?.doseUnitCode_dictText,
+      };
+    });
+    groupMarkers.value = getGroupMarkers(prescriptionList.value); // 更新标记
+    if (props.activeTab == 'prescription' && addNewRow) {
+      handleAddPrescription();
+    }
+  });
+  getContract({ encounterId: patientInfo.value.encounterId }).then((res) => {
+    contractList.value = res.data;
+  });
+  accountId.value = patientInfo.value.accountId;
+}
+
+function getDiagnosisInfo() {
+  getEncounterDiagnosis(patientInfo.value.encounterId).then((res) => {
+    diagnosisList.value = res.data;
+    let diagnosisInfo = diagnosisList.value.filter((item) => {
+      return item.maindiseFlag == 1;
+    });
+    diagnosisInfo.value = diagnosisInfo[0];
+    conditionDefinitionId.value = diagnosisInfo[0].definitionId;
+    conditionId.value = diagnosisInfo[0].conditionId;
+    encounterDiagnosisId.value = diagnosisInfo[0].encounterDiagnosisId;
+    diagnosisName.value = diagnosisInfo[0].name;
+  });
+}
+
+function getRowDisabled(row) {
+  return row.isEdit;
+}
+
+// 新增医嘱
+function handleAddPrescription() {
+  // if (diagnosisList.value.length == 0) {
+  //   proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
+  //   return;
+  // }
+  if (isAdding.value) {
+    proxy.$modal.msgWarning('请先保存当前医嘱');
+    return;
+  }
+  isAdding.value = true;
+  // 在数组最前方添加一行，让新增行显示在最上边
+  prescriptionList.value.unshift({
+    uniqueKey: nextId.value++,
+    showPopover: false,
+    check: false,
+    isEdit: true,
+    statusEnum: 1,
+  });
+  groupMarkers.value = getGroupMarkers(prescriptionList.value);
+  nextTick(() => {
+    proxy.$refs['adviceRef0'].focus();
+  });
+}
+
+/**
+ * 点击行赋值
+ */
+function clickRow(row) {
+  emit('selectDiagnosis', row);
+}
+
+// 行双击打开编辑块，仅待发送的可编辑
+function clickRowDb(row) {
+  if (row.statusEnum == 1) {
+    row = { ...row, ...JSON.parse(row.contentJson), uniqueKey: row.uniqueKey };
+    row.isEdit = true;
+    row.doseUnitCode == JSON.parse(JSON.stringify(row.minUnitCode));
+    const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
+    prescriptionList.value[index] = row;
+    expandOrder.value = [row.uniqueKey];
+  }
+}
+
+function handleDiagnosisChange(item) {
+  diagnosisName.value = item.name;
+  conditionId.value = item.conditionId;
+  encounterDiagnosisId.value = item.encounterDiagnosisId;
+}
+
+function handleFocus(row, index) {
+  rowIndex.value = index;
+  row.showPopover = true;
+}
+
+function handleBlur(row) {
+  row.showPopover = false;
+}
+
+function handleChange(value) {
+  adviceQueryParams.value.searchKey = value;
+}
+
+/**
+ * 选择药品回调
+ */
+function selectAdviceBase(key, row) {
+  getOrgList();
+  unitCodeList.value = [];
+  unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
+  // if (row.doseUnitCode != row.minUnitCode) {
+  unitCodeList.value.push({
+    value: row.doseUnitCode,
+    label: row.doseUnitCode_dictText,
+    type: 'dose',
+  });
+  // }
+  if (
+    (row.partAttributeEnum == 1 || row.partAttributeEnum == 3) &&
+    row.minUnitCode != row.unitCode
+  ) {
+    unitCodeList.value.push({
+      value: row.minUnitCode,
+      label: row.minUnitCode_dictText,
+      type: 'minUnit',
+    });
+  }
+  if (row.adviceType == 2 && row.minUnitCode != row.unitCode) {
+    unitCodeList.value.push({
+      value: row.minUnitCode,
+      label: row.minUnitCode_dictText,
+      type: 'minUnit',
+    });
+  }
+  prescriptionList.value[rowIndex.value] = {
+    ...prescriptionList.value[rowIndex.value],
+    ...JSON.parse(JSON.stringify(row)),
+  };
+  prescriptionList.value[rowIndex.value].orgId = undefined;
+  prescriptionList.value[rowIndex.value].dose = undefined;
+  prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
+  // prescriptionList.value[rowIndex.value].doseUnitCode =
+  //   row.minUnitCode != row.unitCode ? row.minUnitCode : row.unitCode;
+  // prescriptionList.value[rowIndex.value].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
+  prescriptionList.value[rowIndex.value].doseUnitCode = row.doseUnitCode;
+  prescriptionList.value[rowIndex.value].minUnitCode = row.minUnitCode;
+  prescriptionList.value[rowIndex.value].unitCode =
+    row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode;
+  // prescriptionList.value[rowIndex.value].doseUnitCode_dictText = row.minUnitCode_dictText;
+  prescriptionList.value[rowIndex.value].definitionId = JSON.parse(
+    JSON.stringify(row)
+  ).chargeItemDefinitionId;
+
+  // 库存列表 + 价格列表拼成批次号的下拉框
+  if (row.adviceType != 3) {
+    if (row.inventoryList && row.inventoryList.length == 0) {
+      expandOrder.value = [];
+      proxy.$modal.msgWarning('该项目无库存');
+      return;
+    }
+    stockList.value = row.inventoryList.map((item, index) => {
+      return { ...item, ...row.priceList[index] };
+    });
+    prescriptionList.value[rowIndex.value].stockList = stockList.value;
+    // 获取默认批次号的库存，如果没有让医生重新选
+    let stock = stockList.value.filter((item) => {
+      return item.lotNumber == row.defaultLotNumber;
+    })[0];
+    if (stock != {} && stock != undefined) {
+      if (stock.quantity <= 0) {
+        proxy.$modal.msgWarning('该项目库存不足，请选择其它库房');
+        // return;
+      }
+      prescriptionList.value[rowIndex.value].lotNumber = stock.lotNumber;
+      prescriptionList.value[rowIndex.value].inventoryId = stock.inventoryId;
+      prescriptionList.value[rowIndex.value].locationId = stock.locationId;
+      prescriptionList.value[rowIndex.value].unitPrice = stock.price;
+      prescriptionList.value[rowIndex.value].minUnitPrice = new Decimal(stock.price)
+        .div(row.partPercent)
+        .toFixed(2);
+      prescriptionList.value[rowIndex.value].positionName = stock.locationName;
+    }
+  } else {
+    prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId;
+    prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
+  }
+  expandOrder.value = [key];
+  nextTick(() => {
+    if (row.adviceType == 1) {
+      if (row.injectFlag == 1) {
+        inputRefs.value['executeNum']?.focus();
+      } else {
+        inputRefs.value['doseQuantity']?.focus();
+      }
+    } else {
+      inputRefs.value['quantity']?.focus();
+    }
+  });
+}
+
+function getOrgList() {
+  getOrgTree().then((res) => {
+    organization.value = res.data.records;
+  });
+}
+
+function handleDelete() {
+  let selectRow = prescriptionList.value.filter((item) => {
+    return item.check;
+  });
+  if (selectRow.length == 0) {
+    proxy.$modal.msgWarning('请选择要删除的医嘱');
+    return;
+  }
+  let deleteList = [];
+  for (let i = prescriptionList.value.length - 1; i >= 0; i--) {
+    let deleteItem = prescriptionList.value[i];
+    // 通过requestId判断是否已保存，如果选中项未保存 直接从数组中移除，如果已保存，调接口删除
+    if (deleteItem.check && deleteItem.statusEnum == 1 && !deleteItem.requestId) {
+      prescriptionList.value.splice(i, 1);
+    } else if (deleteItem.check && deleteItem.statusEnum == 1 && deleteItem.requestId) {
+      deleteList.push({
+        requestId: deleteItem.requestId,
+        dbOpType: '3',
+        adviceType: deleteItem.adviceType,
+      });
+    }
+  }
+
+  if (deleteList.length > 0) {
+    savePrescription({ adviceSaveList: deleteList }).then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess('操作成功');
+        getListInfo(false);
+      }
+    });
+  } else {
+    proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
+    return;
+  }
+  handleEmrTreatment();
+  expandOrder.value = [];
+  isAdding.value = false;
+  adviceQueryParams.value.adviceType = undefined;
+  groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
+}
+
+// 选择药房/耗材房处理
+function handleNumberClick(item, index) {
+  prescriptionList.value[index].unitPrice = item.price;
+  prescriptionList.value[index].lotNumber = item.lotNumber;
+  prescriptionList.value[index].locationId = item.locationId;
+  prescriptionList.value[index].positionId = item.locationId;
+  prescriptionList.value[index].positionName = item.locationName;
+}
+
+// 选择执行科室处理
+function handleOrgChange(value, index) {
+  prescriptionList.value[index].positionId = value;
+}
+
+/**
+ * 签发处方
+ */
+function handleSave() {
+  if (expandOrder.value.length > 0) {
+    proxy.$modal.msgWarning('请先保存当前医嘱');
+    return;
+  }
+  if (prescriptionList.value[0].isEdit && !prescriptionList.value[0].adviceType) {
+    prescriptionList.value.shift();
+    isAdding.value = false;
+    expandOrder.value = [];
+  }
+  let saveList = prescriptionList.value.filter((item) => {
+    return item.statusEnum == 1;
+  });
+
+  let validList = saveList.filter((item) => {
+    return !item.requestId;
+  });
+  if (validList.length > 0) {
+    proxy.$modal.msgWarning('存在未保存的医嘱，请先点击保存按钮后再执行签发');
+    return;
+  }
+  if (saveList.length == 0) {
+    proxy.$modal.msgWarning('当前无可签发处方');
+    return;
+  }
+  if (!validateGroups(saveList)) {
+    return;
+  }
+  // let itemName = '';
+  // saveList.forEach((item) => {
+  //   if (item.injectFlag == 1 && item.groupId == undefined) {
+  //     itemName = itemName ? itemName + ', ' : '';
+  //     itemName += item.adviceName;
+  //   }
+  // });
+  // if (itemName != '') {
+  //   proxy.$modal.msgWarning(itemName + '为输液项目，请进行分组');
+  //   return;
+  // }
+  // saveList.forEach((item) => {
+  //   item.patientId = patientInfo.value.patientId;
+  //   item.encounterId = patientInfo.value.encounterId;
+  //   item.accountId = patientInfo.value.accountId;
+  //   item.dbOpType = '1';
+  // });
+  // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
+  loading.value = true;
+  let list = saveList.map((item) => {
+    return {
+      ...JSON.parse(item.contentJson),
+      adviceType: item.adviceType,
+      requestId: item.requestId,
+      dbOpType: '1',
+      groupId: item.groupId,
+      uniqueKey: undefined,
+    };
+  });
+  savePrescriptionSign({
+    organizationId: patientInfo.value.orgId,
+    regAdviceSaveList: list,
+  })
+    .then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('保存成功');
+        getListInfo(false);
+        nextId.value == 1;
+      }
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+  if (userStore.fixmedinsCode == 'H22010200672') {
+    // handleEmrTreatment();
+  }
+}
+
+// 把开过的处方加到病历的处理中
+function handleEmrTreatment() {
+  // 病历处理字符串拼接
+  let treatment = '';
+  let treatmentIndex = 1;
+  // 病历辅助检查字符串拼接
+  let auxiliaryExamination = '';
+  let auxiliaryExaminationIndex = 1;
+  prescriptionList.value.forEach((item, index) => {
+    if (item.chargeStatus != 8) {
+      if (item.adviceType == 1) {
+        treatment += '处方[' + (index + 1) + ']' + '  ';
+        treatment += item.adviceName + '  ' + item.volume + '  ';
+        treatment +=
+          '用法：' +
+          item.dose +
+          item.doseUnitCode_dictText +
+          '  ' +
+          item.rateCode_dictText +
+          '  ' +
+          item.methodCode_dictText +
+          '；  ';
+        treatmentIndex++;
+      } else if (item.adviceType == 3) {
+        treatment += '[' + (index + 1) + ']' + '  ';
+        treatment += item.adviceName + '；  ';
+        auxiliaryExaminationIndex++;
+      }
+    }
+  });
+  getEmrDetail(patientInfo.value.encounterId).then((res) => {
+    saveEmr({
+      patientId: patientInfo.value.patientId,
+      encounterId: patientInfo.value.encounterId,
+      contextJson: {
+        ...JSON.parse(res.data.contextJson),
+        treatment: treatment,
+      },
+    });
+  });
+}
+
+function handleClickOutside(row, index) {
+  nextTick(() => {
+    handleSaveSign(row, index);
+  });
+}
+
+function stockFormat(partPercent, unit, minUnit, quantity) {
+  let a = quantity % partPercent;
+  let b = Math.floor(quantity / partPercent);
+  console.log(partPercent, unit, minUnit, quantity);
+
+  if (a == 0) {
+    return b + ' ' + unit;
+  }
+  return b + ' ' + unit + ' ' + a + ' ' + minUnit;
+}
+
+// 单行处方保存
+function handleSaveSign(row, index) {
+  if (row.therapyEnum == undefined) {
+    proxy.$modal.msgWarning('医嘱类型未选择');
+    return;
+  }
+  proxy.$refs['formRef' + index].validate((valid) => {
+    if (valid) {
+      row.isEdit = false;
+      isAdding.value = false;
+      expandOrder.value = [];
+      row.contentJson = undefined;
+      row.patientId = patientInfo.value.patientId;
+      row.encounterId = patientInfo.value.encounterId;
+      row.accountId = accountId.value;
+      if (row.adviceType == 1) {
+        row.minUnitQuantity =
+          row.minUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;
+      } else {
+        row.minUnitQuantity = row.quantity;
+      }
+      row.conditionId = conditionId.value;
+      if (row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit') {
+        row.unitPrice = row.unitPrice;
+      } else {
+        row.unitCode_dictText = row.unitCodeList.find(
+          (item) => item.value == row.minUnitCode
+        ).label;
+        row.unitPrice = row.minUnitPrice;
+      }
+      row.conditionDefinitionId = conditionDefinitionId.value;
+      row.encounterDiagnosisId = encounterDiagnosisId.value;
+      row.diagnosisName = diagnosisName.value;
+      // row.dose = row.doseQuantity;
+      // row.doseUnitCode = unitCodeList.value.find((item) => item.type == 'dose').value;
+      // row.doseUnitCode = JSON.parse(JSON.stringify(row.minUnitCode)); // 页面显示与赋值不符，此处先简单处理，后续修改
+      row.contentJson = JSON.stringify(row);
+      if (row.requestId) {
+        row.dbOpType = '2';
+        savePrescription({ adviceSaveList: [row] }).then((res) => {
+          if (res.code === 200) {
+            proxy.$modal.msgSuccess('保存成功');
+            getListInfo(true);
+            nextId.value == 1;
+          }
+        });
+      } else {
+        handleAddPrescription();
+      }
+    }
+  });
+}
+
+function handleSaveBatch() {
+  if (prescriptionList.value[0].isEdit && !prescriptionList.value[0].adviceType) {
+    prescriptionList.value.shift();
+    isAdding.value = false;
+    expandOrder.value = [];
+  }
+  let saveList = prescriptionList.value
+    .filter((item) => {
+      return item.statusEnum == 1 && !item.requestId;
+    })
+    .map((item) => {
+      return {
+        ...item,
+        dbOpType: item.requestId ? '2' : '1',
+      };
+    });
+  if (saveList.length == 0) {
+    proxy.$modal.msgWarning('当前没有可保存医嘱');
+    return;
+  }
+  savePrescription({ regAdviceSaveList: saveList }).then((res) => {
+    if (res.code === 200) {
+      proxy.$modal.msgSuccess('保存成功');
+      getListInfo(false);
+      nextId.value == 1;
+    }
+  });
+}
+
+function setValue(row) {
+  unitCodeList.value = [];
+  unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
+  if (row.doseUnitCode != row.minUnitCode) {
+    unitCodeList.value.push({
+      value: row.doseUnitCode,
+      label: row.doseUnitCode_dictText,
+      type: 'dose',
+    });
+  }
+  if (
+    (row.partAttributeEnum == 1 || row.partAttributeEnum == 3) &&
+    row.minUnitCode != row.unitCode
+  ) {
+    unitCodeList.value.push({
+      value: row.minUnitCode,
+      label: row.minUnitCode_dictText,
+      type: 'minUnit',
+    });
+  }
+  if (row.adviceType == 2 && row.minUnitCode != row.unitCode) {
+    unitCodeList.value.push({
+      value: row.minUnitCode,
+      label: row.minUnitCode_dictText,
+      type: 'minUnit',
+    });
+  }
+  prescriptionList.value[rowIndex.value] = {
+    ...prescriptionList.value[rowIndex.value],
+    ...JSON.parse(JSON.stringify(row)),
+  };
+  prescriptionList.value[rowIndex.value].orgId = undefined;
+  prescriptionList.value[rowIndex.value].dose = undefined;
+  prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
+  // prescriptionList.value[rowIndex.value].doseUnitCode =
+  //   row.minUnitCode != row.unitCode ? row.minUnitCode : row.unitCode;
+  // prescriptionList.value[rowIndex.value].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
+  prescriptionList.value[rowIndex.value].doseUnitCode = row.doseUnitCode;
+  prescriptionList.value[rowIndex.value].minUnitCode = row.minUnitCode;
+  prescriptionList.value[rowIndex.value].unitCode =
+    row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode;
+  // prescriptionList.value[rowIndex.value].doseUnitCode_dictText = row.minUnitCode_dictText;
+  prescriptionList.value[rowIndex.value].definitionId = JSON.parse(
+    JSON.stringify(row)
+  ).chargeItemDefinitionId;
+
+  // 库存列表 + 价格列表拼成批次号的下拉框
+  if (row.adviceType != 3) {
+    if (row.inventoryList && row.inventoryList.length == 0) {
+      expandOrder.value = [];
+      proxy.$modal.msgWarning('该项目无库存');
+      return;
+    }
+    stockList.value = row.inventoryList.map((item, index) => {
+      return { ...item, ...row.priceList[index] };
+    });
+    prescriptionList.value[rowIndex.value].stockList = stockList.value;
+    // 获取默认批次号的库存，如果没有让医生重新选
+    let stock = stockList.value.filter((item) => {
+      return item.lotNumber == row.defaultLotNumber;
+    })[0];
+    if (stock != {} && stock != undefined) {
+      if (stock.quantity <= 0) {
+        proxy.$modal.msgWarning('该项目库存不足，请选择其它库房');
+        // return;
+      }
+      prescriptionList.value[rowIndex.value].lotNumber = stock.lotNumber;
+      prescriptionList.value[rowIndex.value].inventoryId = stock.inventoryId;
+      prescriptionList.value[rowIndex.value].locationId = stock.locationId;
+      prescriptionList.value[rowIndex.value].unitPrice = stock.price;
+      prescriptionList.value[rowIndex.value].positionName = stock.locationName;
+    }
+  } else {
+    prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId;
+    prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
+  }
+}
+
+// 组套保存
+function handleSaveGroup(orderGroupList) {
+  // orderGroupList.map((item) => {
+  //   item.patientId = patientInfo.value.patientId;
+  //   item.encounterId = patientInfo.value.encounterId;
+  //   item.accountId = accountId.value;
+  //   item.dbOpType = item.requestId ? '2' : '1';
+  //   item.minUnitQuantity = item.quantity * item.partPercent;
+  //   item.conditionId = conditionId.value;
+  //   item.conditionDefinitionId = conditionDefinitionId.value;
+  //   item.encounterDiagnosisId = encounterDiagnosisId.value;
+  //   item.contentJson = JSON.stringify(item);
+  //   prescriptionList.value.push(item);
+  // });
+  let paramList = orderGroupList.map((item) => {
+    return item.adviceDefinitionId;
+  });
+  getAdviceBaseInfo({
+    adviceDefinitionIdParamList: paramList.join(','),
+    organizationId: patientInfo.value.orgId,
+  }).then((res) => {
+    getOrgList();
+    res.data.records.forEach((item, index) => {
+      rowIndex.value = prescriptionList.value.length;
+      setValue(item);
+      let orderGroupValue = orderGroupList.find(
+        (k) => k.adviceDefinitionId == item.adviceDefinitionId
+      );
+
+      prescriptionList.value[rowIndex.value] = {
+        ...prescriptionList.value[rowIndex.value],
+        ...orderGroupValue,
+        patientId: patientInfo.value.patientId,
+        encounterId: patientInfo.value.encounterId,
+        accountId: accountId.value,
+        dbOpType: orderGroupValue.requestId ? '2' : '1',
+        minUnitQuantity: orderGroupValue.quantity * orderGroupValue.partPercent,
+        conditionId: conditionId.value,
+        conditionDefinitionId: conditionDefinitionId.value,
+        encounterDiagnosisId: encounterDiagnosisId.value,
+      };
+      prescriptionList.value[rowIndex.value].contentJson = JSON.stringify(
+        prescriptionList.value[rowIndex.value]
+      );
+    });
+    console.log(prescriptionList.value);
+  });
+  // savePrescription({ adviceSaveList: saveList }).then((res) => {
+  //   if (res.code === 200) {
+  //     proxy.$modal.msgSuccess('保存成功');
+  //     getListInfo(true);
+  //     nextId.value == 1;
+  //   }
+  // });
+}
+
+// 历史医嘱复用
+function handleSaveHistory(value) {
+  let saveRow = {
+    ...value,
+    patientId: patientInfo.value.patientId,
+    encounterId: patientInfo.value.encounterId,
+    accountId: accountId.value,
+    uniqueKey: undefined,
+    dbOpType: value.requestId ? '2' : '1',
+    minUnitQuantity: value.quantity * value.partPercent,
+    conditionId: conditionId.value,
+    conditionDefinitionId: conditionDefinitionId.value,
+    encounterDiagnosisId: encounterDiagnosisId.value,
+    contentJson: JSON.stringify(value),
+  };
+  savePrescription({ adviceSaveList: [saveRow] }).then((res) => {
+    if (res.code === 200) {
+      proxy.$modal.msgSuccess('保存成功');
+      getListInfo(true);
+      nextId.value == 1;
+    }
+  });
+}
+
+// 处理回车事件
+const handleEnter = (currentProp, row, rowIndex, e) => {
+  proxy.$refs['formRef' + rowIndex].validateField(currentProp, (valid) => {
+    if (valid) {
+      const index = requiredProps.value.indexOf(currentProp);
+      console.log(index);
+      if (index === -1) return;
+      // 跳转下一个或提交
+      const nextIndex = index + 1;
+      if (nextIndex < requiredProps.value.length) {
+        setTimeout(() => {
+          const nextProp = requiredProps.value[nextIndex];
+          inputRefs.value[nextProp]?.focus(); // 直接调用 Element 的 focus 方法
+        }, 100);
+      } else {
+        handleSaveSign(row, rowIndex);
+      }
+    }
+  });
+};
+
+function escKeyListener(e) {
+  if (e.key === 'Escape') {
+    if (isAdding.value == true) {
+      let index;
+      if (expandOrder.value.length > 0) {
+        index = prescriptionList.value.findIndex((item) => item.uniqueKey == expandOrder.value[0]);
+      }
+      if (index == 0) {
+        expandOrder.value = [];
+      }
+      prescriptionList.value.shift();
+      isAdding.value = false;
+      groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
+    }
+  }
+}
+
+// 签退
+function handleSingOut() {
+  let requestIdList = prescriptionList.value
+    .filter((item) => {
+      return item.check && item.statusEnum == 2;
+    })
+    .map((item) => {
+      return {
+        requestId: item.requestId,
+        adviceType: item.adviceType,
+      };
+    });
+  if (requestIdList.length == 0) {
+    proxy.$modal.msgWarning('请选择已签发医嘱撤回');
+  }
+  singOut(requestIdList).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+      getListInfo(false);
+    }
+  });
+}
+
+// 停嘱
+function handleStopAdvice() {
+  let requestIdList = prescriptionList.value
+    .filter((item) => {
+      return item.check && item.therapyEnum == '1';
+    })
+    .map((item) => {
+      return {
+        requestId: item.requestId,
+        adviceType: item.adviceType,
+      };
+    });
+  if (requestIdList.length == 0) {
+    proxy.$modal.msgWarning('仅长期医嘱可停止');
+    return;
+  }
+  stopAdvice(requestIdList).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+      getListInfo(false);
+    }
+  });
+}
+
+function handleGroupId(paramList) {
+  updateGroupId(paramList).then(() => {
+    getListInfo(false);
+  });
+}
+
+// 组合
+function combination() {
+  console.log(groupIndexList.value);
+
+  if (groupIndexList.value.length <= 1) {
+    proxy.$modal.msgWarning('至少选择两项');
+    return;
+  }
+  // 相同分组用法需要相同
+  let uniqueValues = new Set();
+  // 相同分组诊断需要相同
+  let uniqDiagnosis = new Set();
+  // 相同分组诊断需要相同
+  let uniqInjectFlag = new Set();
+  let status = false;
+  let isSave = false;
+  groupIndexList.value.forEach((index) => {
+    if (prescriptionList.value[index].statusEnum == 2) {
+      status = true;
+    }
+    if (prescriptionList.value[index].statusEnum == 1 && !prescriptionList.value[index].requestId) {
+      isSave = true;
+    }
+    uniqueValues.add(prescriptionList.value[index].methodCode);
+    uniqDiagnosis.add(prescriptionList.value[index].diagnosisName);
+    uniqInjectFlag.add(prescriptionList.value[index].injectFlag);
+  });
+  // 校验是否有已签发的医嘱
+  if (isSave) {
+    proxy.$modal.msgWarning('请先保存当前医嘱后再进行分组');
+    return;
+  }
+  if (status) {
+    proxy.$modal.msgWarning('已签发医嘱不允许分组');
+    return;
+  }
+  if (uniqueValues.size != 1) {
+    proxy.$modal.msgWarning('同一分组药品用法必须相同');
+    return;
+  }
+  if (uniqDiagnosis.size != 1) {
+    proxy.$modal.msgWarning('同一分组诊断必须相同');
+    return;
+  }
+  if (uniqInjectFlag.size != 1) {
+    proxy.$modal.msgWarning('同一分组必须全部为输液药品');
+    return;
+  }
+  // 获取当前时间戳拼接组号做唯一组号
+  let timestamp = Date.now().toString();
+  let updateList = [];
+  groupIndexList.value.forEach((index) => {
+    updateList.push({
+      requestId: prescriptionList.value[index].requestId,
+      groupId: timestamp + groupIndex.value,
+    });
+    // prescriptionList.value[index].groupId = JSON.parse(JSON.stringify(groupIndex.value));
+    prescriptionList.value[index].check = false;
+  });
+  // 更新组号
+  handleGroupId({ groupList: updateList });
+  // 根据组号排序
+  sortPrescriptionList();
+  groupMarkers.value = getGroupMarkers(prescriptionList.value); // 更新标记
+  groupIndex.value++;
+  groupIndexList.value = [];
+}
+
+// 拆组
+function split() {
+  if (groupIndexList.value.length < 1) {
+    proxy.$modal.msgWarning('至少选择一项');
+    return;
+  }
+
+  // 获取选中的所有行
+  const selectedRows = groupIndexList.value.map((index) => prescriptionList.value[index]);
+
+  // 校验是否包含已签发的医嘱
+  if (selectedRows.some((row) => row.statusEnum === 2)) {
+    proxy.$modal.msgWarning('已签发医嘱不允许拆组');
+    return;
+  }
+
+  // 提取出这些行涉及的所有 groupId
+  const selectedGroupIds = [...new Set(selectedRows.map((row) => row.groupId).filter(Boolean))];
+  if (selectedGroupIds.length === 0) {
+    proxy.$modal.msgWarning('请选择已分组的医嘱');
+    return;
+  }
+
+  // 构建最终要更新的列表
+  let updateList = [];
+
+  // 遍历每个 groupId
+  selectedGroupIds.forEach((groupId) => {
+    // 当前分组下所有的医嘱
+    const groupItems = prescriptionList.value.filter((item) => item.groupId === groupId);
+
+    // 当前分组中被选中的医嘱
+    const selectedInGroup = selectedRows.filter((row) => row.groupId === groupId);
+
+    // 如果选中数 = 总数 - 1 → 拆掉整个分组
+    if (selectedInGroup.length === groupItems.length - 1) {
+      updateList.push(
+        ...groupItems.map((item) => ({
+          requestId: item.requestId,
+          groupId: '',
+        }))
+      );
+    } else {
+      // 否则只更新选中的
+      updateList.push(
+        ...selectedInGroup.map((item) => ({
+          requestId: item.requestId,
+          groupId: '',
+        }))
+      );
+    }
+  });
+
+  // 清除本地数据中的 groupId
+  prescriptionList.value.forEach((item) => {
+    if (updateList.some((u) => u.requestId === item.requestId)) {
+      item.groupId = undefined;
+      item.check = false; // 取消勾选
+    }
+  });
+
+  // 更新分组号
+  handleGroupId({ groupList: updateList });
+
+  // 更新分组标记
+  groupMarkers.value = getGroupMarkers(prescriptionList.value);
+
+  // 排序保持一致性
+  sortPrescriptionList();
+
+  // 清空选中索引
+  groupIndexList.value = [];
+
+  proxy.$modal.msgSuccess('拆组成功');
+}
+// 分组标记处理
+function getGroupMarkers(prescriptionList) {
+  const groupMap = {};
+  const markers = [];
+
+  // 遍历处方列表，记录每组的索引范围（忽略无 groupId 的项）
+  prescriptionList.forEach((item, index) => {
+    if (!item.groupId) {
+      markers[index] = null; // 没有组号的标记为 null
+      return;
+    }
+
+    if (!groupMap[item.groupId]) {
+      groupMap[item.groupId] = [];
+    }
+    groupMap[item.groupId].push(index);
+  });
+
+  // 根据每组的索引范围设置标记
+  Object.values(groupMap).forEach((indices) => {
+    if (indices.length === 1) {
+      // 单个组成员，显示上下括号
+      markers[indices[0]] = 'all';
+    } else {
+      indices.forEach((index, i) => {
+        if (i === 0) {
+          markers[index] = '┏';
+        } else if (i === indices.length - 1) {
+          markers[index] = '┗';
+        } else {
+          markers[index] = '┃';
+        }
+      });
+    }
+  });
+  return markers;
+}
+const groupMarkers = ref([]);
+
+// 计算总价
+function calculateTotalPrice(row, index) {
+  nextTick(() => {
+    if (row.unitCode == row.minUnitCode) {
+      row.totalPrice = new Decimal(row.unitPrice).div(row.partPercent) * row.quantity;
+    } else {
+      row.totalPrice = (row.unitPrice * row.quantity * 100) / 100;
+    }
+  });
+}
+
+// 单位切换时 自动计算对应单位的总量
+function convertValues(row, index) {
+  nextTick(() => {
+    let code = unitCodeList.value.filter((item) => {
+      return item.value == row.doseUnitCode;
+    })[0];
+
+    switch (code.type) {
+      case 'dose':
+        row.dose = row.doseQuantity * row.unitConversionRatio;
+        break;
+      case 'minUnit':
+        row.dose = row.doseQuantity;
+        break;
+      case 'unit':
+        row.dose = row.doseQuantity / row.partPercent;
+        break;
+    }
+  });
+  calculateTotalAmount(row, index);
+}
+
+// 单次剂量数量改变时自动计算总量
+function convertDoseValues(row, index) {
+  nextTick(() => {
+    let code = unitCodeList.value.filter((item) => {
+      return item.value == row.doseUnitCode;
+    })[0];
+
+    switch (code.type) {
+      case 'dose':
+        row.doseQuantity = row.dose / row.unitConversionRatio;
+        break;
+      case 'minUnit':
+        row.doseQuantity = row.dose;
+        break;
+      case 'unit':
+        row.doseQuantity = row.dose * row.partPercent;
+        break;
+    }
+  });
+  calculateTotalAmount(row, index);
+}
+
+// 总量计算,仅适用只有两种单位的情况
+function calculateTotalAmount(row, index) {
+  nextTick(() => {
+    if (row.adviceType == 2) {
+      if (row.partPercent == 1) {
+        row.totalPrice = row.quantity * row.unitPrice;
+      } else {
+        if (row.unitCodeList.find((k) => k.value == row.unitCode).type == 'unit') {
+          row.totalPrice = row.quantity * row.unitPrice;
+        } else {
+          row.totalPrice = (row.quantity * row.minUnitPrice).toFixed(2);
+        }
+      }
+    } else if (row.adviceType == 1) {
+      if (row.rateCode && row.dispensePerDuration) {
+        // 根据用药天数和用药频次计算数量
+        let count = calculateQuantityByDays(row.rateCode, row.dispensePerDuration);
+        if (count) {
+          let quantity;
+          if (row.unitCode == row.minUnitCode) {
+            quantity = calculateQuantityBySplitType(row.partAttributeEnum, row.doseQuantity, count);
+            prescriptionList.value[index].quantity = quantity;
+            prescriptionList.value[index].totalPrice = (quantity * row.minUnitPrice).toFixed(2);
+          } else {
+            quantity = calculateQuantity(
+              row.partAttributeEnum,
+              row.doseQuantity,
+              count,
+              row.partPercent
+            );
+            prescriptionList.value[index].quantity = quantity;
+            prescriptionList.value[index].totalPrice = (quantity * row.unitPrice).toFixed(2);
+          }
+        }
+      }
+    }
+  });
+  // proxy.$refs['formRef' + index].validate();
+}
+
+/**
+ * 根据门诊拆分类型计算总药量
+ *
+ * @param type 门诊拆分类型
+ * @param dose 单次剂量 最小单位
+ * @param count 用药频次和用药天数计算出的总数
+ */
+function calculateQuantityBySplitType(type, dose, count) {
+  switch (type) {
+    case 1: // 门诊按最小单位每次量向上取整
+      return Math.ceil(dose) * count;
+    case 2: // 门诊按包装单位不可拆分
+      return Math.ceil(dose * count);
+    case 3: // 门诊按最小单位总量向上取整
+      return Math.ceil(dose * count);
+    case 4: // 门诊按包装单位每次量向上取整
+      return Math.ceil(dose) * count;
+  }
+}
+
+/**
+ * 根据门诊拆分类型计算总药量
+ *
+ * @param type 门诊拆分类型
+ * @param dose 单次剂量 最小单位
+ * @param count 用药频次和用药天数计算出的总数
+ */
+function calculateQuantity(type, dose, count, partPercent) {
+  switch (type) {
+    case 1: // 门诊按最小单位每次量向上取整
+      return Math.ceil(dose / partPercent) * count;
+    case 2: // 门诊按包装单位不可拆分
+      return Math.ceil(dose * count);
+    case 3: // 门诊按最小单位总量向上取整
+      return Math.ceil((dose / partPercent) * count);
+    case 4: // 门诊按包装单位每次量向上取整
+      return Math.ceil(dose) * count;
+  }
+}
+
+// 处方列表按照组号排序，后端已经将未签发的显示在上边，此处只处理未签发的处方
+function sortPrescriptionList() {
+  prescriptionList.value.sort((a, b) => {
+    if (a.statusEnum == 1 && b.statusEnum == 1) {
+      // 如果 a 和 b 都有 groupId，则按 groupId 升序排列
+      if (a.groupId !== undefined && b.groupId !== undefined) {
+        return a.groupId - b.groupId;
+      }
+      // 如果 a 有 groupId 而 b 没有，则 a 排在前面
+      else if (a.groupId !== undefined && b.groupId === undefined) {
+        return -1;
+      }
+      // 如果 a 没有 groupId 而 b 有，则 b 排在前面
+      else if (a.groupId === undefined && b.groupId !== undefined) {
+        return 1;
+      }
+      // 如果 a 和 b 都没有 groupId，则保持原顺序
+      else {
+        return 0;
+      }
+    }
+  });
+}
+
+// 获取全部选中行
+// function getSelectRows() {
+//   return prescriptionList.value.filter((item) => item.check);
+// }
+
+// 处理行chexkbox选中
+function handleCheckBoxChange(value, index, row) {
+  // 选中将当前行索引记录下来，取消将当前行索引删除
+  if (value) {
+    groupIndexList.value.push(index);
+  } else {
+    groupIndexList.value.splice(groupIndexList.value.indexOf(index), 1);
+  }
+  // 如果选中或取消行有组号，将全部相同组号的行全部选中，并记录或删除这些行的索引
+  if (row.groupId) {
+    // 获取组号相同行
+    let sameGroupIdList = prescriptionList.value.filter((item) => {
+      return item.groupId == row.groupId;
+    });
+    // 如果只有一个组号的情况不做处理
+    if (sameGroupIdList.length == 1) {
+      return;
+    } else {
+      sameGroupIdList.forEach((item) => {
+        // 排除掉当前选中行
+        if (row.uniqueKey != item.uniqueKey) {
+          // 同步选中状态
+          let currentIndex = prescriptionList.value.findIndex((k) => k.uniqueKey == item.uniqueKey);
+          prescriptionList.value[currentIndex].check = value;
+          if (value) {
+            groupIndexList.value.push(currentIndex); // 或使用索引或唯一标识
+          } else if (!value) {
+            groupIndexList.value.splice(groupIndexList.value.indexOf(currentIndex), 1);
+          }
+        }
+      });
+    }
+  }
+  console.log(groupIndexList.value);
+}
+
+// 校验每个组号数量是否大于5和对应分组金额是否大于500
+function validateGroups(saveList) {
+  // 获取到全部组号和对应的金额
+  const groups = saveList
+    .filter((item) => item.groupId != null && item.groupId !== '') // 过滤掉 groupId 为空或空字符串的项
+    .map((item) => ({
+      groupId: item.groupId,
+      totalPrice: item.totalPrice,
+    }));
+  // 计算每个组号数量,以及每组金额
+  const counts = {};
+  groups.forEach((item) => {
+    const groupId = item.groupId;
+    const totalPrice = Number(item.totalPrice);
+    if (!counts[groupId]) {
+      counts[groupId] = {
+        count: 0,
+        totalPrice: 0,
+      };
+    }
+    counts[groupId].groupId = groupId;
+    counts[groupId].count++;
+    counts[groupId].totalPrice += totalPrice;
+  });
+
+  // 获取组数大于5的组号
+  const countStr = Object.values(counts)
+    .filter((group) => {
+      return group.count > 5;
+    })
+    .map((group) => group.groupId);
+  // 获取总金额大于500的组号
+  const totalStr = Object.values(counts)
+    .filter((group) => {
+      return group.totalPrice > 500;
+    })
+    .map((group) => group.groupId);
+  if (countStr.length > 0) {
+    proxy.$modal.msgWarning('分组"' + countStr + '"数量超出限制');
+    return false;
+  } else if (totalStr.length > 0) {
+    proxy.$modal.msgWarning('分组"' + totalStr + '"金额总和超出限制');
+    return false;
+  }
+  return true;
+}
+defineExpose({ getListInfo, getDiagnosisInfo });
+</script>
+    
+<style lang="scss" scoped>
+:deep(.el-table__expand-icon) {
+  display: none !important;
+}
+.medicine-title {
+  font-size: 16px;
+  font-weight: 600;
+  min-width: 280px;
+  display: inline-block;
+}
+
+.total-amount {
+  font-size: 16px;
+  font-weight: 600;
+  color: #409eff;
+  white-space: nowrap;
+}
+
+.medicine-info {
+  font-size: 15px;
+  font-weight: 600;
+  color: #606266;
+  white-space: nowrap;
+}
+
+.form-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  background: #fff;
+  padding: 6px 10px;
+  border-radius: 4px;
+  border: 1px solid #ebeef5;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
+}
+
+/* 调整element组件默认间距 */
+// .el-select,
+// .el-input-number {
+//   margin-right: 0 !important;
+// }
+
+.el-input-number .el-input__inner {
+  text-align: center;
+}
+.el-table__cell .el-form-item--default {
+  margin-bottom: 0px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index1.vue
similarity index 100%
rename from vue3/src/views/inpatientDoctor/home/components/order/index.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index1.vue
diff --git a/vue3/src/views/inpatientDoctor/home/components/order/useOrder.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/useOrder.js
similarity index 100%
rename from vue3/src/views/inpatientDoctor/home/components/order/useOrder.js
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/useOrder.js
diff --git a/vue3/src/views/inpatientDoctor/home/components/patientCard/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/index.vue
similarity index 58%
rename from vue3/src/views/inpatientDoctor/home/components/patientCard/index.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/index.vue
index 91ab8142..af9f729f 100644
--- a/vue3/src/views/inpatientDoctor/home/components/patientCard/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/index.vue
@@ -4,7 +4,7 @@
  * @Description: 
 -->
 <template>
-  <div class="patient-card" v-for="item in data" :key="item.id" :id="item.id">
+  <div class="patient-card" v-for="item in data" :key="item.encounterId" :id="item.encounterId">
     <patient-parent-card :activeId="modelValue" :type="type" :data="item" @click="parentClick">
     </patient-parent-card>
 
@@ -28,69 +28,74 @@
   </div>
 </template>
 <script  setup>
-import { ref, watch } from 'vue'
-import PatientParentCard from './patientParentCard.vue'
+import { ref, watch } from 'vue';
+import PatientParentCard from './patientParentCard.vue';
 // import PatientChildCard from './PatientChildCard.vue'
 
 defineOptions({
   name: 'PatientCard',
-})
+});
 const props = defineProps({
-    modelValue: '',
-    data: {},
-    type: 0,
-    keyChild:'',
-    auto: true,
-  },
-)
+  modelValue: '',
+  data: [],
+  type: 0,
+  keyChild: '',
+  auto: true,
+});
 
-const value = ref(props.modelValue)
+const value = ref(props.modelValue);
 // const childClick = (node: any, parentVal: any) => {
 //   if (props.auto) {
 //     value.value = node.id
 //   }
 //   emits('click', value.value, node, parentVal)
 // }
-
+const diagnosisInit = inject('diagnosisInit')
+const getAdviceList = inject('getAdviceList')
+const adviceDiagnoInit = inject('adviceDiagnoInit')
+// 调用方法
 const parentClick = (node) => {
-  if (props.auto) {
-    value.value = node.id
-  }
-  emits('click', value.value, node, null)
-}
+  value.value = node.encounterId;
+  emits('click', value.value, node, null);
+  setTimeout(() => {
+    diagnosisInit()
+    getAdviceList()
+    adviceDiagnoInit()
+  }, 0);
+};
 
-const parentNode = ref()
+const parentNode = ref();
 const getItem = (val) => {
-  parentNode.value = null
+  parentNode.value = null;
   const re = props.data.find((item) => {
-    return item.id === val
-  })
-  if (re) return re
+    return item.encounterId === val;
+  });
+  if (re) return re;
   else {
-    let rec
+    let rec;
     props.data.forEach((item) => {
       if (item.children) {
         item.children.find((citem) => {
-          if (citem.id === val) {
-            parentNode.value = item
-            rec = citem
+          if (citem.encounterId === val) {
+            parentNode.value = item;
+            rec = citem;
           }
-        })
+        });
       }
-    })
-    return rec
+    });
+    return rec;
   }
-}
+};
 
-const emits = defineEmits(['click', 'change', 'update:modelValue'])
+const emits = defineEmits(['click', 'change', 'update:modelValue']);
 watch(props, (newValue) => {
-  value.value = newValue.modelValue
-})
+  value.value = newValue.modelValue;
+});
 
 watch(value, (val) => {
-  emits('update:modelValue', val)
-  emits('change', val, getItem(val), parentNode.value)
-})
+  emits('update:modelValue', val);
+  emits('change', val, getItem(val), parentNode.value);
+});
 </script>
 <style lang="scss" scoped>
 .patient-card {
diff --git a/vue3/src/views/inpatientDoctor/home/components/patientCard/patientChildCard.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/patientChildCard.vue
similarity index 100%
rename from vue3/src/views/inpatientDoctor/home/components/patientCard/patientChildCard.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/patientChildCard.vue
diff --git a/vue3/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue
similarity index 92%
rename from vue3/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue
index f097b391..b6f7653d 100644
--- a/vue3/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientCard/patientParentCard.vue
@@ -8,7 +8,7 @@
     @click="clickAct"
     class="patient-card"
     :class="{
-      actived: activeId === data.id,
+      actived: activeId === data.encounterId,
     }"
   >
     <!-- //跨科 考虑不考虑 -->
@@ -20,21 +20,21 @@
           <el-text truncated :tclass="bedfont" width="auto">{{ data.bedName }}</el-text>
         </div>
         <!-- 新入院患者标志 -->
-        <div class="bed_new" />
+        <!-- <div class="bed_new" /> -->
       </div>
 
       <div class="indepatient-code-container">
         <!-- 患者重/危标识符 -->
-        <div
+        <!-- <div
           class="sign"
           :style="{
             backgroundColor: data?.criticalCarePatientName === '危' ? '#BA7BC8' : '#E95657',
           }"
         >
           {{ data.criticalCarePatientName }}
-        </div>
+        </div> -->
         <!-- 住院号 -->
-        <span style="margin-left: 4px"> {{ data.inpatientCode }} </span>
+        <span style="margin-left: 4px"> {{ data.busNo }} </span>
       </div>
     </div>
     <div class="doctor-parent-line" />
@@ -42,12 +42,12 @@
       <div class="name-container">
         <!-- 患者姓名 -->
         <div class="name" style="max-width: 70px">
-          <el-text :text="data.name" tclass="name" width="auto">
-            {{ data.name }}
+          <el-text :text="data.patientName" tclass="name" width="auto">
+            {{ data.patientName }}
           </el-text>
         </div>
         <!-- 患者性别/年龄 -->
-        <div class="age">{{ data.sexName }}/{{ data.age }}</div>
+        <div class="age">{{ data.genderEnum_enumText }}/{{ data.age }}</div>
       </div>
     </div>
 
diff --git a/vue3/src/views/inpatientDoctor/home/components/patientList.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientList.vue
similarity index 95%
rename from vue3/src/views/inpatientDoctor/home/components/patientList.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientList.vue
index ef41ce19..b21377fb 100644
--- a/vue3/src/views/inpatientDoctor/home/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/patientList.vue
@@ -6,7 +6,7 @@
   <div class="patientList-container">
     <div class="patientList-operate" :class="{ 'patientList-operate-unexpand': !expand }">
       <el-space>
-        <el-icon icon-class="Refresh" size="24" @click="queryPatientData">
+        <el-icon icon-class="Refresh" size="24" @click="getList">
           <Refresh />
         </el-icon>
         <el-icon class="svg-sty-menu" size="24" @click="updateExpand">
@@ -46,7 +46,7 @@
         <el-tooltip
           v-for="item in filteredCardData"
           :show-after="200"
-          :key="item.id"
+          :key="item.encounterId"
           :show-arrow="true"
           placement="right"
           effect="light"
@@ -63,9 +63,9 @@
           <div>
             <div
               class="card-small"
-              :class="{ 'patient-active': cardId === item.id }"
+              :class="{ 'patient-active': cardId === item.encounterId }"
               @click="smallCardClick(item)"
-              :key="item.id"
+              :key="item.encounterId"
             >
               {{ item.bedName }}
             </div>
@@ -83,6 +83,7 @@ import { ref, reactive, onMounted, computed } from 'vue'
 import { patientInfo, updatePatientInfo } from '../store/patient'
 import PatientCard from './patientCard/index.vue'
 import { Search } from '@element-plus/icons-vue'
+import { getPatientList } from './api'
 // const props = defineProps({
 // })
 const expand = defineModel('expand')
@@ -171,6 +172,7 @@ const filteredCardData = computed(() => {
   return cardAllData.value
 })
 
+
 // 是否初始化激活状态
 const isInitActive = ref(true)
 // 展开患者列表Ref
@@ -180,9 +182,14 @@ const contractScrollbarRef = ref()
 const queryloading = ref(false)
 
 onMounted(() => {
-  cardId.value = patientInfo.value?.id || ''
+  cardId.value = patientInfo.value?.encounterId || ''
   queryPatientData()
 })
+const getList = () => {
+  getPatientList({ status: 5 }).then((res) => {
+    cardAllData.value = res.data.records
+  })
+}
 
 /**
  * 滚动到选中位置
@@ -225,7 +232,7 @@ const cardChange = (val, node, parent) => {
 }
 
 const smallCardClick = (val) => {
-  cardId.value = val.id
+  cardId.value = val.encounterId
   updatePatientInfo(val)
 }
 
@@ -248,6 +255,7 @@ const queryPatientData = async () => {
     queryloading.value = false
   }
 }
+getList()
 </script>
 
 <style lang="scss" scoped>
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
new file mode 100644
index 00000000..4bda4444
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
@@ -0,0 +1,14 @@
+/*
+ * @Author: sjjh
+ * @Date: 2025-04-07 12:58:22
+ * @Description:
+ */
+import PatientList from './components/patientList.vue'
+import PatientCard from './components/patientCard/index.vue'
+import Advice from './components/order/index.vue'
+import Diagnose from './components/diagnosis/diagnosis.vue'
+import BloodTtransfusionAapplication from './components/applicationForm/bloodTtransfusionAapplication.vue'
+import ExamineApplication from './components/applicationForm/examineApplication.vue'
+import SurgeryApplication from './components/applicationForm/surgeryApplication.vue'
+import TestApplication from './components/applicationForm/testApplication.vue'
+export { PatientList, PatientCard, Advice,Diagnose, BloodTtransfusionAapplication, ExamineApplication, SurgeryApplication, TestApplication }
diff --git a/vue3/src/views/inpatientDoctor/home/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
similarity index 44%
rename from vue3/src/views/inpatientDoctor/home/index.vue
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
index 3b0ee425..ccbe89e0 100644
--- a/vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -8,36 +8,73 @@
     <el-container>
       <!-- 患者列表 -->
       <el-aside minWidth="83px" :width="`${patientAside ? '254px' : '83px'}`">
-        <PatientList v-model:expand="patientAside"
-      /></el-aside>
+        <PatientList v-model:expand="patientAside" />
+      </el-aside>
       <!--  main-->
       <el-container class="inpatientDoctor-home-main">
         <el-header height="auto"><inPatientBarDoctorFold /></el-header>
         <el-main>
           <el-tabs v-model="activeTabName" type="card" class="patient-tabs">
-            <el-tab-pane label="临床医嘱" name="first"><Advice /></el-tab-pane>
-            <el-tab-pane label="诊断录入" name="second"><Diagnose /></el-tab-pane>
-            <el-tab-pane label="住院病历" name="third">Role</el-tab-pane>
+            <el-tab-pane label="临床医嘱" name="prescription">
+              <Advice ref="adviceRef" />
+            </el-tab-pane>
+            <el-tab-pane label="诊断录入" name="diagnosis">
+              <Diagnose ref="diagnosisRef" :patientInfo="patientInfo" />
+            </el-tab-pane>
+            <el-tab-pane label="住院病历" name="emr">Role</el-tab-pane>
             <el-tab-pane label="医技报告" name="fourth">Task</el-tab-pane>
+            <el-tab-pane label="检验申请" name="test">
+              <TestApplication />
+            </el-tab-pane>
+            <el-tab-pane label="检查申请" name="examine">
+              <ExamineApplication />
+            </el-tab-pane>
+            <el-tab-pane label="手术申请" name="surgery">
+              <SurgeryApplication />
+            </el-tab-pane>
+            <el-tab-pane label="输血申请" name="blood">
+              <BloodTtransfusionAapplication />
+            </el-tab-pane>
           </el-tabs>
         </el-main>
       </el-container>
     </el-container>
   </div>
 </template>
-<script setup >
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue'
+<script setup>
+import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
 // const { proxy } = getCurrentInstance()
 // const emits = defineEmits([])
 // const props = defineProps({})
-import inPatientBarDoctorFold from '@/components/patientbar/inPatientBarDoctorFold.vue'
-import { PatientList,Advice ,Diagnose} from './index.js'
-const state = reactive({})
-onBeforeMount(() => {})
-onMounted(() => {})
-defineExpose({ state })
-const activeTabName = ref('first')
-const patientAside = ref(false)
+import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
+import {
+  PatientList,
+  Advice,
+  Diagnose,
+  BloodTtransfusionAapplication,
+  ExamineApplication,
+  SurgeryApplication,
+  TestApplication,
+} from './index.js';
+const state = reactive({});
+onBeforeMount(() => {});
+onMounted(() => {});
+defineExpose({ state });
+const activeTabName = ref('prescription');
+const diagnosisRef = ref();
+const adviceRef = ref();
+const patientAside = ref(true);
+const patientInfo = ref({});
+provide('diagnosisInit', (value) => {
+  patientInfo.value = value;
+  diagnosisRef.value.getList();
+});
+provide('getAdviceList', (value) => {
+  adviceRef.value.getListInfo();
+});
+provide('adviceDiagnoInit', (value) => {
+  adviceRef.value.getDiagnosisInfo();
+});
 </script>
 <style lang="scss" scoped>
 .inpatientDoctor-home-container {
@@ -46,7 +83,7 @@ const patientAside = ref(false)
   .el-container {
     height: 100%;
   }
-  :deep(.el-aside ){
+  :deep(.el-aside) {
     padding: 0;
   }
   .inpatientDoctor-home-main {
@@ -63,7 +100,7 @@ const patientAside = ref(false)
       .el-tabs__header {
         margin: 0;
       }
-      .el-tabs__content{
+      .el-tabs__content {
         height: calc(100% - 40px);
       }
       .el-tab-pane {
diff --git a/vue3/src/views/inpatientDoctor/home/store/patient.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/store/patient.js
similarity index 94%
rename from vue3/src/views/inpatientDoctor/home/store/patient.js
rename to openhis-ui-vue3/src/views/inpatientDoctor/home/store/patient.js
index 70a11fc8..68185bb4 100644
--- a/vue3/src/views/inpatientDoctor/home/store/patient.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/store/patient.js
@@ -16,6 +16,8 @@ export function updateNursingLevel(level) {
 // 选择患者信息
 export const patientInfo = ref()
 export function updatePatientInfo(info) {
+  console.log(123111);
+  
   patientInfo.value = info
 }
 
diff --git a/vue3/src/views/inpatientDoctor/readme.md b/openhis-ui-vue3/src/views/inpatientDoctor/readme.md
similarity index 100%
rename from vue3/src/views/inpatientDoctor/readme.md
rename to openhis-ui-vue3/src/views/inpatientDoctor/readme.md
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/index.vue
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue
similarity index 96%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue
index 5d736e6c..c3a198fc 100644
--- a/vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue
@@ -44,7 +44,7 @@ const patientListData = ref([
     attention: '医生B'
   }
 ])
-const handleSelectionChange = (selection: any[]) => {
+const handleSelectionChange = (selection) => {
   console.log('handleSelectionChange', selection)
 }
 </script>
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/review.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/review.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/review.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/review.vue
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/index.ts b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/index.ts
similarity index 100%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/index.ts
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/index.ts
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/index.vue
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue
similarity index 96%
rename from vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue
index 854df0d0..29fd0b48 100644
--- a/vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/patientList.vue
@@ -43,7 +43,7 @@ const patientListData = ref([
     attention: '医生B'
   }
 ])
-const handleSelectionChange = (selection: any[]) => {
+const handleSelectionChange = (selection) => {
   console.log('handleSelectionChange', selection)
 }
 </script>
diff --git a/vue3/src/views/inpatientNurse/dischargedManagement/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/dischargedManagement/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/index.vue
diff --git a/vue3/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
similarity index 99%
rename from vue3/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
index 7ae57730..9260ef26 100644
--- a/vue3/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
@@ -129,7 +129,7 @@
     </div>
   </div>
 </template>
-<script setup >
+<script setup lang="ts">
 import { ref } from 'vue';
 const searchForm = ref({
   drugType: '1',
diff --git a/vue3/src/views/inpatientNurse/drugDistribution/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/drugDistribution/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
diff --git a/vue3/src/views/inpatientNurse/drugDistribution/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/patientList.vue
similarity index 99%
rename from vue3/src/views/inpatientNurse/drugDistribution/patientList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/patientList.vue
index 823b2561..b581b84d 100644
--- a/vue3/src/views/inpatientNurse/drugDistribution/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/patientList.vue
@@ -22,7 +22,7 @@
   </div>
 </template>
 
-<script setup >
+<script setup lang="ts">
 import { ref } from 'vue';
 const searchForm = ref({
   searchVal: '',
diff --git a/vue3/src/views/inpatientNurse/home/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/home/components/api.js
similarity index 100%
rename from vue3/src/views/inpatientNurse/home/components/api.js
rename to openhis-ui-vue3/src/views/inpatientNurse/home/components/api.js
diff --git a/vue3/src/views/inpatientNurse/home/components/patientCard.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/home/components/patientCard.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue
diff --git a/vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue
diff --git a/vue3/src/views/inpatientNurse/home/components/transferDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/components/transferDialog.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/home/components/transferDialog.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/home/components/transferDialog.vue
diff --git a/vue3/src/views/inpatientNurse/home/components/transferToBedDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/components/transferToBedDialog.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/home/components/transferToBedDialog.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/home/components/transferToBedDialog.vue
diff --git a/vue3/src/views/inpatientNurse/home/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/home/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/home/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/home/index.vue
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js
new file mode 100644
index 00000000..bebc5c17
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js
@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+
+/**
+ * 获取初始化
+ */
+export function getInit(queryParams) {
+  return request({
+    url: '/nurse-station/atd-manage/init',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 获取患者列表
+ */
+export function getPendingInfo(queryParams) {
+  return request({
+    url: '/nurse-station/atd-manage/admission-patient',
+    method: 'get',
+    params: queryParams 
+  })
+}
+
+/**
+ * 获取床位列表
+ */
+export function getBedInfo(queryParams) {
+  return request({
+    url: '/nurse-station/atd-manage/admission-bed',
+    method: 'get',
+    params: queryParams 
+  })
+}
+
+/**
+ * 获取患者详细信息
+ */
+export function getPatientInfo(queryParams) {
+  return request({
+    url: '/nurse-station/atd-manage/admission-patient-info',
+    method: 'get',
+    params: queryParams 
+  })
+}
+
+/**
+ * 获取医生列表
+ */
+export function getDoctorInfo(queryParams) {
+  return request({
+    url: '/charge-manage/register/practitioner-metadata?orgId=' + queryParams.organizationId,
+    method: 'get'
+  })
+}
+
+/**
+ * 获取护士列表
+ */
+export function getNurseInfo(queryParams) {
+  return request({
+    url: '/app-common/nurse-list?orgId=' + queryParams.organizationId,
+    method: 'get'
+  })
+}
+
+/**
+ * 入科床位分配
+ */
+export function bedAssignment(data) {
+  return request({
+    url: '/nurse-station/atd-manage/bed-assignment',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取病区
+ */
+export function childLocationList(queryParams) {
+  return request({
+    url: '/app-common/child-location-list',
+    method: 'get',
+    params: queryParams 
+  })
+}
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
new file mode 100644
index 00000000..b89e2719
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
@@ -0,0 +1,738 @@
+<template>
+  <div class="bedAllocation-container">
+    <div>
+        <el-form :model="queryParams" ref="queryRef" :inline="true">
+          <el-row style="margin-top: 8px;">
+            <el-form-item label="入院病区" prop="wardId" style="width: 240px">
+            <el-select v-model="queryParams.wardId" @change="changeWardLocationId">
+              <el-option
+                v-for="item in initInfoOptions.wardListOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="入院病房" prop="houseId">
+            <el-select v-model="queryParams.houseId" style="width: 240px">
+              <el-option
+                v-for="item in wardLocationList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="住院状态" prop="encounterStatus">
+            <el-select v-model="queryParams.encounterStatus" style="width: 240px">
+              <el-option label="全部" value="" />
+              <el-option
+                v-for="item in initInfoOptions.encounterStatusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="床位状态" prop="bedStatus" style="width: 240px">
+            <el-select v-model="bedStatusFilter">
+              <el-option label="全部" value="" />
+              <el-option
+                v-for="item in initInfoOptions.bedStatusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <div style="margin-bottom: 10px">
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </el-form-item>
+          </el-row>
+      </el-form>
+      </div>
+    <div style="display: flex; justify-content: space-between; height: 86vh">
+      <div style="width: 15%; height: 100%; border: 1px solid #eee; border-right: 0">
+        <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-right: 0">
+          <span>新入院患者</span>
+        </div>
+        <div style="width: 100%; padding: 10px">
+          <el-input
+            v-model="queryParams.searchKey"
+            placeholder="请输入住院号"
+            clearable
+            style="width: 100%; margin-bottom: 10px"
+            @keyup.enter="handleQuery"
+          >
+            <template #append>
+              <el-button icon="Search" @click="handleQuery" />
+            </template>
+          </el-input>
+          <el-scrollbar height="700px">
+            <div
+              v-for="(item, index) in patientList"
+              :class="item.active ? 'patient-card actived' : 'patient-card'"
+              :key="item.id"
+              @click="handleCardClick(item, index)"
+              @dblclick="handleCardDblClick(item)"
+              draggable="true"
+              @dragstart="handleDragStart($event, item)"
+              @dragend="handleDragEnd"
+            >
+              <div class="main-info-container">
+                <div class="name-container">
+                  <!-- 患者姓名 -->
+                  <div class="name" style="max-width: 90px">
+                    <el-text class="name" width="auto">{{ item.patientName || '未知' }}</el-text>
+                  </div>
+                </div>
+                <div class="name-container">
+                  <!-- 患者性别/年龄 -->
+                  <div class="age">
+                    <el-text class="name" width="auto">
+                      {{ item.genderEnum_enumText }}/{{ item.age }}/{{ item.priorityEnum_enumText }}
+                    </el-text>
+                  </div>
+                </div>
+
+                <div class="patient-tag" :class="getPatientTagClass(item)">
+                  {{ item.encounterStatus_enumText }}
+                </div>
+              </div>
+              <div class="doctor-parent-line" />
+              <div class="personal-info-container">
+                <div class="name-container">
+                  <div class="name">
+                    <el-text class="name" width="auto">入院时间：</el-text>
+                    <el-text class="name" width="auto">
+                      {{ item.startTime ? formatDate(item.startTime) : '-' }}
+                    </el-text>
+                  </div>
+                </div>
+              </div>
+              <div class="personal-info-container">
+                <div class="name-container">
+                  <el-text class="name" width="auto">入院科室：</el-text>
+                  <el-text class="name" width="auto">
+                    {{ item.organizationName ? item.organizationName : '-' }}
+                  </el-text>
+                </div>
+              </div>
+              <div class="personal-info-container">
+                <div class="name-container">
+                  <el-text class="name" width="auto">住院号：</el-text>
+                  <el-text class="name" width="auto">
+                    {{ item.busNo ? item.busNo : '-' }}
+                  </el-text>
+                </div>
+              </div>
+            </div>
+          </el-scrollbar>
+        </div>
+      </div>
+      <div 
+        class="disabled-wrapper" 
+        style="width: 85%; border: 1px solid #eee; position: relative"
+        @dragover="handleDragOver"
+        @drop="handleDrop"
+      >
+        <div class="bedAllocation-search"> 
+          <div 
+            v-for="item in filteredBadList" 
+            :key="item.id" 
+            class="search-item"
+            :class="{ 'drag-over': draggedOverBedId === item.bedId }"
+            style="padding: 10px; border: 1px solid #eee; margin: 5px; border-radius: 4px;"
+            @dragover="handleBedDragOver($event, item)"
+            @dragenter="handleBedDragEnter(item)"
+            @dragleave="handleBedDragLeave"
+            @drop="handleBedDrop($event, item)"
+          >
+            <div class="bed-tag" :class="getBedTagClass(item)">
+              {{ item.bedStatus_enumText }}
+            </div>
+            <div>
+              <div>
+                {{ item.houseName + '-' + item.bedName }}
+              </div>
+              <div style="margin-top: 6px;">
+                {{ item.patientName }}
+                <el-text class="name" width="auto" v-if="item.encounterId">
+                  {{ item.genderEnum_enumText }}/{{ item.age }}
+                </el-text>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <TransferInDialog 
+      v-model:visible="transferInDialogVisible" 
+      :pendingInfo="pendingInfo" 
+      :priorityOptions="priorityOptions"
+      @okAct="handleTransferInOk" />
+    <SignEntryDialog v-model:visible="signEntryDialogVisible" />
+  </div>
+</template>
+<script setup lang="ts">
+import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, computed } from 'vue'
+import { TransferInDialog, SignEntryDialog } from './index'
+import { getPendingInfo, getBedInfo, getInit, childLocationList } from './api'
+import { formatDate } from '@/utils/index';
+import { init } from '../../../basicmanage/consumablesBinding/components/api';
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+// 定义相关类型
+interface OptionItem {
+  id: string | number;
+  name: string;
+}
+
+interface OptionItemTwo {
+  value: string | number;
+  label: string;
+}
+
+interface InitInfoOptions {
+  encounterStatusOptions: OptionItemTwo[];
+  bedStatusOptions: OptionItemTwo[];
+  priorityOptions: OptionItem[];
+  wardListOptions: OptionItemTwo[]
+}
+
+const transferInDialogVisible = ref(false)
+const signEntryDialogVisible = ref(false)
+const state = reactive({})
+const loading = ref(false)
+const total = ref();
+const badList = ref<any[]>([])
+const patientList = ref<any[]>([]);
+const pendingInfo = ref({})
+const draggedPatient = ref<any>(null);
+const wardLocationList = ref<OptionItem[]>([])
+const draggedOverBedId = ref<number | null>(null)
+const priorityOptions = ref<OptionItem[]>([])
+const wardListOptions = ref<OptionItem[]>([])
+const houseListOptions = ref<OptionItem[]>([])
+const initInfoOptions = ref<InitInfoOptions>({
+  encounterStatusOptions: [],
+  bedStatusOptions: [],
+  priorityOptions: [],
+  wardListOptions: []
+})
+
+// 新增床状态筛选字段
+const bedStatusFilter = ref('')
+
+onBeforeMount(() => {})
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 50,
+  searchKey: '',
+  wardId: '',
+  houseId: '',
+  encounterStatus: '',
+  bedStatus: ''  // 这个字段现在只用于床位查询，不再用于患者列表查询
+})
+
+onMounted(() => {
+  getInit().then(res => {
+    initInfoOptions.value = res.data
+    priorityOptions.value = res.data.priorityOptions || []
+    queryParams.value.wardId = res.data.wardListOptions[0].value
+    changeWardLocationId(res.data.wardListOptions[0].value)
+    getList()
+  })
+})
+defineExpose({ state })
+
+// 计算属性：根据床状态筛选条件过滤床位列表
+const filteredBadList = computed(() => {
+  if (!bedStatusFilter.value) {
+    return badList.value
+  }
+  return badList.value.filter(item => item.bedStatus == bedStatusFilter.value)
+})
+
+const getList = () => {
+  getPatientList()
+  // 床位查询不使用encounterStatus参数，只使用基本的查询参数
+  const bedQueryParams = {
+    ...queryParams.value,
+    encounterStatus: undefined  // 移除encounterStatus，确保不影响床位列表查询
+  }
+  getBedInfo(bedQueryParams).then(res  => {
+    badList.value = res.data.records
+  })
+}
+
+// 重置查询条件
+function resetQuery() {
+  queryParams.value = {
+    pageNo: 1,
+    pageSize: 50,
+    searchKey: '',
+    wardId: '',
+    houseId: '',
+    encounterStatus: '',
+    bedStatus: ''
+  }
+  bedStatusFilter.value = ''
+  getList()
+}
+
+function changeWardLocationId(id) {
+  let params = {
+    locationId: id,
+    locationForm: 10
+  }
+  queryParams.value.houseId = ''
+  childLocationList(params).then(res => {
+    wardLocationList.value = res
+  })
+}
+
+// 获新入院患者列表
+function getPatientList() {
+  // 为患者列表查询创建一个新的参数对象，不包含bedStatus
+  const patientQueryParams = {
+    ...queryParams.value,
+    bedStatus: undefined  // 移除bedStatus，确保不影响患者列表查询
+  }
+  
+  getPendingInfo(patientQueryParams).then(res => {
+    loading.value = false
+    patientList.value = res.data.records
+    total.value = res.data.total;
+  })
+}
+
+const handleTransferInOk = () => {
+  transferInDialogVisible.value = false
+  getList()
+}
+
+function handleCardClick(item: any, index: number) {
+
+}
+
+// 双击患者卡片事件
+function handleCardDblClick(item: any) {
+  if(item.encounterStatus == 2) {
+    ElMessage({
+      message: '请分配病床！',
+      type: 'warning',
+      grouping: true,
+      showClose: true,
+    })
+  }else {
+    pendingInfo.value = {
+      ...item,
+      entranceType: 1
+    };
+    transferInDialogVisible.value = true;
+  }
+}
+
+// 拖拽开始事件
+function handleDragStart(event: DragEvent, item: any) {
+  if (event.dataTransfer) {
+    event.dataTransfer.setData('text/plain', JSON.stringify(item));
+    draggedPatient.value = item;
+    // 设置拖拽样式
+    if (event.target instanceof HTMLElement) {
+      event.target.classList.add('dragging');
+    }
+  }
+}
+
+function handleQuery() {
+  getList()
+}
+
+// 拖拽结束事件
+function handleDragEnd(event: DragEvent) {
+  // 清除拖拽样式
+  if (event.target instanceof HTMLElement) {
+    event.target.classList.remove('dragging');
+  }
+  // 清除高亮
+  draggedOverBedId.value = null;
+}
+
+// 拖拽过程中阻止默认行为
+function handleDragOver(event: DragEvent) {
+  event.preventDefault();
+}
+
+// 拖拽放置事件
+function handleDrop(event: DragEvent) {
+  event.preventDefault();
+  // 清除高亮
+  draggedOverBedId.value = null;
+}
+
+// 床位拖拽事件
+function handleBedDragOver(event: DragEvent, bed: any) {
+  event.preventDefault();
+}
+
+// 床位拖拽进入事件
+function handleBedDragEnter(bed: any) {
+  draggedOverBedId.value = bed.bedId;
+}
+
+// 床位拖拽离开事件
+function handleBedDragLeave(event: DragEvent) {
+  // 避免子元素触发的dragleave事件清除高亮
+  if (event.target === event.currentTarget) {
+    draggedOverBedId.value = null;
+  }
+}
+
+// 床位放置事件
+function handleBedDrop(event: DragEvent, bed: any) {
+  if(draggedPatient.value.encounterStatus == 2 && bed.bedStatus == 5) {
+    ElMessage({
+      message: '该床位已被占用！',
+      type: 'error',
+      grouping: true,
+      showClose: true,
+    })
+  }else {
+    if(draggedPatient.value.encounterStatus == 5) {
+      ElMessageBox.confirm('是否确认换床?')
+      .then(() => {
+        event.preventDefault();
+        // 清除高亮
+        draggedOverBedId.value = null;
+        if (draggedPatient.value) {
+          // 合并患者信息和床位信息
+          pendingInfo.value = {
+            ...draggedPatient.value,
+            bedName: bed.bedName,
+            bedId: bed.bedId,
+            targetHouseId: bed.houseId,
+            entranceType: 2,
+            targetEncounterId: bed.encounterId,
+            houseName: bed.houseName
+          };
+          // 显示TransferInDialog对话框
+          transferInDialogVisible.value = true;
+          // 清空拖拽的患者信息
+          draggedPatient.value = null;
+        }
+      })
+      .catch(() => {
+        // catch error
+      })
+    }else {
+      event.preventDefault();
+      // 清除高亮
+      draggedOverBedId.value = null;
+      if (draggedPatient.value) {
+        // 合并患者信息和床位信息
+        pendingInfo.value = {
+          ...draggedPatient.value,
+          bedName: bed.bedName,
+          bedId: bed.bedId,
+          targetHouseId: bed.houseId,
+          entranceType: 2,
+          targetEncounterId: bed.encounterId
+        };
+        // 显示TransferInDialog对话框
+        transferInDialogVisible.value = true;
+        // 清空拖拽的患者信息
+        draggedPatient.value = null;
+      }
+    }
+    
+  }
+}
+
+// 根据bedStatus获取床位标签类
+function getBedTagClass(item: any) {
+  if (item.bedStatus == 6) {
+    return 'blue-tag';
+  } else if (item.bedStatus == 5) {
+    return 'green-tag';
+  }
+  return '';
+}
+
+function getPatientTagClass(item: any) {
+  if (item.encounterStatus == 2) {
+    return 'blue-tag';
+  } else if (item.encounterStatus == 5) {
+    return 'green-tag';
+  }
+  return '';
+}
+
+const addSigns = (row: any) => {
+  // TODO 新增入院体征
+  signEntryDialogVisible.value = true
+}
+
+const selectBed = (row: any) => {
+  pendingInfo.value = row
+  // TODO 选床 入科
+  transferInDialogVisible.value = true
+}
+</script>
+<style lang="scss" scoped>
+.bedAllocation-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .bedAllocation-search {
+    height: 100px;
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    .search-item {
+      width: 200px;
+      height: 100px;
+      display: flex;
+      margin: 10px;
+      border-radius: 4px;
+      box-shadow: 0 2px 2px 0 rgba(57.55, 69.04, 86.28, 20%);
+      position: relative;
+      transition: all 0.2s ease;
+      
+      &.drag-over {
+        background-color: #e6f7ff;
+        border-color: #1890ff;
+        box-shadow: 0 0 8px rgba(24, 144, 255, 0.6);
+        transform: scale(1.03);
+      }
+      
+      &.blue-bed {
+        background-color: #e6f7ff; // 蓝色背景
+        border-color: #91d5ff;
+      }
+      
+      &.green-bed {
+        background-color: #f6ffed; // 绿色背景
+        border-color: #b7eb8f;
+      }
+      
+      .bed-tag {
+        position: absolute;
+        top: 0;
+        right: 0;
+        font-size: 14px;
+        padding: 2px 8px;
+        border-radius: 4px;
+        
+        &.blue-tag {
+          background-color: #1890ff; // 蓝色标签
+          color: white;
+        }
+        
+        &.green-tag {
+          background-color: #52c41a; // 绿色标签
+          color: white;
+        }
+      }
+    }
+  }
+  .bedAllocation-table {
+    flex: auto;
+  }
+}
+.patient-card {
+  width: 100%;
+  overflow: hidden;
+  background-color: #fff;
+  border: 1px solid;
+  border-color: #eee;
+  border-radius: 4px;
+  box-shadow: 0 2px 2px 0 rgba(57.55, 69.04, 86.28, 20%);
+  margin-bottom: 10px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+
+  &.actived {
+    background-color: rgb(7, 155, 140, 5%);
+    border-color: var(--el-color-primary);
+  }
+  
+  &.dragging {
+    opacity: 0.5;
+    transform: rotate(5deg);
+  }
+
+  .cross-dept {
+    height: 24px;
+    padding: 0 16px;
+    color: #fff;
+    font-size: 14px;
+    line-height: 24px;
+    background-color: #256d95;
+  }
+
+  .doctor-parent-line {
+    margin: 0 16px;
+    border-bottom: 1px dashed #ddd;
+  }
+
+  .personal-info-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 8px 0;
+    padding: 0 16px;
+
+    .name-container {
+      display: flex;
+      align-items: center;
+      height: 18px;
+
+      .name {
+        color: #333;
+        font-size: 14px;
+      }
+
+      .age {
+        margin-left: 10px;
+        color: #666;
+        font-size: 14px;
+      }
+    }
+
+    .change-department {
+      width: 58px;
+      height: 24px;
+      color: #5585e3;
+      font-size: 14px;
+      line-height: 24px;
+      text-align: center;
+      background: #e6edfb;
+      border-radius: 4px;
+    }
+  }
+
+  .dept {
+    margin-bottom: 4px;
+    padding: 0 16px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .doctor {
+      display: flex;
+      align-items: center;
+      height: 32px;
+      line-height: 32px;
+
+      .doctor_name {
+        display: flex;
+        align-items: center;
+        margin-left: 4px;
+        color: #333;
+      }
+    }
+
+    .deptNurseName {
+      display: flex;
+      align-items: center;
+      height: 32px;
+      color: #256d95;
+      line-height: 32px;
+    }
+  }
+}
+
+// 拖拽时的全局样式
+.patient-card.dragging {
+  opacity: 0.6;
+  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
+  transform: rotate(3deg);
+  z-index: 100;
+}
+
+.main-info-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 32px;
+    margin: 7px 0;
+    padding: 0 16px;
+    margin-right: 48px;
+    position: relative;
+    .patient-tag {
+      position: absolute;
+      top: -7px;
+      right: -48px;
+      font-size: 14px;
+      padding: 2px 8px;
+      border-radius: 4px;
+      &.blue-tag {
+          background-color: #1890ff; // 蓝色标签
+          color: white;
+        }
+        
+        &.green-tag {
+          background-color: #52c41a; // 绿色标签
+          color: white;
+        }
+    }
+    .bed-container {
+      display: flex;
+      flex: 1;
+      align-items: center;
+      min-width: 0;
+
+      .bed {
+        flex-grow: 0;
+        flex-shrink: 1;
+        min-width: 0;
+
+        :deep(.bed-font) {
+          color: #333;
+          font-weight: 600;
+          font-size: 16px;
+        }
+      }
+
+      .bed_new {
+        flex-shrink: 0;
+        width: 10px;
+        height: 10px;
+        margin-left: 4px;
+        background: #29af6f;
+        border-radius: 50%;
+      }
+    }
+
+    .indepatient-code-container {
+      display: flex;
+      flex-shrink: 0;
+      align-items: center;
+      padding-left: 6px;
+      color: #666;
+      font-size: 14px;
+
+      .sign {
+        width: 24px;
+        height: 24px;
+        color: white;
+        line-height: 24px;
+        text-align: center;
+        border-radius: 50%;
+        user-select: none;
+      }
+    }
+  }
+.pagination-container {
+  padding: 0px 20px !important;
+}
+::v-deep .el-form-item--default .el-form-item__label {
+  line-height: 44px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inpatientNurse/inOut/components/bedcards.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedcards.vue
similarity index 98%
rename from vue3/src/views/inpatientNurse/inOut/components/bedcards.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedcards.vue
index 8d5e4b72..48c559a7 100644
--- a/vue3/src/views/inpatientNurse/inOut/components/bedcards.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedcards.vue
@@ -17,7 +17,7 @@
     </div>
   </div>
 </template>
-<script setup >
+<script setup lang="ts">
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue'
 // const { proxy } = getCurrentInstance();
 const emits = defineEmits(['drop_handler', 'click_handler'])
diff --git a/vue3/src/views/inpatientNurse/inOut/components/index.ts b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/index.ts
similarity index 100%
rename from vue3/src/views/inpatientNurse/inOut/components/index.ts
rename to openhis-ui-vue3/src/views/inpatientNurse/inOut/components/index.ts
diff --git a/vue3/src/views/inpatientNurse/inOut/components/signEntryDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/signEntryDialog.vue
similarity index 98%
rename from vue3/src/views/inpatientNurse/inOut/components/signEntryDialog.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/inOut/components/signEntryDialog.vue
index 35e146a2..a4a2abea 100644
--- a/vue3/src/views/inpatientNurse/inOut/components/signEntryDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/signEntryDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="visible" top="6vh" :width="width" title="体征录入" @open="openAct" @closed="closedAct" :z-index="20">
+  <el-dialog v-model="visible" top="6vh" :width="width" title="体征录入" @open="openAct" @closed="closedAct" :z-index="20" destroy-on-close>
     <div class="transferIn-container">
       <div class="beds"></div>
       <el-form :model="signForm" :rules="rules" ref="signFormRef">
@@ -59,7 +59,7 @@
     </template>
   </el-dialog>
 </template>
-<script  setup>
+<script lang="ts" setup>
 import { reactive, ref, onMounted, inject } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { dayjs, ElMessage } from 'element-plus'
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
new file mode 100644
index 00000000..6c07d796
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
@@ -0,0 +1,534 @@
+<template>
+  <el-dialog
+    v-model="visible"
+    top="6vh"
+    :width="width"
+    title="入科选床"
+    @open="openAct"
+    @closed="closedAct"
+    :z-index="20"
+    destroy-on-close
+  >
+    <div class="transferIn-container">
+      <el-form :model="interventionForm" :rules="rules" ref="interventionFormRef">
+        <div class="admission-information">
+          <el-row>
+            <el-col :span="24">
+              <div class="patient-info">
+                <div style="display: flex;align-items: center;margin-bottom: 16px;">
+                  <div style="margin-right: 36px;font-size: 18px;font-weight: 700;">{{ props.pendingInfo.houseName + '-' + props.pendingInfo.bedName }}</div>
+                  <div style="border-radius: 50px;border: 2px solid slategray;padding: 4px 12px;">{{ props.pendingInfo.contractName }}</div>
+                </div>
+                <div>
+                  <el-row>
+                    <el-col :span="12">
+                      <div style="margin-bottom: 12px;">
+                        {{ props.pendingInfo.patientName}}
+                        <span style="color: #9f9f9f;">{{ props.pendingInfo.genderEnum_enumText}}/</span>
+                        <span style="color: #9f9f9f;">{{ props.pendingInfo.age}}</span>
+                      </div>
+                    </el-col>
+                    <el-col :span="12">
+                      <div>
+                        电话：{{ pendingInfo.phone }}
+                      </div>
+                    </el-col>
+                    <el-col :span="12">
+                      <div>
+                        住院诊断：{{ pendingInfo.conditionNames }}
+                      </div>
+                    </el-col>
+                    <el-col :span="12">{{ props.pendingInfo.patientId }}</el-col>
+                  </el-row>
+                  
+                  
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="info-title">
+                入院体征
+              </div>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="身高" label-width="50px">
+                <el-input-number :controls="false" style="width: 160px" clearable v-model="interventionForm.height" placeholder="请输入" :min="0"
+                  :max="999"></el-input-number><span class="unit">cm</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="体重" label-width="50px">
+                <el-input-number :controls="false" style="width: 160px" v-model="interventionForm.weight" clearable placeholder="请输入" :min="0"
+                  :max="999"></el-input-number>
+                <span class="unit">kg</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="体温" label-width="50px">
+                <el-input-number :controls="false" style="width: 160px" v-model="interventionForm.temperature" clearable placeholder="请输入"
+                  :min="0" :max="99"></el-input-number>
+                <span class="unit">℃</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="心率" label-width="50px">
+                <el-input-number :controls="false" style="width: 160px" v-model="interventionForm.hertRate" clearable placeholder="请输入" :min="0"
+                  :max="999"></el-input-number>
+                <span class="unit">BPM</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="脉搏" label-width="50px">
+                <el-input-number :controls="false" style="width: 160px" v-model="interventionForm.pulse" clearable placeholder="请输入" :min="0"
+                  :max="999"></el-input-number><span class="unit">P</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="血压" label-width="50px">
+                <el-input-number :controls="false" style="width: 72px" v-model="interventionForm.endBloodPressure" clearable placeholder="请输入"
+                  :min="0" :max="999"></el-input-number>
+                <span style="display: inline-block; width: 8px; margin: 0 4px"> ~ </span>
+
+                <el-input-number :controls="false" style="width: 72px" v-model="interventionForm.highBloodPressure" clearable placeholder="请输入"
+                  :min="0" :max="999"></el-input-number>
+                <span class="unit">mmHg</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="info-title">
+                入院信息
+              </div>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="入院科室" label-width="100px">
+                <el-input
+                  class="w-p100"
+                  clearable
+                  disabled
+                  v-model="interventionForm.organizationName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="入院病区" label-width="100px">
+                <el-input
+                  class="w-p100"
+                  v-model="interventionForm.wardName"
+                  disabled
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="入住床位" label-width="100px">
+                <el-input
+                  class="w-p100"
+                  v-model="interventionForm.bedName"
+                  disabled
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+                <!-- <el-select v-model="interventionForm.bedLocationId" placeholder="请选择入住床位" style="width: 100%">
+                  <el-option
+                    v-for="item in bedInfoOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="住院医生" label-width="100px" prop="admittingDoctorId">
+                <el-select
+                  v-model="interventionForm.admittingDoctorId"
+                  placeholder="请选择住院医生"
+                  style="width: 240px"
+                  :disabled="props.pendingInfo.encounterStatus == 5 && props.pendingInfo.entranceType == 2"
+                >
+                  <el-option
+                    v-for="item in doctorInfoOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="主治医生" label-width="100px">
+                <el-select
+                  v-model="interventionForm.attendingDoctorId"
+                  placeholder="请选择主治医生"
+                  style="width: 240px"
+                  :disabled="props.pendingInfo.encounterStatus == 5 && props.pendingInfo.entranceType == 2"
+                >
+                  <el-option
+                    v-for="item in doctorInfoOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="主任医生" label-width="100px">
+                <el-select
+                  v-model="interventionForm.chiefDoctorId"
+                  placeholder="请选择主任医生"
+                  style="width: 240px"
+                  :disabled="props.pendingInfo.encounterStatus == 5 && props.pendingInfo.entranceType == 2"
+                >
+                  <el-option
+                    v-for="item in doctorInfoOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="入科时间" label-width="100px">
+                <el-date-picker
+                  class="w-p100"
+                  v-model="interventionForm.startTime"
+                  type="datetime"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请输入"
+                  :disabled="props.pendingInfo.encounterStatus == 5"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="责任护士" label-width="100px" prop="primaryNurseId">
+                <el-select
+                  v-model="interventionForm.primaryNurseId"
+                  placeholder="请选择责任护士"
+                  style="width: 240px"
+                  :disabled="props.pendingInfo.encounterStatus == 5 && props.pendingInfo.entranceType == 2"
+                >
+                  <el-option
+                    v-for="item in nurseInfoOptions"
+                    :key="item.practitionerId"
+                    :label="item.name"
+                    :value="item.practitionerId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="患者病情" label-width="100px">
+                <el-select
+                  v-model="interventionForm.priorityEnum"
+                  placeholder="请选择患者病情"
+                  style="width: 240px"
+                  :disabled="props.pendingInfo.encounterStatus == 5 && props.pendingInfo.entranceType == 2"
+                >
+                  <el-option
+                    v-for="item in props.priorityOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- <div class="transferInDialog-footer"> -->
+      <div class="isPrintWristband">
+        <el-checkbox v-model="printWristband">打印腕带</el-checkbox>
+      </div>
+      <el-button class="margin-left-auto" @click="cancelAct">取消 </el-button>
+      <el-button type="primary" @click="handleSubmit">入科</el-button>
+      <!-- </div> -->
+    </template>
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import { reactive, ref, onMounted, inject, type Ref, watch } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import { dayjs, ElMessage } from 'element-plus'
+// import type { IInPatient } from '@/model/IInPatient'
+import { getBedInfo, getDoctorInfo, getNurseInfo, getInit, bedAssignment, getPatientInfo } from './api'
+
+const props = defineProps({
+  pendingInfo: {
+    type: Object,
+    require: true,
+    default: () => ({})
+  },
+  priorityOptions: {
+    type: Object,
+    require: true,
+    default: () => ({})
+  },
+})
+
+const currentInPatient = ref<Partial<IInPatient>>({})
+const bedInfoOptions = ref<{ label: string; value: string }[]>([])
+const doctorInfoOptions = ref<{ name: string; id: string }[]>([])
+const nurseInfoOptions = ref<{ name: string; practitionerId: string }[]>([])
+const InitInfoOptions = ref<any>({})
+const priorityListOptions = ref<{ info: string; value: string }[]>([])
+const pendingInfo = ref<any>({})
+
+const initCurrentInPatient = () => {
+  currentInPatient.value = {
+    feeType: '08',
+    sexName: '男',
+    age: '0',
+  }
+}
+
+/* 入科 */
+const interventionForm = ref({
+  height: undefined,
+  weight: undefined,
+  temperature: undefined,
+  hertRate: undefined,
+  pulse: undefined,
+  endBloodPressure: undefined,
+  highBloodPressure: undefined,
+  bedLocationId: '', // 床号
+  admittingDoctorId: '', // 住院医师
+  attendingDoctorId: '', // 主治医师
+  chiefDoctorId: '', // 主任医师
+  primaryNurseId: '', // 责任护士
+  priorityEnum: '', //患者病情
+  organizationName: '',
+  wardName: '',
+  bedName: '',
+  attendingDocUpdateId: '',
+  startTime: '', //入院时间
+})
+
+watch(() => props.pendingInfo, (newVal, oldVal) => {
+  console.log(newVal)
+  if(newVal) {
+    getPatientInfo({encounterId: newVal.encounterId}).then(res => {
+      pendingInfo.value = res.data
+      interventionForm.value.admittingDoctorId = res.data.admittingDoctorId
+      interventionForm.value.attendingDoctorId = res.data.attendingDoctorId
+      interventionForm.value.chiefDoctorId = res.data.chiefDoctorId
+      interventionForm.value.primaryNurseId = res.data.primaryNurseId
+      if(res.data.startTime) {
+        interventionForm.value.startTime = dayjs(res.data.startTime).format('YYYY-MM-DD HH:mm:ss')
+      }else {
+        interventionForm.value.startTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      }
+    })
+    interventionForm.value.priorityEnum = newVal.priorityEnum
+    interventionForm.value.organizationName = newVal.organizationName
+    interventionForm.value.wardName = newVal.wardName
+    interventionForm.value.bedName = newVal.bedName
+  }
+},{ deep: true })
+
+/* 初始化数据 */
+const init = () => {
+  initCurrentInPatient()
+  getInit().then(res => {
+    InitInfoOptions.value = res.data
+    // 安全地设置priorityListOptions
+    if (res.data && res.data.priorityListOptions) {
+      priorityListOptions.value = res.data.priorityListOptions
+    }
+  }).catch(error => {
+    console.error('获取初始化数据失败:', error)
+  })
+  
+  if (props.pendingInfo.wardLocationId) {
+    getBedInfo({wardLocationId: props.pendingInfo.wardLocationId}).then(res => {
+      bedInfoOptions.value = res.data || []
+    }).catch(error => {
+      console.error('获取床位信息失败:', error)
+      bedInfoOptions.value = []
+    })
+  }
+  
+  if (props.pendingInfo.organizationId) {
+    getDoctorInfo({organizationId: props.pendingInfo.organizationId}).then(res => {
+      doctorInfoOptions.value = res.data.records || []
+    }).catch(error => {
+      console.error('获取医生信息失败:', error)
+      doctorInfoOptions.value = []
+    })
+    
+    getNurseInfo({organizationId: props.pendingInfo.organizationId}).then(res => {
+      nurseInfoOptions.value = res.data || []
+    }).catch(error => {
+      console.error('获取护士信息失败:', error)
+      nurseInfoOptions.value = []
+    })
+  }
+}
+
+const rules = reactive<FormRules>({
+  admittingDoctorId: [{ required: true, message: '请选择住院医生', trigger: ['blur', 'change'] }],
+  primaryNurseId: [{ required: true, message: '请选择责任护士', trigger: ['blur', 'change'] }],
+  bedLocationId: [{ required: true, message: '请选择入住床位', trigger: ['blur', 'change'] }],
+})
+
+const printWristband = ref(false)
+const emits = defineEmits(['okAct'])
+const visible = defineModel('visible')
+const width = '950px'
+
+/* 取消 */
+const cancelAct = () => {
+  resetForm()
+  visible.value = false
+}
+
+const resetForm = () => {
+  // interventionForm.value = {
+  //   height: undefined,
+  //   weight: undefined,
+  //   temperature: undefined,
+  //   hertRate: undefined,
+  //   pulse: undefined,
+  //   endBloodPressure: undefined,
+  //   highBloodPressure: undefined,
+  //   bedLocationId: '', // 床号
+  //   admittingDoctorId: '', // 住院医师
+  //   attendingDoctorId: '', // 主治医师
+  //   chiefDoctorId: '', // 主任医师
+  //   primaryNurseId: '', // 责任护士
+  //   priorityEnum: '', //患者病情
+  //   organizationName: '',
+  //   wardName: '',
+  //   attendingDocUpdateId: '',
+  //   startTime: '', //入院时间
+  // }
+
+  // 可选：清空校验状态
+  if (interventionFormRef.value) {
+    interventionFormRef.value.resetFields()
+  }
+}
+
+/* 入科 */
+const interventionFormRef = ref<FormInstance | null>(null)
+const handleSubmit = async () => {
+  // TODO 登记入科
+  if (!interventionFormRef.value) {
+    console.error('表单引用不存在')
+    return
+  }
+  try {
+    const valid = await interventionFormRef.value.validate()
+    if (valid) {
+      const params = { 
+        ...pendingInfo.value,
+        ...interventionForm.value,
+        targetBedId: props.pendingInfo.bedId,
+        busNo: props.pendingInfo.busNo,
+        inHosTime: props.pendingInfo.inHosTime,
+        targetHouseId : props.pendingInfo.targetHouseId,
+        targetEncounterId: props.pendingInfo.targetEncounterId,
+        editFlag: props.pendingInfo.entranceType == 1 ? 1 : 0
+      }
+      
+      bedAssignment(params).then((res: any) => {
+        ElMessage({
+          message: '登记成功！',
+          type: 'success',
+          grouping: true,
+          showClose: true,
+        })
+        resetForm()
+        emits('okAct')
+        visible.value = false // 关闭对话框
+      }).catch((error: any) => {
+        console.error('登记失败:', error)
+        ElMessage({
+          message: '登记失败！',
+          type: 'error',
+          grouping: true,
+          showClose: true,
+        })
+      })
+    }
+  } catch (error) {
+    console.log('表单验证失败:', error)
+  }
+}
+
+const openAct = () => {
+  init()
+  if (props.pendingInfo) {
+    interventionForm.value.priorityEnum = props.pendingInfo.priorityEnum || ''
+    interventionForm.value.admittingDoctorId = props.pendingInfo.practitionerId || ''
+    interventionForm.value.organizationName = props.pendingInfo.organizationName || ''
+    interventionForm.value.wardName = props.pendingInfo.wardName || ''
+    interventionForm.value.attendingDocUpdateId = props.pendingInfo.admittingDoctorId || ''
+  }
+}
+
+const closedAct = () => {
+  resetForm()
+  visible.value = false
+}
+
+onMounted(() => {})
+</script>
+<style lang="scss" scoped>
+.transferIn-container {
+  width: 100%;
+
+  .admission-information {
+    width: 896px;
+    .unit {
+      display: inline-block;
+      margin-left: 10px;
+      color: #bbb;
+      font-weight: 400;
+      font-size: 14px;
+      font-family: '思源黑体 CN';
+    }
+  }
+  .beds {
+    margin-bottom: 8px;
+  }
+}
+
+.patient-info {
+  padding: 16px;
+  margin: 10px;
+  border-radius: 4px;
+  box-shadow: 0 2px 2px 0 rgba(58, 69, 86, 0.2);
+  position: relative;
+  transition: all 0.2s ease;
+}
+
+.isPrintWristband {
+  float: left;
+  display: inline-block;
+}
+.w-p100 {
+  width: 100%;
+}
+
+.w-80 {
+  width: 80px;
+}
+
+.info-title {
+  background: #f6f7f9;
+  color: #4f6877;
+  padding: 5px 10px;
+  margin-bottom: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/inpatientNurse/inOut/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
similarity index 77%
rename from vue3/src/views/inpatientNurse/inOut/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
index 76c43bdd..6b68fb26 100644
--- a/vue3/src/views/inpatientNurse/inOut/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
@@ -6,14 +6,16 @@
 <template>
   <div class="inpatientNurseHome-inOut-container">
     <el-tabs v-model="activeTabName" type="card" class="inOut-tabs">
-      <el-tab-pane label="床位分配" name="first">
+      <el-tab-pane label="入科" name="first">
         <BedAllocation />
       </el-tab-pane>
-      <el-tab-pane label="转科转床" name="second">Config</el-tab-pane>
+      <el-tab-pane label="转出" name="second">Config</el-tab-pane>
+      <el-tab-pane label="出院" name="second">Config</el-tab-pane>
+      <el-tab-pane label="出院患者" name="second">Config</el-tab-pane>
     </el-tabs>
   </div>
 </template>
-<script setup >
+<script setup lang="ts">
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue'
 
 import { BedAllocation, TransferInDialog, SignEntryDialog } from './components/index'
@@ -22,7 +24,9 @@ import { BedAllocation, TransferInDialog, SignEntryDialog } from './components/i
 // const props = defineProps({})
 const state = reactive({})
 onBeforeMount(() => {})
-onMounted(() => {})
+onMounted(() => {
+  
+})
 defineExpose({ state })
 
 const activeTabName = ref('first')
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js
new file mode 100644
index 00000000..5d7b332c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+/**
+ * 获取住院患者列表
+ */
+export function getPatientList(queryParams) {
+  return request({
+    url: '/nurse-station/advice-process/inpatient',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 获取当前登录人管理病区
+ */
+export function getWardList(queryParams) {
+  return request({
+    url: '/app-common/practitioner-ward',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 获取当前选中患者全部医嘱
+ */
+export function getPrescriptionList(queryParams) {
+  return request({
+    url: '/nurse-station/advice-process/inpatient-advice',
+    method: 'get',
+    params: queryParams
+  })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/patientList.vue
new file mode 100644
index 00000000..b2e7d47f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/patientList.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <div>
+      <el-input placeholder="住院号/姓名">
+        <template #append>
+          <el-button icon="Search" @click="getPatientList" />
+        </template>
+      </el-input>
+    </div>
+    <el-tree
+      ref="treeRef"
+      :load="loadNode"
+      lazy
+      show-checkbox
+      node-key="id"
+      default-expand-all
+      :props="{ label: 'name', children: 'children' }"
+      @node-click="handleNodeClick"
+      @check="handleCheckChange"
+      @node-expand="onNodeExpand"
+    >
+      <template #default="{ node, data }">
+        <div class="custom-tree-node" v-if="node.level === 2">
+          <span>{{ data.bedName + ' / ' + node.label }}</span>
+          <span class="tree-node-actions">
+            {{ data.genderEnum_enumText + ' / ' + data.age }}
+          </span>
+        </div>
+      </template>
+    </el-tree>
+  </div>
+</template>
+
+<script setup>
+import { getPatientList, getWardList } from './api';
+import { updatePatientInfoList } from '../store/patient';
+import { nextTick, onMounted } from 'vue';
+
+const treeRef = ref(null);
+const allNodesLoaded = ref(false);
+// 树节点加载完成后的回调
+function onTreeLoaded() {
+  if (!allNodesLoaded.value && treeRef.value) {
+    // 等待DOM更新后设置全选
+    nextTick(() => {
+      // 获取所有节点并设置为选中状态
+      const allNodes = getAllNodes(treeRef.value.store.root.childNodes);
+      const allKeys = allNodes.map((node) => node.key);
+
+      treeRef.value.setCheckedKeys(allKeys, true); // 第二个参数设为true表示级联选中
+      allNodesLoaded.value = true;
+    });
+  }
+}
+
+// 递归获取所有节点
+function getAllNodes(nodes) {
+  let result = [];
+  if (nodes && nodes.length > 0) {
+    nodes.forEach((node) => {
+      result.push(node);
+      if (node.childNodes && node.childNodes.length > 0) {
+        result = result.concat(getAllNodes(node.childNodes));
+      }
+    });
+  }
+  return result;
+}
+
+function loadNode(node, resolve) {
+  // 初始加载：获取所有病区（父级节点）
+  if (node.level === 0) {
+    getWardList().then((res) => {
+      // 确保病区节点不是叶子节点
+      const wards = res.map((ward) => ({
+        ...ward,
+        leaf: false,
+      }));
+      return resolve(wards);
+    });
+  }
+  // 展开病区节点时：获取该病区下的患者列表
+  else if (node.level === 1) {
+    const wardId = node.data.id;
+    getPatientList({ wardId: wardId }).then((res) => {
+      let children = res.data.records.map((item) => {
+        return {
+          leaf: true, // 患者节点为叶子节点
+          ...item,
+          name: item.patientName,
+        };
+      });
+      return resolve(children);
+    });
+  }
+  // 更深层级直接返回空数组
+  else {
+    return resolve([]);
+  }
+}
+
+// 获取所有选中的子节点（叶子节点）
+function getCheckedLeafNodes() {
+  if (!treeRef.value) return [];
+
+  // 获取所有选中的节点key
+  const checkedKeys = treeRef.value.getCheckedKeys();
+  // 获取所有半选中的节点key（父节点）
+  const halfCheckedKeys = treeRef.value.getHalfCheckedKeys();
+
+  // 获取所有选中的节点数据
+  const checkedNodes = treeRef.value.getCheckedNodes();
+
+  // 只返回叶子节点（患者节点）
+  return checkedNodes.filter((node) => node.leaf === true);
+}
+
+// 处理节点选中状态变化
+function handleCheckChange(data, checked) {
+  // 可以在这里处理选中状态变化的逻辑
+  let list = getCheckedLeafNodes();
+  console.log(list, '2345678');
+
+  updatePatientInfoList(list);
+  handleGetPrescription()
+}
+const handleGetPrescription = inject('handleGetPrescription')
+
+
+</script>
+
+<style scoped lang="scss">
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.tree-node-actions {
+  display: flex;
+  align-items: center;
+}
+
+:deep(.el-tree-node__content) {
+  height: 35px;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
new file mode 100644
index 00000000..688bd62c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
@@ -0,0 +1,298 @@
+<template>
+  <div style="height: calc(100vh - 126px)">
+    <div
+      style="
+        height: 51px;
+        border-bottom: 2px solid #e4e7ed;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      "
+    >
+      <div>
+        <span class="descriptions-item-label">截止时间：</span>
+        <el-date-picker
+          v-model="deadline"
+          type="datetime"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY/MM/DD HH:mm:ss"
+          :clearable="false"
+          @change="handleGetPrescription"
+        />
+        <el-radio-group v-model="therapyEnum" class="ml20" @change="handleRadioChange">
+          <el-radio :value="undefined">全部</el-radio>
+          <el-radio :value="1">长期</el-radio>
+          <el-radio :value="2">临时</el-radio>
+        </el-radio-group>
+        <el-button class="ml20" type="primary" plain @click="handleGetPrescription">
+          查询
+        </el-button>
+      </div>
+      <div>
+        <el-button class="ml20" type="danger" plain> 不执行 </el-button>
+        <el-button class="ml20" type="primary"> 皮试结果 </el-button>
+        <el-button class="ml20 mr20" type="primary"> 执行选中 </el-button>
+      </div>
+    </div>
+    <div
+      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
+      v-loading="loading"
+    >
+      <el-collapse
+        v-model="activeNames"
+        expand-icon-position="left"
+        v-if="prescriptionList.length > 0"
+        style="
+          border-bottom: 0px;
+          border-top: 0px;
+          border-radius: 0px;
+          overflow-y: auto;
+          max-height: calc(100vh - 200px);
+        "
+      >
+        <el-collapse-item
+          v-for="(item, index) in prescriptionList"
+          :key="index"
+          :name="item[0].encounterId"
+          style="
+            border: 2px solid #e4e7ed;
+            border-radius: 8px;
+            margin-bottom: 10px;
+            overflow: hidden;
+          "
+        >
+          <template #title>
+            <div style="display: flex; justify-content: space-between; align-items: center">
+              <div>
+                <span class="item-value">{{ item[0].badName }}</span>
+                <span class="item-value">{{ '【' + item[0].busNo + '】' }}</span>
+                <span class="item-value">{{ item[0].patientName + item[0].age }}</span>
+                <span>{{ item[0].contractName }}</span>
+                <span>{{ item[0].conditionNames }}</span>
+              </div>
+              <div
+                style="
+                  display: flex;
+                  justify-content: space-between;
+                  gap: 20px;
+                  align-items: center;
+                  margin-right: 20px;
+                "
+              >
+                <div style="display: inline-block; margin-right: 10px">
+                  <span class="descriptions-item-label">住院医生：</span>
+                  <span>{{ item[0].requesterId_dictText }}</span>
+                </div>
+                <div style="display: inline-block; margin-right: 10px">
+                  <div
+                    class="descriptions-item-label"
+                    style="height: 20px; line-height: 20px; text-align: center; margin: 0"
+                  >
+                    预交金额
+                  </div>
+                  <div
+                    style="
+                      height: 20px;
+                      line-height: 20px;
+                      text-align: center;
+                      font-size: 15px;
+                      color: #ec8c43;
+                    "
+                  >
+                    {{ item[0].balanceAmount?.toFixed(2) }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </template>
+          <el-table :data="item" border :header-cell-style="{ background: '#eef9fd !important' }">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="类型" align="center" prop="therapyEnum_enumText" width="80">
+              <template #default="scope">
+                <span :style="scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5'">
+                  {{ scope.row.therapyEnum_enumText }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="医嘱内容" prop="adviceName" />
+            <el-table-column label="开始/终止" prop="requestTime" width="230" />
+            <el-table-column label="预计执行" prop="times">
+              <template #default="scope">
+                <div
+                  v-for="(item, timeIndex) in scope.row.times"
+                  :key="timeIndex"
+                  style="padding-bottom: 5px"
+                >
+                  <span>{{ item }}</span>
+                  <el-checkbox-group
+                    v-model="scope.row.checkedRates[timeIndex]"
+                    style="display: inline-block; margin-left: 15px"
+                  >
+                    <el-checkbox
+                      v-for="(rateItem, rateIndex) in scope.row.rate"
+                      :key="rateIndex"
+                      :value="rateItem"
+                      border
+                      size="small"
+                      style="margin-right: 15px"
+                    >
+                      {{ rateItem }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+      <el-empty v-else description="点击查询获取患者医嘱信息"></el-empty>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { getPrescriptionList } from './api';
+import { patientInfoList } from '../store/patient.js';
+import { formatDate, formatDateStr } from '@/utils/index';
+
+const activeNames = ref([]);
+const prescriptionList = ref([]);
+const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
+const therapyEnum = ref(undefined);
+const { proxy } = getCurrentInstance();
+const loading = ref(false);
+const props = defineProps({
+  exeStatus: {
+    type: Number,
+    default: 1,
+  },
+});
+
+function handleRadioChange() {
+  handleGetPrescription();
+}
+
+function handleGetPrescription() {
+  if (patientInfoList.value.length > 0) {
+    loading.value = true;
+    let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
+    getPrescriptionList({
+      encounterIds: encounterIds,
+      pageSize: 10000,
+      pageNo: 1,
+      therapyEnum: therapyEnum.value,
+      exeStatus: props.exeStatus,
+    }).then((res) => {
+      // try {
+      // 根据encounterId分组
+      const groupedPrescriptions = res.data.records.reduce((groups, prescription) => {
+        // 获取当前医嘱全部执行频次
+        let rate;
+        let times;
+        if (prescription.therapyEnum == 1) {
+          rate = prescription.dayTimes?.split(',');
+          times = getDateRange(prescription.requestTime, deadline.value);
+        } else {
+          rate = [formatDateStr(prescription.requestTime, 'HH:mm')];
+          times = [formatDateStr(prescription.requestTime, 'MM-DD')];
+        }
+
+        prescription.times = times;
+        prescription.rate = rate;
+
+        // 添加复选框状态管理
+        prescription.checkedRates = {};
+        if (rate) {
+          times.forEach((time, index) => {
+            // 默认选中所有执行频次
+            prescription.checkedRates[index] = [...rate];
+          });
+        }
+        // 把相同encounterId的医嘱放在同一个数组中
+        const encounterId = prescription.encounterId;
+        if (!groups[encounterId]) {
+          groups[encounterId] = [];
+        }
+        if (!activeNames.value.includes(encounterId)) {
+          activeNames.value.push(encounterId);
+        }
+        groups[encounterId].push(prescription);
+        return groups;
+      }, {});
+
+      // 将分组结果转换为数组形式
+      prescriptionList.value = Object.values(groupedPrescriptions);
+      console.log(prescriptionList.value, '1111');
+      loading.value = false;
+      // } catch {
+      //   loading.value = false;
+      // }
+    });
+  } else {
+    prescriptionList.value = [];
+    // proxy.$message.warning('请选择患者');
+  }
+}
+
+/**
+ * 计算两个日期之间的所有日期（包含起始和结束日期）
+ * @param {string|Date} startDate - 开始日期
+ * @param {string|Date} endDate - 结束日期
+ * @returns {Array<string>} 格式为MM-DD的日期数组
+ */
+function getDateRange(startDate, endDate) {
+  const start = new Date(startDate);
+  const end = new Date(endDate);
+
+  // 重置时间部分，只保留日期
+  start.setHours(0, 0, 0, 0);
+  end.setHours(0, 0, 0, 0);
+
+  const dates = [];
+  const current = new Date(start);
+
+  // 循环添加日期直到结束日期
+  while (current <= end) {
+    // 格式化为MM-DD
+    const month = String(current.getMonth() + 1).padStart(2, '0');
+    const day = String(current.getDate()).padStart(2, '0');
+    dates.push(`${month}-${day}`);
+
+    // 移动到下一天
+    current.setDate(current.getDate() + 1);
+  }
+  return dates;
+}
+
+// 处理后端返回的时间集合
+function handleTime() {}
+
+defineExpose({
+  handleGetPrescription,
+});
+</script>
+
+<style scoped>
+.el-collapse-icon-position-left :deep(.el-collapse-item__header) {
+  padding: 10px;
+}
+
+:deep(.el-collapse-item__wrap) {
+  padding: 10px;
+}
+
+/* 表头背景色 */
+:deep(.prescription-table .el-table__header th) {
+  background-color: #eef9fd !important;
+}
+
+:deep(.el-table__row:hover > td) {
+  background-color: #eef9fd !important;
+}
+
+.item-value {
+  color: #606266;
+  font-size: 15px;
+  font-weight: 500;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue
new file mode 100644
index 00000000..a2013926
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue
@@ -0,0 +1,137 @@
+<template>
+  <div style="display: flex; justify-content: space-between">
+    <div style="width: 20%; height: 90vh; border-right: solid 2px #e4e7ed">
+      <div
+        style="
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          border-bottom: solid 2px #e4e7ed;
+        "
+      >
+        <el-icon
+          @click="refresh"
+          class="refresh-icon"
+          style="cursor: pointer; font-size: 20px; margin-right: 10px"
+        >
+          <Refresh />
+        </el-icon>
+      </div>
+      <el-tabs v-model="active" class="demo-tabs centered-tabs tab-header" @tab-click="handleClick">
+        <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
+          <PatientList />
+        </el-tab-pane>
+        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
+          <PatientList />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div style="width: 100%">
+      <el-tabs
+        v-model="activeName"
+        class="demo-tabs centered-tabs"
+        @tab-change="handleClick"
+      >
+        <el-tab-pane 
+          v-for="tab in prescriptionTabs" 
+          :key="tab.name"
+          :lazy="true" 
+          :label="tab.label" 
+          :name="tab.name"
+        >
+          <!-- 使用模板引用 -->
+          <PrescriptionList 
+            :exeStatus="exeStatus" 
+            :ref="(el) => setPrescriptionRef(el, tab.name)" 
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { getCurrentInstance } from 'vue';
+import PatientList from './components/patientList.vue';
+import PrescriptionList from './components/prescriptionList.vue';
+
+const activeName = ref('preparation');
+const active = ref('first');
+const exeStatus = ref(1);
+const { proxy } = getCurrentInstance();
+
+// 存储子组件引用的对象
+const prescriptionRefs = ref({});
+
+// 定义处方列表tabs配置
+const prescriptionTabs = [
+  { label: '待执行', name: 'preparation' },
+  { label: '已执行', name: 'completed' },
+  { label: '不执行', name: 'stopped' },
+  { label: '取消执行', name: 'cancel' }
+];
+
+// 设置处方组件引用
+function setPrescriptionRef(el, name) {
+  if (el) {
+    prescriptionRefs.value[name] = el;
+  }
+}
+
+function handleClick(tabName) {
+  // tabName是tab的name属性值
+  const activeTabName = tabName || activeName.value;
+  
+  switch(activeTabName){
+    case 'preparation':
+      exeStatus.value = 1;
+      break;
+    case 'completed':
+      exeStatus.value = 6;
+      break;
+    case 'stopped':
+      exeStatus.value = 5;
+      break;
+    case 'cancel':
+      exeStatus.value = 9;
+      break;
+  }
+  
+  // 调用子组件方法
+  nextTick(() => {
+    if (prescriptionRefs.value[activeTabName] && 
+        typeof prescriptionRefs.value[activeTabName].handleGetPrescription === 'function') {
+      prescriptionRefs.value[activeTabName].handleGetPrescription();
+    }
+  });
+}
+
+provide('handleGetPrescription', (value) => {
+  prescriptionRefs.value[activeName.value].handleGetPrescription();
+});
+</script>
+
+<style scoped>
+.centered-tabs :deep(.el-tabs__nav-wrap) {
+  display: flex;
+  justify-content: center;
+}
+
+.centered-tabs :deep(.el-tabs__nav-scroll) {
+  display: flex;
+  justify-content: center;
+}
+
+.tab-header :deep(.el-tabs__item) {
+  height: 50px !important;
+}
+
+.centered-tabs :deep(.el-tabs__nav) {
+  display: flex;
+  justify-content: center;
+}
+:deep(.el-tabs__header) {
+  margin: 0;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/store/patient.js b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/store/patient.js
new file mode 100644
index 00000000..db579a0a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/store/patient.js
@@ -0,0 +1,12 @@
+// 选择患者信息
+export const patientInfo = ref()
+export function updatePatientInfo(info) {
+  patientInfo.value = info
+}
+
+// 多选患者
+export const patientInfoList = ref([])
+export function updatePatientInfoList(info) {
+  patientInfoList.value = info
+}
+
diff --git a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue
similarity index 98%
rename from vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue
index 43a4b99a..3720a755 100644
--- a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/MedicalOrderManagement.vue
@@ -72,7 +72,7 @@
     </div>
   </div>
 </template>
-<script setup >
+<script setup lang="ts">
 import { onBeforeMount, onMounted, reactive, ref } from 'vue'
 // const { proxy } = getCurrentInstance()
 // const emits = defineEmits([])
@@ -223,9 +223,9 @@ const arraySpanMethod = ({
   row,
   column,
   rowIndex,
-  columnIndex,
+  columnIndex
 }: any) => {
-  // console.log(row, column, rowIndex, columnIndex);
+  console.log(row, column, rowIndex, columnIndex);
   // 如果是父级行
   if (row.children && row.children.length > 0) {
     if (columnIndex === 0) {
@@ -234,8 +234,7 @@ const arraySpanMethod = ({
     // 如果是患者列
     if (columnIndex === 1) {
       return [1, 6]
-    }
-    else {
+    } else {
       return [1, 0]
     }
   }
diff --git a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue
similarity index 98%
rename from vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue
index 433d72d0..d5a2d9f3 100644
--- a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/check/patientList.vue
@@ -50,7 +50,7 @@
   </div>
 </template>
 
-<script setup >
+<script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { Expand, Fold, Refresh } from '@element-plus/icons-vue'
 
@@ -110,7 +110,7 @@ const patientListData = ref([
 
 const selectedRows = ref<any[]>([])
 
-const handleSelectionChange = (selection: any[]) => {
+const handleSelectionChange = (selection) => {
   selectedRows.value = selection
 }
 </script>
diff --git a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
similarity index 51%
rename from vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
index 59dc8970..dcb5b212 100644
--- a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
@@ -8,18 +8,39 @@
     <div class="medicalOrderManagement-operate">
       <el-space :size="4">
         <el-select v-model="searchForm.patientStatus" placeholder="执行状态" style="width: 100px">
-          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
         <el-select v-model="searchForm.selectedType" placeholder="医嘱类型" style="width: 100px">
-          <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
         <el-select v-model="searchForm.executionType" placeholder="执行单类型" style="width: 100px">
-          <el-option v-for="item in executionTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option
+            v-for="item in executionTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
         <el-input v-model="searchForm.searchVal" style="width: 100px" placeholder="医嘱名称" />
         <!-- 增加预计执行时间 时间范围筛选 -->
-        <el-date-picker v-model="searchForm.timeRange" type="daterange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" style="width: 200px" />
+        <el-date-picker
+          v-model="searchForm.timeRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 200px"
+        />
         <el-button type="primary">查询</el-button>
         <el-button type="danger">不执行</el-button>
         <el-checkbox v-model="searchForm.isPrintExecution">执行单打印</el-checkbox>
@@ -27,13 +48,16 @@
         <el-button type="primary">执行</el-button>
         <el-button type="">皮试结果</el-button>
       </el-space>
-      <el-space :size="4">
-
-      </el-space>
+      <el-space :size="4"> </el-space>
     </div>
     <div class="medicalOrderManagement-table">
-      <el-table :data="medicalOrderManagementData" row-key="id" style="width: 100%; height: 100%" border
-        :span-method="arraySpanMethod">
+      <el-table
+        :data="medicalOrderManagementData"
+        row-key="id"
+        style="width: 100%; height: 100%"
+        border
+        :span-method="arraySpanMethod"
+      >
         <el-table-column type="selection" />
 
         <el-table-column label="类型" prop="name">
@@ -41,10 +65,10 @@
             <span v-if="!row.children">长期/西药</span>
             <template v-else>
               {{ row.name }}
-              11 床【000000001】 &nbsp; 林俊杰 女/24 重 &nbsp;1级 自费 主诊断 医生：医生甲&nbsp; 预交金：1990.3
+              11 床【000000001】 &nbsp; 林俊杰 女/24 重 &nbsp;1级 自费 主诊断 医生：医生甲&nbsp;
+              预交金：1990.3
             </template>
           </template>
-
         </el-table-column>
 
         <el-table-column label="医嘱内容" prop="content">
@@ -55,25 +79,22 @@
         <el-table-column label="开始终止" prop="gender">
           <template #default="{ row }">
             <div v-if="!row.children">
-              <div> 05/04 07:00 </div>
-              <div> 05/25 07:00 </div>
+              <div>05/04 07:00</div>
+              <div>05/25 07:00</div>
             </div>
           </template>
         </el-table-column>
         <el-table-column label="执行时间" prop="gender" min-width="200px">
           <template #default="{ row }">
             <template v-if="!row.children">
-
               <div v-for="item in row.dates" :key="item.id">
                 <span>{{ item.date }}</span>
                 <span v-for="time in item.times" :key="time.id">
                   <el-checkbox v-model="time.checked" :label="`${time.time + time.nurse}`" border />
                 </span>
               </div>
-
-            </template>
-            <template v-else>
             </template>
+            <template v-else> </template>
           </template>
         </el-table-column>
       </el-table>
@@ -81,14 +102,14 @@
   </div>
 </template>
 <script setup >
-import { onBeforeMount, onMounted, reactive, ref } from 'vue'
+import { onBeforeMount, onMounted, reactive, ref } from 'vue';
 // const { proxy } = getCurrentInstance()
 // const emits = defineEmits([])
 // const props = defineProps({})
-const state = reactive({})
-onBeforeMount(() => { })
-onMounted(() => { })
-defineExpose({ state })
+const state = reactive({});
+onBeforeMount(() => {});
+onMounted(() => {});
+defineExpose({ state });
 const medicalOrderManagementData = ref([
   {
     id: 1,
@@ -102,58 +123,78 @@ const medicalOrderManagementData = ref([
         age: 10,
         gender: '男',
         content: '维生素B12注射液【1ml：0.5mg*1】  ',
-        dates: [{
-          date: '05/04',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }, {
-          date: '05/05',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }]
-      }, {
+        dates: [
+          {
+            date: '05/04',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+          {
+            date: '05/05',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+        ],
+      },
+      {
         name: '',
         age: 10,
         gender: '男',
         content: '维生素B12注射液【1ml：0.5mg*1】  ',
-        dates: [{
-          date: '05/04',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }, {
-          date: '05/05',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }]
-      }]
+        dates: [
+          {
+            date: '05/04',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+          {
+            date: '05/05',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+        ],
+      },
+    ],
   },
   {
     id: 2,
@@ -167,99 +208,113 @@ const medicalOrderManagementData = ref([
         age: 10,
         gender: '男',
         content: '维生素B12注射液【1ml：0.5mg*1】  ',
-        dates: [{
-          date: '05/04',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }, {
-          date: '05/05',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }]
-      }, {
+        dates: [
+          {
+            date: '05/04',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+          {
+            date: '05/05',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+        ],
+      },
+      {
         name: '',
         age: 10,
         gender: '男',
         content: '维生素B12注射液【1ml：0.5mg*1】  ',
-        dates: [{
-          date: '05/04',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }, {
-          date: '05/05',
-          times: [{
-            time: '08:00',
-            nurse: '刘护士',
-            checked: false
-          }, {
-            time: '12:00',
-            nurse: '刘护士',
-            checked: false
-          }]
-        }]
-      }]
-  }
-])
+        dates: [
+          {
+            date: '05/04',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+          {
+            date: '05/05',
+            times: [
+              {
+                time: '08:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+              {
+                time: '12:00',
+                nurse: '刘护士',
+                checked: false,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]);
 
-const arraySpanMethod = ({
-  row,
-  column,
-  rowIndex,
-  columnIndex,
-}: any) => {
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
   console.log(row, column, rowIndex, columnIndex);
   // 如果是父级行
   if (row.children && row.children.length > 0) {
     if (columnIndex === 0) {
-      return [1, 1]
+      return [1, 1];
     }
     // 如果是患者列
     if (columnIndex === 1) {
-      return [1, 6]
-    }
-    else {
-      return [1, 0]
+      return [1, 6];
+    } else {
+      return [1, 0];
     }
   }
   // 如果是子级行，显示其他列
   if (!row.children || row.children.length == 0) {
-    return [1, 1]
+    return [1, 1];
   }
   // 如果是父级行，隐藏其他列
-  return [1, 1]
-}
+  return [1, 1];
+};
 const statusOptions = [
   { value: '未执行', label: '未执行' },
   { value: '已执行', label: '已执行' },
   { value: '不执行', label: '不执行' },
-  { value: '取消执行', label: '取消执行' }
-]
+  { value: '取消执行', label: '取消执行' },
+];
 const typeOptions = [
   { value: '全部', label: '全部' },
   { value: '长期', label: '长期' },
-  { value: '临时', label: '临时' }
-]
+  { value: '临时', label: '临时' },
+];
 const executionTypeOptions = [
   { value: '全部', label: '全部' },
   { value: '口服单', label: '口服单' },
@@ -267,8 +322,8 @@ const executionTypeOptions = [
   { value: '针剂单', label: '针剂单' },
   { value: '雾化单', label: '雾化单' },
   { value: '治疗单', label: '治疗单' },
-  { value: '其他', label: '其他' }
-]
+  { value: '其他', label: '其他' },
+];
 const searchForm = reactive({
   searchVal: '',
   patientStatus: '未执行',
@@ -276,9 +331,8 @@ const searchForm = reactive({
   timeRange: [],
   executionType: '全部',
   isPrintExecution: true,
-  isPrintLabel: true
-})
-
+  isPrintLabel: true,
+});
 </script>
 <style lang="scss" scoped>
 .medicalOrderManagement-container {
diff --git a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue
similarity index 98%
rename from vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue
index 433d72d0..d5a2d9f3 100644
--- a/vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/components/execute/patientList.vue
@@ -50,7 +50,7 @@
   </div>
 </template>
 
-<script setup >
+<script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { Expand, Fold, Refresh } from '@element-plus/icons-vue'
 
@@ -110,7 +110,7 @@ const patientListData = ref([
 
 const selectedRows = ref<any[]>([])
 
-const handleSelectionChange = (selection: any[]) => {
+const handleSelectionChange = (selection) => {
   selectedRows.value = selection
 }
 </script>
diff --git a/vue3/src/views/inpatientNurse/medicalOrderManagement/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/index.vue
similarity index 94%
rename from vue3/src/views/inpatientNurse/medicalOrderManagement/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/index.vue
index 73e97838..7eb84ab0 100644
--- a/vue3/src/views/inpatientNurse/medicalOrderManagement/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderManagement/index.vue
@@ -24,15 +24,12 @@
     <el-tab-pane label="查询与打印">查询与打印</el-tab-pane>
   </el-tabs>
 </template>
-<script setup >
+<script setup lang="ts">
 import { onBeforeMount, onMounted, reactive, ref } from 'vue'
 import CheckPatientList from './components/check/patientList.vue'
 import CheckMedicalOrderManagement from './components/check/MedicalOrderManagement.vue'
 import ExecutePatientList from './components/execute/patientList.vue'
 import ExecuteMedicalOrderManagement from './components/execute/MedicalOrderManagement.vue'
-// const { proxy } = getCurrentInstance()
-// const emits = defineEmits([])
-// const props = defineProps({})
 
 const transferInDialogVisible = ref(false)
 const signEntryDialogVisible = ref(false)
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/api.js
new file mode 100644
index 00000000..5d7b332c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/api.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+/**
+ * 获取住院患者列表
+ */
+export function getPatientList(queryParams) {
+  return request({
+    url: '/nurse-station/advice-process/inpatient',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 获取当前登录人管理病区
+ */
+export function getWardList(queryParams) {
+  return request({
+    url: '/app-common/practitioner-ward',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 获取当前选中患者全部医嘱
+ */
+export function getPrescriptionList(queryParams) {
+  return request({
+    url: '/nurse-station/advice-process/inpatient-advice',
+    method: 'get',
+    params: queryParams
+  })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/patientList.vue
new file mode 100644
index 00000000..bdb2e371
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/patientList.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <div>
+      <el-input placeholder="住院号/姓名">
+        <template #append>
+          <el-button icon="Search" @click="getPatientList" />
+        </template>
+      </el-input>
+    </div>
+    <el-tree
+      ref="treeRef"
+      :load="loadNode"
+      lazy
+      show-checkbox
+      node-key="id"
+      default-expand-all
+      :props="{ label: 'name', children: 'children' }"
+      @node-click="handleNodeClick"
+      @check="handleCheckChange"
+      @node-expand="onNodeExpand"
+    >
+      <template #default="{ node, data }">
+        <div class="custom-tree-node" v-if="node.level === 2">
+          <span>{{ data.bedName + ' / ' + node.label }}</span>
+          <span class="tree-node-actions">
+            {{ data.genderEnum_enumText + ' / ' + data.age }}
+          </span>
+        </div>
+      </template>
+    </el-tree>
+  </div>
+</template>
+
+<script setup>
+import { getPatientList, getWardList } from './api';
+import { updatePatientInfoList } from '../store/patient';
+import { nextTick, onMounted } from 'vue';
+
+const treeRef = ref(null);
+const allNodesLoaded = ref(false);
+// 树节点加载完成后的回调
+function onTreeLoaded() {
+  if (!allNodesLoaded.value && treeRef.value) {
+    // 等待DOM更新后设置全选
+    nextTick(() => {
+      // 获取所有节点并设置为选中状态
+      const allNodes = getAllNodes(treeRef.value.store.root.childNodes);
+      const allKeys = allNodes.map((node) => node.key);
+
+      treeRef.value.setCheckedKeys(allKeys, true); // 第二个参数设为true表示级联选中
+      allNodesLoaded.value = true;
+    });
+  }
+}
+
+// 递归获取所有节点
+function getAllNodes(nodes) {
+  let result = [];
+  if (nodes && nodes.length > 0) {
+    nodes.forEach((node) => {
+      result.push(node);
+      if (node.childNodes && node.childNodes.length > 0) {
+        result = result.concat(getAllNodes(node.childNodes));
+      }
+    });
+  }
+  return result;
+}
+
+function loadNode(node, resolve) {
+  // 初始加载：获取所有病区（父级节点）
+  if (node.level === 0) {
+    getWardList().then((res) => {
+      // 确保病区节点不是叶子节点
+      const wards = res.map((ward) => ({
+        ...ward,
+        leaf: false,
+      }));
+      return resolve(wards);
+    });
+  }
+  // 展开病区节点时：获取该病区下的患者列表
+  else if (node.level === 1) {
+    const wardId = node.data.id;
+    getPatientList({ wardId: wardId }).then((res) => {
+      let children = res.data.records.map((item) => {
+        return {
+          leaf: true, // 患者节点为叶子节点
+          ...item,
+          name: item.patientName,
+        };
+      });
+      return resolve(children);
+    });
+  }
+  // 更深层级直接返回空数组
+  else {
+    return resolve([]);
+  }
+}
+
+// 获取所有选中的子节点（叶子节点）
+function getCheckedLeafNodes() {
+  if (!treeRef.value) return [];
+
+  // 获取所有选中的节点key
+  const checkedKeys = treeRef.value.getCheckedKeys();
+  // 获取所有半选中的节点key（父节点）
+  const halfCheckedKeys = treeRef.value.getHalfCheckedKeys();
+
+  // 获取所有选中的节点数据
+  const checkedNodes = treeRef.value.getCheckedNodes();
+
+  // 只返回叶子节点（患者节点）
+  return checkedNodes.filter((node) => node.leaf === true);
+}
+
+// 处理节点选中状态变化
+function handleCheckChange(data, checked) {
+  // 可以在这里处理选中状态变化的逻辑
+  let list = getCheckedLeafNodes();
+  console.log(list, '2345678');
+
+  updatePatientInfoList(list);
+}
+</script>
+
+<style scoped lang="scss">
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.tree-node-actions {
+  display: flex;
+  align-items: center;
+}
+
+:deep(.el-tree-node__content) {
+  height: 35px;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
new file mode 100644
index 00000000..e3677d3f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
@@ -0,0 +1,216 @@
+<template>
+  <div style="height: calc(100vh - 126px)">
+    <div
+      style="
+        height: 51px;
+        border-bottom: 2px solid #e4e7ed;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      "
+    >
+      <div>
+        <el-radio-group v-model="type" class="ml20" @change="handleRadioChange">
+          <el-radio :label="1">全部</el-radio>
+          <el-radio :label="2">长期</el-radio>
+          <el-radio :label="3">临时</el-radio>
+        </el-radio-group>
+        <el-button class="ml20" type="primary" plain @click="handleGetPrescription">
+          查询
+        </el-button>
+      </div>
+      <div>
+        <span class="descriptions-item-label">全选：</span>
+        <el-switch/>
+        <el-button class="ml20" type="primary"> 核对通过 </el-button>
+        <el-button class="ml20 mr20" type="danger"> 退回 </el-button>
+      </div>
+    </div>
+    <div
+      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
+      v-loading="loading"
+    >
+      <el-collapse
+        v-model="activeNames"
+        expand-icon-position="left"
+        v-if="prescriptionList.length > 0"
+        style="
+          border-bottom: 0px;
+          border-top: 0px;
+          border-radius: 0px;
+          overflow-y: auto;
+          max-height: calc(100vh - 200px);
+        "
+      >
+        <el-collapse-item
+          v-for="(item, index) in prescriptionList"
+          :key="index"
+          :name="item[0].encounterId"
+          style="
+            border: 2px solid #e4e7ed;
+            border-radius: 8px;
+            margin-bottom: 10px;
+            overflow: hidden;
+          "
+        >
+          <template #title>
+            <span>11床【202501010101】</span>
+            <span>张先生/男/20岁</span>
+            <span>自费</span>
+          </template>
+          <el-table :data="item" border :header-cell-style="{ background: '#eef9fd !important' }">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="类型" align="center" prop="therapyEnum_enumText" width="80">
+              <template #default="scope">
+                <span :style="scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5'">
+                  {{ scope.row.therapyEnum_enumText }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="医嘱内容" prop="adviceName" />
+            <el-table-column label="开始/终止" prop="requestTime" width="230" />
+            <el-table-column label="预计执行" prop="times">
+              <template #default="scope">
+                <div
+                  v-for="(item, timeIndex) in scope.row.times"
+                  :key="timeIndex"
+                  style="padding-bottom: 5px"
+                >
+                  <span>{{ item }}</span>
+                  <el-checkbox-group
+                    v-model="scope.row.checkedRates[timeIndex]"
+                    style="display: inline-block; margin-left: 15px"
+                  >
+                    <el-checkbox
+                      v-for="(rateItem, rateIndex) in scope.row.rate"
+                      :key="rateIndex"
+                      :value="rateItem"
+                      border
+                      size="small"
+                      style="margin-right: 15px"
+                    >
+                      {{ rateItem }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+      <el-empty v-else description="点击查询获取患者医嘱信息"></el-empty>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { getPrescriptionList } from './api';
+import { patientInfoList } from '../store/patient.js';
+import { formatDate, formatDateStr } from '@/utils/index';
+
+const activeNames = ref([]);
+const prescriptionList = ref([]);
+const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
+const type = ref(1);
+const { proxy } = getCurrentInstance();
+const loading = ref(false);
+
+function handleGetPrescription() {
+  if (patientInfoList.value.length > 0) {
+    loading.value = true;
+    let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
+    getPrescriptionList({ encounterIds: encounterIds, pageSize: 10000, pageNo: 1 }).then((res) => {
+      // try {
+        // 根据encounterId分组
+        const groupedPrescriptions = res.data.records.reduce((groups, prescription) => {
+          // 获取当前医嘱全部执行频次
+          let rate = prescription.dayTimes?.split(',');
+          let times = getDateRange(prescription.requestTime, deadline.value);
+          prescription.times = times;
+          prescription.rate = rate;
+
+          // 添加复选框状态管理
+          prescription.checkedRates = {};
+          if (rate) {
+            times.forEach((time, index) => {
+              // 默认选中所有执行频次
+              prescription.checkedRates[index] = [...rate];
+            });
+          }
+
+          const encounterId = prescription.encounterId;
+          if (!groups[encounterId]) {
+            groups[encounterId] = [];
+          }
+          if (!activeNames.value.includes(encounterId)) {
+            activeNames.value.push(encounterId);
+          }
+          groups[encounterId].push(prescription);
+          return groups;
+        }, {});
+
+        // 将分组结果转换为数组形式
+        prescriptionList.value = Object.values(groupedPrescriptions);
+        console.log(prescriptionList.value, '1111');
+        loading.value = false;
+      // } catch {
+      //   loading.value = false;
+      // }
+    });
+  } else {
+    proxy.$message.warning('请选择患者');
+  }
+}
+
+/**
+ * 计算两个日期之间的所有日期（包含起始和结束日期）
+ * @param {string|Date} startDate - 开始日期
+ * @param {string|Date} endDate - 结束日期
+ * @returns {Array<string>} 格式为MM-DD的日期数组
+ */
+function getDateRange(startDate, endDate) {
+  const start = new Date(startDate);
+  const end = new Date(endDate);
+
+  // 重置时间部分，只保留日期
+  start.setHours(0, 0, 0, 0);
+  end.setHours(0, 0, 0, 0);
+
+  const dates = [];
+  const current = new Date(start);
+
+  // 循环添加日期直到结束日期
+  while (current <= end) {
+    // 格式化为MM-DD
+    const month = String(current.getMonth() + 1).padStart(2, '0');
+    const day = String(current.getDate()).padStart(2, '0');
+    dates.push(`${month}-${day}`);
+
+    // 移动到下一天
+    current.setDate(current.getDate() + 1);
+  }
+  return dates;
+}
+
+// 处理后端返回的时间集合
+function handleTime() {}
+</script>
+
+<style scoped>
+.el-collapse-icon-position-left :deep(.el-collapse-item__header) {
+  padding: 10px;
+}
+
+:deep(.el-collapse-item__wrap) {
+  padding: 10px;
+}
+
+/* 表头背景色 */
+:deep(.prescription-table .el-table__header th) {
+  background-color: #eef9fd !important;
+}
+
+:deep(.el-table__row:hover > td) {
+  background-color: #eef9fd !important; 
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
new file mode 100644
index 00000000..a7a935dc
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <div style="display: flex; justify-content: space-between">
+    <div style="width: 20%; height: 90vh; border-right: solid 2px #e4e7ed">
+      <div
+        style="
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          border-bottom: solid 2px #e4e7ed;
+        "
+      >
+        <el-icon
+          @click="refresh"
+          class="refresh-icon"
+          style="cursor: pointer; font-size: 20px; margin-right: 10px"
+        >
+          <Refresh />
+        </el-icon>
+      </div>
+      <el-tabs v-model="active" class="demo-tabs centered-tabs tab-header" @tab-click="handleClick">
+        <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
+          <PatientList />
+        </el-tab-pane>
+        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
+          <PatientList />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div style="width: 100%">
+      <el-tabs v-model="activeName" class="demo-tabs centered-tabs" @tab-click="handleClick">
+        <el-tab-pane label="未校对" name="first">
+          <PrescriptionList />
+        </el-tab-pane>
+        <el-tab-pane label="已校对" name="second">Config</el-tab-pane>
+        <el-tab-pane label="已停止" name="third">Role</el-tab-pane>
+        <el-tab-pane label="已作废" name="fourth">Task</el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import PatientList from './components/patientList.vue';
+import PrescriptionList from './components/prescriptionList.vue';
+
+const activeName = ref('first');
+const active = ref('first');
+</script>
+
+<style scoped>
+.centered-tabs :deep(.el-tabs__nav-wrap) {
+  display: flex;
+  justify-content: center;
+}
+
+.centered-tabs :deep(.el-tabs__nav-scroll) {
+  display: flex;
+  justify-content: center;
+}
+
+.tab-header :deep(.el-tabs__item){
+  height: 50px !important
+}
+
+.centered-tabs :deep(.el-tabs__nav) {
+  display: flex;
+  justify-content: center;
+}
+:deep(.el-tabs__header){
+  margin: 0;
+}
+
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/store/patient.js b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/store/patient.js
new file mode 100644
index 00000000..db579a0a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/store/patient.js
@@ -0,0 +1,12 @@
+// 选择患者信息
+export const patientInfo = ref()
+export function updatePatientInfo(info) {
+  patientInfo.value = info
+}
+
+// 多选患者
+export const patientInfoList = ref([])
+export function updatePatientInfoList(info) {
+  patientInfoList.value = info
+}
+
diff --git a/vue3/src/views/inpatientNurse/nursingRecord/components/addNursingRecordDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/components/addNursingRecordDialog.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/nursingRecord/components/addNursingRecordDialog.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/components/addNursingRecordDialog.vue
diff --git a/vue3/src/views/inpatientNurse/nursingRecord/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/components/api.js
similarity index 100%
rename from vue3/src/views/inpatientNurse/nursingRecord/components/api.js
rename to openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/components/api.js
diff --git a/vue3/src/views/inpatientNurse/nursingRecord/components/recordTemplate.vue b/openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/components/recordTemplate.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/nursingRecord/components/recordTemplate.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/components/recordTemplate.vue
diff --git a/vue3/src/views/inpatientNurse/nursingRecord/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/nursingRecord/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/nursingRecord/index.vue
diff --git a/vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue
diff --git a/vue3/src/views/inpatientNurse/tprChart/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/api.js
similarity index 100%
rename from vue3/src/views/inpatientNurse/tprChart/components/api.js
rename to openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/api.js
diff --git a/vue3/src/views/inpatientNurse/tprChart/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
similarity index 100%
rename from vue3/src/views/inpatientNurse/tprChart/index.vue
rename to openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
diff --git a/vue3/src/views/login.vue b/openhis-ui-vue3/src/views/login.vue
similarity index 80%
rename from vue3/src/views/login.vue
rename to openhis-ui-vue3/src/views/login.vue
index 110c52d8..6490215b 100644
--- a/vue3/src/views/login.vue
+++ b/openhis-ui-vue3/src/views/login.vue
@@ -5,7 +5,7 @@
       <el-image :src="logoNew"></el-image>
     </div> -->
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h1 class="title">his管理系统</h1>
+      <h1 class="title">医院信息管理系统</h1>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -43,12 +43,12 @@
           clearable
           filterable
         >
-        <el-option
-          v-for="item in tenantOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
+          <el-option
+            v-for="item in tenantOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
       <!--<el-form-item prop="code" v-if="captchaEnabled">
@@ -79,52 +79,6 @@
           <span v-else-if="!signIng">登 录 中...</span>
           <span v-else>连接医保中...</span>
         </el-button>
-        <div style="margin-top: 10px" v-if="env === 'development'">
-          <el-button
-            :loading="loading"
-            link
-            type="primary"
-            style="width: 20%"
-            @click.prevent="handleUserName('admin')"
-          >
-            管理员
-          </el-button>
-          <el-button
-            :loading="loading"
-            link
-            type="primary"
-            style="width: 20%"
-            @click.prevent="handleUserName('doctor')"
-          >
-            医生
-          </el-button>
-          <el-button
-            :loading="loading"
-            link
-            type="primary"
-            style="width: 20%"
-            @click.prevent="handleUserName('drug')"
-          >
-            药房
-          </el-button>
-          <!-- <el-button
-            :loading="loading"
-            type="primary"
-            style="width: 20%"
-            @click.prevent="handleUserName()"
-          >
-          款台
-          </el-button> -->
-          <el-button
-            :loading="loading"
-            link
-            type="primary"
-            style="width: 20%"
-            @click.prevent="handleUserName('nurse')"
-          >
-            护士
-          </el-button>
-        </div>
         <div style="float: right" v-if="register">
           <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
@@ -151,7 +105,8 @@
 </template>
 
 <script setup>
-import { getCodeImg ,sign ,getUserBindTenantList } from '@/api/login';
+import { getCodeImg, sign, getUserBindTenantList } from '@/api/login';
+import { invokeYbPlugin } from '@/api/public';
 import Cookies from 'js-cookie';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
 import useUserStore from '@/store/modules/user';
@@ -216,7 +171,7 @@ function handleLogin() {
       // 调用action的登录方法
       userStore
         .login(loginForm.value)
-        .then(() => {
+        .then(async () => {
           const query = route.query;
           const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
             if (cur !== 'redirect') {
@@ -224,7 +179,7 @@ function handleLogin() {
             }
             return acc;
           }, {});
-          if (chrome.webview === undefined) {
+          if (env === 'development') {
             router.push({ path: redirect.value || '/', query: otherQueryParams });
           } else {
             signIng.value = true;
@@ -242,41 +197,62 @@ function handleLogin() {
     }
   });
 }
+
 // 获取MAC 加密地址
 async function GetMacString() {
-  if (chrome.webview === undefined) {
-  } else {
-    try {
-      // 必须参数
-      const data = {
-        IP: 'ddjk.jlhs.gov.cn',
-        PORT: 20215,
-        TIMEOUT: 50,
-        LOG_PATH: 'C:/neu_log/',
-        SFZ_DRIVER_TYPE: 0,
-      };
-      // 获取 mac 地址
-      let result = await window.chrome.webview.hostObjects.CSharpAccessor.GetMacString(
-        JSON.stringify(data)
-      );
-      if (result === undefined) {
-        alert('获取 mac 地址失败！');
-        return;
+  // if (window.CefSharp === undefined) {
+  // } else {
+  try {
+    // 必须参数
+    const data = {
+      FunctionId: 5,
+      IP: 'ddjk.jlhs.gov.cn',
+      PORT: 20215,
+      TIMEOUT: 2000,
+      LOG_PATH: 'C:/neu_log/',
+      SFZ_DRIVER_TYPE: 0,
+    };
+    // 获取 mac 地址
+    // let result = await window.chrome.webview.hostObjects.CSharpAccessor.GetMacString(
+    //   JSON.stringify(data)
+    // );
+    // 获取IP地址
+    // let ip = await window.chrome.webview.hostObjects.CSharpAccessor.GetIpString();
+
+    // 获取 mac 地址 兼容win7 start--------------------------------------
+    let result = undefined;
+    // await CefSharp.BindObjectAsync('boundAsync');
+    // console.log(boundAsync);
+
+    // await boundAsync.getMacString(JSON.stringify(data)).then((res) => {
+    //   result = res
+    // });
+    await invokeYbPlugin(data).then((res) => {
+      result = res.data;
+      if (result === undefined || result === '' || result === ' ') {
+        throw new Error('获取 mac 地址失败');
       }
-      let ip = await window.chrome.webview.hostObjects.CSharpAccessor.GetIpString();
-      if (ip === undefined) {
-        alert('获取 ip 地址失败！');
-        return;
+    });
+    // 获取ip地址
+    let ip = undefined;
+    // await boundAsync.getIpString().then((res) => {
+    //   ip = res;
+    // });
+    await invokeYbPlugin({ FunctionId: 6 }).then((res) => {
+      ip = res.data;
+      if (ip === undefined || ip === '' || ip === ' ') {
+        throw new Error('获取 ip 地址失败');
       }
-      // 医保签到
-      signIn(result, ip);
-      // 解析返回的结果
-      console.log('result', result);
-      // let cardInfo = JSON.parse(jsonResult);
-    } catch (error) {
-      console.error('调用失败:', error);
-    }
+    });
+    // 医保签到
+    signIn(result, ip);
+    // end--------------------------------------
+    // 解析返回的结果
+    // let cardInfo = JSON.parse(jsonResult);
+  } catch (error) {
+    console.error('调用失败:', error);
   }
+  // }
 }
 function getCode() {
   getCodeImg().then((res) => {
@@ -290,23 +266,23 @@ function getCode() {
 
 //账号变化时
 function handleUsernameChange(newVal) {
-  getTenantList(newVal); 
+  getTenantList(newVal);
 }
 
 //查询租户列表
 function getTenantList(username) {
-  if(!username){
+  if (!username) {
     return;
   }
   getUserBindTenantList(username).then((res) => {
-    loginForm.value.tenantId = ''
-    if(res.code == 200){
-      if(res.data.length > 0){
-        tenantOptions.value = res.data.map(item => ({
+    loginForm.value.tenantId = '';
+    if (res.code == 200) {
+      if (res.data.length > 0) {
+        tenantOptions.value = res.data.map((item) => ({
           value: item.id,
-          label: item.tenantName
+          label: item.tenantName,
         }));
-        loginForm.value.tenantId = tenantOptions.value[0].value;//默认选中第一个
+        loginForm.value.tenantId = tenantOptions.value[0].value; //默认选中第一个
       }
     }
   });
@@ -390,7 +366,7 @@ function handleUserName(value) {
 //getCode();
 getCookie();
 
-getTenantList(loginForm.value.username)
+getTenantList(loginForm.value.username);
 </script>
 
 <style lang="scss" scoped>
@@ -426,7 +402,6 @@ getTenantList(loginForm.value.username)
     width: 14px;
     margin-left: 0px;
   }
-  
 }
 .login-tip {
   font-size: 13px;
diff --git a/vue3/src/views/medicationmanagement/billapproval/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/billapproval/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/billapproval/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/billapproval/components/api.js
diff --git a/vue3/src/views/medicationmanagement/billapproval/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/billapproval/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/api.js
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
similarity index 90%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
index a1b1a722..57cdfd9e 100644
--- a/vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
@@ -151,7 +151,7 @@
               >
             </el-col>
           </el-row>
-        <el-form :model="form" :rules="tableRules" ref="formRef">
+        <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'apply'">
           <el-table
             v-loading="loading"
             :data="form.purchaseinventoryList"
@@ -449,21 +449,21 @@
             <el-table-column
               label="实盘数量"
               align="center"
-              key="totalSourceQuantity"
-              prop="totalSourceQuantity"
+              key="totalQuantity"
+              prop="totalQuantity"
               width="110"
               :show-overflow-tooltip="true"
             >
               <template #default="scope">
                 <el-form-item
-                  :prop="`purchaseinventoryList.${scope.$index}.totalSourceQuantity`"
-                  :rules="tableRules.totalSourceQuantity"
+                  :prop="`purchaseinventoryList.${scope.$index}.totalQuantity`"
+                  :rules="tableRules.totalQuantity"
                 >
                   <el-input
-                    v-model="scope.row.totalSourceQuantity"
+                    v-model="scope.row.totalQuantity"
                     placeholder=""
                     :disabled="viewStatus == 'view'"
-                    @change="totalSourceQuantityChange(scope.row, scope.$index, scope.row.totalSourceQuantity)"
+                    @change="totalQuantityChange(scope.row, scope.$index, scope.row.totalQuantity)"
                   />
                 </el-form-item>
               </template>
@@ -649,7 +649,7 @@
                     :prop="`purchaseinventoryList.${scope.$index}.traceNo`"
                     :rules="tableRules.traceNo"
                   >
-                    <el-input v-model="scope.row.traceNo" :disabled="viewStatus == 'view'" placeholder="" :id ="'traceNo'+`${scope.$index}`"
+                    <el-input @change="(value) => handleTraceNo(value, scope.row, scope.$index)" v-model="scope.row.traceNo" :disabled="viewStatus == 'view'" placeholder="" :id ="'traceNo'+`${scope.$index}`"
                     />
                   </el-form-item>
                 </el-tooltip>
@@ -727,57 +727,7 @@
         </el-row>
       </el-col>
     </el-row>
-    <el-dialog
-      title="药品追溯码"
-      v-model="openTraceNo"
-      width="800"
-      append-to-body
-      destroy-on-close
-      :draggable="true"
-      @opened="
-        () => {
-          console.log(123);
-          traceNoTempRef.focus();
-        }
-      "
-    >
-      <div>
-        <div style="font-size: 16px">
-          <span style="margin-right: 20px">药品名称： {{ medName }}</span>
-          选择追溯码
-          <el-input
-            ref="traceNoTempRef"
-            v-model="traceNoTemp"
-            style="width: 260px; margin-right: 20px"
-            @input="throttledGetList"
-          />
-          <el-button
-            type="warning"
-            plain
-            icon="CircleClose"
-            @click="handleClear"
-            style="float: right"
-          >
-            清除
-          </el-button>
-        </div>
-        <el-input
-          ref="inputRef"
-          v-model="traceNo"
-          type="textarea"
-          :rows="15"
-          disabled
-          @input="throttledGetList"
-          style="width: 100%; margin-top: 10px; margin-right: 20px"
-        />
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submit">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <TraceNoDialog :ypName="ypName" :openDialog="openTraceNoDialog" @submit="submit" :rowData="rowData" @cancel="openTraceNoDialog = false"/>
   </div>
 </template>
 
@@ -799,9 +749,9 @@ import {
 } from "../components/api";
 import PopoverList from "@/components/OpenHis/popoverList/index.vue";
 import MedicineList from "../components/medicineList.vue";
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import { formatDate,formatDateymd } from "@/utils/index";
 import { ref } from "vue";
-import { debounce } from 'lodash-es';
 
 const router = useRouter();
 const route = useRoute();
@@ -831,13 +781,9 @@ const row = ref({});
 const rowIndex = ref(-1);
 const totalAmount = ref(0);
 const rowList = ref([])
-const openTraceNo = ref(false)
-const traceNo = ref('');
-const traceNoList = ref([]);
-const traceNoTemp = ref('');
-const traceNoTempRef = ref();
+const openTraceNoDialog = ref(false)
+const ypName = ref("");
 const currentIndex = ref("");
-const medName = ref("");
 const props = defineProps({
   // 仓库
   purposeTypeListOptions: {
@@ -865,6 +811,7 @@ const props = defineProps({
     required: false,
   },
 });
+const rowData = ref({})
 
 const form = reactive({
   purchaseinventoryList: [],
@@ -906,7 +853,7 @@ const data = reactive({
     itemQuantity: [
       { required: true, message: "盈亏数量不能为空", trigger: "blur" },
     ],
-    totalSourceQuantity:[
+    totalQuantity:[
       { required: true, message: "实盘数量不能为空", trigger: "blur" },
     ],
     // reasonCode: [
@@ -1030,38 +977,10 @@ function addNewRow() {
     }
   });
 }
-function handleScan(row,index){
-  medName.value = row.itemName
-  openTraceNo.value = true;
-  currentIndex.value = index
-}
-function handleClear() {
-  traceNo.value = '';
-  traceNoList.value = [];
-}
-const throttledGetList = debounce(handelTraceNo, 500);
-function handelTraceNo(value) {
-  traceNoList.value.push(value);
-  traceNo.value = traceNo.value + '[' + traceNoList.value.length + ']' + '  ' + value + '\n';
-  traceNoTemp.value = '';
-  // let saveValue = value.substring(inputValue.length + 5, value.length);
-  // inputValue = value;
-  // console.log(value);
-  // console.log(saveValue);
-  // traceNoList.value.push(saveValue);
-  // traceNo.value = value + '[' + (traceNoList.value.length + 1) + ']' + '  ';
-}
-function cancel() {
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
-}
 
-function submit(){
-  form.purchaseinventoryList[currentIndex.value].traceNo = traceNoList.value.join(',');
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
+function submit(value){
+  form.purchaseinventoryList[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
 }
 
 function formatContent(value){
@@ -1075,6 +994,8 @@ function formatContent(value){
 }
 
 function handleBlur(row, index) {
+  console.log(row)
+  debugger
   let hasError = false;
     for (let key in row) {
     if(!row[key]){
@@ -1094,11 +1015,11 @@ function handleBlur(row, index) {
     row.itemQuantity = 0 
     row.profitAmount = 0
   }
-  if(row.totalSourceQuantity==0 || !row.totalSourceQuantity ){
-    row.totalSourceQuantity = 0
+  if(row.totalQuantity==0 || !row.totalQuantity ){
+    row.totalQuantity = 0
     row.totalPrice = 0
   }
-  row.totalSourceQuantity = Number(row.totalSourceQuantity)
+  row.totalQuantity = Number(row.totalQuantity)
   console.log(receiptHeaderForm,row,"receiptHeaderForm")
   // row.sourceLocationId =receiptHeaderForm.sourceLocationId
   // row.sourceLocationStoreId = receiptHeaderForm.sourceLocationStoreId;
@@ -1116,7 +1037,7 @@ function handleBlur(row, index) {
   let purposeLocationId = purposeTypeListOptions.value.filter(e=> e.name==receiptHeaderForm.purposeLocationId)
   row.purposeLocationId = (purposeLocationId&&purposeLocationId[0])?purposeLocationId[0].id:receiptHeaderForm.purposeLocationId
   row.applicantId = userStore.id
-  if(row.totalPurposeQuantity==row.totalSourceQuantity){
+  if(row.totalPurposeQuantity==row.totalQuantity){
     row.itemQuantity = 0
     row.profitAmount = 0
   }
@@ -1180,7 +1101,7 @@ function selectRow(rowValue, index) {
 //   form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
 //   form.purchaseinventoryList[index].price = rowValue.purchasePrice;
 //   form.purchaseinventoryList[index].totalQuantity = rowValue.quantity;
-//   form.purchaseinventoryList[index].totalSourceQuantity = '';
+//   form.purchaseinventoryList[index].totalQuantity = '';
 //   form.purchaseinventoryList[index].totalPrice = '';
 //   form.purchaseinventoryList[index].itemQuantity = '';
 //   form.purchaseinventoryList[index].reasonCode = '';
@@ -1216,7 +1137,7 @@ function handleLocationClick(purposeLocationId,itemId,index,lotNumber) {
     if (res.data&&res.data[0]) {
       form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || "";
       form.purchaseinventoryList[index].totalPurposeQuantity = res.data[0].orgQuantity || 0;
-      form.purchaseinventoryList[index].totalSourceQuantity = res.data[0].objQuantity || 0;
+      form.purchaseinventoryList[index].totalQuantity = res.data[0].objQuantity || 0;
       // 单价
       form.purchaseinventoryList[index].traceNo = res.data[0].traceNo || "";
       form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || "";
@@ -1244,7 +1165,7 @@ function handleLocationClick(purposeLocationId,itemId,index,lotNumber) {
       }
     }else {
       form.purchaseinventoryList[index].totalPurposeQuantity = 0;
-      form.purchaseinventoryList[index].totalSourceQuantity = 0
+      form.purchaseinventoryList[index].totalQuantity = 0
       form.purchaseinventoryList[index].price = 0;
       proxy.$message.warning('仓库数量为0，无法调用！');
     }
@@ -1258,12 +1179,12 @@ function handleUnitCodeChange(row, index, value) {
     return     
   }
   if (row.minUnitCode == value) { //最小计量单位
-    form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].oldtotalSourceQuantity?form.purchaseinventoryList[index].oldtotalSourceQuantity:form.purchaseinventoryList[index].totalSourceQuantity
+    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity?form.purchaseinventoryList[index].oldtotalQuantity:form.purchaseinventoryList[index].totalQuantity
     form.purchaseinventoryList[index].totalPurposeQuantity = form.purchaseinventoryList[index].oldtotalPurposeQuantity?form.purchaseinventoryList[index].oldtotalPurposeQuantity:form.purchaseinventoryList[index].totalPurposeQuantity
     form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
     form.purchaseinventoryList[index].itemQuantity = 0
     form.purchaseinventoryList[index].totalPrice = 0
-    form.purchaseinventoryList[index].totalSourceQuantity = 0
+    form.purchaseinventoryList[index].totalQuantity = 0
     form.purchaseinventoryList[index].profitAmount = 0
     // 单价
     form.purchaseinventoryList[index].price =
@@ -1273,7 +1194,7 @@ function handleUnitCodeChange(row, index, value) {
   } else {  // 切换成大的计量单位
     form.purchaseinventoryList[index].itemQuantity = 0
     form.purchaseinventoryList[index].totalPrice = 0
-    form.purchaseinventoryList[index].totalSourceQuantity = 0
+    form.purchaseinventoryList[index].totalQuantity = 0
     form.purchaseinventoryList[index].profitAmount = 0
     getMaxCounts(row,index)
   }
@@ -1298,8 +1219,8 @@ function getMaxCounts(row,index,counts){
       form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity*row.partPercent
       form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
 
-      form.purchaseinventoryList[index].oldtotalSourceQuantity = form.purchaseinventoryList[index].itemQuantity*row.partPercent
-      form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity
+      form.purchaseinventoryList[index].oldtotalQuantity = form.purchaseinventoryList[index].itemQuantity*row.partPercent
+      form.purchaseinventoryList[index].itemMaxtotalQuantity = form.purchaseinventoryList[index].totalQuantity
 
       const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
       const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
@@ -1309,15 +1230,15 @@ function getMaxCounts(row,index,counts){
         (decimalPart*row.partPercent).toFixed(0) +
         form.purchaseinventoryList[index].minUnitCode_dictText
       }
-      const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalSourceQuantity/row.partPercent); // 获取整数部分
-      const decimalPart2 = (form.purchaseinventoryList[index].totalSourceQuantity/row.partPercent) - integerPart2; // 获取小数部分
+      const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalQuantity/row.partPercent); // 获取整数部分
+      const decimalPart2 = (form.purchaseinventoryList[index].totalQuantity/row.partPercent) - integerPart2; // 获取小数部分
 
       if(decimalPart2){
-        form.purchaseinventoryList[index].totalSourceQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
+        form.purchaseinventoryList[index].totalQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
         (decimalPart2*row.partPercent).toFixed(0) +
         form.purchaseinventoryList[index].unitList.minUnitCode_dictText
       }else{
-        form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
       }
     }else{
       form.purchaseinventoryList[index].price =
@@ -1343,8 +1264,8 @@ function getMaxCountsAll(row,index,counts){
       forms.purchaseinventoryList[index].olditemQuantity =  forms.purchaseinventoryList[index].itemQuantity*row.partPercent
       forms.purchaseinventoryList[index].itemMaxQuantity = forms.purchaseinventoryList[index].itemQuantity
 
-      forms.purchaseinventoryList[index].oldtotalSourceQuantity = forms.purchaseinventoryList[index].itemQuantity*row.partPercent
-      forms.purchaseinventoryList[index].itemMaxtotalSourceQuantity = forms.purchaseinventoryList[index].totalSourceQuantity
+      forms.purchaseinventoryList[index].oldtotalQuantity = forms.purchaseinventoryList[index].itemQuantity*row.partPercent
+      forms.purchaseinventoryList[index].itemMaxtotalQuantity = forms.purchaseinventoryList[index].totalQuantity
 
       const integerPart = Math.floor(forms.purchaseinventoryList[index].itemQuantity); // 获取整数部分
       const decimalPart = forms.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
@@ -1354,15 +1275,15 @@ function getMaxCountsAll(row,index,counts){
         (decimalPart*row.partPercent).toFixed(0) +
         forms.purchaseinventoryList[index].minUnitCode_dictText
       }
-      const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalSourceQuantity/row.partPercent); // 获取整数部分
-      const decimalPart2 = (forms.purchaseinventoryList[index].totalSourceQuantity/row.partPercent) - integerPart2; // 获取小数部分
+      const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalQuantity/row.partPercent); // 获取整数部分
+      const decimalPart2 = (forms.purchaseinventoryList[index].totalQuantity/row.partPercent) - integerPart2; // 获取小数部分
 
       if(decimalPart2){
-        forms.purchaseinventoryList[index].totalSourceQuantity = integerPart2 + forms.purchaseinventoryList[index].unitList.unitCode_dictText +
+        forms.purchaseinventoryList[index].totalQuantity = integerPart2 + forms.purchaseinventoryList[index].unitList.unitCode_dictText +
         (decimalPart2*row.partPercent).toFixed(0) +
         forms.purchaseinventoryList[index].unitList.minUnitCode_dictText
       }else{
-        forms.purchaseinventoryList[index].totalSourceQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+        forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
       }
     }else{
       forms.purchaseinventoryList[index].price =
@@ -1371,15 +1292,15 @@ function getMaxCountsAll(row,index,counts){
     }
 }
 // function getMaxCounts(row,index,counts){
-//   form.purchaseinventoryList[index].oldtotalSourceQuantity =  form.purchaseinventoryList[index].totalSourceQuantity
-//   form.purchaseinventoryList[index].totalSourceQuantity =
-//   form.purchaseinventoryList[index].totalSourceQuantity / row.partPercent;
+//   form.purchaseinventoryList[index].oldtotalQuantity =  form.purchaseinventoryList[index].totalQuantity
+//   form.purchaseinventoryList[index].totalQuantity =
+//   form.purchaseinventoryList[index].totalQuantity / row.partPercent;
 
-//   const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalSourceQuantity); // 获取整数部分
-//   const decimalPart1 = form.purchaseinventoryList[index].totalSourceQuantity - integerPart1; // 获取小数部分
+//   const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
+//   const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
 
 //   if(decimalPart1){
-//     form.purchaseinventoryList[index].totalSourceQuantity = integerPart1 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
+//     form.purchaseinventoryList[index].totalQuantity = integerPart1 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
 //     parseFloat(decimalPart1.toFixed(1))*row.partPercent +
 //     form.purchaseinventoryList[index].unitList.minUnitCode_dictText
 //   }
@@ -1444,14 +1365,14 @@ function handleSave() {
               let rows = JSON.parse(JSON.stringify(row))
               // delete rows.itemMaxQuantity
               // delete rows.olditemQuantity
-              // delete rows.oldtotalSourceQuantity
+              // delete rows.oldtotalQuantity
               // delete rows.oldtotalPurposeQuantity 
               // if(rows.unitCode== rows.unitList.minUnitCode){
               //   rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-              //   rows.totalSourceQuantity = form.purchaseinventoryList[index].oldtotalSourceQuantity?form.purchaseinventoryList[index].oldtotalSourceQuantity:form.purchaseinventoryList[index].totalSourceQuantity
+              //   rows.totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity?form.purchaseinventoryList[index].oldtotalQuantity:form.purchaseinventoryList[index].totalQuantity
               // }else{
               //   rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity?form.purchaseinventoryList[index].itemMaxQuantity:form.purchaseinventoryList[index].itemQuantity
-              //   rows.totalSourceQuantity = form.purchaseinventoryList[index].itemMaxtotalSourceQuantity?form.purchaseinventoryList[index].itemMaxtotalSourceQuantity:form.purchaseinventoryList[index].totalSourceQuantity
+              //   rows.totalQuantity = form.purchaseinventoryList[index].itemMaxtotalQuantity?form.purchaseinventoryList[index].itemMaxtotalQuantity:form.purchaseinventoryList[index].totalQuantity
               // }
               if(rows.unitCode == rows.unitCode_dictText){
                 if(rows.unitCode_dictText == rows.unitList.minUnitCode_dictText){
@@ -1471,8 +1392,8 @@ function handleSave() {
                 rows.unitCode = rows.unitList.minUnitCode
                 rows.unitCode_dictText= rows.unitList.minUnitCode_dictText
                 rows.totalPurposeQuantity =rows.oldtotalPurposeQuantity
-                rows.totalSourceQuantity = rows.totalSourceQuantity*rows.partPercent   
-                rows.itemQuantity= rows.totalSourceQuantity - rows.totalPurposeQuantity 
+                rows.totalQuantity = rows.totalQuantity*rows.partPercent   
+                rows.itemQuantity= rows.totalQuantity - rows.totalPurposeQuantity 
               }
               rowList.value.push(JSON.parse(JSON.stringify(rows)))
               if(rowList._rawValue&&rowList._rawValue.length == forms.purchaseinventoryList.length){
@@ -1519,6 +1440,14 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
+function handleScan(row,index){
+  rowData.value = row
+  rowData.value.locationId = queryParams.value.sourceLocationId
+  ypName.value = row.name
+  openTraceNoDialog .value = true;
+  currentIndex.value = index
+}
+
 /** 重置操作表单 */
 function reset() {
   // form.value = {
@@ -1612,7 +1541,7 @@ function getDetailAll(){
       if(forms.purchaseinventoryList[index].measurementUnitCode == forms.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
         getMaxCountsAll(e,index,1)
       }else{
-        forms.purchaseinventoryList[index].totalSourceQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+        forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
       }
       console.log(forms.purchaseinventoryList, e.unitList,"获取详情12");
     }
@@ -1628,7 +1557,7 @@ function getDetailAll(){
     //       console.log(e,index,1,forms.purchaseinventoryList[index].unitList)
     //       getMaxCountsAll(e,index,1)
     //     }else{
-    //       forms.purchaseinventoryList[index].totalSourceQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+    //       forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
     //     }
     //   }
     // }
@@ -1644,9 +1573,9 @@ function getDetailAll(){
         }
       }
       let purchaseItem = forms.purchaseinventoryList[index];
-      if (purchaseItem.price > 0 && purchaseItem.totalSourceQuantity > 0) {
+      if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
         purchaseItem.totalPrice =
-          purchaseItem.price * purchaseItem.totalSourceQuantity;
+          purchaseItem.price * purchaseItem.totalQuantity;
         purchaseItem.totalPrice = purchaseItem.totalPrice.toFixed(4);
       }
       if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
@@ -1662,7 +1591,7 @@ function getDetailAll(){
     }
 
     forms.purchaseinventoryList[index].reasonCode = forms.purchaseinventoryList[index].reasonCode
-    if(forms.purchaseinventoryList[index].totalPurposeQuantity== forms.purchaseinventoryList[index].totalSourceQuantity){
+    if(forms.purchaseinventoryList[index].totalPurposeQuantity== forms.purchaseinventoryList[index].totalQuantity){
       forms.purchaseinventoryList[index].itemQuantity = 0 
       forms.purchaseinventoryList[index].profitAmount = 0
     }
@@ -1719,7 +1648,7 @@ function getDetail(type){
       if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
         getMaxCounts(e,index,1)
       }else{
-        form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
       }
       console.log(form.purchaseinventoryList, e.unitList,"获取详情12");
     }else{
@@ -1734,7 +1663,7 @@ function getDetail(type){
           console.log(e,index,1,form.purchaseinventoryList[index].unitList)
           getMaxCounts(e,index,1)
         }else{
-          form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+          form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
         }
       }
     }
@@ -1750,9 +1679,9 @@ function getDetail(type){
         }
       }
       let purchaseItem = form.purchaseinventoryList[index];
-      if (purchaseItem.price > 0 && purchaseItem.totalSourceQuantity > 0) {
+      if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
         form.purchaseinventoryList[index].totalPrice =
-          purchaseItem.price * purchaseItem.totalSourceQuantity;
+          purchaseItem.price * purchaseItem.totalQuantity;
         form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
       }
       if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
@@ -1767,7 +1696,7 @@ function getDetail(type){
       form.purchaseinventoryList[index].profitAmount = 0  
     }
     // stocktakingUnitId : item.unitCode === item.unitCode ? 1 : 2,
-    // form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity,
+    // form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity,
     // form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].unitCode === form.purchaseinventoryList[index].unitCode ? form.purchaseinventoryList[index].price * (form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity) : parseFloat( form.purchaseinventoryList[index].partPercent) === 0?form.purchaseinventoryList[index].price * (( form.purchaseinventoryList[index].totalPurposeQuantity +  form.purchaseinventoryList[index].itemQuantity)): form.purchaseinventoryList[index].price * (( form.purchaseinventoryList[index].totalPurposeQuantity +  form.purchaseinventoryList[index].itemQuantity)/ form.purchaseinventoryList[index].partPercent)
     // form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].unitCode === form.purchaseinventoryList[index].unitCode ? form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity : parseFloat(form.purchaseinventoryList[index].partPercent) === 0?form.purchaseinventoryList[index].price *  form.purchaseinventoryList[index].itemQuantity: form.purchaseinventoryList[index].price * ( form.purchaseinventoryList[index].itemQuantity/ form.purchaseinventoryList[index].partPercent)
    
@@ -1775,7 +1704,7 @@ function getDetail(type){
     // console.log(profitReasonOptionslabel,"333")
     // form.purchaseinventoryList[index].reasonCodeText = profitReasonOptionslabel[0]?profitReasonOptionslabel[0].label:''
     form.purchaseinventoryList[index].reasonCode =  form.purchaseinventoryList[index].reasonCode
-    if(form.purchaseinventoryList[index].totalPurposeQuantity== form.purchaseinventoryList[index].totalSourceQuantity){
+    if(form.purchaseinventoryList[index].totalPurposeQuantity== form.purchaseinventoryList[index].totalQuantity){
       form.purchaseinventoryList[index].itemQuantity = 0 
       form.purchaseinventoryList[index].profitAmount = 0
     }
@@ -2089,14 +2018,14 @@ function getStockReceiptTypeList() {
 }
 // 计算总价
 function handleTotalPrice(index) {
-  form.purchaseinventoryList[index].oldtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity * row.partPercent;
-  form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity
+  form.purchaseinventoryList[index].oldtotalQuantity = form.purchaseinventoryList[index].totalQuantity * row.partPercent;
+  form.purchaseinventoryList[index].itemMaxtotalQuantity = form.purchaseinventoryList[index].totalQuantity
   form.purchaseinventoryList[index].olditemQuantity = form.purchaseinventoryList[index].itemQuantity * row.partPercent;
   form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
   let purchaseItem = form.purchaseinventoryList[index];
-  if (purchaseItem.price > 0 && purchaseItem.totalSourceQuantity > 0) {
+  if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
     form.purchaseinventoryList[index].totalPrice =
-      purchaseItem.price * purchaseItem.totalSourceQuantity;
+      purchaseItem.price * purchaseItem.totalQuantity;
      form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
   }
   if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
@@ -2107,13 +2036,13 @@ function handleTotalPrice(index) {
   if(form.purchaseinventoryList[index].itemQuantity==0){
     form.purchaseinventoryList[index].profitAmount = 0
   }
-  if(form.purchaseinventoryList[index].totalSourceQuantity==0){
+  if(form.purchaseinventoryList[index].totalQuantity==0){
     form.purchaseinventoryList[index].totalPrice = 0
   }
   editBatchTransfer(index)
 }
 //实盘数量变更
-function totalSourceQuantityChange(rowData,index,value) {
+function totalQuantityChange(rowData,index,value) {
   console.log(rowData.oldtotalPurposeQuantity,rowData.oldtotalPurposeQuantity,222222222222)
   form.purchaseinventoryList[index].lllstatus = false
   if(rowData.oldtotalPurposeQuantity&&rowData.oldtotalPurposeQuantity>0&&rowData.unitCode==rowData.unitList.unitCode){
@@ -2128,20 +2057,20 @@ function totalSourceQuantityChange(rowData,index,value) {
         let xiaoshuzhi = xiaoshu.split(form.purchaseinventoryList[index].unitList.minUnitCode_dictText)[0]
        
         form.purchaseinventoryList[index].itemQuantity = 
-        (parseFloat(zhengshu) - parseFloat(rowData.totalSourceQuantity))
+        (parseFloat(zhengshu) - parseFloat(rowData.totalQuantity))
         + form.purchaseinventoryList[index].unitList.unitCode_dictText
         + xiaoshuzhi
         + form.purchaseinventoryList[index].unitList.minUnitCode_dictText
         if (rowData.price > 0 && rowData.itemQuantity) {
           form.purchaseinventoryList[index].lllstatus = true
           form.purchaseinventoryList[index].profitAmount = 
-          rowData.price * (parseFloat(zhengshu) - parseFloat(rowData.totalSourceQuantity))
+          rowData.price * (parseFloat(zhengshu) - parseFloat(rowData.totalQuantity))
           + (rowData.price/rowData.partPercent) * xiaoshuzhi
           form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
         }
       }
     }else{
-      form.purchaseinventoryList[index].itemQuantity = rowData.totalSourceQuantity - rowData.totalPurposeQuantity 
+      form.purchaseinventoryList[index].itemQuantity = rowData.totalQuantity - rowData.totalPurposeQuantity 
         if (rowData.price > 0 && rowData.itemQuantity &&rowData.unitList.minUnitCode==rowData.unitCode) {
           form.purchaseinventoryList[index].profitAmount =
             rowData.price * rowData.itemQuantity;
@@ -2149,16 +2078,16 @@ function totalSourceQuantityChange(rowData,index,value) {
         }
     }
   }else{
-    form.purchaseinventoryList[index].itemQuantity = rowData.totalSourceQuantity - rowData.totalPurposeQuantity 
+    form.purchaseinventoryList[index].itemQuantity = rowData.totalQuantity - rowData.totalPurposeQuantity 
   }
   if (rowData.price > 0 && rowData.itemQuantity &&!form.purchaseinventoryList[index].lllstatus) {
     form.purchaseinventoryList[index].profitAmount =
       rowData.price * rowData.itemQuantity;
      form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
   }
-  if (rowData.price > 0 && rowData.totalSourceQuantity > 0) {
+  if (rowData.price > 0 && rowData.totalQuantity > 0) {
     form.purchaseinventoryList[index].totalPrice =
-      rowData.price * rowData.totalSourceQuantity;
+      rowData.price * rowData.totalQuantity;
      form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
   }
   if(form.purchaseinventoryList[index].itemQuantity==0){
@@ -2231,6 +2160,9 @@ function getbusNo() {
     }
   }
 }
+function handleTraceNo(value, row, index) {
+  forms.purchaseinventoryList[index].traceNo = value
+}
 getStockReceiptTypeList();// 详情页查询下拉树结构
 getbusNo();// 单据号取得
 
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js
similarity index 94%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js
index 75b34c85..5ff3300e 100644
--- a/vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/api.js
@@ -119,4 +119,12 @@ export function getDispensaryList() {
     url: '/app-common/cabinet-list',
     method: 'get',
   })
-}
\ No newline at end of file
+}
+
+export function stocktakingReceiptAuto() {
+  return request({
+    url: '/inventory-manage/stocktaking/stocktaking-receipt-auto',
+    method: 'get',
+  })
+}
+
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
similarity index 89%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
index 4a448d2a..7b0bf1e4 100644
--- a/vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading" :element-loading-text="'审批中。。。'">
     <el-row :gutter="10" class="mb8" v-if="viewStatus">
       <el-col :span="1.5">
         <el-button
@@ -169,7 +169,7 @@
             >
           </el-col>
         </el-row>
-        <el-form :model="form" :rules="tableRules" ref="formRef">
+        <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'apply'">
           <el-table
             v-loading="loading"
             :data="form.purchaseinventoryList"
@@ -374,20 +374,20 @@
             <el-table-column
               label="实盘数量"
               align="center"
-              key="totalSourceQuantity"
-              prop="totalSourceQuantity"
+              key="totalQuantity"
+              prop="totalQuantity"
               width="120"
             >
               <template #default="scope">
                 <el-form-item
-                  :prop="`purchaseinventoryList.${scope.$index}.totalSourceQuantity`"
-                  :rules="tableRules.totalSourceQuantity"
+                  :prop="`purchaseinventoryList.${scope.$index}.totalQuantity`"
+                  :rules="tableRules.totalQuantity"
                 >
                   <el-input
                     :disabled="viewStatus =='view'"
-                    v-model="scope.row.totalSourceQuantity"
+                    v-model="scope.row.totalQuantity"
                     placeholder=""
-                    @change="totalSourceQuantityChange(scope.row, scope.$index, scope.row.totalSourceQuantity)"
+                    @change="totalSourceQuantityChange(scope.row, scope.$index, scope.row.totalQuantity)"
                   />
                 </el-form-item>
               </template>
@@ -645,63 +645,7 @@
         </el-row>
       </el-col>
     </el-row>
-    <el-dialog
-      title="药品追溯码"
-      v-model="openTraceNo"
-      width="800"
-      append-to-body
-      destroy-on-close
-      :draggable="true"
-      @opened="
-        () => {
-          console.log(123);
-          traceNoTempRef.focus();
-        }
-      "
-    >
-      <div>
-        <div style="font-size: 16px">
-          <span>药品名称： {{ medName }}</span>
-          选择追溯码
-          <el-input
-            ref="traceNoTempRef"
-            v-model="traceNoTemp"
-            style="width: 260px; margin-right: 20px"
-            @input="throttledGetList"
-          />
-          <el-button
-            type="primary"
-            plain
-            icon="CircleClose"
-            @click="handleReturn"
-          >
-            撤回
-          </el-button>
-          <el-button
-            type="danger"
-            plain
-            icon="CircleClose"
-            @click="handleClear"
-          >
-            清除
-          </el-button>
-        </div>
-        <el-input
-          ref="inputRef"
-          v-model="traceNo"
-          type="textarea"
-          :rows="15"
-          disabled
-          style="width: 100%; margin-top: 10px; margin-right: 20px"
-        />
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submit">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <TraceNoDialog :ypName="ypName" :rowData="rowData" :openDialog="openTraceNoDialog" @submit="submit" @cancel="openTraceNoDialog = false"/>
   </div>
 </template>
 
@@ -721,6 +665,7 @@ import {
   reject
 } from "../components/api";
 import PopoverList from "@/components/OpenHis/popoverList/index.vue";
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import MedicineList from "../components/medicineList.vue";
 import { formatDate,formatDateymd } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
@@ -755,6 +700,9 @@ const row = ref({});
 const rowIndex = ref(-1);
 const totalAmount = ref(0);
 const rowList = ref([])
+const openTraceNoDialog = ref(false)
+const ypName = ref("");
+const rowData = ref({})
 
 const form = reactive({
   purchaseinventoryList: [],
@@ -763,6 +711,8 @@ const form = reactive({
 const receiptHeaderForm = reactive({
   busNo: undefined,
   occurrenceTime: formatDate(new Date()),
+  locationId: '',
+  time: ''
 });
 
 const data = reactive({
@@ -797,7 +747,7 @@ const data = reactive({
     itemQuantity: [
       { required: true, message: "盈亏数量不能为空", trigger: "blur" },
     ],
-    totalSourceQuantity:[
+    totalQuantity:[
       { required: true, message: "实盘数量不能为空", trigger: "blur" },
     ],
     // reasonCode: [
@@ -859,66 +809,36 @@ watch(
 // 挂载时绑定事件
 onMounted(() => {
   document.addEventListener("click", handleClickOutside);
+  const fromReconciliation = route.query.fromReconciliation === 'true';
+  if (fromReconciliation) {
+    // 清空搜索框
+    receiptHeaderForm.value?.resetFields();
+    
+    // 设置传递过来的参数
+    receiptHeaderForm.locationId = route.query.locationId || '';
+    receiptHeaderForm.startTime = route.query.startTime || '';
+    receiptHeaderForm.endTime = route.query.endTime || '';
+  }
 });
 
 // 卸载时移除事件
 onUnmounted(() => {
   document.removeEventListener("click", handleClickOutside);
 });
-
-
-const openTraceNo = ref(false)
-const traceNo = ref('');
-const traceNoList = ref([]);
-const traceNoTemp = ref('');
-const traceNoTempRef = ref();
 const currentIndex = ref("");
-const throttledGetList = debounce(handelTraceNo, 500);
 
-// 撤回最后一条追溯码
-function handleReturn() {
-  if (traceNoList.value.length === 0) return;
-  // 1. 从数组中移除最后一项
-  traceNoList.value.pop();
-  // 2. 重新构建显示文本
-  traceNo.value = traceNoList.value
-    .map((item, index) => `[${index + 1}]  ${item}`)
-    .join('\n');
-  if(traceNoList.value != 0){
-    traceNo.value += '\n';
-  }
-}
-function handleClear() {
-  traceNo.value = '';
-  traceNoList.value = [];
-}
 function handleScan(row,index){
-  medName.value = row.name
-  openTraceNo.value = true;
+  rowData.value = row
+  rowData.value.locationId = receiptHeaderForm.purposeLocationId
+  rowData.value.itemType = receiptHeaderForm.medicationType
+  ypName.value = row.name
+  openTraceNoDialog .value = true;
   currentIndex.value = index
 }
-function handelTraceNo(value) {
-  traceNoList.value.push(value);
-  traceNo.value = traceNo.value + '[' + traceNoList.value.length + ']' + '  ' + value + '\n';
-  traceNoTemp.value = '';
-  // let saveValue = value.substring(inputValue.length + 5, value.length);
-  // inputValue = value;
-  // console.log(value);
-  // console.log(saveValue);
-  // traceNoList.value.push(saveValue);
-  // traceNo.value = value + '[' + (traceNoList.value.length + 1) + ']' + '  ';
-}
-function cancel() {
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
-}
 
-function submit(){
-  form.purchaseinventoryList[currentIndex.value].traceNo = traceNoList.value.join(',');
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
+function submit(value){
+  form.purchaseinventoryList[currentIndex.value].traceNo = value;
+  openTraceNoDialog .value = false;
 }
 function formatContent(value){
   let content = ''
@@ -1040,11 +960,11 @@ function handleBlur(row, index) {
     row.itemQuantity = 0 
     row.profitAmount = 0
   }
-  if(row.totalSourceQuantity==0 || !row.totalSourceQuantity ){
-    row.totalSourceQuantity = 0
+  if(row.totalQuantity==0 || !row.totalQuantity ){
+    row.totalQuantity = 0
     row.totalPrice = 0
   }
-  row.totalSourceQuantity = Number(row.totalSourceQuantity)
+  row.totalQuantity = Number(row.totalQuantity)
   row.purposeLocationId = receiptHeaderForm.purposeLocationId
   row.purposeLocationStoreId = receiptHeaderForm.purposeLocationStoreId;
   row.busNo = receiptHeaderForm.busNo;
@@ -1062,7 +982,6 @@ function handleBlur(row, index) {
 }
 // 获取调拨详情
 function getTransferProductDetails(type){
-
   if(route.query.supplyBusNo){ // 编辑
     data.isEdit = true;
     store.clearCurrentDataPD()
@@ -1101,7 +1020,7 @@ function getTransferProductDetails(type){
         if(e.partPercent){
           form.purchaseinventoryList[index].partPercent = Number(form.purchaseinventoryList[index].partPercent).toFixed(4);
         }
-        form.purchaseinventoryList[index].totalPurposeQuantity = form.purchaseinventoryList[index].totalQuantity?form.purchaseinventoryList[index].totalQuantity:0
+        form.purchaseinventoryList[index].totalPurposeQuantity = form.purchaseinventoryList[index].totalQuantity !=undefined &&form.purchaseinventoryList[index].totalQuantity !=null ?form.purchaseinventoryList[index].totalQuantity - form.purchaseinventoryList[index].itemQuantity:0
       
         if(e.unitList&&e.unitCode){
           form.purchaseinventoryList[index].unitList = e.unitList[0]   //计量单位回显数组
@@ -1110,7 +1029,7 @@ function getTransferProductDetails(type){
           if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
             getMaxCounts(e,index,1)
           }else{
-            form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+            form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
           }
         }else{
           if(!e.unitList&&e.unitCode){
@@ -1123,7 +1042,7 @@ function getTransferProductDetails(type){
             if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
               getMaxCounts(e,index,1)
             }else{
-              form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+              form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
             }
           }
         }
@@ -1138,9 +1057,9 @@ function getTransferProductDetails(type){
             }
           }
           let purchaseItem = form.purchaseinventoryList[index];
-          if (purchaseItem.price > 0 && purchaseItem.totalSourceQuantity > 0) {
+          if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
             form.purchaseinventoryList[index].totalPrice =
-              purchaseItem.price * purchaseItem.totalSourceQuantity;
+              purchaseItem.price * purchaseItem.totalQuantity;
             form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
           }
           if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
@@ -1148,6 +1067,9 @@ function getTransferProductDetails(type){
               purchaseItem.price * purchaseItem.itemQuantity;
             form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
           }
+          if (purchaseItem.totalQuantity == 0) {
+            form.purchaseinventoryList[index].totalPrice = 0
+          }
         }else{
           form.purchaseinventoryList[index].price = 0
           form.purchaseinventoryList[index].totalPrice = 0
@@ -1195,7 +1117,7 @@ function getTransferProductDetails(type){
             if(e.partPercent){
               forms.purchaseinventoryList[index].partPercent = Number(forms.purchaseinventoryList[index].partPercent).toFixed(4);
             }
-            forms.purchaseinventoryList[index].totalPurposeQuantity = forms.purchaseinventoryList[index].totalQuantity?forms.purchaseinventoryList[index].totalQuantity:0
+            forms.purchaseinventoryList[index].totalPurposeQuantity = forms.purchaseinventoryList[index].totalQuantity?forms.purchaseinventoryList[index].totalQuantity - forms.purchaseinventoryList[index].itemQuantity:0
           
             if(e.unitList&&e.unitCode){
               forms.purchaseinventoryList[index].unitList = e.unitList[0]   //计量单位回显数组
@@ -1204,7 +1126,7 @@ function getTransferProductDetails(type){
               if(forms.purchaseinventoryList[index].measurementUnitCode == forms.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
                 getMaxCountsAll(e,index,1)
               }else{
-                forms.purchaseinventoryList[index].totalSourceQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+                forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
               }
             }else{
               if(!e.unitList&&e.unitCode){
@@ -1217,7 +1139,7 @@ function getTransferProductDetails(type){
                 if(forms.purchaseinventoryList[index].measurementUnitCode == forms.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
                   getMaxCountsAll(e,index,1)
                 }else{
-                  forms.purchaseinventoryList[index].totalSourceQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+                  forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
                 }
               }
             }
@@ -1233,9 +1155,9 @@ function getTransferProductDetails(type){
                 }
               }
               let purchaseItem = forms.purchaseinventoryList[index];
-              if (purchaseItem.price > 0 && purchaseItem.totalSourceQuantity > 0) {
+              if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
                 purchaseItem.totalPrice =
-                  purchaseItem.price * purchaseItem.totalSourceQuantity;
+                  purchaseItem.price * purchaseItem.totalQuantity;
                 purchaseItem.totalPrice = purchaseItem.totalPrice.toFixed(4);
               }
               if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
@@ -1303,6 +1225,7 @@ function selectRow(rowValue, index) {
   form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
   form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
   form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber
+  form.purchaseinventoryList[index].totalQuantity = 0
   if(route.query.supplyBusNo){
     handleLocationClick(receiptHeaderForm.purposeLocationId,form.purchaseinventoryList[index].itemId,index,form.purchaseinventoryList[index].lotNumber)
   }else{
@@ -1323,7 +1246,7 @@ function selectRow(rowValue, index) {
 //   form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
 //   // form.purchaseinventoryList[index].price = rowValue.locationInventoryList.length > 0 ? rowValue.locationInventoryList[0].price : 0;
 //   // form.purchaseinventoryList[index].totalPurposeQuantity = rowValue.locationInventoryList.length > 0 ? rowValue.locationInventoryList[0].quantity : 0  ; //盘前库存
-//   form.purchaseinventoryList[index].totalSourceQuantity = '';
+//   form.purchaseinventoryList[index].totalQuantity = '';
 //   form.purchaseinventoryList[index].totalPrice = '';
 //   form.purchaseinventoryList[index].itemQuantity = '';
 //   form.purchaseinventoryList[index].reasonCode = '';
@@ -1345,7 +1268,7 @@ function handleLocationClick(purposeLocationId,itemId, index,lotNumber) {
     if (res.data&&res.data[0]) {
       form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || "";
       form.purchaseinventoryList[index].totalPurposeQuantity = res.data[0].orgQuantity || 0;
-      form.purchaseinventoryList[index].totalSourceQuantity = res.data[0].objQuantity || 0;
+      form.purchaseinventoryList[index].totalQuantity = res.data[0].objQuantity || 0;
       // 单价
       form.purchaseinventoryList[index].traceNo = res.data[0].traceNo || "";
       form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || "";
@@ -1366,14 +1289,14 @@ function handleLocationClick(purposeLocationId,itemId, index,lotNumber) {
       }
       startTimeOld.value = form.purchaseinventoryList[index].startTime?form.purchaseinventoryList[index].startTime:''
       endTimeOld.value = form.purchaseinventoryList[index].endTime?form.purchaseinventoryList[index].endTime:''
-     
+      totalSourceQuantityChange(form.purchaseinventoryList[index], index)
       if (form.purchaseinventoryList[index].totalPurposeQuantity == 0) {
         proxy.$message.warning('仓库数量为0，无法调用！');
         return;
       }
     }else {
       form.purchaseinventoryList[index].totalPurposeQuantity = 0
-      form.purchaseinventoryList[index].totalSourceQuantity = 0
+      form.purchaseinventoryList[index].totalQuantity = 0
       form.purchaseinventoryList[index].price = 0
       proxy.$message.warning('仓库数量为0，无法调用！');
     }
@@ -1387,12 +1310,12 @@ function handleUnitCodeChange(row, index, value) {
     return     
   }
   if (row.minUnitCode == value) { //最小计量单位
-    form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].oldtotalSourceQuantity?form.purchaseinventoryList[index].oldtotalSourceQuantity:form.purchaseinventoryList[index].totalSourceQuantity
+    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalSourceQuantity?form.purchaseinventoryList[index].oldtotalSourceQuantity:form.purchaseinventoryList[index].totalQuantity
     form.purchaseinventoryList[index].totalPurposeQuantity = form.purchaseinventoryList[index].oldtotalPurposeQuantity?form.purchaseinventoryList[index].oldtotalPurposeQuantity:form.purchaseinventoryList[index].totalPurposeQuantity
     form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
     form.purchaseinventoryList[index].itemQuantity = 0
     form.purchaseinventoryList[index].totalPrice = 0
-    form.purchaseinventoryList[index].totalSourceQuantity = 0
+    form.purchaseinventoryList[index].totalQuantity = 0
     form.purchaseinventoryList[index].profitAmount = 0
     // 单价
     form.purchaseinventoryList[index].price =
@@ -1402,7 +1325,7 @@ function handleUnitCodeChange(row, index, value) {
   } else {  // 切换成大的计量单位
     form.purchaseinventoryList[index].itemQuantity = 0
     form.purchaseinventoryList[index].totalPrice = 0
-    form.purchaseinventoryList[index].totalSourceQuantity = 0
+    form.purchaseinventoryList[index].totalQuantity = 0
     form.purchaseinventoryList[index].profitAmount = 0
     getMaxCounts(row,index)
   }
@@ -1428,7 +1351,7 @@ function getMaxCountsAll(row,index,counts){
       forms.purchaseinventoryList[index].itemMaxQuantity = forms.purchaseinventoryList[index].itemQuantity
 
       forms.purchaseinventoryList[index].oldtotalSourceQuantity = forms.purchaseinventoryList[index].itemQuantity*row.partPercent
-      forms.purchaseinventoryList[index].itemMaxtotalSourceQuantity = forms.purchaseinventoryList[index].totalSourceQuantity
+      forms.purchaseinventoryList[index].itemMaxtotalSourceQuantity = forms.purchaseinventoryList[index].totalQuantity
 
       const integerPart = Math.floor(forms.purchaseinventoryList[index].itemQuantity); // 获取整数部分
       const decimalPart = forms.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
@@ -1438,15 +1361,15 @@ function getMaxCountsAll(row,index,counts){
         (decimalPart*row.partPercent).toFixed(0) +
         forms.purchaseinventoryList[index].minUnitCode_dictText
       }
-      const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalSourceQuantity/row.partPercent); // 获取整数部分
-      const decimalPart2 = (forms.purchaseinventoryList[index].totalSourceQuantity/row.partPercent) - integerPart2; // 获取小数部分
+      const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalQuantity/row.partPercent); // 获取整数部分
+      const decimalPart2 = (forms.purchaseinventoryList[index].totalQuantity/row.partPercent) - integerPart2; // 获取小数部分
     
       if(decimalPart2){
-        forms.purchaseinventoryList[index].totalSourceQuantity = integerPart2 + forms.purchaseinventoryList[index].unitList.unitCode_dictText +
+        forms.purchaseinventoryList[index].totalQuantity = integerPart2 + forms.purchaseinventoryList[index].unitList.unitCode_dictText +
         (decimalPart2*row.partPercent).toFixed(0) +
         forms.purchaseinventoryList[index].unitList.minUnitCode_dictText
       }else{
-        forms.purchaseinventoryList[index].totalSourceQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+        forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
       }
     }else{
       forms.purchaseinventoryList[index].price =
@@ -1473,7 +1396,7 @@ function getMaxCounts(row,index,counts){
       form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
 
       form.purchaseinventoryList[index].oldtotalSourceQuantity = form.purchaseinventoryList[index].itemQuantity*row.partPercent
-      form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity
+      form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalQuantity
 
       const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
       const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
@@ -1483,26 +1406,26 @@ function getMaxCounts(row,index,counts){
         (decimalPart*row.partPercent).toFixed(0) +
         form.purchaseinventoryList[index].minUnitCode_dictText
       }
-      const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalSourceQuantity/row.partPercent); // 获取整数部分
-      const decimalPart2 = (form.purchaseinventoryList[index].totalSourceQuantity/row.partPercent) - integerPart2; // 获取小数部分
+      const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalQuantity/row.partPercent); // 获取整数部分
+      const decimalPart2 = (form.purchaseinventoryList[index].totalQuantity/row.partPercent) - integerPart2; // 获取小数部分
       if(decimalPart2){
-        form.purchaseinventoryList[index].totalSourceQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
+        form.purchaseinventoryList[index].totalQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
         (decimalPart2*row.partPercent).toFixed(0) +
         form.purchaseinventoryList[index].unitList.minUnitCode_dictText
       }else{
-        form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
       }
-      // form.purchaseinventoryList[index].totalSourceQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
+      // form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
     }else{
       // form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity
-      // form.purchaseinventoryList[index].oldtotalSourceQuantity =  form.purchaseinventoryList[index].totalSourceQuantity
+      // form.purchaseinventoryList[index].oldtotalSourceQuantity =  form.purchaseinventoryList[index].totalQuantity
 
       // form.purchaseinventoryList[index].itemQuantity =
       // form.purchaseinventoryList[index].itemQuantity / row.partPercent;
-      // form.purchaseinventoryList[index].totalSourceQuantity =
-      // form.purchaseinventoryList[index].totalSourceQuantity / row.partPercent;
+      // form.purchaseinventoryList[index].totalQuantity =
+      // form.purchaseinventoryList[index].totalQuantity / row.partPercent;
       // form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
-      // form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity
+      // form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalQuantity
       // const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
       // const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
 
@@ -1511,11 +1434,11 @@ function getMaxCounts(row,index,counts){
       //   (decimalPart*row.partPercent).toFixed(0) +
       //   form.purchaseinventoryList[index].unitList.minUnitCode_dictText
       // }
-      // const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalSourceQuantity); // 获取整数部分
-      // const decimalPart2 = form.purchaseinventoryList[index].totalSourceQuantity - integerPart2; // 获取小数部分
+      // const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
+      // const decimalPart2 = form.purchaseinventoryList[index].totalQuantity - integerPart2; // 获取小数部分
 
       // if(decimalPart2){
-      //   form.purchaseinventoryList[index].totalSourceQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
+      //   form.purchaseinventoryList[index].totalQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
       //   (decimalPart2*row.partPercent).toFixed(0) +
       //   form.purchaseinventoryList[index].unitList.minUnitCode_dictText
       // }
@@ -1554,8 +1477,8 @@ function handleSave(row, index) {
                   rows.unitCode = rows.unitList.minUnitCode
                   rows.unitCode_dictText= rows.unitList.minUnitCode_dictText
                   rows.totalPurposeQuantity =rows.oldtotalPurposeQuantity
-                  rows.totalSourceQuantity = rows.totalSourceQuantity*rows.partPercent   
-                  rows.itemQuantity= rows.totalSourceQuantity - rows.totalPurposeQuantity 
+                  rows.totalQuantity = rows.totalQuantity*rows.partPercent   
+                  rows.itemQuantity= rows.totalQuantity - rows.totalPurposeQuantity 
                 }
                 rowList.value.push(JSON.parse(JSON.stringify(rows)))
                 if(rowList._rawValue&&rowList._rawValue.length == forms.purchaseinventoryList.length){
@@ -1579,10 +1502,10 @@ function handleSave(row, index) {
                 // delete rows.itemMaxQuantity
                 // if(rows.unitCode== rows.unitList.minUnitCode){
                 //   rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-                //   rows.totalSourceQuantity = form.purchaseinventoryList[index].oldtotalSourceQuantity?form.purchaseinventoryList[index].oldtotalSourceQuantity:form.purchaseinventoryList[index].totalSourceQuantity
+                //   rows.totalQuantity = form.purchaseinventoryList[index].oldtotalSourceQuantity?form.purchaseinventoryList[index].oldtotalSourceQuantity:form.purchaseinventoryList[index].totalQuantity
                 // }else{
                 //   rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity?form.purchaseinventoryList[index].itemMaxQuantity:form.purchaseinventoryList[index].itemQuantity
-                //   rows.totalSourceQuantity = form.purchaseinventoryList[index].itemMaxtotalSourceQuantity?form.purchaseinventoryList[index].itemMaxtotalSourceQuantity:form.purchaseinventoryList[index].totalSourceQuantity
+                //   rows.totalQuantity = form.purchaseinventoryList[index].itemMaxtotalSourceQuantity?form.purchaseinventoryList[index].itemMaxtotalSourceQuantity:form.purchaseinventoryList[index].totalQuantity
                 // }
                 if(rows.unitCode == rows.unitCode_dictText){
                   if(rows.unitCode_dictText == rows.unitList.minUnitCode_dictText){
@@ -1602,8 +1525,8 @@ function handleSave(row, index) {
                   rows.unitCode = rows.unitList.minUnitCode
                   rows.unitCode_dictText= rows.unitList.minUnitCode_dictText
                   rows.totalPurposeQuantity =rows.oldtotalPurposeQuantity
-                  rows.totalSourceQuantity = rows.totalSourceQuantity*rows.partPercent   
-                  rows.itemQuantity= rows.totalSourceQuantity - rows.totalPurposeQuantity 
+                  rows.totalQuantity = rows.totalQuantity*rows.partPercent   
+                  rows.itemQuantity= rows.totalQuantity - rows.totalPurposeQuantity 
                 }
                 rowList.value.push(JSON.parse(JSON.stringify(rows)))
                 if(rowList._rawValue&&rowList._rawValue.length == form.purchaseinventoryList.length){
@@ -1789,9 +1712,11 @@ function handleReject() {
   });
 }
 function handelApply() {
+  loading.value = true
   productStocktakingApproved(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess("操作成功");
+      loading.value = false
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataPD();
       // 跳转到审核页面
@@ -1927,7 +1852,7 @@ function getStockReceiptTypeList() {
   //         return {
   //           ...item,
   //           stocktakingUnitId : item.unitCode === item.unitCode ? 1 : 2,
-  //           totalSourceQuantity : item.totalPurposeQuantity + item.itemQuantity,
+  //           totalQuantity : item.totalPurposeQuantity + item.itemQuantity,
   //           totalPrice:item.unitCode === item.unitCode ? item.price * (item.totalPurposeQuantity + item.itemQuantity) : parseFloat(item.partPercent) === 0? item.price * ((item.totalPurposeQuantity + item.itemQuantity)):item.price * ((item.totalPurposeQuantity + item.itemQuantity)/item.partPercent),
   //           profitAmount:item.unitCode === item.unitCode ? item.price * item.itemQuantity : parseFloat(item.partPercent) === 0? item.price * item.itemQuantity:item.price * (item.itemQuantity/item.partPercent),
   //           reasonCodeText: profitReasonOptions.value.filter(reasonItem => reasonItem.value ===  parseFloat(item.reasonCode))[0].label,
@@ -1973,17 +1898,17 @@ function handleCabinetChange(value) {
 //   if (value === 1) {
 //     form.purchaseinventoryList[index].stocktakingUnitId = 1;
 //     form.purchaseinventoryList[index].totalPurposeQuantity = rowData.totalPurposeQuantity / partPer;
-//     if (rowData.totalSourceQuantity > 0 && rowData.totalSourceQuantity !== '') {
-//       form.purchaseinventoryList[index].totalSourceQuantity = rowData.totalSourceQuantity / partPer;
-//       form.purchaseinventoryList[index].itemQuantity = (rowData.totalSourceQuantity / partPer )- (rowData.totalPurposeQuantity / partPer);
+//     if (rowData.totalQuantity > 0 && rowData.totalQuantity !== '') {
+//       form.purchaseinventoryList[index].totalQuantity = rowData.totalQuantity / partPer;
+//       form.purchaseinventoryList[index].itemQuantity = (rowData.totalQuantity / partPer )- (rowData.totalPurposeQuantity / partPer);
 //     }
 //   }
 //   if (value === 2) {
 //     form.purchaseinventoryList[index].stocktakingUnitId = 2;
 //     form.purchaseinventoryList[index].totalPurposeQuantity = rowData.totalPurposeQuantity * partPer;
-//     if (rowData.totalSourceQuantity > 0 && rowData.totalSourceQuantity !== '') {
-//       form.purchaseinventoryList[index].totalSourceQuantity = rowData.totalSourceQuantity * partPer;
-//       form.purchaseinventoryList[index].itemQuantity = (rowData.totalSourceQuantity * partPer )- (rowData.totalPurposeQuantity * partPer);
+//     if (rowData.totalQuantity > 0 && rowData.totalQuantity !== '') {
+//       form.purchaseinventoryList[index].totalQuantity = rowData.totalQuantity * partPer;
+//       form.purchaseinventoryList[index].itemQuantity = (rowData.totalQuantity * partPer )- (rowData.totalPurposeQuantity * partPer);
 //     }
 //   }
 // }
@@ -1998,14 +1923,14 @@ function reasonBlur(row,index){
 }
 // 计算总价
 function handleTotalPrice(index) {
-  form.purchaseinventoryList[index].oldtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity * row.partPercent;
-  form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalSourceQuantity
+  form.purchaseinventoryList[index].oldtotalSourceQuantity = form.purchaseinventoryList[index].totalQuantity * row.partPercent;
+  form.purchaseinventoryList[index].itemMaxtotalSourceQuantity = form.purchaseinventoryList[index].totalQuantity
   form.purchaseinventoryList[index].olditemQuantity = form.purchaseinventoryList[index].itemQuantity * row.partPercent;
   form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
   let purchaseItem = form.purchaseinventoryList[index];
-  if (purchaseItem.price > 0 && purchaseItem.totalSourceQuantity > 0) {
+  if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
     form.purchaseinventoryList[index].totalPrice =
-      purchaseItem.price * purchaseItem.totalSourceQuantity;
+      purchaseItem.price * purchaseItem.totalQuantity;
      form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
   }
   if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
@@ -2016,7 +1941,7 @@ function handleTotalPrice(index) {
   if(form.purchaseinventoryList[index].itemQuantity==0){
     form.purchaseinventoryList[index].profitAmount = 0
   }
-  if(form.purchaseinventoryList[index].totalSourceQuantity==0){
+  if(form.purchaseinventoryList[index].totalQuantity==0){
     form.purchaseinventoryList[index].totalPrice = 0
   }
   editBatchTransfer(index)    //todo
@@ -2038,20 +1963,20 @@ function totalSourceQuantityChange(rowData,index,value) {
         let xiaoshuzhi = xiaoshu.split(form.purchaseinventoryList[index].unitList.minUnitCode_dictText)[0]
        
         form.purchaseinventoryList[index].itemQuantity = 
-        (parseFloat(zhengshu) - parseFloat(rowData.totalSourceQuantity))
+        (parseFloat(zhengshu) - parseFloat(rowData.totalQuantity))
         + form.purchaseinventoryList[index].unitList.unitCode_dictText
         + xiaoshuzhi
         + form.purchaseinventoryList[index].unitList.minUnitCode_dictText
         if (rowData.price > 0 && rowData.itemQuantity) {
           form.purchaseinventoryList[index].lllstatus = true
           form.purchaseinventoryList[index].profitAmount = 
-          rowData.price * (parseFloat(zhengshu) - parseFloat(rowData.totalSourceQuantity))
+          rowData.price * (parseFloat(zhengshu) - parseFloat(rowData.totalQuantity))
           + (rowData.price/rowData.partPercent) * xiaoshuzhi
           form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
         }
       }
     }else{
-      form.purchaseinventoryList[index].itemQuantity = rowData.totalSourceQuantity - rowData.totalPurposeQuantity 
+      form.purchaseinventoryList[index].itemQuantity = rowData.totalQuantity - rowData.totalPurposeQuantity 
         if (rowData.price > 0 && rowData.itemQuantity &&rowData.unitList.minUnitCode==rowData.unitCode) {
           form.purchaseinventoryList[index].profitAmount =
             rowData.price * rowData.itemQuantity;
@@ -2059,16 +1984,16 @@ function totalSourceQuantityChange(rowData,index,value) {
         }
     }
   }else{
-    form.purchaseinventoryList[index].itemQuantity = rowData.totalSourceQuantity - rowData.totalPurposeQuantity 
+    form.purchaseinventoryList[index].itemQuantity = rowData.totalQuantity - rowData.totalPurposeQuantity 
   }
   if (rowData.price > 0 && rowData.itemQuantity &&!form.purchaseinventoryList[index].lllstatus) {
     form.purchaseinventoryList[index].profitAmount =
       rowData.price * rowData.itemQuantity;
      form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
   }
-  if (rowData.price > 0 && rowData.totalSourceQuantity > 0) {
+  if (rowData.price > 0) {
     form.purchaseinventoryList[index].totalPrice =
-      rowData.price * rowData.totalSourceQuantity;
+      rowData.price * rowData.totalQuantity;
      form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
   }
   if(form.purchaseinventoryList[index].itemQuantity==0){
@@ -2076,8 +2001,8 @@ function totalSourceQuantityChange(rowData,index,value) {
   }
   editBatchTransfer(index)
   store.setCurrentDataPD({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm });
-  // form.purchaseinventoryList[index].totalPrice = rowData.purposeLocationId === 1 ? rowData.price * rowData.totalSourceQuantity : rowData.price * (rowData.totalSourceQuantity / partPer)
-  // form.purchaseinventoryList[index].profitAmount = rowData.purposeLocationId === 1 ? rowData.price * (rowData.totalSourceQuantity - rowData.totalPurposeQuantity ) : rowData.price * ((rowData.totalSourceQuantity - rowData.totalPurposeQuantity ) / partPer)
+  // form.purchaseinventoryList[index].totalPrice = rowData.purposeLocationId === 1 ? rowData.price * rowData.totalQuantity : rowData.price * (rowData.totalQuantity / partPer)
+  // form.purchaseinventoryList[index].profitAmount = rowData.purposeLocationId === 1 ? rowData.price * (rowData.totalQuantity - rowData.totalPurposeQuantity ) : rowData.price * ((rowData.totalQuantity - rowData.totalPurposeQuantity ) / partPer)
   // form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
   // form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
 }
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/api.js
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue
diff --git a/vue3/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue
similarity index 97%
rename from vue3/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue
index 0232586e..c9a9875d 100644
--- a/vue3/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockRecord/index.vue
@@ -214,7 +214,7 @@
               type="primary"
               icon="Edit"
               @click="handleUpdate(scope.row)"
-              :disabled="scope.row.statusEnum != '1' && scope.row.statusEnum != '9'"
+              :disabled="scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'"
               >编辑</el-button
             >
             <!-- v-hasPermi="['system:user:edit']" -->
@@ -261,7 +261,9 @@
     </div>
   </template>
   
-  <script setup name="chkstockRecord">
+  <script setup name="ChkstockRecord">
+  // 导入onActivated钩子
+  import { onMounted, onActivated } from 'vue';
   import {
     getStockinventoryList,
     getstocktakingDetail,
@@ -425,8 +427,16 @@
     });
   }
   
-  getStockinventoryTypeList();
+  onMounted(() => {
+    getStockinventoryTypeList();
+    getList();
+  });
+
+  // 添加组件被激活时的处理逻辑
+  onActivated(() => {
+  // 重新加载数据
   getList();
+  });
   </script>
   <style scoped>
   .custom-tree-node {
diff --git a/vue3/src/views/medicationmanagement/chkstock/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/api.js
diff --git a/vue3/src/views/medicationmanagement/chkstock/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/medicineList.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/chkstock/components/medicineList.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/medicineList.vue
diff --git a/vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting.js b/openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting.js
rename to openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting.js
diff --git a/vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue b/openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue
diff --git a/vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue
similarity index 40%
rename from vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue
index 02782633..9fda9f1c 100644
--- a/vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue
@@ -2,12 +2,7 @@
   <div class="app-container">
     <el-row :gutter="10" class="mb8" v-if="viewStatus">
       <el-col :span="1.5">
-        <el-button
-          v-if="viewStatus != 'view'"
-          plain
-          type="primary"
-          icon="Edit"
-          @click="handelApply"
+        <el-button v-if="viewStatus != 'view'" plain type="primary" icon="Edit" @click="handelApply"
           >审批通过</el-button
         >
       </el-col>
@@ -22,162 +17,140 @@
         >
       </el-col>
     </el-row>
-      <el-row :gutter="10" class="mb8" v-else>
-        <!-- <el-col :span="1.5">
+    <el-row :gutter="10" class="mb8" v-else>
+      <!-- <el-col :span="1.5">
           <el-button type="primary" plain icon="Plus" @click="submitSave">保存</el-button>
         </el-col> -->
-        <el-col :span="1.5">
-          <!-- v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'" -->
-           <el-button
-            plain
-            type="primary"
-            icon="Plus"
-            @click="handleSubmitApproval()"
-   
-            >提交审核</el-button
-          >
-          <!-- <el-button type="primary" plain icon="Plus" @click="submitAudit"
+      <el-col :span="1.5">
+        <!-- v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'" -->
+        <el-button plain type="primary" icon="Plus" @click="handleSubmitApproval()"
+          >提交审核</el-button
+        >
+        <!-- <el-button type="primary" plain icon="Plus" @click="submitAudit"
             >提交审核</el-button
           > -->
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="Printer"
-            :disabled="multiple"
-            @click="handleDelete"
-            >打印</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="EditPen"
-            @click="handleTotalAmount"
-            >计算金额</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="Plus"
-            @click="handleSave"
-            >批量保存</el-button
-          >
-        </el-col>
-      </el-row>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Printer" :disabled="multiple" @click="handleDelete"
+          >打印</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="EditPen" @click="handleTotalAmount"
+          >计算金额</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
+      </el-col>
+    </el-row>
 
-      <el-form
-        :model="receiptHeaderForm"
-        ref="receiptHeaderRef"
-        :inline="true"
-        label-width="100px"
-        :rules="rules"
-      >
-          <el-form-item label="单据号：" prop="busNo">
-            <el-input
-              v-model="receiptHeaderForm.busNo"
-              placeholder="单据号："
-              clearable
-              style="width: 260px"
-              disabled
-            />
-          </el-form-item>
-          <el-form-item label="报损日期：">
-            <el-date-picker
-              v-model="receiptHeaderForm.occurrenceTime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="datetime"
-              :disabled="data.isEdit||viewStatus == 'view'"
-            />
-          </el-form-item>
-          <el-form-item label="仓库类型：" prop="lossTypeEnum">
-            <el-select
-              v-model="receiptHeaderForm.lossTypeEnum"
-              placeholder=""
-              clearable
-              style="width: 150px"
-              :disabled="data.isEdit||viewStatus == 'view'"
-              @change="handleChangelossTypeEnum"
-            >
-              <el-option
-                v-for="supplier in warehous_type"
-                :key="supplier.value"
-                :label="supplier.label"
-                :value="supplier.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- sourceLocationName -->
-          <el-form-item label="报损仓库：" prop="lossLocationId" required>
-            <el-select
-              v-model="receiptHeaderForm.lossLocationId"
-              placeholder=""
-              clearable
-              style="width: 150px"
-              :disabled="data.isEdit||viewStatus == 'view'"
-            >
-            <!-- purchase_type -->
-              <el-option
-                v-for="supplier in sourceTypeListOptions"
-                :key="supplier.id"
-                :label="supplier.name"
-                :value="supplier.id"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- sourceLocationStoreName -->
-          <el-form-item label="货位：" prop="lossLocationStoreId">
-            <el-select
-              v-model="receiptHeaderForm.lossLocationStoreId"
-              placeholder=""
-              clearable
-              style="width: 150px"
-              :disabled="data.isEdit||viewStatus == 'view'"
-            >
-              <el-option
-                v-for="supplier in lossLocationStoreIdListOptions"
-                :key="supplier.value"
-                :label="supplier.label"
-                :value="supplier.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="药品类型：" prop="medicationType" label-width="115px">
-            <el-select
-              v-model="receiptHeaderForm.medicationType"
-              placeholder=""
-              clearable
-              style="width: 150px"
-              :disabled="data.isEdit||viewStatus == 'view'"
-              @change="
-                (value) => {
-                  itemType = value;
-                }
-              "
-            >
-            <!-- 字典 purchase_type -->
-              <el-option
-                v-for="itemType in purchase_type"
-                :key="itemType.value"
-                :label="itemType.label"
-                :value="itemType.value"
-              />
-            </el-select>
-         </el-form-item>
-      </el-form>
-      <el-tabs type="border-card">
-        <el-tab-pane label="报损单据明细">
-          <el-row :gutter="10" class="mb8" v-if="!viewStatus">
-            <el-col :span="1.5">
-              <el-button type="primary" plain icon="Plus" @click="addNewRow"
-                >添加行</el-button
-              >
-            </el-col>
-            <!-- <el-col :span="1.5">
+    <el-form
+      :model="receiptHeaderForm"
+      ref="receiptHeaderRef"
+      :inline="true"
+      label-width="100px"
+      :rules="rules"
+    >
+      <el-form-item label="单据号：" prop="busNo">
+        <el-input
+          v-model="receiptHeaderForm.busNo"
+          placeholder="单据号："
+          clearable
+          style="width: 260px"
+          disabled
+        />
+      </el-form-item>
+      <el-form-item label="报损日期：">
+        <el-date-picker
+          v-model="receiptHeaderForm.occurrenceTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="datetime"
+          :disabled="data.isEdit || viewStatus == 'view'"
+        />
+      </el-form-item>
+      <el-form-item label="仓库类型：" prop="lossTypeEnum">
+        <el-select
+          v-model="receiptHeaderForm.lossTypeEnum"
+          placeholder=""
+          clearable
+          style="width: 150px"
+          :disabled="data.isEdit || viewStatus == 'view'"
+          @change="handleChangelossTypeEnum"
+        >
+          <el-option
+            v-for="supplier in warehous_type"
+            :key="supplier.value"
+            :label="supplier.label"
+            :value="supplier.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- sourceLocationName -->
+      <el-form-item label="报损仓库：" prop="lossLocationId" required>
+        <el-select
+          v-model="receiptHeaderForm.lossLocationId"
+          placeholder=""
+          clearable
+          style="width: 150px"
+          :disabled="data.isEdit || viewStatus == 'view'"
+        >
+          <!-- purchase_type -->
+          <el-option
+            v-for="supplier in sourceTypeListOptions"
+            :key="supplier.id"
+            :label="supplier.name"
+            :value="supplier.id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- sourceLocationStoreName -->
+      <el-form-item label="货位：" prop="lossLocationStoreId">
+        <el-select
+          v-model="receiptHeaderForm.lossLocationStoreId"
+          placeholder=""
+          clearable
+          style="width: 150px"
+          :disabled="data.isEdit || viewStatus == 'view'"
+        >
+          <el-option
+            v-for="supplier in lossLocationStoreIdListOptions"
+            :key="supplier.value"
+            :label="supplier.label"
+            :value="supplier.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="药品类型：" prop="medicationType" label-width="115px">
+        <el-select
+          v-model="receiptHeaderForm.medicationType"
+          placeholder=""
+          clearable
+          style="width: 150px"
+          :disabled="data.isEdit || viewStatus == 'view'"
+          @change="
+            (value) => {
+              itemType = value;
+            }
+          "
+        >
+          <!-- 字典 purchase_type -->
+          <el-option
+            v-for="itemType in purchase_type"
+            :key="itemType.value"
+            :label="itemType.label"
+            :value="itemType.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-tabs type="border-card">
+      <el-tab-pane label="报损单据明细">
+        <el-row :gutter="10" class="mb8" v-if="!viewStatus">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="addNewRow">添加行</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
               <el-button type="primary" plain icon="Plus" @click="confirmCurrentRow"
                 >确认当前行</el-button
               >
@@ -192,106 +165,85 @@
                 >取消所有行编辑</el-button
               >
             </el-col> -->
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                plain
-                icon="Delete"
-                :disabled="multiple"
-                @click="deleteSelectedRows"
-                >删除行</el-button
-              >
-            </el-col>
-          </el-row>
-          <el-form :model="form" :rules="tableRules" ref="formRef">
-            <el-table
-              v-loading="loading"
-              :data="form.purchaseinventoryList"
-              @selection-change="handleSelectionChange"
-              @row-click="handleRowClick"
-              ref="tableRef"
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="deleteSelectedRows"
+              >删除行</el-button
             >
-              <el-table-column type="selection" width="50" align="center" />
-              <el-table-column
-                label="项目"
-                align="center"
-                key="name"
-                prop="name"
-                width="200"
-                fixed
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.name`"
-                    :rules="tableRules.name"
-                    required
-                  >
-                    <el-input
-                      v-if="viewStatus=='view'"
-                      v-model="scope.row.name"
-                      placeholder=""
-                      disabled
-                    />
-                    <PopoverList
-                      v-else
-                      @search="handleSearch"
-                      :width="1000"
-                      :modelValue="scope.row.name"
-                    >
-                      <template #popover-content="{}">
-                        <transferManagement
-                          @selectRow="(row) => selectRow(row, scope.$index)"
-                           :searchKey="medicineSearchKey"
-                           :lossLocationId="receiptHeaderForm.lossLocationId"
-                           :itemType="receiptHeaderForm.medicationType"
-                        />
-                      </template>
-                    </PopoverList>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="规格"
-                align="center"
-                key="volume"
-                prop="volume"
-                width="200"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.volume`"
-                    :rules="tableRules.volume"
-                  >
-                    <el-input
-                      v-model="scope.row.volume"
-                      placeholder=""
-                      disabled
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="厂家/产地"
-                align="center"
-                key="manufacturer"
-                prop="manufacturer"
-                :show-overflow-tooltip="true"
-                width="240"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.manufacturer`"
-                    :rules="tableRules.manufacturer"
+          </el-col>
+        </el-row>
+        <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'view'">
+          <el-table
+            v-loading="loading"
+            :data="form.purchaseinventoryList"
+            @selection-change="handleSelectionChange"
+            @row-click="handleRowClick"
+            ref="tableRef"
+          >
+            <el-table-column type="selection" width="50" align="center" />
+            <el-table-column label="项目" align="center" key="name" prop="name" width="200" fixed>
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.name`"
+                  :rules="tableRules.name"
+                  required
+                >
+                  <el-input
+                    v-if="viewStatus == 'view'"
+                    v-model="scope.row.name"
+                    placeholder=""
+                    disabled
+                  />
+                  <PopoverList
+                    v-else
+                    @search="handleSearch"
+                    :width="1000"
+                    :modelValue="scope.row.name"
                   >
-                    <el-input
-                      v-model="scope.row.manufacturer"
-                      placeholder=""
-                      disabled
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
+                    <template #popover-content="{}">
+                      <transferManagement
+                        @selectRow="(row) => selectRow(row, scope.$index)"
+                        :searchKey="medicineSearchKey"
+                        :lossLocationId="receiptHeaderForm.lossLocationId"
+                        :itemType="receiptHeaderForm.medicationType"
+                      />
+                    </template>
+                  </PopoverList>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格" align="center" key="volume" prop="volume" width="200">
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.volume`"
+                  :rules="tableRules.volume"
+                >
+                  <el-input v-model="scope.row.volume" placeholder="" disabled />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="厂家/产地"
+              align="center"
+              key="manufacturer"
+              prop="manufacturer"
+              :show-overflow-tooltip="true"
+              width="240"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.manufacturer`"
+                  :rules="tableRules.manufacturer"
+                >
+                  <el-input v-model="scope.row.manufacturer" placeholder="" disabled />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
               label="计量单位"
               align="center"
               key="unitCode"
@@ -309,7 +261,7 @@
                     <el-select
                       v-model="scope.row.unitCode"
                       placeholder=" "
-                      :disabled="data.isEdit||viewStatus == 'view'"
+                      :disabled="data.isEdit || viewStatus == 'view'"
                       :class="{ 'error-border': scope.row.error }"
                       @change="(value) => handleUnitCodeChange(scope.row, scope.$index, value)"
                     >
@@ -333,199 +285,181 @@
                   </div>
                 </el-form-item>
               </template>
-              </el-table-column>
-              <el-table-column
-                label="报损前库存数量"
-                align="center"
-                key="totalQuantity"
-                prop="totalQuantity"
-                width="120"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.totalQuantity`"
-                    :rules="tableRules.totalQuantity"
-                  >
+            </el-table-column>
+            <el-table-column
+              label="报损前库存数量"
+              align="center"
+              key="totalQuantity"
+              prop="totalQuantity"
+              width="120"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.totalQuantity`"
+                  :rules="tableRules.totalQuantity"
+                >
+                  <el-input v-model="scope.row.totalQuantity" placeholder="" disabled />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="报损数量"
+              align="center"
+              key="itemQuantity"
+              prop="itemQuantity"
+              width="120"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.itemQuantity`"
+                  :rules="tableRules.itemQuantity"
+                  required
+                >
+                  <div class="select_wrapper_div">
                     <el-input
-                      v-model="scope.row.totalQuantity"
+                      v-model="scope.row.itemQuantity"
                       placeholder=""
-                      disabled
+                      :disabled="viewStatus == 'view'"
+                      @blur="handleTotalPrice(scope.$index)"
+                      :class="{ 'error-border': scope.row.error }"
                     />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="报损数量"
-                align="center"
-                key="itemQuantity"
-                prop="itemQuantity"
-                width="120"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.itemQuantity`"
-                    :rules="tableRules.itemQuantity"
-                    required
-                  >
-                    <div class="select_wrapper_div">
-                      <el-input
-                        v-model="scope.row.itemQuantity"
-                        placeholder=""
-                        :disabled="viewStatus == 'view'"
-                        @blur="handleTotalPrice(scope.$index)"
-                        :class="{ 'error-border': scope.row.error }"
-                      />
-                    </div>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="采购单价 "
-                align="center"
-                key="price"
-                prop="price"
-                width="130"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.price`"
-                    :rules="tableRules.price"
-                  >
-                    <div class="select_wrapper_div">
-                      <el-input
-                        disabled
-                        v-model="scope.row.price"
-                        placeholder=""
-                        @blur="handleTotalPrice(scope.$index)"
-                        :class="{ 'error-border': scope.row.error }"
-                      >
-                        <template #suffix>元</template>
-                      </el-input>
-                    </div>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              
-              <el-table-column
-                label="报损金额 "
-                align="center"
-                key="totalPrice"
-                prop="totalPrice"
-                width="130"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.totalPrice`"
-                  >
+                  </div>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="采购单价 " align="center" key="price" prop="price" width="130">
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.price`"
+                  :rules="tableRules.price"
+                >
+                  <div class="select_wrapper_div">
                     <el-input
                       disabled
-                      v-model="scope.row.totalPrice"
+                      v-model="scope.row.price"
                       placeholder=""
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="产品批号"
-                align="center"
-                key="lotNumber"
-                prop="lotNumber"
-                width="160"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.lotNumber`"
-                    :rules="tableRules.lotNumber"
-                  >
-                    <el-input 
-                      v-model="scope.row.lotNumber" 
-                      placeholder="" 
-                      disabled
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="供应商"
-                align="center"
-                key="supplierName"
-                prop="supplierName"
-                width="130"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.supplierName`"
-                    :rules="tableRules.supplierName"
-                    
-                  >
-                    <el-input v-model="scope.row.supplierName" placeholder="" disabled/>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="原因"
-                align="center"
-                key="lossReason"
-                prop="lossReason"
-                width="130"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.lossReason`"
-                    :rules="tableRules.lossReason"
-                  >
-                    <el-input v-model="scope.row.lossReason" placeholder="" :disabled="viewStatus == 'view'"/>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="生产日期"
-                align="center"
-                key="startTime"
-                prop="startTime"
-                width="150"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.startTime`"
-                    :rules="tableRules.startTime"
-                  >
-                    <el-date-picker
-                      v-model="scope.row.startTime"
-                      type="date"
-                      placeholder="选择日期"
-                      format="YYYY-MM-DD"
-                      value-format="YYYY-MM-DD"
-                      :disabled="viewStatus == 'view'"
+                      @blur="handleTotalPrice(scope.$index)"
+                      :class="{ 'error-border': scope.row.error }"
+                    >
+                      <template #suffix>元</template>
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </template>
+            </el-table-column>
 
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="有效期至"
-                align="center"
-                key="endTime"
-                prop="endTime"
-                width="150"
-              >
-                <template #default="scope">
-                  <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.endTime`"
-                    :rules="tableRules.endTime"
-                  >
-                    <el-date-picker
-                      v-model="scope.row.endTime"
-                      type="date"
-                      placeholder="选择日期"
-                      format="YYYY-MM-DD"
-                      value-format="YYYY-MM-DD"
-                      :disabled="viewStatus == 'view'"
-                    />
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column
+            <el-table-column
+              label="报损金额 "
+              align="center"
+              key="totalPrice"
+              prop="totalPrice"
+              width="130"
+            >
+              <template #default="scope">
+                <el-form-item :prop="`purchaseinventoryList.${scope.$index}.totalPrice`">
+                  <el-input disabled v-model="scope.row.totalPrice" placeholder="" />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="产品批号"
+              align="center"
+              key="lotNumber"
+              prop="lotNumber"
+              width="160"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.lotNumber`"
+                  :rules="tableRules.lotNumber"
+                >
+                  <el-input v-model="scope.row.lotNumber" placeholder="" disabled />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="供应商"
+              align="center"
+              key="supplierName"
+              prop="supplierName"
+              width="130"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.supplierName`"
+                  :rules="tableRules.supplierName"
+                >
+                  <el-input v-model="scope.row.supplierName" placeholder="" disabled />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="原因"
+              align="center"
+              key="lossReason"
+              prop="lossReason"
+              width="130"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.lossReason`"
+                  :rules="tableRules.lossReason"
+                >
+                  <el-input
+                    v-model="scope.row.lossReason"
+                    placeholder=""
+                    :disabled="viewStatus == 'view'"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="生产日期"
+              align="center"
+              key="startTime"
+              prop="startTime"
+              width="150"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.startTime`"
+                  :rules="tableRules.startTime"
+                >
+                  <el-date-picker
+                    v-model="scope.row.startTime"
+                    type="date"
+                    placeholder="选择日期"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="viewStatus == 'view'"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="有效期至"
+              align="center"
+              key="endTime"
+              prop="endTime"
+              width="150"
+            >
+              <template #default="scope">
+                <el-form-item
+                  :prop="`purchaseinventoryList.${scope.$index}.endTime`"
+                  :rules="tableRules.endTime"
+                >
+                  <el-date-picker
+                    v-model="scope.row.endTime"
+                    type="date"
+                    placeholder="选择日期"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="viewStatus == 'view'"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column
                 label="发票号 "
                 align="center"
                 key="invoiceNo"
@@ -541,66 +475,52 @@
                   </el-form-item>
                 </template>
               </el-table-column> -->
-              <!-- <el-table-column
-                label="操作"
-                align="center"
-                width="80"
-                class-name="small-padding fixed-width"
-                fixed="right"
-                v-if="!viewStatus"
-              >
-                <template #default="scope">
-                  <el-button
-                    link
-                    type="primary"
-                    icon="Edit"
-                    @click="handleSave(scope.row, scope.$index)"
-             
-                    >保存</el-button
-                  >
-                </template>
-              </el-table-column> -->
-            </el-table>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
-      <el-row
-        :gutter="10"
-        class="mb8"
-        style="
-          margin-top: 15px;
-          display: flex;
-          align-items: center;
-          justify-content: flex-start;
-        "
-      >
-        <el-col :span="3">
-          <span>制单人：{{ userStore.name }}</span>
-        </el-col>
-        <!-- <el-col :span="2">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="80"
+              class-name="small-padding fixed-width"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="handleScan(scope.row, scope.$index)"
+                  >扫码</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+    <el-row
+      :gutter="10"
+      class="mb8"
+      style="margin-top: 15px; display: flex; align-items: center; justify-content: flex-start"
+    >
+      <el-col :span="3">
+        <span>制单人：{{ userStore.name }}</span>
+      </el-col>
+      <!-- <el-col :span="2">
           <span>审核人：</span>
         </el-col>
         <el-col :span="2">
           <span>单据状态：</span>
         </el-col> -->
-        <el-col :span="6">
-          <el-row
-            :gutter="8"
-            style="
-              display: flex;
-              align-items: center;
-              justify-content: flex-start;
-            "
-          >
-            <el-col :span="10">
-              <span>合计金额：{{ totalAmount?totalAmount.toFixed(4):0 }}</span>
-            </el-col>
-            <!-- <el-col :span="10">
+      <el-col :span="6">
+        <el-row :gutter="8" style="display: flex; align-items: center; justify-content: flex-start">
+          <el-col :span="10">
+            <span>合计金额：{{ totalAmount ? totalAmount.toFixed(4) : 0 }}</span>
+          </el-col>
+          <!-- <el-col :span="10">
               <el-input v-model="totalAmount" placeholder="" disabled />
             </el-col> -->
-          </el-row>
-        </el-col>
-      </el-row>
+        </el-row>
+      </el-col>
+    </el-row>
     <!-- </el-dialog> -->
   </div>
 </template>
@@ -619,12 +539,12 @@ import {
   getMedicineList,
   getTransferProductDetail,
   reject,
-  lossReportApproved
-} from "../lossReporting";
-import PopoverList from "@/components/OpenHis/popoverList/index.vue";
-import transferManagement from "./components/lossReporting.vue";
-import { formatDate,formatDateymd } from "@/utils/index";
-import useUserStore from "@/store/modules/user";
+  lossReportApproved,
+} from '../lossReporting';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import transferManagement from './components/lossReporting.vue';
+import { formatDate, formatDateymd } from '@/utils/index';
+import useUserStore from '@/store/modules/user';
 import { useStore } from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
 const tagsViewStore = useTagsViewStore();
@@ -634,23 +554,18 @@ const route = useRoute();
 const userStore = useUserStore();
 
 const { proxy } = getCurrentInstance();
-const {
-  warehous_type,
-  category_code,
-  service_type_code,
-  specialty_code,
-  purchase_type,
-} = proxy.useDict(
-  "warehous_type",
-  "category_code",
-  "service_type_code",
-  "specialty_code",
-  "purchase_type"
-);
+const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
+  proxy.useDict(
+    'warehous_type',
+    'category_code',
+    'service_type_code',
+    'specialty_code',
+    'purchase_type'
+  );
 
-const viewStatus = ref("")
-const startTimeOld = ref("")
-const endTimeOld = ref("")
+const viewStatus = ref('');
+const startTimeOld = ref('');
+const endTimeOld = ref('');
 const purchaseinventoryList = ref([]);
 const open = ref(false);
 const loading = ref(false);
@@ -658,7 +573,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
+const title = ref('');
 const visible = ref(false);
 const row = ref({});
 const rowIndex = ref(-1);
@@ -693,7 +608,7 @@ const props = defineProps({
 const form = reactive({
   purchaseinventoryList: [],
 });
-const rowList = ref([])
+const rowList = ref([]);
 const receiptHeaderForm = reactive({
   busNo: undefined,
   occurrenceTime: formatDate(new Date()),
@@ -708,33 +623,23 @@ const data = reactive({
     searchKey: undefined, // 供应商名称
     busNo: undefined, // 编码
     statusEnum: undefined, // 状态
-    // supplierId: undefined, // 
+    // supplierId: undefined, //
     occurrenceTime: undefined, // 申请时间
     // practitionerId: undefined, // 经手人ID
   },
   rules: {
-    purposeLocationId: [
-      { required: true, message: "请选择目的仓库", trigger: "change" },
-    ],
-    lossLocationId: [
-      { required: true, message: "请选择报损仓库", trigger: "change" },
-    ],
-    medicationType: [
-      { required: true, message: "请选择药品类型", trigger: "change" },
-    ],
+    purposeLocationId: [{ required: true, message: '请选择目的仓库', trigger: 'change' }],
+    lossLocationId: [{ required: true, message: '请选择报损仓库', trigger: 'change' }],
+    medicationType: [{ required: true, message: '请选择药品类型', trigger: 'change' }],
   },
   tableRules: {
-    name: [{ required: true, message: "项目不能为空", trigger: "change" }],
+    name: [{ required: true, message: '项目不能为空', trigger: 'change' }],
     // volume: [
     //   { required: true, message: "规格不能为空", trigger: "blur" },
     // ],
-    unitCode: [
-      { required: true, message: "计量单位不能为空", trigger: "change" },
-    ],
-   
-    itemQuantity: [
-      { required: true, message: "报损数量不能为空", trigger: "blur" },
-    ],
+    unitCode: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
+
+    itemQuantity: [{ required: true, message: '报损数量不能为空', trigger: 'blur' }],
     // lotNumber: [
     //   { required: true, message: "产品批号不能为空", trigger: "blur" },
     // ],
@@ -749,40 +654,40 @@ const data = reactive({
 });
 
 const { queryParams, rules, tableRules } = toRefs(data);
-const purposeTypeListOptions = ref(undefined); 
+const purposeTypeListOptions = ref(undefined);
 const sourceTypeListOptions = ref(undefined);
-const lossLocationStoreIdListOptions = ref(undefined); 
+const lossLocationStoreIdListOptions = ref(undefined);
 const purposeLocationStoreIdListOptions = ref(undefined);
-const categoryListOptions = ref(undefined); 
+const categoryListOptions = ref(undefined);
 
 const selectedRows = ref([]); // 用于存储选中的行
-const emit = defineEmits(["refresh"]);
+const emit = defineEmits(['refresh']);
 const tableRef = ref(undefined); // 表格引用
 const currentRow = ref(undefined); // 当前操作的行
-const medicineSearchKey = ref("");
-const itemType = ref("");
+const medicineSearchKey = ref('');
+const itemType = ref('');
 
 watch(
   () => store.currentDataBS,
   (newVlaue) => {
-    if (newVlaue&&!route.query.supplyBusNo) {
-      form.purchaseinventoryList = newVlaue?.purchaseinventoryList
-      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo
-      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime
-      receiptHeaderForm.lossTypeEnum = newVlaue?.receiptHeaderForm.lossTypeEnum
-      handleChangeSourceTypeEnum(receiptHeaderForm.lossTypeEnum,1)
-      receiptHeaderForm.lossLocationId = newVlaue?.receiptHeaderForm.lossLocationId
-      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType
+    if (newVlaue && !route.query.supplyBusNo) {
+      form.purchaseinventoryList = newVlaue?.purchaseinventoryList;
+      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo;
+      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime;
+      receiptHeaderForm.lossTypeEnum = newVlaue?.receiptHeaderForm.lossTypeEnum;
+      handleChangeSourceTypeEnum(receiptHeaderForm.lossTypeEnum, 1);
+      receiptHeaderForm.lossLocationId = newVlaue?.receiptHeaderForm.lossLocationId;
+      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType;
     }
   },
   { immediate: true }
-)
+);
 watch(
   () => form.purchaseinventoryList,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-      if(viewStatus.value){
-        handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      if (viewStatus.value) {
+        handleTotalAmount();
       }
     }
   },
@@ -790,76 +695,76 @@ watch(
 );
 // 挂载时绑定事件
 onMounted(() => {
-  document.addEventListener("click", handleClickOutside);
+  document.addEventListener('click', handleClickOutside);
 });
 
 // 卸载时移除事件
 onUnmounted(() => {
-  document.removeEventListener("click", handleClickOutside);
+  document.removeEventListener('click', handleClickOutside);
 });
 
 function addNewRow() {
   //  proxy.$message.warning("等待和后端联调！");
   //  return
-  proxy.$refs["receiptHeaderRef"].validate((valid) => {
+  proxy.$refs['receiptHeaderRef'].validate((valid) => {
     if (valid) {
       // if (data.isAdding) {
       //   proxy.$message.warning("请先保存当前行后再新增！");
       //   return;
       // }
       const newRow = {
-        id: "",
-        supplyBusNo:"",
-        occurrenceTime:"",
-        typeEnum_enumText:"",
-        statusEnum_enumText:"",
-        lossLocationId:"", // 源仓库
-        sourceLocationName:"",
-        purposeLocationName:"",
-        approverId_dictText:"",
-        applicantId_dictText:"",
-        approvalTime:"",
-        createTime:"",
-        itemTable: "",
-        itemQuantity: "",
-        itemId: "",
+        id: '',
+        supplyBusNo: '',
+        occurrenceTime: '',
+        typeEnum_enumText: '',
+        statusEnum_enumText: '',
+        lossLocationId: '', // 源仓库
+        sourceLocationName: '',
+        purposeLocationName: '',
+        approverId_dictText: '',
+        applicantId_dictText: '',
+        approvalTime: '',
+        createTime: '',
+        itemTable: '',
+        itemQuantity: '',
+        itemId: '',
         // unitCode: "",
-        lossReason: "",
-        purposeTypeEnum: "",
+        lossReason: '',
+        purposeTypeEnum: '',
         purposeLocationId: null,
         purposeLocationStoreId: null,
         // practitionerId: "",
-        supplierId: "",
-        supplierName: "",
-        invoiceNo: "",
-        startTime: "",
-        endTime: "",
-        price: "",
-        totalPrice: "",
-        objQuantity:"",
-        orgQuantity:"",
-        categoryCode:"",
-        definitionId:"",
-        itemBusNo:"",
-        itemTableName:"",
-        itemType:"",
-        itemType_enumText:"",
-        lotNumber:"",
-        manufacturer:"",
-        minUnitCode:"",
-        minUnitCode_dictText:"",
-        name:"",
-        orgLocation:"",
-        partPercent:"",
-        productName:"",
-        pyStr:"",
-        supplier:"",
-        unitCode:"",
-        unitCode_dictText:'',
+        supplierId: '',
+        supplierName: '',
+        invoiceNo: '',
+        startTime: '',
+        endTime: '',
+        price: '',
+        totalPrice: '',
+        objQuantity: '',
+        orgQuantity: '',
+        categoryCode: '',
+        definitionId: '',
+        itemBusNo: '',
+        itemTableName: '',
+        itemType: '',
+        itemType_enumText: '',
+        lotNumber: '',
+        manufacturer: '',
+        minUnitCode: '',
+        minUnitCode_dictText: '',
+        name: '',
+        orgLocation: '',
+        partPercent: '',
+        productName: '',
+        pyStr: '',
+        supplier: '',
+        unitCode: '',
+        unitCode_dictText: '',
         // unitList: [{unitCode: "2", unitCode_dictText: "盒", minUnitCode: "1", minUnitCode_dictText: "片"}],
-        volume:'',
-        wbStr:'',
-        ybNo:'',
+        volume: '',
+        wbStr: '',
+        ybNo: '',
         // sellPrice: "",
         // minSellPrice: "",
         // locationInventoryList: [{value:1,label:'药房'},{value:2,label:'仓库'}], // 库房列表
@@ -880,29 +785,29 @@ function getNextDayZeroTimeStamp(selectedTime) {
   return nextDay.getTime();
 }
 
-function changeValStart(val,index){
-  const selectedTime = val
+function changeValStart(val, index) {
+  const selectedTime = val;
   const validTime = this.getNextDayZeroTimeStamp(selectedTime);
-  if(form.purchaseinventoryList[index].endTime){
-    const endTime = formatDateymd(form.purchaseinventoryList[index].endTime)
-    const getNextDayZeroTime = this.getNextDayZeroTimeStamp(endTime)
-    if (getNextDayZeroTime<validTime) {
-      proxy.$message.warning("生产日期必须小于等于有效期！");
-      form.purchaseinventoryList[index].startTime = startTimeOld.value
-      return
+  if (form.purchaseinventoryList[index].endTime) {
+    const endTime = formatDateymd(form.purchaseinventoryList[index].endTime);
+    const getNextDayZeroTime = this.getNextDayZeroTimeStamp(endTime);
+    if (getNextDayZeroTime < validTime) {
+      proxy.$message.warning('生产日期必须小于等于有效期！');
+      form.purchaseinventoryList[index].startTime = startTimeOld.value;
+      return;
     }
   }
 }
-function changeValEnd(val,index){
-  const selectedTimes = val
+function changeValEnd(val, index) {
+  const selectedTimes = val;
   const validTimes = this.getNextDayZeroTimeStamp(selectedTimes);
-  if(form.purchaseinventoryList[index].startTime){
-    const startTime = formatDateymd(form.purchaseinventoryList[index].startTime)
-    const getNextDayZeroTimes = this.getNextDayZeroTimeStamp(startTime)
-    if (getNextDayZeroTimes>validTimes) {
-      proxy.$message.warning("有效期必须大于等于生产日期！");
-      form.purchaseinventoryList[index].endTime = endTimeOld.value
-      return
+  if (form.purchaseinventoryList[index].startTime) {
+    const startTime = formatDateymd(form.purchaseinventoryList[index].startTime);
+    const getNextDayZeroTimes = this.getNextDayZeroTimeStamp(startTime);
+    if (getNextDayZeroTimes > validTimes) {
+      proxy.$message.warning('有效期必须大于等于生产日期！');
+      form.purchaseinventoryList[index].endTime = endTimeOld.value;
+      return;
     }
   }
 }
@@ -910,35 +815,39 @@ function changeValEnd(val,index){
 function handleBlur(row, index) {
   let hasError = false;
   for (let key in row) {
-    if(!row[key]){
-      row[key] = ''
+    if (!row[key]) {
+      row[key] = '';
     }
   }
-  if(receiptHeaderForm.medicationType){
-    if(!row.itemTable){
+  if (receiptHeaderForm.medicationType) {
+    if (!row.itemTable) {
       if (receiptHeaderForm.medicationType == 1) {
-        row.itemTable = "med_medication_definition";
+        row.itemTable = 'med_medication_definition';
       } else {
-        row.itemTable = "adm_device_definition";
+        row.itemTable = 'adm_device_definition';
       }
     }
   }
 
-  row.purposeLocationId = receiptHeaderForm.purposeLocationId
+  row.purposeLocationId = receiptHeaderForm.purposeLocationId;
   row.purposeLocationStoreId = receiptHeaderForm.purposeLocationStoreId;
   row.busNo = receiptHeaderForm.busNo;
   row.occurrenceTime = receiptHeaderForm.occurrenceTime;
-  row.applyTime = formatDate(row.applyTime) 
-  row.startTime = formatDateymd(row.startTime)
-  row.endTime = formatDateymd(row.endTime)
+  row.applyTime = formatDate(row.applyTime);
+  row.startTime = formatDateymd(row.startTime);
+  row.endTime = formatDateymd(row.endTime);
   // 报损仓库类型
-  let lossTypeEnum = warehous_type.value.filter(e=>{return e.value == receiptHeaderForm.lossTypeEnum})
-  row.lossTypeEnum = lossTypeEnum?lossTypeEnum[0].value:receiptHeaderForm.lossTypeEnum
+  let lossTypeEnum = warehous_type.value.filter((e) => {
+    return e.value == receiptHeaderForm.lossTypeEnum;
+  });
+  row.lossTypeEnum = lossTypeEnum ? lossTypeEnum[0].value : receiptHeaderForm.lossTypeEnum;
   // let purposeTypeEnum = warehous_type.value.filter(e=>{return e.label==receiptHeaderForm.purposeTypeEnum})
   // row.purposeTypeEnum = (purposeTypeEnum&&purposeTypeEnum[0])?purposeTypeEnum[0].value:receiptHeaderForm.purposeTypeEnum
   // 报损仓库ID
-  let lossLocationId = sourceTypeListOptions.value.filter(e=>{return e.id == receiptHeaderForm.lossLocationId})
-  row.lossLocationId = lossLocationId?lossLocationId[0].id:receiptHeaderForm.lossLocationId
+  let lossLocationId = sourceTypeListOptions.value.filter((e) => {
+    return e.id == receiptHeaderForm.lossLocationId;
+  });
+  row.lossLocationId = lossLocationId ? lossLocationId[0].id : receiptHeaderForm.lossLocationId;
   // let purposeLocationId = purposeTypeListOptions.value.filter(e=>{return e.name==receiptHeaderForm.purposeLocationId})
   // row.purposeLocationId = (purposeLocationId&&purposeLocationId[0])?purposeLocationId[0].id:receiptHeaderForm.purposeLocationId
   // row.lossTypeEnum = receiptHeaderForm.lossTypeEnum;
@@ -957,99 +866,130 @@ function handleChangeSourceTypeEnum(value) {
   }
 }
 // 获取详情
-function getTransferProductDetails(){
-  if(route.query.supplyBusNo){ // 编辑
+function getTransferProductDetails() {
+  if (route.query.supplyBusNo) {
+    // 编辑
     getTransferProductDetail(receiptHeaderForm.busNo).then((res) => {
-      form.purchaseinventoryList = res.data
-      form.purchaseinventoryList.map((e,index)=>{
-        e.isSave = true
-        form.purchaseinventoryList[index].statusMaxvalue =  false
-        e.volume = e.totalVolume
-        e.name = e.itemName
-        e.manufacturer = e.manufacturerText
-        e.lossReason = e.reason
-        if(e.purposeTypeEnum){
-          warehous_type.value.map(item=>{
-            if(item.value == e.purposeTypeEnum ){
-              receiptHeaderForm.lossTypeEnum = item.value
-              handleChangelossTypeEnum(receiptHeaderForm.lossTypeEnum)
+      form.purchaseinventoryList = res.data;
+      form.purchaseinventoryList.map((e, index) => {
+        e.isSave = true;
+        form.purchaseinventoryList[index].statusMaxvalue = false;
+        e.volume = e.totalVolume;
+        e.name = e.itemName;
+        e.manufacturer = e.manufacturerText;
+        e.lossReason = e.reason;
+        if (e.purposeTypeEnum) {
+          warehous_type.value.map((item) => {
+            if (item.value == e.purposeTypeEnum) {
+              receiptHeaderForm.lossTypeEnum = item.value;
+              handleChangelossTypeEnum(receiptHeaderForm.lossTypeEnum);
             }
-          })
+          });
         }
-        if(e.itemType){
-          purchase_type.value.map(item=>{
-            if(item.value == e.itemType ){
+        if (e.itemType) {
+          purchase_type.value.map((item) => {
+            if (item.value == e.itemType) {
               // receiptHeaderForm.medicationType = item.label
-              receiptHeaderForm.medicationType = item.value
+              receiptHeaderForm.medicationType = item.value;
             }
-          })
+          });
         }
-        if(e.purposeLocationId){
-          console.log(sourceTypeListOptions,"1212121211")
-          receiptHeaderForm.lossLocationId = e.purposeLocationId
+        if (e.purposeLocationId) {
+          console.log(sourceTypeListOptions, '1212121211');
+          receiptHeaderForm.lossLocationId = e.purposeLocationId;
           // receiptHeaderForm.lossLocationId = e.purposeLocationName
         }
-        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalQuantity?form.purchaseinventoryList[index].totalQuantity:0
-        if(e.unitList&&e.unitCode){
-          form.purchaseinventoryList[index].unitList = e.unitList[0]   //计量单位回显数组
-          form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].measurementUnitCode
-          form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-          if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-            getMaxCounts(e,index,1)
+        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index]
+          .totalQuantity
+          ? form.purchaseinventoryList[index].totalQuantity
+          : 0;
+        if (e.unitList && e.unitCode) {
+          form.purchaseinventoryList[index].unitList = e.unitList[0]; //计量单位回显数组
+          form.purchaseinventoryList[index].unitCode =
+            form.purchaseinventoryList[index].measurementUnitCode;
+          form.purchaseinventoryList[index].unitCode_dictText =
+            form.purchaseinventoryList[index].measurementUnitCode_dictText;
+          if (
+            form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.unitCode
+          ) {
+            // 回显大单位
+            getMaxCounts(e, index, 1);
           }
-          console.log(form.purchaseinventoryList, e.unitList,"获取详情12");
-        }else{
-          if(!e.unitList&&e.unitCode){
-            form.purchaseinventoryList[index].unitList = {unitCode: form.purchaseinventoryList[index].unitCode,unitCode_dictText:form.purchaseinventoryList[index].unitCode_dictText,
-              minUnitCode:form.purchaseinventoryList[index].minUnitCode, minUnitCode_dictText:form.purchaseinventoryList[index].minUnitCode_dictText
-            }  //计量单位回显数组
-            form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-            form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-            if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-              getMaxCounts(e,index,1)
+          console.log(form.purchaseinventoryList, e.unitList, '获取详情12');
+        } else {
+          if (!e.unitList && e.unitCode) {
+            form.purchaseinventoryList[index].unitList = {
+              unitCode: form.purchaseinventoryList[index].unitCode,
+              unitCode_dictText: form.purchaseinventoryList[index].unitCode_dictText,
+              minUnitCode: form.purchaseinventoryList[index].minUnitCode,
+              minUnitCode_dictText: form.purchaseinventoryList[index].minUnitCode_dictText,
+            }; //计量单位回显数组
+            form.purchaseinventoryList[index].unitCode =
+              form.purchaseinventoryList[index].measurementUnitCode_dictText;
+            form.purchaseinventoryList[index].unitCode_dictText =
+              form.purchaseinventoryList[index].measurementUnitCode_dictText;
+            if (
+              form.purchaseinventoryList[index].measurementUnitCode ==
+              form.purchaseinventoryList[index].unitList.unitCode
+            ) {
+              // 回显大单位
+              getMaxCounts(e, index, 1);
             }
           }
         }
-        if(e.price){
+        if (e.price) {
           // 单价   大单位单价
-          if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.minUnitCode){
-            form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price / form.purchaseinventoryList[index].partPercent|| "";
-            form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+          if (
+            form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.minUnitCode
+          ) {
+            form.purchaseinventoryList[index].price =
+              form.purchaseinventoryList[index].price /
+                form.purchaseinventoryList[index].partPercent || '';
+            form.purchaseinventoryList[index].price =
+              form.purchaseinventoryList[index].price.toFixed(4);
             // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-          }else{
-            if(form.purchaseinventoryList[index].price>1){
-              form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+          } else {
+            if (form.purchaseinventoryList[index].price > 1) {
+              form.purchaseinventoryList[index].price =
+                form.purchaseinventoryList[index].price.toFixed(4);
             }
           }
-          if (form.purchaseinventoryList[index].price > 0 && form.purchaseinventoryList[index].itemQuantity > 0) {
+          if (
+            form.purchaseinventoryList[index].price > 0 &&
+            form.purchaseinventoryList[index].itemQuantity > 0
+          ) {
             form.purchaseinventoryList[index].totalPrice =
-            form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity;
-            form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
+              form.purchaseinventoryList[index].price *
+              form.purchaseinventoryList[index].itemQuantity;
+            form.purchaseinventoryList[index].totalPrice =
+              form.purchaseinventoryList[index].totalPrice.toFixed(4);
           }
-        }else{
-          form.purchaseinventoryList[index].price = 0
-          form.purchaseinventoryList[index].totalPrice = 0
+        } else {
+          form.purchaseinventoryList[index].price = 0;
+          form.purchaseinventoryList[index].totalPrice = 0;
         }
-      })
-    })
-  }else{ //新增
-
+      });
+    });
+  } else {
+    //新增
   }
 }
 
 // 取消行编辑
-function cancelEditRow(){
-  const findIndexId  = form.purchaseinventoryList.findIndex(e=>e.id==currentRow.value.id)
+function cancelEditRow() {
+  const findIndexId = form.purchaseinventoryList.findIndex((e) => e.id == currentRow.value.id);
   // console.log(findIndexId,"-----------",form.purchaseinventoryList[findIndexId])
-  form.purchaseinventoryList[findIndexId] = {}
+  form.purchaseinventoryList[findIndexId] = {};
   // currentRow.value
-  console.log(currentRow.value,"3223",form.purchaseinventoryList[findIndexId])
+  console.log(currentRow.value, '3223', form.purchaseinventoryList[findIndexId]);
 }
 // 点击行时记录当前行
 function handleRowClick(row) {
-  console.log(row,"--------------------`15`")
+  console.log(row, '--------------------`15`');
   currentRow.value = row;
-   console.log(row, currentRow.value,"--------------------`1`")
+  console.log(row, currentRow.value, '--------------------`1`');
 }
 
 // 监听表格外的点击事件
@@ -1067,7 +1007,7 @@ function saveRow(row, index) {
   addTransferProduct(row).then((response) => {
     reset();
     data.isAdding = false; // 允许新增下一行
-    proxy.$message.success("保存成功！");
+    proxy.$message.success('保存成功！');
     visible.value = false;
   });
 }
@@ -1076,53 +1016,60 @@ function saveRow(row, index) {
 function handleReject() {
   reject(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataBS();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'lossReporting'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'lossReporting' },
+      });
     }
   });
 }
 function handelApply() {
   lossReportApproved(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataBS();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'lossReporting'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'lossReporting' },
+      });
     }
-  })
+  });
 }
 /** 提交审核按钮 */
 function handleSubmitApproval() {
   let length = form.purchaseinventoryList.length;
   if (length < 1) {
-    proxy.$modal.msgWarning("请先添加单据");
+    proxy.$modal.msgWarning('请先添加单据');
   } else if (!form.purchaseinventoryList[length - 1].isSave) {
-    proxy.$modal.msgWarning("第" + length + "行单据未保存，请先保存");
+    proxy.$modal.msgWarning('第' + length + '行单据未保存，请先保存');
   } else {
     submitApproval(receiptHeaderForm.busNo).then((response) => {
-      proxy.$modal.msgSuccess("提交审批成功");
+      proxy.$modal.msgSuccess('提交审批成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataBS();
       router.replace({ path: 'lossReportingList' });
-    })
+    });
   }
 }
 function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0]
-  if(view.name== 'LossReportingManagement'){ //单据号删除
-    sessionStorage.setItem('busNoBS',"")
-  }  
+  const latestView = visitedViews.slice(-1)[0];
+  if (view.name == 'LossReportingManagement') {
+    //单据号删除
+    sessionStorage.setItem('busNoBS', '');
+  }
   if (latestView) {
-    router.push(latestView.fullPath)
+    router.push(latestView.fullPath);
   } else {
     if (view.name === 'Dashboard') {
-      router.replace({ path: '/redirect' + view.fullPath })
-    }else {
-      router.push('/')
+      router.replace({ path: '/redirect' + view.fullPath });
+    } else {
+      router.push('/');
     }
   }
 }
@@ -1133,10 +1080,10 @@ function handleSearch(value) {
 
 // 选择药品
 function selectRow(rowValue, index) {
-  console.log(receiptHeaderForm.lossLocationId,rowValue,"receiptHeaderForm.lossLocationId")
+  console.log(receiptHeaderForm.lossLocationId, rowValue, 'receiptHeaderForm.lossLocationId');
   rowIndex.value = index;
-  form.purchaseinventoryList[index].lossLocationId = receiptHeaderForm.lossLocationId
-  form.purchaseinventoryList[index].purposeLocationId = receiptHeaderForm.purposeLocationId
+  form.purchaseinventoryList[index].lossLocationId = receiptHeaderForm.lossLocationId;
+  form.purchaseinventoryList[index].purposeLocationId = receiptHeaderForm.purposeLocationId;
   form.purchaseinventoryList[index].itemId = rowValue.definitionId;
   form.purchaseinventoryList[index].name = rowValue.name;
   form.purchaseinventoryList[index].volume = rowValue.volume;
@@ -1145,58 +1092,77 @@ function selectRow(rowValue, index) {
   form.purchaseinventoryList[index].manufacturer = rowValue.manufacturer;
   form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
   form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
-  form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber
-  form.purchaseinventoryList[index].ybNo = rowValue.ybNo
-  form.purchaseinventoryList[index].itemQuantity = 0
-  form.purchaseinventoryList[index].totalPrice = 0
-  console.log(form.purchaseinventoryList[index].lossLocationId,12121)
+  form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber;
+  form.purchaseinventoryList[index].ybNo = rowValue.ybNo;
+  form.purchaseinventoryList[index].itemQuantity = 0;
+  form.purchaseinventoryList[index].totalPrice = 0;
+  console.log(form.purchaseinventoryList[index].lossLocationId, 12121);
   getCount({
     itemId: rowValue.definitionId,
-    orgLocationId:form.purchaseinventoryList[index].lossLocationId,
+    orgLocationId: form.purchaseinventoryList[index].lossLocationId,
     // objLocationId:purposeLocationId,
-    lotNumber:form.purchaseinventoryList[index].lotNumber
+    lotNumber: form.purchaseinventoryList[index].lotNumber,
   }).then((res) => {
-      console.log(res.data,"获取详情")
+    console.log(res.data, '获取详情');
 
-    if (res.data&&res.data.length>0) {
+    if (res.data && res.data.length > 0) {
       // form.purchaseinventoryList[index].totalPurposeQuantity = res.data[0].objQuantity || 0;
       form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
       if (res.data[0].price) {
-        form.purchaseinventoryList[index].price = res.data[0].price.toFixed(4)
-      }else{
-        form.purchaseinventoryList[index].price = 0
+        form.purchaseinventoryList[index].price = res.data[0].price.toFixed(4);
+      } else {
+        form.purchaseinventoryList[index].price = 0;
       }
-      form.purchaseinventoryList[index].supplierName = res.data[0].supplierName || ""
-      form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || ""
-      form.purchaseinventoryList[index].startTime = formatDateymd(res.data[0].productionDate)|| "";
-      form.purchaseinventoryList[index].endTime =  formatDateymd(res.data[0].expirationDate) || "";
-      startTimeOld.value = form.purchaseinventoryList[index].startTime?form.purchaseinventoryList[index].startTime:''
-      endTimeOld.value = form.purchaseinventoryList[index].endTime?form.purchaseinventoryList[index].endTime:''
-      console.log( form.purchaseinventoryList[index].endTime,form.purchaseinventoryList[index].startTime,12)
-      form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].unitList.minUnitCode
-      form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].unitList.minUnitCode_dictText 
-       
-       // 单价   大单位单价
-      if(form.purchaseinventoryList[index].unitCode==form.purchaseinventoryList[index].unitList.minUnitCode){
-        form.purchaseinventoryList[index].price = res.data[0].price / form.purchaseinventoryList[index].partPercent|| "";
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+      form.purchaseinventoryList[index].supplierName = res.data[0].supplierName || '';
+      form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || '';
+      form.purchaseinventoryList[index].startTime = formatDateymd(res.data[0].productionDate) || '';
+      form.purchaseinventoryList[index].endTime = formatDateymd(res.data[0].expirationDate) || '';
+      startTimeOld.value = form.purchaseinventoryList[index].startTime
+        ? form.purchaseinventoryList[index].startTime
+        : '';
+      endTimeOld.value = form.purchaseinventoryList[index].endTime
+        ? form.purchaseinventoryList[index].endTime
+        : '';
+      console.log(
+        form.purchaseinventoryList[index].endTime,
+        form.purchaseinventoryList[index].startTime,
+        12
+      );
+      form.purchaseinventoryList[index].unitCode =
+        form.purchaseinventoryList[index].unitList.minUnitCode;
+      form.purchaseinventoryList[index].unitCode_dictText =
+        form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
+
+      // 单价   大单位单价
+      if (
+        form.purchaseinventoryList[index].unitCode ==
+        form.purchaseinventoryList[index].unitList.minUnitCode
+      ) {
+        form.purchaseinventoryList[index].price =
+          res.data[0].price / form.purchaseinventoryList[index].partPercent || '';
+        form.purchaseinventoryList[index].price =
+          form.purchaseinventoryList[index].price.toFixed(4);
         // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-      }else{
-        if(form.purchaseinventoryList[index].price>1){
-          form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+      } else {
+        if (form.purchaseinventoryList[index].price > 1) {
+          form.purchaseinventoryList[index].price =
+            form.purchaseinventoryList[index].price.toFixed(4);
         }
       }
       if (form.purchaseinventoryList[index].totalQuantity == 0) {
         proxy.$message.warning('仓库数量为0，无法调用！');
         return;
       }
-    }else{
+    } else {
       form.purchaseinventoryList[index].totalQuantity = 0;
       form.purchaseinventoryList[index].price = 0;
-      proxy.$message.warning("仓库数量为0，无法调用！");
+      proxy.$message.warning('仓库数量为0，无法调用！');
     }
-  })
-  store.setCurrentDataBS({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
+  });
+  store.setCurrentDataBS({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 
 // 获取数量
@@ -1204,26 +1170,33 @@ function handleLocationClick(id, itemId, index) {
   getCount({
     itemId: itemId,
     orgLocationId: id,
-    lotNumber:form.purchaseinventoryList[index].lotNumber
+    lotNumber: form.purchaseinventoryList[index].lotNumber,
   }).then((res) => {
-    if (res.data&&res.data.length>0) {
-      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || "";
+    if (res.data && res.data.length > 0) {
+      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
       form.purchaseinventoryList[index].totalQuantity = res.data[0].totalQuantity || 0;
       if (res.data[0].price) {
         form.purchaseinventoryList[index].price = res.data[0].price.toFixed(4);
       }
-      form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || "";
-      form.purchaseinventoryList[index].supplierName = res.data[0].supplierName || "";
-      form.purchaseinventoryList[index].startTime =  res.data[0].productionDate || "";
-      form.purchaseinventoryList[index].endTime =  res.data[0].expirationDate || "";
-      form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].unitList.minUnitCode
-      form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+      form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || '';
+      form.purchaseinventoryList[index].supplierName = res.data[0].supplierName || '';
+      form.purchaseinventoryList[index].startTime = res.data[0].productionDate || '';
+      form.purchaseinventoryList[index].endTime = res.data[0].expirationDate || '';
+      form.purchaseinventoryList[index].unitCode =
+        form.purchaseinventoryList[index].unitList.minUnitCode;
+      form.purchaseinventoryList[index].unitCode_dictText =
+        form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
       // 单价   大单位单价
-      if(form.purchaseinventoryList[index].unitCode==form.purchaseinventoryList[index].unitList.minUnitCode){
-        form.purchaseinventoryList[index].price = res.data[0].price / form.purchaseinventoryList[index].partPercent|| "";
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+      if (
+        form.purchaseinventoryList[index].unitCode ==
+        form.purchaseinventoryList[index].unitList.minUnitCode
+      ) {
+        form.purchaseinventoryList[index].price =
+          res.data[0].price / form.purchaseinventoryList[index].partPercent || '';
+        form.purchaseinventoryList[index].price =
+          form.purchaseinventoryList[index].price.toFixed(4);
         // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-      }else{
+      } else {
         // if(form.purchaseinventoryList[index].price>1){
         //   form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
         // }
@@ -1233,7 +1206,7 @@ function handleLocationClick(id, itemId, index) {
         return;
       }
     } else {
-      form.purchaseinventoryList[index].itemQuantity = 0
+      form.purchaseinventoryList[index].itemQuantity = 0;
       form.purchaseinventoryList[index].totalQuantity = 0;
       form.purchaseinventoryList[index].price = 0;
       // if(form.purchaseinventoryList[index].totalQuantity==0){
@@ -1251,104 +1224,131 @@ function handleChangePurposeTypeEnum(value) {
   if (value == 16) {
     getPharmacyList().then((res) => {
       purposeTypeListOptions.value = res.data;
-       if(!route.query.supplyBusNo){
-        receiptHeaderForm.lossLocationId = ''
+      if (!route.query.supplyBusNo) {
+        receiptHeaderForm.lossLocationId = '';
       }
     });
   } else if (value == 11) {
     getDispensaryList().then((res) => {
       purposeTypeListOptions.value = res.data;
-      if(!route.query.supplyBusNo){
-        receiptHeaderForm.lossLocationId = ''
-      }         
+      if (!route.query.supplyBusNo) {
+        receiptHeaderForm.lossLocationId = '';
+      }
     });
   }
 }
- // 源仓库切换
+// 源仓库切换
 function handleChangelossTypeEnum(value) {
   if (value == 16) {
     getPharmacyList().then((res) => {
-      sourceTypeListOptions.value = res.data
-      if(!route.query.supplyBusNo){
-        receiptHeaderForm.lossLocationId = ''
+      sourceTypeListOptions.value = res.data;
+      if (!route.query.supplyBusNo) {
+        receiptHeaderForm.lossLocationId = '';
       }
     });
   } else if (value == 11) {
     getDispensaryList().then((res) => {
-      sourceTypeListOptions.value = res.data
-      if(!route.query.supplyBusNo){
-        receiptHeaderForm.lossLocationId = ''
+      sourceTypeListOptions.value = res.data;
+      if (!route.query.supplyBusNo) {
+        receiptHeaderForm.lossLocationId = '';
       }
-    })
+    });
   }
 }
 // 单位处理
 function handleUnitCodeChange(row, index, value) {
-  console.log(row, index, value,"row, index, value")
-    // 防止点击和已选一样的问题
-  if(!form.purchaseinventoryList[index].statusMaxvalue&&row.measurementUnitCode==value&&route.query.supplyBusNo){
-    return     
+  console.log(row, index, value, 'row, index, value');
+  // 防止点击和已选一样的问题
+  if (
+    !form.purchaseinventoryList[index].statusMaxvalue &&
+    row.measurementUnitCode == value &&
+    route.query.supplyBusNo
+  ) {
+    return;
   }
   if (row.minUnitCode == value) {
     //最小计量单位
     // form.purchaseinventoryList[index].totalQuantity = oldtotalQuantity.value;
     // form.purchaseinventoryList[index].itemQuantity = olditemQuantity.value;
-    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity?form.purchaseinventoryList[index].oldtotalQuantity:form.purchaseinventoryList[index].totalQuantity
-    form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
+    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index]
+      .oldtotalQuantity
+      ? form.purchaseinventoryList[index].oldtotalQuantity
+      : form.purchaseinventoryList[index].totalQuantity;
+    form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index]
+      .olditemQuantity
+      ? form.purchaseinventoryList[index].olditemQuantity
+      : form.purchaseinventoryList[index].itemQuantity;
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
     // 单价
     form.purchaseinventoryList[index].price =
-    form.purchaseinventoryList[index].price / row.partPercent;
+      form.purchaseinventoryList[index].price / row.partPercent;
     form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
     // if (!form.purchaseinventoryList[index].itemQuantity) {
     // }
   } else {
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
-    getMaxCounts(row,index)
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
+    getMaxCounts(row, index);
   }
-  form.purchaseinventoryList[index].statusMaxvalue = true
-  store.setCurrentDataBS({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
+  form.purchaseinventoryList[index].statusMaxvalue = true;
+  store.setCurrentDataBS({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 
-function getMaxCounts(row,index,counts){
-    form.purchaseinventoryList[index].oldtotalQuantity =  form.purchaseinventoryList[index].totalQuantity
-    form.purchaseinventoryList[index].totalQuantity =
+function getMaxCounts(row, index, counts) {
+  form.purchaseinventoryList[index].oldtotalQuantity =
+    form.purchaseinventoryList[index].totalQuantity;
+  form.purchaseinventoryList[index].totalQuantity =
     form.purchaseinventoryList[index].totalQuantity / row.partPercent;
 
-    const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
-    const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
+  const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
+  const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
 
-    if(decimalPart1){
-      form.purchaseinventoryList[index].totalQuantity = integerPart1 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-      (decimalPart1*row.partPercent).toFixed(0) +
-      form.purchaseinventoryList[index].unitList.minUnitCode_dictText
-    }
+  if (decimalPart1) {
+    form.purchaseinventoryList[index].totalQuantity =
+      integerPart1 +
+      form.purchaseinventoryList[index].unitList.unitCode_dictText +
+      (decimalPart1 * row.partPercent).toFixed(0) +
+      form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
+  }
 
-    //领用数量
-    if(counts){
-      form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity*row.partPercent
-      form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
-      const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
-      const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
-      console.log(integerPart,decimalPart,form.purchaseinventoryList[index].itemQuantity,121212121)
-      if(decimalPart){
-        form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-        (decimalPart*row.partPercent).toFixed(0) +
-        form.purchaseinventoryList[index].minUnitCode_dictText
-      }
-    }else{
-        form.purchaseinventoryList[index].price =
-        form.purchaseinventoryList[index].price * row.partPercent;
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
-    } 
-    console.log(form.purchaseinventoryList[index].price,"121212121")
+  //领用数量
+  if (counts) {
+    form.purchaseinventoryList[index].olditemQuantity =
+      form.purchaseinventoryList[index].itemQuantity * row.partPercent;
+    form.purchaseinventoryList[index].itemMaxQuantity =
+      form.purchaseinventoryList[index].itemQuantity;
+    const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
+    const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
+    console.log(
+      integerPart,
+      decimalPart,
+      form.purchaseinventoryList[index].itemQuantity,
+      121212121
+    );
+    if (decimalPart) {
+      form.purchaseinventoryList[index].itemQuantity =
+        integerPart +
+        form.purchaseinventoryList[index].unitList.unitCode_dictText +
+        (decimalPart * row.partPercent).toFixed(0) +
+        form.purchaseinventoryList[index].minUnitCode_dictText;
+    }
+  } else {
+    form.purchaseinventoryList[index].price =
+      form.purchaseinventoryList[index].price * row.partPercent;
+    form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+  }
+  console.log(form.purchaseinventoryList[index].price, '121212121');
 }
 // 计算总价
 function handleTotalPrice(index) {
-  form.purchaseinventoryList[index].olditemQuantity = form.purchaseinventoryList[index].itemQuantity * row.partPercent;
-  form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
+  form.purchaseinventoryList[index].olditemQuantity =
+    form.purchaseinventoryList[index].itemQuantity * row.partPercent;
+  form.purchaseinventoryList[index].itemMaxQuantity =
+    form.purchaseinventoryList[index].itemQuantity;
   let purchaseItem = form.purchaseinventoryList[index];
   if (purchaseItem.price > 0 && purchaseItem.itemQuantity > 0) {
     form.purchaseinventoryList[index].totalPrice = purchaseItem.price * purchaseItem.itemQuantity;
@@ -1356,73 +1356,84 @@ function handleTotalPrice(index) {
       form.purchaseinventoryList[index].totalPrice.toFixed(4);
     //  parseFloat(form.purchaseinventoryList[index].totalPrice.toFixed(4))
   }
-  if(form.purchaseinventoryList[index].itemQuantity==0){
-    form.purchaseinventoryList[index].totalPrice = 0
+  if (form.purchaseinventoryList[index].itemQuantity == 0) {
+    form.purchaseinventoryList[index].totalPrice = 0;
   }
-  store.setCurrentDataBS({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
+  store.setCurrentDataBS({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
-// 保存 
-function handleSave(row, index) {  
-  rowList.value = []
-  form.purchaseinventoryList.map((row,index)=>{
-    if(row){
+// 保存
+function handleSave(row, index) {
+  rowList.value = [];
+  form.purchaseinventoryList.map((row, index) => {
+    if (row) {
       handleBlur(row);
-      proxy.$refs["receiptHeaderRef"].validate((valid) => {
+      proxy.$refs['receiptHeaderRef'].validate((valid) => {
         if (valid) {
-          proxy.$refs["formRef"].validate((valid) => {
+          proxy.$refs['formRef'].validate((valid) => {
             if (valid) {
-              let rowValue = { ...row,
+              let rowValue = {
+                ...row,
                 // 申请人id
-                applicantId : userStore.id,
+                applicantId: userStore.id,
               };
-              let rows = JSON.parse(JSON.stringify(rowValue))
-              delete rows.itemMaxQuantity
-              console.log('userStore',userStore);
-              if(rows.unitCode== rows.unitList.minUnitCode){
-                rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-              }else{
-                rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity?form.purchaseinventoryList[index].itemMaxQuantity:form.purchaseinventoryList[index].itemQuantity
+              let rows = JSON.parse(JSON.stringify(rowValue));
+              delete rows.itemMaxQuantity;
+              console.log('userStore', userStore);
+              if (rows.unitCode == rows.unitList.minUnitCode) {
+                rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity
+                  ? form.purchaseinventoryList[index].olditemQuantity
+                  : form.purchaseinventoryList[index].itemQuantity;
+              } else {
+                rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
+                  ? form.purchaseinventoryList[index].itemMaxQuantity
+                  : form.purchaseinventoryList[index].itemQuantity;
               }
-              if(rows.unitCode == rows.unitCode_dictText){
-                if(rows.unitCode_dictText == rows.unitList.minUnitCode_dictText){
-                  rows.unitCode = rows.unitList.minUnitCode
-                  console.log(rows.unitCode_dictText,2323232 )
-                }else{
-                  rows.unitCode = rows.unitList.unitCode
-                  rows.unitCode_dictText = rows.unitList.unitCode_dictText
-                  console.log(rows.unitCode_dictText,23232326565 )
+              if (rows.unitCode == rows.unitCode_dictText) {
+                if (rows.unitCode_dictText == rows.unitList.minUnitCode_dictText) {
+                  rows.unitCode = rows.unitList.minUnitCode;
+                  console.log(rows.unitCode_dictText, 2323232);
+                } else {
+                  rows.unitCode = rows.unitList.unitCode;
+                  rows.unitCode_dictText = rows.unitList.unitCode_dictText;
+                  console.log(rows.unitCode_dictText, 23232326565);
                 }
               }
-              rowList.value.push(JSON.parse(JSON.stringify(rows)))
-              if(rowList._rawValue&&rowList._rawValue.length == form.purchaseinventoryList.length){
-                addTransferProducts(rowList._rawValue)
+              rowList.value.push(JSON.parse(JSON.stringify(rows)));
+              if (
+                rowList._rawValue &&
+                rowList._rawValue.length == form.purchaseinventoryList.length
+              ) {
+                addTransferProducts(rowList._rawValue);
               }
             }
-          })
+          });
         }
-      })
+      });
     }
   });
 }
-function addTransferProducts(rowList){
-   addTransferProduct(JSON.parse(JSON.stringify(rowList))).then((res) => {
+function addTransferProducts(rowList) {
+  addTransferProduct(JSON.parse(JSON.stringify(rowList))).then((res) => {
     // 当前行没有id视为首次新增
     if (!row.id) {
       data.isAdding = false; // 允许新增下一行
     }
     if (res.data) {
-      proxy.$message.success("保存成功！");
-      form.purchaseinventoryList.map((row,index)=>{
-        form.purchaseinventoryList[index].id = res.data[index]
+      proxy.$message.success('保存成功！');
+      form.purchaseinventoryList.map((row, index) => {
+        form.purchaseinventoryList[index].id = res.data[index];
         form.purchaseinventoryList[index].isSave = true;
-      })
+      });
     }
   });
 }
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, "selection");
+  console.log(selection, 'selection');
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   selectedRows.value = selection;
@@ -1432,23 +1443,23 @@ function handleSelectionChange(selection) {
 
 function deleteSelectedRows() {
   let length = selectedRows.value.length;
-  let ids  = []
-  if(selectedRows.value[0].id){
-     ids = selectedRows.value.map((item) => {
-      return item.id
+  let ids = [];
+  if (selectedRows.value[0].id) {
+    ids = selectedRows.value.map((item) => {
+      return item.id;
     });
-  } 
+  }
   if (selectedRows.value[length - 1].isSave) {
     delTransferProduct(ids).then((res) => {
       if (res.code == 200) {
-        proxy.$message.success("删除成功");
+        proxy.$message.success('删除成功');
       }
     });
   } else {
     if (length > 1) {
       delTransferProduct(ids).then((res) => {
         if (res.code == 200) {
-          proxy.$message.success("删除成功");
+          proxy.$message.success('删除成功');
         }
       });
     }
@@ -1457,27 +1468,24 @@ function deleteSelectedRows() {
     (row) => !selectedRows.value.includes(row)
   );
   // 允许新增下一行
-  if(form.purchaseinventoryList&&form.purchaseinventoryList.length>0){
-    data.isEdit = true
-  }else{
-    data.isEdit = false
+  if (form.purchaseinventoryList && form.purchaseinventoryList.length > 0) {
+    data.isEdit = true;
+  } else {
+    data.isEdit = false;
   }
   data.isAdding = false;
 }
 
 /**计算合计金额 */
 function handleTotalAmount() {
-  totalAmount.value = form.purchaseinventoryList.reduce(
-    (accumulator, currentRow) => {
-      return (accumulator + (Number(currentRow.totalPrice) || 0))
-    },
-    0
-  );
+  totalAmount.value = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
+    return accumulator + (Number(currentRow.totalPrice) || 0);
+  }, 0);
 }
 
 /** 重置操作表单 */
 function reset() {
-  proxy.resetForm("receiptHeaderRef");
+  proxy.resetForm('receiptHeaderRef');
   form.purchaseinventoryList = [];
 }
 // 显示弹框
@@ -1486,12 +1494,12 @@ function show() {
   data.isAdding = false;
   reset();
   visible.value = true;
-  console.log(props,"props获取数据")
+  console.log(props, 'props获取数据');
   // purposeTypeListOptions.value = props.purposeTypeListOptions;
   categoryListOptions.value = props.categoryListOptions;
   // sourceTypeListOptions.value = props.sourceTypeListOptions;
   receiptHeaderForm.busNo = props.busNoAdd;
-  console.log(receiptHeaderForm,props.purposeLocationId, "purchase_type.value")
+  console.log(receiptHeaderForm, props.purposeLocationId, 'purchase_type.value');
   // // 设置默认值为字典中的第一个值
   // if (purchase_type.value.length > 0) {
   //   form.value.medicationType = purchase_type.value[0].value;
@@ -1510,16 +1518,16 @@ function edit() {
   // receiptHeaderForm = props.item.length > 0 ? props.item[0] : {};
   // receiptHeaderForm.busNo = props.item.supplyBusNo;
   //报损仓库
-  receiptHeaderForm.lossLocationId = props.editRow.lossLocationId
+  receiptHeaderForm.lossLocationId = props.editRow.lossLocationId;
   //仓库
-  receiptHeaderForm.purposeLocationId = props.editRow.purposeLocationId
-  receiptHeaderForm.lossLocationStoreId =props.editRow.lossLocationStoreId //源货位
+  receiptHeaderForm.purposeLocationId = props.editRow.purposeLocationId;
+  receiptHeaderForm.lossLocationStoreId = props.editRow.lossLocationStoreId; //源货位
   // receiptHeaderForm.purposeTypeEnum = props.editRow.purposeTypeEnum
-  receiptHeaderForm.purposeLocationStoreId = props.editRow.purposeLocationStoreId // 目的仓位
-  receiptHeaderForm.lotNumber = props.editRow.lotNumber
-  receiptHeaderForm.supplierId = props.editRow.supplierId
-  receiptHeaderForm.price = props.editRow.price
-  receiptHeaderForm.totalPrice = props.editRow.totalPrice
+  receiptHeaderForm.purposeLocationStoreId = props.editRow.purposeLocationStoreId; // 目的仓位
+  receiptHeaderForm.lotNumber = props.editRow.lotNumber;
+  receiptHeaderForm.supplierId = props.editRow.supplierId;
+  receiptHeaderForm.price = props.editRow.price;
+  receiptHeaderForm.totalPrice = props.editRow.totalPrice;
   receiptHeaderForm.busNo = props.editRow.supplyBusNo;
   // receiptHeaderForm.supplierId = props.editRow.supplierId;
   // receiptHeaderForm.practitionerId = props.editRow.practitionerId;
@@ -1527,7 +1535,7 @@ function edit() {
   receiptHeaderForm.purposeTypeEnum = props.editRow.purposeTypeEnum.toString();
   receiptHeaderForm.lossTypeEnum = props.editRow.purposeTypeEnum.toString();
   receiptHeaderForm.medicationType =
-    props.editRow.itemTable == "med_medication_definition" ? "1" : "2";
+    props.editRow.itemTable == 'med_medication_definition' ? '1' : '2';
   total.value = form.purchaseinventoryList.length;
   handleChangePurposeTypeEnum(props.editRow.purposeTypeEnum.toString());
   handleChangelossTypeEnum(props.editRow.lossTypeEnum.toString());
@@ -1548,8 +1556,8 @@ function edit() {
     });
   }, 100);
 
-  console.log(form.purchaseinventoryList, "purchaseinventoryList.value");
-  console.log(receiptHeaderForm, "receiptHeaderForm");
+  console.log(form.purchaseinventoryList, 'purchaseinventoryList.value');
+  console.log(receiptHeaderForm, 'receiptHeaderForm');
   loading.value = false;
 }
 /** 取消按钮 */
@@ -1561,11 +1569,11 @@ function cancel() {
 function submitAudit() {
   let length = form.purchaseinventoryList.length;
   if (length < 1) {
-    proxy.$modal.msgWarning("请先添加单据");
+    proxy.$modal.msgWarning('请先添加单据');
   } else if (!form.purchaseinventoryList[length - 1].isSave) {
-    proxy.$modal.msgWarning("第" + length + "行单据未保存，请先保存");
+    proxy.$modal.msgWarning('第' + length + '行单据未保存，请先保存');
   } else {
-    console.log(receiptHeaderForm.busNo,'receiptHeaderForm.busNo')
+    console.log(receiptHeaderForm.busNo, 'receiptHeaderForm.busNo');
     // submitApproval(receiptHeaderForm.busNo).then((res) => {
     //   if (res.code == 200) {
     //     proxy.$modal.msgSuccess("提交审批成功");
@@ -1581,19 +1589,19 @@ function handleUpdate(row) {
   form.value = JSON.parse(JSON.stringify(row));
   form.value.fwTypeCode = form.value.typeCode;
   open.value = true;
-  title.value = "编辑";
+  title.value = '编辑';
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
   const delId = row.id || ids.value;
   proxy.$modal
-    .confirm("是否确认删除以上数据?")
+    .confirm('是否确认删除以上数据?')
     .then(function () {
-      return delTransferProduct({ ids: delId.join(",") });
+      return delTransferProduct({ ids: delId.join(',') });
     })
     .then(() => {
-      proxy.$modal.msgSuccess("删除成功");
+      proxy.$modal.msgSuccess('删除成功');
     })
     .catch(() => {});
 }
@@ -1601,41 +1609,40 @@ function handleDelete(row) {
 function getTransferProductTypeList() {
   data.isAdding = false;
   getInit().then((response) => {
-    console.log(response,'response',response.data)
+    console.log(response, 'response', response.data);
     // busNoAdd.value = response.data.busNo; // 单据号新增
-    // purposeTypeListOptions.value = response.data.purposeTypeListOptions; 
+    // purposeTypeListOptions.value = response.data.purposeTypeListOptions;
     // sourceTypeListOptions.value = response.data.sourceTypeListOptions;
-    categoryListOptions.value = response.data.categoryListOptions 
-    // supplyStatusOptions.value = response.data.supplyStatusOptions; 
+    categoryListOptions.value = response.data.categoryListOptions;
+    // supplyStatusOptions.value = response.data.supplyStatusOptions;
   });
 }
 
 const locationList = ref([]);
 function getBusNoInitList() {
-  console.log(route,route.query,"路由传值")
-  if(route.query.supplyBusNo){
-    receiptHeaderForm.busNo = route.query.supplyBusNo
-    viewStatus.value = route.query.view
-    sessionStorage.setItem('busNoBS', "")
-  }else{
-    if(!sessionStorage.getItem('busNoBS')){
-      store.clearCurrentDataBS()
+  console.log(route, route.query, '路由传值');
+  if (route.query.supplyBusNo) {
+    receiptHeaderForm.busNo = route.query.supplyBusNo;
+    viewStatus.value = route.query.view;
+    sessionStorage.setItem('busNoBS', '');
+  } else {
+    if (!sessionStorage.getItem('busNoBS')) {
+      store.clearCurrentDataBS();
       getBusNoInit().then((response) => {
-        console.log(response,'response',response.data)
+        console.log(response, 'response', response.data);
         receiptHeaderForm.busNo = response.data.busNo;
-        sessionStorage.setItem('busNoBS', receiptHeaderForm.busNo)
+        sessionStorage.setItem('busNoBS', receiptHeaderForm.busNo);
         // busNoAdd.value = response.data.busNo; // 单据号新增
-      })
-    }else{
-      receiptHeaderForm.busNo = sessionStorage.getItem('busNoBS')
+      });
+    } else {
+      receiptHeaderForm.busNo = sessionStorage.getItem('busNoBS');
     }
   }
- 
 }
- 
+
 getTransferProductTypeList();
-getBusNoInitList()
-getTransferProductDetails()
+getBusNoInitList();
+getTransferProductDetails();
 
 // defineExpose({
 //   show,
diff --git a/vue3/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue
index 871b89fd..a30afd08 100644
--- a/vue3/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReportingList/index.vue
@@ -248,7 +248,7 @@
             @click="handleUpdate(scope.row)"
 
             :disabled="
-              scope.row.statusEnum != '1' && scope.row.statusEnum != '9'
+              scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
             "
             >编辑</el-button
           >
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/components/api.js
new file mode 100644
index 00000000..bb0812cf
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/components/api.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function getList(query) {
+  return request({
+    url: '/report-manage/monthly-settlement/month',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取药房
+export function getPharmacyList() {
+  return request({
+    url: '/report-manage/monthly-settlement/init',
+    method: 'get'
+  })
+}
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/index.vue
new file mode 100644
index 00000000..90d2bd0d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <!-- 顶部查询条件 -->
+    <div class="table-header">
+      <el-select class="table-header-search" v-model="searchParams.locationId" placeholder="请选择库房">
+        <el-option
+          v-for="item in locationOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+      <el-date-picker
+        v-model="searchParams.startTime"
+        type="date"
+        placeholder="选择开始时间"
+        value-format="YYYY-MM-DD"
+        style="margin-right: 15px"
+      />
+
+      <el-date-picker
+        class="table-header-search"
+        v-model="searchParams.endTime"
+        type="date"
+        placeholder="选择结束时间"
+        value-format="YYYY-MM-DD"
+      />
+      <el-button class="table-header-button" type="primary" @click="handleSearch">查询</el-button>
+      <el-button class="table-header-button" @click="resetForm">重置</el-button>
+    </div>
+
+    <!-- 数据表格 -->
+    <div class="table-container">
+      <el-table
+        v-loading="loading"
+        :data="reconciliationData"
+        style="width: 100%"
+        border
+      >
+        <el-table-column prop="locationId_dictText" label="库房" width="180" />
+        <el-table-column prop="initialAmount" label="期初金额" width="120" align="right" />
+        <el-table-column prop="finalAmount" label="期末金额" width="120" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 1)">
+              {{ scope.row.finalAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="expectFinalAmount" label="预期期末金额" width="140" align="right"  />
+        <el-table-column prop="offsetAmount" label="偏移量" width="100" align="right" />
+        <el-table-column prop="purchaseInAmount" label="采购入库金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 2)">
+              {{ scope.row.purchaseInAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="purchaseInNumber" label="采购入库单据数" width="140" align="right" />
+        <el-table-column prop="purchaseReturnAmount" label="采购出库金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 3)">
+              {{ scope.row.purchaseReturnAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="purchaseReturnNumber" label="采购出库单据数" width="140" align="right" />
+        <el-table-column prop="applyOutAmount" label="领用出库金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 4)">
+              {{ scope.row.applyOutAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="applyOutNumber" label="领用出库单据数" width="140" align="right" />
+        <el-table-column prop="applyReturnAmount" label="领用退货金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 5)">
+              {{ scope.row.applyReturnAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="applyReturnNumber" label="领用退货单据数" width="140" align="right" />
+        <el-table-column prop="transferInAmount" label="调拨入库金额" width="140" align="right"  />
+        <el-table-column prop="transferInNumber" label="调拨入库单据数" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 6)">
+              {{ scope.row.transferInNumber }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="transferOutAmount" label="调拨出库金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 6)">
+              {{ scope.row.transferOutAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="transferOutNumber" label="调拨出库单据数" width="140" align="right" />
+        <el-table-column prop="checkProfitLossAmount" label="盘点盈亏金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 7)">
+              {{ scope.row.checkProfitLossAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checkProfitLossNumber" label="盘点盈亏单据数" width="140" align="right" />
+        <el-table-column prop="lossAmount" label="报损金额" width="120" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 8)">
+              {{ scope.row.lossAmount }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="lossNumber" label="报损单据数" width="120" align="right" />
+        <el-table-column prop="drugIssueAmount" label="药品发放金额" width="140" align="right">
+          <template #default="scope">
+            <div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 9)">
+              {{ scope.row.drugIssueAmount }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+// 导入路由钩子
+import { useRouter } from 'vue-router';
+// 假设API模块存在，实际项目中需要根据实际情况导入
+import { getList, getPharmacyList } from './components/api.js';
+
+// 创建路由实例
+const router = useRouter();
+
+// 搜索参数
+const searchParams = reactive({
+  locationId: '',
+  startTime: '',
+  endTime: ''
+});
+
+// 搜索表单引用
+const searchFormRef = ref(null);
+
+// 库房选项
+const locationOptions = ref([]);
+
+// 对账数据
+const reconciliationData = ref([]);
+
+// 加载状态
+const loading = ref(false);
+
+// 格式化金额
+const formatMoney = (value) => {
+  if (value === null || value === undefined) return '0.00';
+  return Number(value).toFixed(2);
+};
+
+// 格式化日期为YYYY-MM-DD
+const formatDate = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+};
+
+// 设置默认日期范围（今日之前一个月）
+const setDefaultDateRange = () => {
+  const today = new Date();
+  // 结束时间为昨天
+  const endDate = new Date(today);
+  endDate.setDate(today.getDate() - 1);
+  
+  // 开始时间为一个月前的今天
+  const startDate = new Date(today);
+  startDate.setMonth(today.getMonth() - 1);
+  
+  // 处理月份溢出（如1月减1个月变为12月）
+  if (startDate.getMonth() === 11 && today.getMonth() === 0) {
+    startDate.setFullYear(today.getFullYear() - 1);
+  }
+  
+  // 确保日期有效性（处理不同月份天数差异）
+  const lastDayOfMonth = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0).getDate();
+  if (startDate.getDate() > lastDayOfMonth) {
+    startDate.setDate(lastDayOfMonth);
+  }
+  
+  searchParams.startTime = formatDate(startDate);
+  searchParams.endTime = formatDate(endDate);
+};
+
+// 查询数据
+const handleSearch = async () => {
+  try {
+    loading.value = true;
+    // 构建查询参数
+    const params = {
+      ...searchParams
+    };
+
+    // 调用API获取数据，实际项目中替换为真实API调用
+    const response = await getList(params);
+    loading.value = false;
+    console.log('查询结果：', response)
+    reconciliationData.value.push(response.data.data)
+
+  } catch (error) {
+    ElMessage.error('获取对账数据失败: ' + (error.message || '未知错误'));
+    console.error('Failed to get reconciliation data:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 重置表单
+const resetForm = () => {
+  searchFormRef.value?.resetFields();
+  // 重置后重新设置默认日期范围
+  setDefaultDateRange();
+};
+
+// 获取库房列表
+const getLocationList = async () => {
+  try {
+    // 调用API获取库房数据，实际项目中替换为真实API调用
+    const response = await getPharmacyList();
+    locationOptions.value = response.data.locationListOptions || [];
+    
+    // 默认选择第一个库房
+    if (locationOptions.value.length > 0) {
+      searchParams.locationId = locationOptions.value[0].value;
+    }
+    handleSearch()
+  } catch (error) {
+    ElMessage.error('获取库房数据失败: ' + (error.message || '未知错误'));
+    console.error('Failed to get location list:', error);
+  }
+};
+
+// 跳转到对应页面的函数
+const skipToPage = (records, index) => {
+  // 获取当前选中的库房ID和日期范围
+  const { startTime, endTime } = searchParams;
+  console.log(records.row)
+  const { locationId } = records.row;
+  // 根据index跳转到不同页面
+  let path = '';
+  switch (index) {
+    case 1:
+      path = '/medicationmanagement/chkstock/chkstockPart'; // 盘点
+      break;
+    case 2:
+      path = '/medicationmanagement/medicationmanagement/purchaseDocument'; // 采购入库页
+      break;
+    case 3:
+      path = '/medicationmanagement/medicationmanagement/returnedPurchase'; // 采购退货页
+      break;
+    case 4:
+      path = '/medicationmanagement/requisitionManagement/requisitionManagement'; // 领用出库页
+      break;
+    case 5:
+      path = '/medicationmanagement/requisitionManagement/returningInventory'; // 领用退库页
+      break;
+    case 6:
+      path = '/medicationmanagement/transferManagement/transferManagent'; // 调拨页
+      break;
+    case 7:
+      path = '/medicationmanagement/chkstock/chkstockPart'; // 盘点页
+      break;
+    case 8:
+      path = '/medicationmanagement/lossReportingManagement/lossReportingManagement'; // 报损页
+      break;
+    case 9:
+      path = '/giveGrug/pharmacymanagement'; // 药品发放
+      break;
+    default:
+      ElMessage.warning('无效的页面索引');
+      return;
+  }
+
+  // 跳转到对应页面并传递参数
+  router.push({
+    path: path,
+    query: {
+      locationId: locationId,
+      startTime: startTime,
+      endTime: endTime,
+      fromReconciliation: 'true' // 添加标志参数
+    }
+  });
+}
+
+
+// 组件初始化
+onMounted(() => {
+  // 设置默认日期范围
+  setDefaultDateRange();
+  getLocationList();
+});
+</script>
+
+<style scoped>
+.table-header-search {
+  width: 200px;
+  float: left;
+  margin-right: 15px;
+}
+.table-header {
+  margin-top: 0px;
+  margin-bottom: 15px;
+  overflow: hidden;
+}
+.table-header-button {
+  float: right;
+  margin-left: 10px;
+}
+
+.table-container {
+  background-color: #fff;
+  padding: 16px;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  overflow-x: auto;
+}
+
+.text-red {
+  color: #f56c6c;
+}
+
+.text-green {
+  color: #67c23a;
+}
+</style>
diff --git a/vue3/src/views/medicationmanagement/purchaseDocument/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/purchaseDocument/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/api.js
diff --git a/vue3/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue
diff --git a/vue3/src/views/medicationmanagement/purchaseDocument/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
similarity index 95%
rename from vue3/src/views/medicationmanagement/purchaseDocument/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
index 69f295a4..b7c1bfa3 100644
--- a/vue3/src/views/medicationmanagement/purchaseDocument/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
@@ -157,7 +157,7 @@
             >
           </el-col>
         </el-row>
-        <el-form :model="form" :rules="tableRules" ref="formRef">
+        <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'apply'">
           <!-- @cell-mouse-enter="handleMouseEnter" -->
           <!-- v-click-outside-row="handleClickOutside" @row-click="handleRowClick" 点击行以外的部分自动保存 -->
           <el-table
@@ -591,57 +591,7 @@
       </el-col>
     </el-row>
     <!-- </el-dialog> -->
-    <el-dialog
-      title="药品追溯码"
-      v-model="openTraceNo"
-      width="800"
-      append-to-body
-      destroy-on-close
-      :draggable="true"
-      @opened="
-        () => {
-          console.log(123);
-          traceNoTempRef.focus();
-        }
-      "
-    >
-      <div>
-        <div style="font-size: 16px">
-          <span>药品名称： {{ medName }}</span>
-          选择追溯码
-          <el-input
-            ref="traceNoTempRef"
-            v-model="traceNoTemp"
-            style="width: 260px; margin-right: 20px"
-            @input="throttledGetList"
-          />
-          <el-button
-            type="warning"
-            plain
-            icon="CircleClose"
-            @click="handleClear"
-            style="float: right"
-          >
-            清除
-          </el-button>
-        </div>
-        <el-input
-          ref="inputRef"
-          v-model="traceNo"
-          type="textarea"
-          :rows="15"
-          disabled
-          @input="throttledGetList"
-          style="width: 100%; margin-top: 10px; margin-right: 20px"
-        />
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submit">确 定</el-button>
-          <el-button @click="cancelTraceNo">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <TraceNoDialog :ypName="ypName" :rowData="rowData" :openDialog="openTraceNoDialog" @submit="submit" @cancel="openTraceNoDialog = false"/>
   </div>
 </template>
 
@@ -662,6 +612,7 @@ import {
 const route = useRoute();
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
 import MedicineList from './components/medicineList.vue';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import { formatDate, formatDateymd } from '@/utils/index';
 import { useStore } from '@/store/store';
 import useUserStore from '@/store/modules/user';
@@ -673,6 +624,7 @@ const router = useRouter();
 const tagsViewStore = useTagsViewStore();
 const userUserStore = useUserStore();
 const store = useStore();
+const rowData = ref({})
 
 const { proxy } = getCurrentInstance();
 const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
@@ -697,6 +649,8 @@ const total = ref(0);
 const title = ref('');
 const visible = ref(false);
 const row = ref({});
+const openTraceNoDialog = ref(false)
+const ypName = ref("");
 const rowIndex = ref(-1);
 const totalAmount = ref(0);
 const editData = ref({});
@@ -763,7 +717,6 @@ const unitMap = ref({});
 const currentEditRow = ref({});
 const currentIndex = ref(-1);
 const currentRowId = ref('');
-const medName = ref('');
 const disabledForm = computed(() => {
   return form.purchaseinventoryList.length > 0;
 });
@@ -987,43 +940,21 @@ function saveRow(row, index) {
   });
 }
 
-const openTraceNo = ref(false)
-const traceNo = ref('');
-const traceNoList = ref([]);
-const traceNoTemp = ref('');
-const traceNoTempRef = ref();
-const throttledGetList = debounce(handelTraceNo, 500);
-function handleClear() {
-  traceNo.value = '';
-  traceNoList.value = [];
-}
 function handleScan(row,index){
-  medName.value = row.name
-  openTraceNo.value = true;
-  currentIndex.value = index
-}
-function handelTraceNo(value) {
-  traceNoList.value.push(value);
-  traceNo.value = traceNo.value + '[' + traceNoList.value.length + ']' + '  ' + value + '\n';
-  traceNoTemp.value = '';
-  // let saveValue = value.substring(inputValue.length + 5, value.length);
-  // inputValue = value;
-  // console.log(value);
-  // console.log(saveValue);
-  // traceNoList.value.push(saveValue);
-  // traceNo.value = value + '[' + (traceNoList.value.length + 1) + ']' + '  ';
-}
-function cancelTraceNo() {
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
+  if(row.purposeLocationId && row.lotNumber) {
+    rowData.value = row
+    rowData.value.locationId = row.purposeLocationId
+    rowData.value.itemType = receiptHeaderForm.medicationType
+    ypName.value = row.name
+    openTraceNoDialog.value = true;
+    currentIndex.value = index
+  }else {
+    proxy.$message.warning('请先选择仓库和产品批号！')
+  }
 }
-
-function submit(){
-  form.purchaseinventoryList[currentIndex.value].traceNo = traceNoList.value.join(',');
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
+function submit(value){
+  form.purchaseinventoryList[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
 }
 
 function formatContent(value){
diff --git a/vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue
diff --git a/vue3/src/views/medicationmanagement/purchaseinventory/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/medicineList.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/purchaseinventory/components/medicineList.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/medicineList.vue
diff --git a/vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js
diff --git a/vue3/src/views/medicationmanagement/purchaseinventory/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/purchaseinventory/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
index 39c44f61..04e084fc 100644
--- a/vue3/src/views/medicationmanagement/purchaseinventory/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
@@ -363,7 +363,7 @@
             icon="Edit"
             @click.stop="handleUpdateReturn(scope.row)"
             
-            :disabled="scope.row.statusEnum != '1' && scope.row.statusEnum != '9'"
+            :disabled="scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'"
             >编辑</el-button
           >
           <!-- v-hasPermi="['system:user:remove']" -->
diff --git a/vue3/src/views/medicationmanagement/requisitionManagement/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/requisitionManagement/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/api.js
diff --git a/vue3/src/views/medicationmanagement/requisitionManagement/components/list.vue b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/list.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/requisitionManagement/components/list.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/list.vue
diff --git a/vue3/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue
index f4b5029c..f4763e99 100644
--- a/vue3/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue
@@ -261,7 +261,7 @@
             @click="handleUpdate(scope.row)"
             
             :disabled="
-              scope.row.statusEnum != '1' && scope.row.statusEnum != '9'
+              scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
             "
             >编辑</el-button
           >
diff --git a/vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
similarity index 75%
rename from vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
index 8eff64bb..af4ba933 100644
--- a/vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
@@ -2,12 +2,7 @@
   <div class="app-container">
     <el-row :gutter="10" class="mb8" v-if="viewStatus">
       <el-col :span="1.5">
-        <el-button
-          v-if="viewStatus != 'view'"
-          plain
-          type="primary"
-          icon="Edit"
-          @click="handelApply"
+        <el-button v-if="viewStatus != 'view'" plain type="primary" icon="Edit" @click="handelApply"
           >审批通过</el-button
         >
       </el-col>
@@ -26,12 +21,7 @@
       <el-col :span="1.5">
         <!-- v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'" -->
         <!-- v-hasPermi="['system:user:remove']" -->
-        <el-button
-          plain
-          type="primary"
-          icon="Plus"
-          @click="handleSubmitApproval()"
-          
+        <el-button plain type="primary" icon="Plus" @click="handleSubmitApproval()"
           >提交审核</el-button
         >
         <!-- <el-button type="primary" plain icon="Plus" @click="submitAudit"
@@ -44,22 +34,12 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="EditPen"
-          @click="handleTotalAmount"
+        <el-button type="primary" plain icon="EditPen" @click="handleTotalAmount"
           >计算金额</el-button
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleSave"
-          >批量保存</el-button
-        >
+        <el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
       </el-col>
     </el-row>
 
@@ -184,6 +164,7 @@
             @selection-change="handleSelectionChange"
             @row-click="handleRowClick"
             ref="tableRef"
+            :disabled="viewStatus == 'apply'"
           >
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="项目" align="center" key="name" prop="name" width="200" fixed>
@@ -199,7 +180,12 @@
                     placeholder=""
                     disabled
                   />
-                  <PopoverList v-else  @search="handleSearch" :width="1000" :modelValue="scope.row.name">
+                  <PopoverList
+                    v-else
+                    @search="handleSearch"
+                    :width="1000"
+                    :modelValue="scope.row.name"
+                  >
                     <template #popover-content="{}">
                       <transferManagement
                         @selectRow="(row) => selectRow(row, scope.$index)"
@@ -217,7 +203,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.volume`"
                   :rules="tableRules.volume"
                 >
-                  <el-input v-model="scope.row.volume" placeholder="" disabled/>
+                  <el-input v-model="scope.row.volume" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -234,7 +220,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.manufacturer`"
                   :rules="tableRules.manufacturer"
                 >
-                  <el-input v-model="scope.row.manufacturer" placeholder="" disabled/>
+                  <el-input v-model="scope.row.manufacturer" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -426,14 +412,8 @@
               width="130"
             >
               <template #default="scope">
-                <el-form-item
-                  :prop="`purchaseinventoryList.${scope.$index}.totalPrice`"
-                >
-                  <el-input
-                    disabled
-                    v-model="scope.row.totalPrice"
-                    placeholder=""
-                  />
+                <el-form-item :prop="`purchaseinventoryList.${scope.$index}.totalPrice`">
+                  <el-input disabled v-model="scope.row.totalPrice" placeholder="" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -444,7 +424,7 @@
                   :rules="tableRules.ybNo"
                   disabled
                 >
-                  <el-input v-model="scope.row.ybNo" placeholder="" disabled/>
+                  <el-input v-model="scope.row.ybNo" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -454,30 +434,26 @@
                   :prop="`purchaseinventoryList.${scope.$index}.remake`"
                   :rules="tableRules.remake"
                 >
-                  <el-input v-model="scope.row.remake" placeholder="" :disabled="viewStatus == 'view'"/>
+                  <el-input
+                    v-model="scope.row.remake"
+                    placeholder=""
+                    :disabled="viewStatus == 'view'"
+                  />
                 </el-form-item>
               </template>
             </el-table-column>
-            <!-- <el-table-column
-              v-if="!viewStatus"
-              label="操作"
-              align="center"
-              width="80"
-              class-name="small-padding fixed-width"
-              fixed="right"
-            >
+            <el-table-column label="操作" align="center" width="80" fixed="right">
               <template #default="scope">
-
                 <el-button
                   link
                   type="primary"
                   icon="Edit"
-                  @click="handleSave(scope.row, scope.$index)"
-                  
-                  >保存</el-button
+                  @click="handleScan(scope.row, scope.$index)"
                 >
+                  扫码
+                </el-button>
               </template>
-            </el-table-column> -->
+            </el-table-column>
           </el-table>
         </el-form>
       </el-tab-pane>
@@ -499,7 +475,7 @@
       <el-col :span="6">
         <el-row :gutter="8" style="display: flex; align-items: center; justify-content: flex-start">
           <el-col :span="10">
-            <span>合计金额：{{ totalAmount?totalAmount.toFixed(4):0 }}</span>
+            <span>合计金额：{{ totalAmount ? totalAmount.toFixed(4) : 0 }}</span>
           </el-col>
           <!-- <el-col :span="10">
             <el-input v-model="totalAmount" placeholder="" disabled />
@@ -507,6 +483,7 @@
         </el-row>
       </el-col>
     </el-row>
+    <TraceNoDialog :ypName="ypName" :rowData="rowData" :openDialog="openTraceNoDialog" @submit="submit" @cancel="openTraceNoDialog = false"/>
   </div>
 </template>
 
@@ -524,20 +501,24 @@ import {
   getMedicineList,
   getTransferProductDetail,
   requisitionIssueApproved,
-  reject
-} from "../components/api";
+  reject,
+} from '../components/api';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
 import transferManagement from '../components/list.vue';
 import { formatDate } from '@/utils/index';
-import useUserStore from "@/store/modules/user";
+import useUserStore from '@/store/modules/user';
 import { useStore } from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 const tagsViewStore = useTagsViewStore();
 const store = useStore();
 
 const router = useRouter();
 const route = useRoute();
 const userStore = useUserStore();
+const openTraceNoDialog = ref(false)
+const rowData = ref({})
+const ypName = ref('')
 
 const { proxy } = getCurrentInstance();
 const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
@@ -549,7 +530,7 @@ const { warehous_type, category_code, service_type_code, specialty_code, purchas
     'purchase_type'
   );
 
-const viewStatus = ref("")
+const viewStatus = ref('');
 const purposeLocationIdListOptions = ref(undefined); //目的仓库
 const purchaseinventoryList = ref([]);
 const open = ref(false);
@@ -599,7 +580,7 @@ const receiptHeaderForm = reactive({
   busNo: undefined,
   occurrenceTime: formatDate(new Date()),
 });
-const rowList = ref([])
+const rowList = ref([]);
 const data = reactive({
   isEdit: false,
   isAdding: true,
@@ -654,26 +635,26 @@ const itemType = ref('');
 watch(
   () => store.currentDataLYCK,
   (newVlaue) => {
-    if (newVlaue&&!route.query.supplyBusNo) {
-      form.purchaseinventoryList = newVlaue?.purchaseinventoryList
-      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo
-      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime
-      receiptHeaderForm.locationId = newVlaue?.receiptHeaderForm.locationId
-      receiptHeaderForm.practitionerId = newVlaue?.receiptHeaderForm.practitionerId
+    if (newVlaue && !route.query.supplyBusNo) {
+      form.purchaseinventoryList = newVlaue?.purchaseinventoryList;
+      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo;
+      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime;
+      receiptHeaderForm.locationId = newVlaue?.receiptHeaderForm.locationId;
+      receiptHeaderForm.practitionerId = newVlaue?.receiptHeaderForm.practitionerId;
       getPharmacyCabinetList().then((res) => {
-        purposeTypeListOptions.value = res.data
-      })
-      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType
+        purposeTypeListOptions.value = res.data;
+      });
+      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType;
     }
   },
   { immediate: true }
-)
+);
 watch(
   () => form.purchaseinventoryList,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-      if(viewStatus.value){
-        handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      if (viewStatus.value) {
+        handleTotalAmount();
       }
     }
   },
@@ -723,7 +704,7 @@ function addNewRow() {
         purposeLocationId: '',
         purposeLocationStoreId: '',
         practitionerId: '',
-        practitionerName:'',
+        practitionerName: '',
         applicantId: '',
         traceNo: '',
         traceNo: '',
@@ -753,16 +734,16 @@ function addNewRow() {
 function handleBlur(row, index) {
   let hasError = false;
   for (let key in row) {
-    if(!row[key]){
-      row[key] = ''
+    if (!row[key]) {
+      row[key] = '';
     }
   }
-  if(receiptHeaderForm.medicationType){
-    if(!row.itemTable){
+  if (receiptHeaderForm.medicationType) {
+    if (!row.itemTable) {
       if (receiptHeaderForm.medicationType == 1) {
-        row.itemTable = "med_medication_definition";
+        row.itemTable = 'med_medication_definition';
       } else {
-        row.itemTable = "adm_device_definition";
+        row.itemTable = 'adm_device_definition';
       }
     }
   }
@@ -775,7 +756,6 @@ function handleBlur(row, index) {
     return e.id == row.sourceLocationId;
   });
 
- 
   row.sourceLocationId = sourceLocation[0].id;
 
   row.sourceTypeEnum = sourceLocation[0].formEnum;
@@ -784,7 +764,7 @@ function handleBlur(row, index) {
   let purposeLocation = issueDepartmentDto.value.filter((e) => {
     return e.locationId == receiptHeaderForm.locationId;
   });
-  console.log('purposeLocation',purposeLocation);
+  console.log('purposeLocation', purposeLocation);
   row.purposeLocationId = purposeLocation[0].locationId;
 
   row.purposeTypeEnum = purposeLocation[0].typeEnum;
@@ -794,10 +774,10 @@ function handleBlur(row, index) {
   let practitioner = practitionerListOptions.value.filter((e) => {
     return e.value == receiptHeaderForm.practitionerId;
   });
-  console.log('practitioner',practitioner);
-  row.practitionerId = practitioner[0].value
-  row.practitionerName = practitioner[0].label
-  console.log('row111111',row);
+  console.log('practitioner', practitioner);
+  row.practitionerId = practitioner[0].value;
+  row.practitionerName = practitioner[0].label;
+  console.log('row111111', row);
   // row.practitionerId = practitioner && practitioner[0].id ? practitioner[0].id : '';
   // 申请人
   row.applicantId = userStore.id;
@@ -807,58 +787,81 @@ function handleBlur(row, index) {
 function getTransferProductDetails() {
   if (route.query.supplyBusNo) {
     // 编辑
-    data.isEdit = true
+    data.isEdit = true;
     getTransferProductDetail(receiptHeaderForm.busNo).then((res) => {
       form.purchaseinventoryList = res.data;
       form.purchaseinventoryList.map((e, index) => {
-        form.purchaseinventoryList[index].statusMaxvalue =  false
+        form.purchaseinventoryList[index].statusMaxvalue = false;
         e.volume = e.totalVolume;
-        e.name = e.itemName
-        if (e.purposeLocationId) { //目的仓库
+        e.name = e.itemName;
+        if (e.purposeLocationId) {
+          //目的仓库
           receiptHeaderForm.locationId = e.purposeLocationId;
         }
-        if (e.practitionerId) {  // 经手人
-          receiptHeaderForm.practitionerId = e.practitionerId
+        if (e.practitionerId) {
+          // 经手人
+          receiptHeaderForm.practitionerId = e.practitionerId;
         }
         if (e.itemType) {
-          receiptHeaderForm.medicationType = e.itemType
+          receiptHeaderForm.medicationType = e.itemType;
         }
         getPharmacyCabinetList().then((res) => {
           purposeTypeListOptions.value = res.data;
           // form.purchaseinventoryList[index].purposeLocationId = '';
           // handleLocationClick(1, row, index)
         });
-        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalQuantity?form.purchaseinventoryList[index].totalQuantity:0
-        if(e.unitList&&e.unitCode){
-          form.purchaseinventoryList[index].unitList = e.unitList[0]   //计量单位回显数组
-          form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-          form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-          if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-            getMaxCounts(e,index,1)
+        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index]
+          .totalQuantity
+          ? form.purchaseinventoryList[index].totalQuantity
+          : 0;
+        if (e.unitList && e.unitCode) {
+          form.purchaseinventoryList[index].unitList = e.unitList[0]; //计量单位回显数组
+          form.purchaseinventoryList[index].unitCode =
+            form.purchaseinventoryList[index].measurementUnitCode_dictText;
+          form.purchaseinventoryList[index].unitCode_dictText =
+            form.purchaseinventoryList[index].measurementUnitCode_dictText;
+          if (
+            form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.unitCode
+          ) {
+            // 回显大单位
+            getMaxCounts(e, index, 1);
           }
-          console.log(form.purchaseinventoryList, e.unitList,"获取详情12");
+          console.log(form.purchaseinventoryList, e.unitList, '获取详情12');
         }
-        if(e.price){
+        if (e.price) {
           // 单价   大单位单价
-          if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.minUnitCode){
-            form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price / form.purchaseinventoryList[index].partPercent|| "";
-            form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+          if (
+            form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.minUnitCode
+          ) {
+            form.purchaseinventoryList[index].price =
+              form.purchaseinventoryList[index].price /
+                form.purchaseinventoryList[index].partPercent || '';
+            form.purchaseinventoryList[index].price =
+              form.purchaseinventoryList[index].price.toFixed(4);
             // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-          }else{
-            if(form.purchaseinventoryList[index].price>1){
-              form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+          } else {
+            if (form.purchaseinventoryList[index].price > 1) {
+              form.purchaseinventoryList[index].price =
+                form.purchaseinventoryList[index].price.toFixed(4);
             }
           }
-          if (form.purchaseinventoryList[index].price > 0 && form.purchaseinventoryList[index].itemQuantity > 0) {
+          if (
+            form.purchaseinventoryList[index].price > 0 &&
+            form.purchaseinventoryList[index].itemQuantity > 0
+          ) {
+            form.purchaseinventoryList[index].totalPrice =
+              form.purchaseinventoryList[index].price *
+              form.purchaseinventoryList[index].itemQuantity;
             form.purchaseinventoryList[index].totalPrice =
-            form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity;
-            form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
+              form.purchaseinventoryList[index].totalPrice.toFixed(4);
           }
-        }else{
-          form.purchaseinventoryList[index].price = 0
-          form.purchaseinventoryList[index].totalPrice = 0
+        } else {
+          form.purchaseinventoryList[index].price = 0;
+          form.purchaseinventoryList[index].totalPrice = 0;
         }
-      })
+      });
     });
   }
 }
@@ -900,53 +903,60 @@ function saveRow(row, index) {
 function handleReject() {
   reject(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataLYCK();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'requisitionManagement'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'requisitionManagement' },
+      });
     }
   });
 }
 function handelApply() {
   requisitionIssueApproved(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataLYCK();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'requisitionManagement'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'requisitionManagement' },
+      });
     }
-  })
+  });
 }
 /** 提交审核按钮 */
 function handleSubmitApproval() {
   let length = form.purchaseinventoryList.length;
   if (length < 1) {
-    proxy.$modal.msgWarning("请先添加单据");
+    proxy.$modal.msgWarning('请先添加单据');
   } else if (!form.purchaseinventoryList[length - 1].isSave) {
-    proxy.$modal.msgWarning("第" + length + "行单据未保存，请先保存");
+    proxy.$modal.msgWarning('第' + length + '行单据未保存，请先保存');
   } else {
     submitApproval(receiptHeaderForm.busNo).then((response) => {
       proxy.$modal.msgSuccess('提交审批成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataLYCK();
       router.replace({ path: 'requisitionManagementList' });
-    })
+    });
   }
 }
 function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0]
-  if(view.name== 'RequisitionManagement'){ //调拨单据号删除
-    sessionStorage.setItem('busNoLY',"")
-  }  
+  const latestView = visitedViews.slice(-1)[0];
+  if (view.name == 'RequisitionManagement') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNoLY', '');
+  }
   if (latestView) {
-    router.push(latestView.fullPath)
+    router.push(latestView.fullPath);
   } else {
     if (view.name === 'Dashboard') {
-      router.replace({ path: '/redirect' + view.fullPath })
-    }else {
-      router.push('/')
+      router.replace({ path: '/redirect' + view.fullPath });
+    } else {
+      router.push('/');
     }
   }
 }
@@ -970,14 +980,17 @@ function selectRow(rowValue, index) {
   form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
   form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber;
   form.purchaseinventoryList[index].ybNo = rowValue.ybNo;
-  form.purchaseinventoryList[index].sourceLocationId = ''
+  form.purchaseinventoryList[index].sourceLocationId = '';
   getPharmacyCabinetList().then((res) => {
-    purposeTypeListOptions.value = res.data
+    purposeTypeListOptions.value = res.data;
     // handleLocationClick(1, row, index)
-  })
-  form.purchaseinventoryList[index].itemQuantity = 0
-  form.purchaseinventoryList[index].totalPrice = 0
-  store.setCurrentDataLYCK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
+  });
+  form.purchaseinventoryList[index].itemQuantity = 0;
+  form.purchaseinventoryList[index].totalPrice = 0;
+  store.setCurrentDataLYCK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 
 // 选择仓库
@@ -991,11 +1004,11 @@ function handleLocationClick(item, row, index) {
     if (res.data && res.data.length > 0) {
       form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
       form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
-     
+
       if (res.data[0].price) {
         form.purchaseinventoryList[index].price = res.data[0].price.toFixed(4);
-      }else{
-        form.purchaseinventoryList[index].price = 0
+      } else {
+        form.purchaseinventoryList[index].price = 0;
       }
       // 获取供应商id
       form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || '';
@@ -1003,18 +1016,34 @@ function handleLocationClick(item, row, index) {
       form.purchaseinventoryList[index].startTime = res.data[0].productionDate;
       // 有效期
       form.purchaseinventoryList[index].endTime = res.data[0].expirationDate;
-      form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].unitList.minUnitCode
-      form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+      form.purchaseinventoryList[index].unitCode =
+        form.purchaseinventoryList[index].unitList.minUnitCode;
+      form.purchaseinventoryList[index].unitCode_dictText =
+        form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
       // 单价   大单位单价
-      console.log(form.purchaseinventoryList[index].unitCode==form.purchaseinventoryList[index].unitList.minUnitCode,1212121)
-      if(form.purchaseinventoryList[index].unitCode==form.purchaseinventoryList[index].unitList.minUnitCode){
-        form.purchaseinventoryList[index].price = res.data[0].price / form.purchaseinventoryList[index].partPercent|| "";
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+      console.log(
+        form.purchaseinventoryList[index].unitCode ==
+          form.purchaseinventoryList[index].unitList.minUnitCode,
+        1212121
+      );
+      if (
+        form.purchaseinventoryList[index].unitCode ==
+        form.purchaseinventoryList[index].unitList.minUnitCode
+      ) {
+        form.purchaseinventoryList[index].price =
+          res.data[0].price / form.purchaseinventoryList[index].partPercent || '';
+        form.purchaseinventoryList[index].price =
+          form.purchaseinventoryList[index].price.toFixed(4);
         // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-      }else{
-        console.log(form.purchaseinventoryList[index].price>1,1212,form.purchaseinventoryList[index].price)
-        if(form.purchaseinventoryList[index].price>1){
-          form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+      } else {
+        console.log(
+          form.purchaseinventoryList[index].price > 1,
+          1212,
+          form.purchaseinventoryList[index].price
+        );
+        if (form.purchaseinventoryList[index].price > 1) {
+          form.purchaseinventoryList[index].price =
+            form.purchaseinventoryList[index].price.toFixed(4);
         }
       }
       if (form.purchaseinventoryList[index].totalQuantity == 0) {
@@ -1028,8 +1057,11 @@ function handleLocationClick(item, row, index) {
       proxy.$message.warning('仓库数量为0，无法调用！');
       // }
     }
-  })
-  store.setCurrentDataLYCK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
+  });
+  store.setCurrentDataLYCK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 // 切换仓库类型获取药房/药库列表
 // function handleChangeLocationType(value) {
@@ -1046,32 +1078,45 @@ function handleLocationClick(item, row, index) {
 
 // 单位处理
 function handleUnitCodeChange(row, index, value) {
-    // 防止点击和已选一样的问题
-  if(!form.purchaseinventoryList[index].statusMaxvalue&&row.measurementUnitCode==value&&route.query.supplyBusNo){
-    return     
+  // 防止点击和已选一样的问题
+  if (
+    !form.purchaseinventoryList[index].statusMaxvalue &&
+    row.measurementUnitCode == value &&
+    route.query.supplyBusNo
+  ) {
+    return;
   }
   if (row.minUnitCode == value) {
     //最小计量单位
     // form.purchaseinventoryList[index].totalQuantity = oldtotalQuantity.value;
     // form.purchaseinventoryList[index].itemQuantity = olditemQuantity.value;
-    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity?form.purchaseinventoryList[index].oldtotalQuantity:form.purchaseinventoryList[index].totalQuantity
-    form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
+    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index]
+      .oldtotalQuantity
+      ? form.purchaseinventoryList[index].oldtotalQuantity
+      : form.purchaseinventoryList[index].totalQuantity;
+    form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index]
+      .olditemQuantity
+      ? form.purchaseinventoryList[index].olditemQuantity
+      : form.purchaseinventoryList[index].itemQuantity;
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
     // 单价
     form.purchaseinventoryList[index].price =
-    form.purchaseinventoryList[index].price / row.partPercent;
+      form.purchaseinventoryList[index].price / row.partPercent;
     form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
     // if (!form.purchaseinventoryList[index].itemQuantity) {
     // }
   } else {
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
-    getMaxCounts(row,index)
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
+    getMaxCounts(row, index);
   }
-  form.purchaseinventoryList[index].statusMaxvalue = true
-  store.setCurrentDataLYCK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
-    // 切换成大的计量单位
+  form.purchaseinventoryList[index].statusMaxvalue = true;
+  store.setCurrentDataLYCK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
+  // 切换成大的计量单位
   //   oldtotalQuantity.value = form.purchaseinventoryList[index].totalQuantity;
   //   form.purchaseinventoryList[index].totalQuantity =
   //     form.purchaseinventoryList[index].totalQuantity / row.partPercent;
@@ -1108,61 +1153,75 @@ function handleUnitCodeChange(row, index, value) {
   // }
 }
 
-function getMaxCounts(row,index,counts){
-    form.purchaseinventoryList[index].oldtotalQuantity =  form.purchaseinventoryList[index].totalQuantity
-    form.purchaseinventoryList[index].totalQuantity =
+function getMaxCounts(row, index, counts) {
+  form.purchaseinventoryList[index].oldtotalQuantity =
+    form.purchaseinventoryList[index].totalQuantity;
+  form.purchaseinventoryList[index].totalQuantity =
     form.purchaseinventoryList[index].totalQuantity / row.partPercent;
 
-    const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
-    const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
+  const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
+  const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
 
-    if(decimalPart1){
-      form.purchaseinventoryList[index].totalQuantity = integerPart1 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-      (decimalPart1*row.partPercent).toFixed(0) +
-      form.purchaseinventoryList[index].unitList.minUnitCode_dictText
-    }
+  if (decimalPart1) {
+    form.purchaseinventoryList[index].totalQuantity =
+      integerPart1 +
+      form.purchaseinventoryList[index].unitList.unitCode_dictText +
+      (decimalPart1 * row.partPercent).toFixed(0) +
+      form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
+  }
 
-    //领用数量
-    if(counts){
-      form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity*row.partPercent
-      form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
-      const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
-      const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
-      console.log(integerPart,decimalPart,form.purchaseinventoryList[index].itemQuantity,121212121)
-      if(decimalPart){
-        form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-        (decimalPart*row.partPercent).toFixed(0) +
-        form.purchaseinventoryList[index].minUnitCode_dictText
-      }
-    }else{
-      // form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity
-      // form.purchaseinventoryList[index].itemQuantity =
-      // form.purchaseinventoryList[index].itemQuantity / row.partPercent;
-      // form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
-      // const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
-      // const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
+  //领用数量
+  if (counts) {
+    form.purchaseinventoryList[index].olditemQuantity =
+      form.purchaseinventoryList[index].itemQuantity * row.partPercent;
+    form.purchaseinventoryList[index].itemMaxQuantity =
+      form.purchaseinventoryList[index].itemQuantity;
+    const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
+    const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
+    console.log(
+      integerPart,
+      decimalPart,
+      form.purchaseinventoryList[index].itemQuantity,
+      121212121
+    );
+    if (decimalPart) {
+      form.purchaseinventoryList[index].itemQuantity =
+        integerPart +
+        form.purchaseinventoryList[index].unitList.unitCode_dictText +
+        (decimalPart * row.partPercent).toFixed(0) +
+        form.purchaseinventoryList[index].minUnitCode_dictText;
+    }
+  } else {
+    // form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity
+    // form.purchaseinventoryList[index].itemQuantity =
+    // form.purchaseinventoryList[index].itemQuantity / row.partPercent;
+    // form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
+    // const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
+    // const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
 
-      // if(decimalPart){
-      //   form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-      //   (decimalPart*row.partPercent).toFixed(0) +
-      //   form.purchaseinventoryList[index].unitList.minUnitCode_dictText
-      // }
-      // if(counts==form.purchaseinventoryList[index].unitCode&&route.query.supplyBusNo){  // 修复编辑时在大单位重复点击大单位的bug
-      //   form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity
-      //   form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
-      //   form.purchaseinventoryList[index].totalPrice =  (form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity).toFixed(4);
-      // }else{
-        form.purchaseinventoryList[index].price =
-        form.purchaseinventoryList[index].price * row.partPercent;
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
-      // }
-    } 
-    console.log(form.purchaseinventoryList[index].price,"121212121")
+    // if(decimalPart){
+    //   form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
+    //   (decimalPart*row.partPercent).toFixed(0) +
+    //   form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+    // }
+    // if(counts==form.purchaseinventoryList[index].unitCode&&route.query.supplyBusNo){  // 修复编辑时在大单位重复点击大单位的bug
+    //   form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity
+    //   form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
+    //   form.purchaseinventoryList[index].totalPrice =  (form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity).toFixed(4);
+    // }else{
+    form.purchaseinventoryList[index].price =
+      form.purchaseinventoryList[index].price * row.partPercent;
+    form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+    // }
+  }
+  console.log(form.purchaseinventoryList[index].price, '121212121');
 }
 // 计算总价
 function handleTotalPrice(index) {
-  form.purchaseinventoryList[index].olditemQuantity = form.purchaseinventoryList[index].itemQuantity * row.partPercent;
-  form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
+  form.purchaseinventoryList[index].olditemQuantity =
+    form.purchaseinventoryList[index].itemQuantity * row.partPercent;
+  form.purchaseinventoryList[index].itemMaxQuantity =
+    form.purchaseinventoryList[index].itemQuantity;
   let purchaseItem = form.purchaseinventoryList[index];
   if (purchaseItem.price > 0 && purchaseItem.itemQuantity > 0) {
     form.purchaseinventoryList[index].totalPrice = purchaseItem.price * purchaseItem.itemQuantity;
@@ -1170,54 +1229,64 @@ function handleTotalPrice(index) {
       form.purchaseinventoryList[index].totalPrice.toFixed(4);
     //  parseFloat(form.purchaseinventoryList[index].totalPrice.toFixed(4))
   }
-  if(form.purchaseinventoryList[index].itemQuantity==0){
-    form.purchaseinventoryList[index].totalPrice = 0
+  if (form.purchaseinventoryList[index].itemQuantity == 0) {
+    form.purchaseinventoryList[index].totalPrice = 0;
   }
-  store.setCurrentDataLYCK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm })
+  store.setCurrentDataLYCK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 // 保存
 function handleSave(row, index) {
-  rowList.value = []
-  form.purchaseinventoryList.map((row,index)=>{
-    if(row){
+  rowList.value = [];
+  form.purchaseinventoryList.map((row, index) => {
+    if (row) {
       // 触发校验
       handleBlur(row);
       proxy.$refs['receiptHeaderRef'].validate((valid) => {
         if (valid) {
           proxy.$refs['formRef'].validate((valid) => {
             if (valid) {
-              let rows = JSON.parse(JSON.stringify(row))
-              delete rows.itemMaxQuantity
+              let rows = JSON.parse(JSON.stringify(row));
+              delete rows.itemMaxQuantity;
               // delete rows.olditemQuantity
               // delete rows.oldtotalSourceQuantity
-              // delete rows.oldtotalPurposeQuantity 
-              if(rows.unitCode== rows.unitList.minUnitCode){
-                rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-              }else{
-                rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity?form.purchaseinventoryList[index].itemMaxQuantity:form.purchaseinventoryList[index].itemQuantity
+              // delete rows.oldtotalPurposeQuantity
+              if (rows.unitCode == rows.unitList.minUnitCode) {
+                rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity
+                  ? form.purchaseinventoryList[index].olditemQuantity
+                  : form.purchaseinventoryList[index].itemQuantity;
+              } else {
+                rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
+                  ? form.purchaseinventoryList[index].itemMaxQuantity
+                  : form.purchaseinventoryList[index].itemQuantity;
               }
-              if(rows.unitCode == rows.unitCode_dictText){
-                if(rows.unitCode_dictText == rows.unitList.minUnitCode_dictText){
-                  rows.unitCode = rows.unitList.minUnitCode
-                  console.log(rows.unitCode_dictText,2323232 )
-                }else{
-                  rows.unitCode = rows.unitList.unitCode
-                  rows.unitCode_dictText = rows.unitList.unitCode_dictText
-                  console.log(rows.unitCode_dictText,23232326565 )
+              if (rows.unitCode == rows.unitCode_dictText) {
+                if (rows.unitCode_dictText == rows.unitList.minUnitCode_dictText) {
+                  rows.unitCode = rows.unitList.minUnitCode;
+                  console.log(rows.unitCode_dictText, 2323232);
+                } else {
+                  rows.unitCode = rows.unitList.unitCode;
+                  rows.unitCode_dictText = rows.unitList.unitCode_dictText;
+                  console.log(rows.unitCode_dictText, 23232326565);
                 }
-              } 
-              rowList.value.push(JSON.parse(JSON.stringify(rows)))
-              if(rowList._rawValue&&rowList._rawValue.length == form.purchaseinventoryList.length){
-                addTransferProducts(rowList._rawValue)
-              }         
+              }
+              rowList.value.push(JSON.parse(JSON.stringify(rows)));
+              if (
+                rowList._rawValue &&
+                rowList._rawValue.length == form.purchaseinventoryList.length
+              ) {
+                addTransferProducts(rowList._rawValue);
+              }
             }
           });
         }
-      })
+      });
     }
   });
 }
-function addTransferProducts(rowList){
+function addTransferProducts(rowList) {
   addTransferProduct(JSON.parse(JSON.stringify(rowList))).then((res) => {
     // 当前行没有id视为首次新增
     // if (!row.id) {
@@ -1225,14 +1294,14 @@ function addTransferProducts(rowList){
     // }
     if (res.data) {
       proxy.$message.success('保存成功！');
-      form.purchaseinventoryList.map((row,index)=>{
-        form.purchaseinventoryList[index].id = res.data[index]
+      form.purchaseinventoryList.map((row, index) => {
+        form.purchaseinventoryList[index].id = res.data[index];
         form.purchaseinventoryList[index].isSave = true;
-      })
+      });
     }
   });
 }
-  /** 选择条数  */
+/** 选择条数  */
 function handleSelectionChange(selection) {
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
@@ -1243,12 +1312,12 @@ function handleSelectionChange(selection) {
 
 function deleteSelectedRows() {
   let length = selectedRows.value.length;
-  let ids  = []
-  if(selectedRows.value[0].id){
-     ids = selectedRows.value.map((item) => {
-      return item.id
+  let ids = [];
+  if (selectedRows.value[0].id) {
+    ids = selectedRows.value.map((item) => {
+      return item.id;
     });
-  } 
+  }
   if (selectedRows.value[length - 1].isSave) {
     delTransferProduct(ids).then((res) => {
       if (res.code == 200) {
@@ -1268,10 +1337,10 @@ function deleteSelectedRows() {
     (row) => !selectedRows.value.includes(row)
   );
   // 允许新增下一行
-  if(form.purchaseinventoryList&&form.purchaseinventoryList.length>0){
-    data.isEdit = true
-  }else{
-    data.isEdit = false
+  if (form.purchaseinventoryList && form.purchaseinventoryList.length > 0) {
+    data.isEdit = true;
+  } else {
+    data.isEdit = false;
   }
   data.isAdding = false;
 }
@@ -1279,10 +1348,18 @@ function deleteSelectedRows() {
 /**计算合计金额 */
 function handleTotalAmount() {
   totalAmount.value = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
-    return (accumulator + (Number(currentRow.totalPrice) || 0))
+    return accumulator + (Number(currentRow.totalPrice) || 0);
   }, 0);
 }
 
+function handleScan(row,index){
+  rowData.value = row
+  rowData.value.itemType = receiptHeaderForm.medicationType
+  ypName.value = row.name
+  openTraceNoDialog .value = true;
+  currentIndex.value = index
+}
+
 /** 重置操作表单 */
 function reset() {
   // form.value = {
@@ -1449,11 +1526,11 @@ const locationList = ref([]);
 function getBusNoInitList() {
   if (route.query.supplyBusNo) {
     receiptHeaderForm.busNo = route.query.supplyBusNo;
-    viewStatus.value = route.query.view
-    sessionStorage.setItem('busNoLY',"")
+    viewStatus.value = route.query.view;
+    sessionStorage.setItem('busNoLY', '');
   } else {
     if (!sessionStorage.getItem('busNoLY')) {
-      store.clearCurrentDataLYCK()
+      store.clearCurrentDataLYCK();
       getBusNoInit().then((response) => {
         receiptHeaderForm.busNo = response.data.busNo;
         sessionStorage.setItem('busNoLY', receiptHeaderForm.busNo);
diff --git a/vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue
index faaddb88..e00e3107 100644
--- a/vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue
@@ -239,7 +239,7 @@
             @click="handleUpdate(scope.row)"
             
             :disabled="
-              scope.row.statusEnum != '1' && scope.row.statusEnum != '9'
+              scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
             "
             >编辑</el-button
           >
diff --git a/vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue
similarity index 73%
rename from vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue
index c11d08d2..9c61d3a4 100644
--- a/vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue
@@ -2,12 +2,7 @@
   <div class="app-container">
     <el-row :gutter="10" class="mb8" v-if="viewStatus">
       <el-col :span="1.5">
-        <el-button
-          v-if="viewStatus != 'view'"
-          plain
-          type="primary"
-          icon="Edit"
-          @click="handelApply"
+        <el-button v-if="viewStatus != 'view'" plain type="primary" icon="Edit" @click="handelApply"
           >审批通过</el-button
         >
       </el-col>
@@ -29,12 +24,7 @@
       <el-col :span="1.5">
         <!-- v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'" -->
         <!-- v-hasPermi="['system:user:remove']" -->
-        <el-button
-          plain
-          type="primary"
-          icon="Plus"
-          @click="handleSubmitApproval()"
-          
+        <el-button plain type="primary" icon="Plus" @click="handleSubmitApproval()"
           >提交审核</el-button
         >
         <!-- <el-button type="primary" plain icon="Plus" @click="submitAudit"
@@ -47,22 +37,12 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="EditPen"
-          @click="handleTotalAmount"
+        <el-button type="primary" plain icon="EditPen" @click="handleTotalAmount"
           >计算金额</el-button
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleSave"
-          >批量保存</el-button
-        >
+        <el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
       </el-col>
     </el-row>
     <el-form
@@ -87,7 +67,7 @@
           placeholder=""
           clearable
           style="width: 150px"
-          :disabled="data.isEdit||viewStatus == 'view'"
+          :disabled="data.isEdit || viewStatus == 'view'"
           @change="handleChangeSourceTypeEnum"
         >
           <el-option
@@ -104,7 +84,7 @@
           placeholder=""
           clearable
           style="width: 150px"
-          :disabled="data.isEdit||viewStatus == 'view'"
+          :disabled="data.isEdit || viewStatus == 'view'"
         >
           <el-option
             v-for="supplier in practitionerListOptions"
@@ -119,7 +99,7 @@
           v-model="receiptHeaderForm.occurrenceTime"
           value-format="YYYY-MM-DD HH:mm:ss"
           type="datetime"
-          :disabled="data.isEdit||viewStatus == 'view'"
+          :disabled="data.isEdit || viewStatus == 'view'"
         />
       </el-form-item>
       <el-form-item label="药品类型：" prop="medicationType">
@@ -128,7 +108,7 @@
           placeholder=""
           clearable
           style="width: 150px"
-          :disabled="data.isEdit||viewStatus == 'view'"
+          :disabled="data.isEdit || viewStatus == 'view'"
           @change="
             (value) => {
               itemType = value;
@@ -193,7 +173,7 @@
             >
           </el-col>
         </el-row>
-        <el-form :model="form" :rules="tableRules" ref="formRef">
+        <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'apply'">
           <el-table
             v-loading="loading"
             :data="form.purchaseinventoryList"
@@ -215,7 +195,12 @@
                     placeholder=""
                     disabled
                   />
-                  <PopoverList v-else @search="handleSearch" :width="1000" :modelValue="scope.row.name">
+                  <PopoverList
+                    v-else
+                    @search="handleSearch"
+                    :width="1000"
+                    :modelValue="scope.row.name"
+                  >
                     <template #popover-content="{}">
                       <transferManagement
                         @selectRow="(row) => selectRow(row, scope.$index)"
@@ -233,7 +218,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.volume`"
                   :rules="tableRules.volume"
                 >
-                  <el-input v-model="scope.row.volume" placeholder="" disabled/>
+                  <el-input v-model="scope.row.volume" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -378,7 +363,7 @@
                     <el-select
                       v-model="scope.row.unitCode"
                       placeholder=" "
-                      :disabled="data.isEdit||viewStatus == 'view'"
+                      :disabled="data.isEdit || viewStatus == 'view'"
                       :class="{ 'error-border': scope.row.error }"
                       @change="(value) => handleUnitCodeChange(scope.row, scope.$index, value)"
                     >
@@ -452,14 +437,8 @@
               width="130"
             >
               <template #default="scope">
-                <el-form-item
-                  :prop="`purchaseinventoryList.${scope.$index}.totalPrice`"
-                >
-                  <el-input
-                    disabled
-                    v-model="scope.row.totalPrice"
-                    placeholder=""
-                  />
+                <el-form-item :prop="`purchaseinventoryList.${scope.$index}.totalPrice`">
+                  <el-input disabled v-model="scope.row.totalPrice" placeholder="" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -480,29 +459,26 @@
                   :prop="`purchaseinventoryList.${scope.$index}.remake`"
                   :rules="tableRules.remake"
                 >
-                  <el-input v-model="scope.row.remake" placeholder="" :disabled="viewStatus == 'view'"/>
+                  <el-input
+                    v-model="scope.row.remake"
+                    placeholder=""
+                    :disabled="viewStatus == 'view'"
+                  />
                 </el-form-item>
               </template>
             </el-table-column>
-            <!-- <el-table-column
-              v-if="!viewStatus"
-              label="操作"
-              align="center"
-              width="80"
-              class-name="small-padding fixed-width"
-              fixed="right"
-            >
+            <el-table-column label="操作" align="center" width="80" fixed="right">
               <template #default="scope">
                 <el-button
                   link
                   type="primary"
                   icon="Edit"
-                  @click="handleSave(scope.row, scope.$index)"
-                 
-                  >保存</el-button
+                  @click="handleScan(scope.row, scope.$index)"
                 >
+                  保存
+                </el-button>
               </template>
-            </el-table-column> -->
+            </el-table-column>
           </el-table>
         </el-form>
       </el-tab-pane>
@@ -513,7 +489,7 @@
       style="margin-top: 15px; display: flex; align-items: center; justify-content: flex-start"
     >
       <el-col :span="3">
-        <span>制单人：{{ userStore?userStore.name:"" }}</span>
+        <span>制单人：{{ userStore ? userStore.name : '' }}</span>
       </el-col>
       <!-- <el-col :span="2">
           <span>审核人：</span>
@@ -524,7 +500,7 @@
       <el-col :span="6">
         <el-row :gutter="8" style="display: flex; align-items: center; justify-content: flex-start">
           <el-col :span="10">
-            <span>合计金额：{{ totalAmount?totalAmount.toFixed(4):0 }}</span>
+            <span>合计金额：{{ totalAmount ? totalAmount.toFixed(4) : 0 }}</span>
           </el-col>
           <!-- <el-col :span="10">
               <el-input v-model="totalAmount" placeholder="" disabled />
@@ -533,6 +509,13 @@
       </el-col>
     </el-row>
     <!-- </el-dialog> -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
   </div>
 </template>
 
@@ -550,15 +533,15 @@ import {
   getMedicineList,
   getTHTransferProductDetail,
   reject,
-  returnIssueApproved
-
+  returnIssueApproved,
 } from '../components/api';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 import transferManagement from '../components/list.vue';
 import { formatDate } from '@/utils/index';
 const router = useRouter();
 const route = useRoute();
-import useUserStore from "@/store/modules/user";
+import useUserStore from '@/store/modules/user';
 import { useStore } from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
 const tagsViewStore = useTagsViewStore();
@@ -574,7 +557,7 @@ const { warehous_type, category_code, service_type_code, specialty_code, purchas
     'purchase_type'
   );
 
-const viewStatus = ref("")
+const viewStatus = ref('');
 const supplierListOptions = ref([]);
 const issueDepartmentDto = ref([]);
 const practitionerListOptions = ref([]);
@@ -679,31 +662,31 @@ const tableRef = ref(undefined); // 表格引用
 const currentRow = ref(undefined); // 当前操作的行
 const medicineSearchKey = ref('');
 const itemType = ref('');
-const rowList =ref([])
+const rowList = ref([]);
 
 watch(
   () => store.currentDataLYTK,
   (newVlaue) => {
-    if (newVlaue&&!route.query.supplyBusNo) {
-      form.purchaseinventoryList = newVlaue?.purchaseinventoryList
-      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo
-      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime
-      receiptHeaderForm.sourceLocationId = newVlaue?.receiptHeaderForm.sourceLocationId
-      receiptHeaderForm.practitionerId = newVlaue?.receiptHeaderForm.practitionerId
+    if (newVlaue && !route.query.supplyBusNo) {
+      form.purchaseinventoryList = newVlaue?.purchaseinventoryList;
+      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo;
+      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime;
+      receiptHeaderForm.sourceLocationId = newVlaue?.receiptHeaderForm.sourceLocationId;
+      receiptHeaderForm.practitionerId = newVlaue?.receiptHeaderForm.practitionerId;
       getPharmacyCabinetList().then((res) => {
-        purposeTypeListOptions.value = res.data
-      })
-      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType
+        purposeTypeListOptions.value = res.data;
+      });
+      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType;
     }
   },
   { immediate: true }
-)
+);
 watch(
   () => form.purchaseinventoryList,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-      if(viewStatus.value){
-        handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      if (viewStatus.value) {
+        handleTotalAmount();
       }
     }
   },
@@ -750,8 +733,8 @@ function addNewRow() {
         supplierId: '',
         purposeTypeEnum: '',
         purposeLocationId: '',
-        purposeLocationStoreId:'',
-        practitionerId: "",
+        purposeLocationStoreId: '',
+        practitionerId: '',
         ybNo: '',
         invoiceNo: '',
         startTime: '',
@@ -776,16 +759,16 @@ function addNewRow() {
 function handleBlur(row, index) {
   let hasError = false;
   for (let key in row) {
-    if(!row[key]){
-      row[key] = ''
+    if (!row[key]) {
+      row[key] = '';
     }
   }
-  if(receiptHeaderForm.medicationType){
-    if(!row.itemTable){
+  if (receiptHeaderForm.medicationType) {
+    if (!row.itemTable) {
       if (receiptHeaderForm.medicationType == 1) {
-        row.itemTable = "med_medication_definition";
+        row.itemTable = 'med_medication_definition';
       } else {
-        row.itemTable = "adm_device_definition";
+        row.itemTable = 'adm_device_definition';
       }
     }
   }
@@ -794,23 +777,31 @@ function handleBlur(row, index) {
   row.busNo = receiptHeaderForm.busNo;
   // 申请时间
   row.occurrenceTime = receiptHeaderForm.occurrenceTime;
-  
+
   // 部门
   let sourceLocation = issueDepartmentDto.value.filter((e) => {
-    return (e.locationId == receiptHeaderForm.sourceLocationId||e.locationId == receiptHeaderForm.sourceLocationId1)
+    return (
+      e.locationId == receiptHeaderForm.sourceLocationId ||
+      e.locationId == receiptHeaderForm.sourceLocationId1
+    );
   });
-  console.log('sourceLocation',issueDepartmentDto,receiptHeaderForm.sourceLocationId,sourceLocation);
+  console.log(
+    'sourceLocation',
+    issueDepartmentDto,
+    receiptHeaderForm.sourceLocationId,
+    sourceLocation
+  );
   // 部门
   row.sourceLocationId = sourceLocation[0].locationId;
   // 源仓库类型
   row.sourceTypeEnum = sourceLocation[0].typeEnum;
 
   // 目的仓库
- 
+
   let purposeLocation = purposeTypeListOptions.value.filter((e) => {
     return e.id == row.purposeLocationId;
   });
-   console.log(purposeTypeListOptions.value,row.purposeLocationId,1212121,purposeLocation)
+  console.log(purposeTypeListOptions.value, row.purposeLocationId, 1212121, purposeLocation);
   // 目的仓库id
   row.purposeLocationId = purposeLocation[0].id;
   // 目的仓库类型
@@ -820,9 +811,9 @@ function handleBlur(row, index) {
   let practitioner = practitionerListOptions.value.filter((e) => {
     return e.value == receiptHeaderForm.practitionerId;
   });
-  console.log('practitioner',practitioner);
-  row.practitionerId = practitioner[0].value
-  row.practitionerName = practitioner[0].label
+  console.log('practitioner', practitioner);
+  row.practitionerId = practitioner[0].value;
+  row.practitionerName = practitioner[0].label;
   // 申请人
   row.applicantId = userStore.id;
 }
@@ -836,71 +827,101 @@ function getTransferProductDetails() {
     getTHTransferProductDetail(receiptHeaderForm.busNo).then((res) => {
       form.purchaseinventoryList = res.data;
       form.purchaseinventoryList.map((e, index) => {
-        e.isSave = true
-        form.purchaseinventoryList[index].statusMaxvalue =  false
+        e.isSave = true;
+        form.purchaseinventoryList[index].statusMaxvalue = false;
         e.volume = e.totalVolume;
-        e.name = e.itemName
+        e.name = e.itemName;
 
         if (e.sourceLocationId) {
-          receiptHeaderForm.sourceLocationId = e.sourceLocationId
-          receiptHeaderForm.sourceLocationName = e.sourceLocationName
+          receiptHeaderForm.sourceLocationId = e.sourceLocationId;
+          receiptHeaderForm.sourceLocationName = e.sourceLocationName;
         }
         if (e.practitionerId) {
-          receiptHeaderForm.practitionerId = e.practitionerId
+          receiptHeaderForm.practitionerId = e.practitionerId;
         }
-        
-         if (e.itemType) {
-          receiptHeaderForm.medicationType = e.itemType
+
+        if (e.itemType) {
+          receiptHeaderForm.medicationType = e.itemType;
           // let medicationType1 = purchase_type.value.filter(k=>{
           //   return k.label == e.itemType
           // })
         }
 
-        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalQuantity?form.purchaseinventoryList[index].totalQuantity:0
-    
-        console.log(e,e.unitList&&e.unitCode,!e.unitList&&e.unitCode,12121212)
-        if(e.unitList&&e.unitCode){
-          form.purchaseinventoryList[index].unitList = e.unitList[0]   //计量单位回显数组
-          form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-          form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-          if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-            getMaxCounts(e,index,1)
+        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index]
+          .totalQuantity
+          ? form.purchaseinventoryList[index].totalQuantity
+          : 0;
+
+        console.log(e, e.unitList && e.unitCode, !e.unitList && e.unitCode, 12121212);
+        if (e.unitList && e.unitCode) {
+          form.purchaseinventoryList[index].unitList = e.unitList[0]; //计量单位回显数组
+          form.purchaseinventoryList[index].unitCode =
+            form.purchaseinventoryList[index].measurementUnitCode_dictText;
+          form.purchaseinventoryList[index].unitCode_dictText =
+            form.purchaseinventoryList[index].measurementUnitCode_dictText;
+          if (
+            form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.unitCode
+          ) {
+            // 回显大单位
+            getMaxCounts(e, index, 1);
           }
-          console.log(form.purchaseinventoryList, e.unitList,"获取详情12");
-        }else{
-          if(!e.unitList&&e.unitCode){
-            form.purchaseinventoryList[index].unitList = {unitCode: form.purchaseinventoryList[index].unitCode,unitCode_dictText:form.purchaseinventoryList[index].unitCode_dictText,
-              minUnitCode:form.purchaseinventoryList[index].minUnitCode, minUnitCode_dictText:form.purchaseinventoryList[index].minUnitCode_dictText
-            }  //计量单位回显数组
-            form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-            form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].measurementUnitCode_dictText;
-            if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-              getMaxCounts(e,index,1)
+          console.log(form.purchaseinventoryList, e.unitList, '获取详情12');
+        } else {
+          if (!e.unitList && e.unitCode) {
+            form.purchaseinventoryList[index].unitList = {
+              unitCode: form.purchaseinventoryList[index].unitCode,
+              unitCode_dictText: form.purchaseinventoryList[index].unitCode_dictText,
+              minUnitCode: form.purchaseinventoryList[index].minUnitCode,
+              minUnitCode_dictText: form.purchaseinventoryList[index].minUnitCode_dictText,
+            }; //计量单位回显数组
+            form.purchaseinventoryList[index].unitCode =
+              form.purchaseinventoryList[index].measurementUnitCode_dictText;
+            form.purchaseinventoryList[index].unitCode_dictText =
+              form.purchaseinventoryList[index].measurementUnitCode_dictText;
+            if (
+              form.purchaseinventoryList[index].measurementUnitCode ==
+              form.purchaseinventoryList[index].unitList.unitCode
+            ) {
+              // 回显大单位
+              getMaxCounts(e, index, 1);
             }
           }
         }
         getPharmacyCabinetList().then((res) => {
           purposeTypeListOptions.value = res.data;
         });
-        if(e.price){
+        if (e.price) {
           // 单价   大单位单价
-          if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.minUnitCode){
-            form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price / form.purchaseinventoryList[index].partPercent|| "";
-            form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+          if (
+            form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.minUnitCode
+          ) {
+            form.purchaseinventoryList[index].price =
+              form.purchaseinventoryList[index].price /
+                form.purchaseinventoryList[index].partPercent || '';
+            form.purchaseinventoryList[index].price =
+              form.purchaseinventoryList[index].price.toFixed(4);
             // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-          }else{
-            if(form.purchaseinventoryList[index].price>1){
-              form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+          } else {
+            if (form.purchaseinventoryList[index].price > 1) {
+              form.purchaseinventoryList[index].price =
+                form.purchaseinventoryList[index].price.toFixed(4);
             }
           }
-          if (form.purchaseinventoryList[index].price > 0 && form.purchaseinventoryList[index].itemQuantity > 0) {
+          if (
+            form.purchaseinventoryList[index].price > 0 &&
+            form.purchaseinventoryList[index].itemQuantity > 0
+          ) {
+            form.purchaseinventoryList[index].totalPrice =
+              form.purchaseinventoryList[index].price *
+              form.purchaseinventoryList[index].itemQuantity;
             form.purchaseinventoryList[index].totalPrice =
-            form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity;
-            form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
+              form.purchaseinventoryList[index].totalPrice.toFixed(4);
           }
-        }else{
-          form.purchaseinventoryList[index].price = 0
-          form.purchaseinventoryList[index].totalPrice = 0
+        } else {
+          form.purchaseinventoryList[index].price = 0;
+          form.purchaseinventoryList[index].totalPrice = 0;
         }
       });
     });
@@ -953,32 +974,38 @@ function saveRow(row, index) {
 function handleReject() {
   reject(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataLYTK();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'returningInventory'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'returningInventory' },
+      });
     }
   });
 }
 function handelApply() {
   returnIssueApproved(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataLYTK();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'returningInventory'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'returningInventory' },
+      });
     }
-  })
+  });
 }
 /** 提交审核按钮 */
 function handleSubmitApproval() {
   let length = form.purchaseinventoryList.length;
   if (length < 1) {
-    proxy.$modal.msgWarning("请先添加单据");
+    proxy.$modal.msgWarning('请先添加单据');
   } else if (!form.purchaseinventoryList[length - 1].isSave) {
-    proxy.$modal.msgWarning("第" + length + "行单据未保存，请先保存");
+    proxy.$modal.msgWarning('第' + length + '行单据未保存，请先保存');
   } else {
     submitTHApproval(receiptHeaderForm.busNo).then((response) => {
       proxy.$modal.msgSuccess('提交审批成功');
@@ -986,21 +1013,22 @@ function handleSubmitApproval() {
       store.clearCurrentDataLYTK();
       // 跳转到审核页面
       router.replace({ path: 'requisitionInventoryManagement' });
-    })
+    });
   }
 }
 function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0]
-  if(view.name== 'ReturningInventory'){ //调拨单据号删除
-    sessionStorage.setItem('busNoLYTH',"")
-  }  
+  const latestView = visitedViews.slice(-1)[0];
+  if (view.name == 'ReturningInventory') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNoLYTH', '');
+  }
   if (latestView) {
-    router.push(latestView.fullPath)
+    router.push(latestView.fullPath);
   } else {
     if (view.name === 'Dashboard') {
-      router.replace({ path: '/redirect' + view.fullPath })
-    }else {
-      router.push('/')
+      router.replace({ path: '/redirect' + view.fullPath });
+    } else {
+      router.push('/');
     }
   }
 }
@@ -1027,10 +1055,13 @@ function selectRow(rowValue, index) {
   form.purchaseinventoryList[index].purposeLocationId = '';
   getPharmacyCabinetList().then((res) => {
     purposeTypeListOptions.value = res.data;
-  })
-  form.purchaseinventoryList[index].itemQuantity = 0
-  form.purchaseinventoryList[index].totalPrice = 0
-  store.setCurrentDataLYTK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm });
+  });
+  form.purchaseinventoryList[index].itemQuantity = 0;
+  form.purchaseinventoryList[index].totalPrice = 0;
+  store.setCurrentDataLYTK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 
 // 选择仓库
@@ -1042,11 +1073,11 @@ function handleLocationClick(item, row, index) {
   }).then((res) => {
     if (res.data && res.data.length > 0) {
       form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
-      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || "";
+      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
       if (res.data[0].price) {
         form.purchaseinventoryList[index].price = res.data[0].price.toFixed(4);
-      }else{
-        form.purchaseinventoryList[index].price = 0
+      } else {
+        form.purchaseinventoryList[index].price = 0;
       }
       form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || '';
       // 生产日期
@@ -1055,30 +1086,40 @@ function handleLocationClick(item, row, index) {
       form.purchaseinventoryList[index].endTime = res.data[0].expirationDate;
       // 仓库类型
       form.purchaseinventoryList[index].purposeTypeEnum = item.formEnum;
-      form.purchaseinventoryList[index].unitCode = form.purchaseinventoryList[index].unitList.minUnitCode
-      form.purchaseinventoryList[index].unitCode_dictText = form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+      form.purchaseinventoryList[index].unitCode =
+        form.purchaseinventoryList[index].unitList.minUnitCode;
+      form.purchaseinventoryList[index].unitCode_dictText =
+        form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
       // 单价   大单位单价
-      if(form.purchaseinventoryList[index].unitCode==form.purchaseinventoryList[index].unitList.minUnitCode){
-        form.purchaseinventoryList[index].price = res.data[0].price / form.purchaseinventoryList[index].partPercent|| "";
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+      if (
+        form.purchaseinventoryList[index].unitCode ==
+        form.purchaseinventoryList[index].unitList.minUnitCode
+      ) {
+        form.purchaseinventoryList[index].price =
+          res.data[0].price / form.purchaseinventoryList[index].partPercent || '';
+        form.purchaseinventoryList[index].price =
+          form.purchaseinventoryList[index].price.toFixed(4);
         // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-      }else{
-        console.log(form.purchaseinventoryList[index].price,"!21221")
+      } else {
+        console.log(form.purchaseinventoryList[index].price, '!21221');
         // if(form.purchaseinventoryList[index].price>1){
         //   form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4)
         // }
       }
       if (form.purchaseinventoryList[index].totalQuantity == 0) {
-        proxy.$message.warning('仓库数量为0，无法调用！')
+        proxy.$message.warning('仓库数量为0，无法调用！');
       }
     } else {
-      form.purchaseinventoryList[index].itemQuantity = 0
-      form.purchaseinventoryList[index].totalQuantity = 0
-      form.purchaseinventoryList[index].price = 0
+      form.purchaseinventoryList[index].itemQuantity = 0;
+      form.purchaseinventoryList[index].totalQuantity = 0;
+      form.purchaseinventoryList[index].price = 0;
       proxy.$message.warning('仓库数量为0，无法调用！');
     }
-  })
-  store.setCurrentDataLYTK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm });
+  });
+  store.setCurrentDataLYTK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
 // 切换仓库类型获取药房/药库列表   目的仓库切换
 function handleChangePurposeTypeEnum(value) {
@@ -1131,86 +1172,113 @@ function handleChangeSourceTypeEnum(value) {
 // 单位处理
 function handleUnitCodeChange(row, index, value) {
   // 防止点击和已选一样的问题
-  if(!form.purchaseinventoryList[index].statusMaxvalue&&row.measurementUnitCode==value&&route.query.supplyBusNo){
-    return     
+  if (
+    !form.purchaseinventoryList[index].statusMaxvalue &&
+    row.measurementUnitCode == value &&
+    route.query.supplyBusNo
+  ) {
+    return;
   }
   if (row.minUnitCode == value) {
     //最小计量单位
     // form.purchaseinventoryList[index].totalQuantity = oldtotalQuantity.value;
     // form.purchaseinventoryList[index].itemQuantity = olditemQuantity.value;
-    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity?form.purchaseinventoryList[index].oldtotalQuantity:form.purchaseinventoryList[index].totalQuantity
-    form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
+    form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index]
+      .oldtotalQuantity
+      ? form.purchaseinventoryList[index].oldtotalQuantity
+      : form.purchaseinventoryList[index].totalQuantity;
+    form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index]
+      .olditemQuantity
+      ? form.purchaseinventoryList[index].olditemQuantity
+      : form.purchaseinventoryList[index].itemQuantity;
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
     // 单价
     form.purchaseinventoryList[index].price =
-    form.purchaseinventoryList[index].price / row.partPercent;
-    form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4)
+      form.purchaseinventoryList[index].price / row.partPercent;
+    form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
     // if (!form.purchaseinventoryList[index].itemQuantity) {
     // }
   } else {
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
-    getMaxCounts(row,index)
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
+    getMaxCounts(row, index);
   }
-  form.purchaseinventoryList[index].statusMaxvalue = true
-  store.setCurrentDataLYTK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm });
+  form.purchaseinventoryList[index].statusMaxvalue = true;
+  store.setCurrentDataLYTK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
 }
-function getMaxCounts(row,index,counts){
-    form.purchaseinventoryList[index].oldtotalQuantity =  form.purchaseinventoryList[index].totalQuantity
-    form.purchaseinventoryList[index].totalQuantity =
+function getMaxCounts(row, index, counts) {
+  form.purchaseinventoryList[index].oldtotalQuantity =
+    form.purchaseinventoryList[index].totalQuantity;
+  form.purchaseinventoryList[index].totalQuantity =
     form.purchaseinventoryList[index].totalQuantity / row.partPercent;
 
-    const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
-    const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
+  const integerPart1 = Math.floor(form.purchaseinventoryList[index].totalQuantity); // 获取整数部分
+  const decimalPart1 = form.purchaseinventoryList[index].totalQuantity - integerPart1; // 获取小数部分
 
-    if(decimalPart1){
-      form.purchaseinventoryList[index].totalQuantity = integerPart1 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-      (decimalPart1*row.partPercent).toFixed(0) +
-      form.purchaseinventoryList[index].unitList.minUnitCode_dictText
-    }
+  if (decimalPart1) {
+    form.purchaseinventoryList[index].totalQuantity =
+      integerPart1 +
+      form.purchaseinventoryList[index].unitList.unitCode_dictText +
+      (decimalPart1 * row.partPercent).toFixed(0) +
+      form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
+  }
 
-    //领用数量
-    if(counts){
-      form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity*row.partPercent
-      form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
-      const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
-      const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
-      console.log(integerPart,decimalPart,form.purchaseinventoryList[index].itemQuantity,121212121)
-      if(decimalPart){
-        form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-        (decimalPart*row.partPercent).toFixed(0) +
-        form.purchaseinventoryList[index].minUnitCode_dictText
-      }
-    }else{
-      // form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity
-      // form.purchaseinventoryList[index].itemQuantity =
-      // form.purchaseinventoryList[index].itemQuantity / row.partPercent;
-      // form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
-      // const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
-      // const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
+  //领用数量
+  if (counts) {
+    form.purchaseinventoryList[index].olditemQuantity =
+      form.purchaseinventoryList[index].itemQuantity * row.partPercent;
+    form.purchaseinventoryList[index].itemMaxQuantity =
+      form.purchaseinventoryList[index].itemQuantity;
+    const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
+    const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
+    console.log(
+      integerPart,
+      decimalPart,
+      form.purchaseinventoryList[index].itemQuantity,
+      121212121
+    );
+    if (decimalPart) {
+      form.purchaseinventoryList[index].itemQuantity =
+        integerPart +
+        form.purchaseinventoryList[index].unitList.unitCode_dictText +
+        (decimalPart * row.partPercent).toFixed(0) +
+        form.purchaseinventoryList[index].minUnitCode_dictText;
+    }
+  } else {
+    // form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity
+    // form.purchaseinventoryList[index].itemQuantity =
+    // form.purchaseinventoryList[index].itemQuantity / row.partPercent;
+    // form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
+    // const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
+    // const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
 
-      // if(decimalPart){
-      //   form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-      //   (decimalPart*row.partPercent).toFixed(0) +
-      //   form.purchaseinventoryList[index].unitList.minUnitCode_dictText
-      // }
-      // if(counts==form.purchaseinventoryList[index].unitCode&&route.query.supplyBusNo){  // 修复编辑时在大单位重复点击大单位的bug
-      //   form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity
-      //   form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
-      //   form.purchaseinventoryList[index].totalPrice =  (form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity).toFixed(4);
-      // }else{
-        form.purchaseinventoryList[index].price =
-        form.purchaseinventoryList[index].price * row.partPercent;
-        form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
-      // }
-    } 
-    console.log(form.purchaseinventoryList[index].price,"121212121")
+    // if(decimalPart){
+    //   form.purchaseinventoryList[index].itemQuantity = integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
+    //   (decimalPart*row.partPercent).toFixed(0) +
+    //   form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+    // }
+    // if(counts==form.purchaseinventoryList[index].unitCode&&route.query.supplyBusNo){  // 修复编辑时在大单位重复点击大单位的bug
+    //   form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity
+    //   form.purchaseinventoryList[index].itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
+    //   form.purchaseinventoryList[index].totalPrice =  (form.purchaseinventoryList[index].price * form.purchaseinventoryList[index].itemQuantity).toFixed(4);
+    // }else{
+    form.purchaseinventoryList[index].price =
+      form.purchaseinventoryList[index].price * row.partPercent;
+    form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+    // }
+  }
+  console.log(form.purchaseinventoryList[index].price, '121212121');
 }
 // 计算总价
 function handleTotalPrice(index) {
-  form.purchaseinventoryList[index].olditemQuantity = form.purchaseinventoryList[index].itemQuantity * row.partPercent;
-  form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
+  form.purchaseinventoryList[index].olditemQuantity =
+    form.purchaseinventoryList[index].itemQuantity * row.partPercent;
+  form.purchaseinventoryList[index].itemMaxQuantity =
+    form.purchaseinventoryList[index].itemQuantity;
   let purchaseItem = form.purchaseinventoryList[index];
   if (purchaseItem.price > 0 && purchaseItem.itemQuantity > 0) {
     form.purchaseinventoryList[index].totalPrice = purchaseItem.price * purchaseItem.itemQuantity;
@@ -1218,51 +1286,73 @@ function handleTotalPrice(index) {
       form.purchaseinventoryList[index].totalPrice.toFixed(4);
     //  parseFloat(form.purchaseinventoryList[index].totalPrice.toFixed(4))
   }
-  if(form.purchaseinventoryList[index].itemQuantity==0){
-    form.purchaseinventoryList[index].totalPrice = 0
+  if (form.purchaseinventoryList[index].itemQuantity == 0) {
+    form.purchaseinventoryList[index].totalPrice = 0;
   }
-  store.setCurrentDataLYTK({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm });
+  store.setCurrentDataLYTK({
+    purchaseinventoryList: form.purchaseinventoryList,
+    receiptHeaderForm: receiptHeaderForm,
+  });
+}
+
+const openTraceNoDialog = ref(false)
+const rowData = ref({})
+const ypName = ref('')
+const currentIndex = ref(undefined)
+function handleScan(row,index){
+  rowData.value = row
+  rowData.value.itemType = receiptHeaderForm.medicationType
+  ypName.value = row.name
+  openTraceNoDialog.value = true;
+  currentIndex.value = index
 }
 
 function handleSave(row, index) {
-  rowList.value = []
-  
-  form.purchaseinventoryList.map((row,index)=>{
-    if(row){
+  rowList.value = [];
+
+  form.purchaseinventoryList.map((row, index) => {
+    if (row) {
       handleBlur(row);
       proxy.$refs['receiptHeaderRef'].validate((valid) => {
         if (valid) {
           proxy.$refs['formRef'].validate((valid) => {
             if (valid) {
-              let rows = JSON.parse(JSON.stringify(row))
-              delete rows.itemMaxQuantity
-              if(rows.unitCode== rows.unitList.minUnitCode){
-                rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
-              }else{
-                rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity?form.purchaseinventoryList[index].itemMaxQuantity:form.purchaseinventoryList[index].itemQuantity
+              let rows = JSON.parse(JSON.stringify(row));
+              delete rows.itemMaxQuantity;
+              if (rows.unitCode == rows.unitList.minUnitCode) {
+                rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity
+                  ? form.purchaseinventoryList[index].olditemQuantity
+                  : form.purchaseinventoryList[index].itemQuantity;
+              } else {
+                rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity
+                  ? form.purchaseinventoryList[index].itemMaxQuantity
+                  : form.purchaseinventoryList[index].itemQuantity;
               }
-              if(rows.unitCode == rows.unitCode_dictText){
-                if(rows.unitCode_dictText == rows.unitList.minUnitCode_dictText){
-                  rows.unitCode = rows.unitList.minUnitCode
-                  console.log(rows.unitCode_dictText,2323232 )
-                }else{
-                  rows.unitCode = rows.unitList.unitCode
-                  rows.unitCode_dictText = rows.unitList.unitCode_dictText
-                  console.log(rows.unitCode_dictText,23232326565 )
+              if (rows.unitCode == rows.unitCode_dictText) {
+                if (rows.unitCode_dictText == rows.unitList.minUnitCode_dictText) {
+                  rows.unitCode = rows.unitList.minUnitCode;
+                  console.log(rows.unitCode_dictText, 2323232);
+                } else {
+                  rows.unitCode = rows.unitList.unitCode;
+                  rows.unitCode_dictText = rows.unitList.unitCode_dictText;
+                  console.log(rows.unitCode_dictText, 23232326565);
                 }
               }
-              rowList.value.push(JSON.parse(JSON.stringify(rows)))
-              if(rowList._rawValue&&rowList._rawValue.length == form.purchaseinventoryList.length){
-                addTHTransferProducts(rowList._rawValue)
+              rowList.value.push(JSON.parse(JSON.stringify(rows)));
+              if (
+                rowList._rawValue &&
+                rowList._rawValue.length == form.purchaseinventoryList.length
+              ) {
+                addTHTransferProducts(rowList._rawValue);
               }
             }
-          })
+          });
         }
-      })
+      });
     }
   });
 }
-function addTHTransferProducts(rowList){
+function addTHTransferProducts(rowList) {
   addTHTransferProduct(JSON.parse(JSON.stringify(rowList))).then((res) => {
     // 当前行没有id视为首次新增
     // if (!row.id) {
@@ -1270,10 +1360,10 @@ function addTHTransferProducts(rowList){
     // }
     if (res.data) {
       proxy.$message.success('保存成功！');
-      form.purchaseinventoryList.map((row,index)=>{
-        form.purchaseinventoryList[index].id = res.data[index]
+      form.purchaseinventoryList.map((row, index) => {
+        form.purchaseinventoryList[index].id = res.data[index];
         form.purchaseinventoryList[index].isSave = true;
-      })
+      });
       // form.purchaseinventoryList[index].id = res.data;
       // form.purchaseinventoryList[index].isSave = true;
     }
@@ -1290,12 +1380,12 @@ function handleSelectionChange(selection) {
 
 function deleteSelectedRows() {
   let length = selectedRows.value.length;
-  let ids  = []
-  if(selectedRows.value[0].id){
-     ids = selectedRows.value.map((item) => {
-      return item.id
+  let ids = [];
+  if (selectedRows.value[0].id) {
+    ids = selectedRows.value.map((item) => {
+      return item.id;
     });
-  } 
+  }
   if (selectedRows.value[length - 1].isSave) {
     delTHTransferProduct(ids).then((res) => {
       if (res.code == 200) {
@@ -1314,11 +1404,11 @@ function deleteSelectedRows() {
   form.purchaseinventoryList = form.purchaseinventoryList.filter(
     (row) => !selectedRows.value.includes(row)
   );
-  // 
-  if(form.purchaseinventoryList&&form.purchaseinventoryList.length>0){
-    data.isEdit = true
-  }else{
-    data.isEdit = false
+  //
+  if (form.purchaseinventoryList && form.purchaseinventoryList.length > 0) {
+    data.isEdit = true;
+  } else {
+    data.isEdit = false;
   }
   data.isAdding = false;
 }
@@ -1326,7 +1416,7 @@ function deleteSelectedRows() {
 /**计算合计金额 */
 function handleTotalAmount() {
   totalAmount.value = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
-    return (accumulator + (Number(currentRow.totalPrice) || 0))
+    return accumulator + (Number(currentRow.totalPrice) || 0);
   }, 0);
 }
 
@@ -1406,7 +1496,9 @@ function edit() {
   receiptHeaderForm.busNo = props.editRow.supplyBusNo;
   // receiptHeaderForm.supplierId = props.editRow.supplierId;
   // receiptHeaderForm.practitionerId = props.editRow.practitionerId;
-  receiptHeaderForm.occurrenceTime = editData.value.editRow.occurrenceTime?formatDate(editData.value.editRow.occurrenceTime):formatDate(new Date())
+  receiptHeaderForm.occurrenceTime = editData.value.editRow.occurrenceTime
+    ? formatDate(editData.value.editRow.occurrenceTime)
+    : formatDate(new Date());
   receiptHeaderForm.purposeTypeEnum = props.editRow.purposeTypeEnum.toString();
   receiptHeaderForm.sourceTypeEnum = props.editRow.purposeTypeEnum.toString();
   receiptHeaderForm.medicationType =
@@ -1492,11 +1584,11 @@ const locationList = ref([]);
 function getBusNoInitList() {
   if (route.query.supplyBusNo) {
     receiptHeaderForm.busNo = route.query.supplyBusNo;
-    viewStatus.value = route.query.view
-    sessionStorage.setItem('busNoLYTH',"")
+    viewStatus.value = route.query.view;
+    sessionStorage.setItem('busNoLYTH', '');
   } else {
     if (!sessionStorage.getItem('busNoLYTH')) {
-      store.clearCurrentDataLYTK()
+      store.clearCurrentDataLYTK();
       getTHBusNoInit().then((response) => {
         receiptHeaderForm.busNo = response.data.busNo;
         sessionStorage.setItem('busNoLYTH', receiptHeaderForm.busNo);
diff --git a/vue3/src/views/medicationmanagement/returnedPurchase/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/components/api.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/returnedPurchase/components/api.js
rename to openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/components/api.js
diff --git a/vue3/src/views/medicationmanagement/returnedPurchase/components/transferManagement.vue b/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/components/transferManagement.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/returnedPurchase/components/transferManagement.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/components/transferManagement.vue
diff --git a/vue3/src/views/medicationmanagement/returnedPurchase/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue
similarity index 95%
rename from vue3/src/views/medicationmanagement/returnedPurchase/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue
index 8aaed3e8..e3080288 100644
--- a/vue3/src/views/medicationmanagement/returnedPurchase/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue
@@ -629,6 +629,7 @@
         </el-row>
       </el-col>
     </el-row>
+    <TraceNoDialog :ypName="ypName" :rowData="rowData" :openDialog="openTraceNoDialog" @submit="submit" @cancel="openTraceNoDialog = false"/>
   </div>
 </template>
 
@@ -652,6 +653,7 @@ import PopoverList from "@/components/OpenHis/popoverList/index.vue";
 import MedicineList from "./components/transferManagement.vue";
 import { formatDate,formatDateymd } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import { time } from "echarts";
 import { useStore } from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
@@ -813,15 +815,16 @@ onMounted(() => {
 // onUnmounted(() => {
   // document.removeEventListener("click", handleClickOutside);
 // });
+const openTraceNoDialog = ref(false)
+const rowData = ref({})
+const ypName = ref('')
+const currentIndex = ref(undefined)
 function handleScan(row,index){
-  document.addEventListener('keydown', function(event) {
-    // 检查是否为条码输入
-    if (event.key === 'Enter' || event.key === 'Tab') { // 某些扫码枪在输入后可能发送Enter或Tab键
-      console.log('Barcode detected:', event.target.value);
-      form.purchaseinventoryList[index].traceNo = event.target.value
-      // 处理条码数据
-    }
-  })
+  rowData.value = row
+  rowData.value.itemType = receiptHeaderForm.medicationType
+  ypName.value = row.name
+  openTraceNoDialog.value = true;
+  currentIndex.value = index
 }
 function addNewRow() {
   proxy.$refs["receiptHeaderRef"].validate((valid) => {
@@ -879,7 +882,6 @@ function handleBlur(row, index) {
   row.itemQuantity = Number(row.itemQuantity)
   row.price = Number(row.price)
   row.totalPrice = Number(row.totalPrice)
-  console.log(practitionerList,"practitionerList")
   row.practitionerName = (practitionerList&&practitionerList[0])?practitionerList[0].label:''
   row.busNo = receiptHeaderForm.busNo;
   row.originalBusNo = route.query.originalSupplyBusNo
@@ -937,8 +939,6 @@ function handleLocationClick(item, row, index) {
       res.data.forEach((item) => {
         totalQuantity += item.orgQuantity;
       });
-      console.log(row);
-      console.log(row.unitList);
       form.purchaseinventoryList[index].quantity =
         handleTotalQuantity(
           totalQuantity,
@@ -1037,7 +1037,6 @@ function handleUnitCodeChange(row, index, value) {
     form.purchaseinventoryList[index].price =
     form.purchaseinventoryList[index].price / row.partPercent;
     form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
-    console.log(form.purchaseinventoryList[index],row,"111111111111111112")
     if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){
       form.purchaseinventoryList[index].returnedQuantity =
       form.purchaseinventoryList[index].returnedQuantity * row.partPercent
@@ -1088,7 +1087,7 @@ function getMaxCounts(row,index,counts){
       form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
       const integerPart = Math.floor(form.purchaseinventoryList[index].itemQuantity); // 获取整数部分
       const decimalPart = form.purchaseinventoryList[index].itemQuantity - integerPart; // 获取小数部分
-      console.log(integerPart,decimalPart,form.purchaseinventoryList[index].itemQuantity,121212121)
+     
       if(decimalPart){
         form.purchaseinventoryList[index].itemQuantity = 
         integerPart + form.purchaseinventoryList[index].unitList.unitCode_dictText +
@@ -1099,7 +1098,6 @@ function getMaxCounts(row,index,counts){
       form.purchaseinventoryList[index].price * row.partPercent;
       form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
     } 
-    console.log(form.purchaseinventoryList[index],"121212121")
 }
 // // 单位处理
 // function handleUnitCodeChange(row, index, value) {
@@ -1173,12 +1171,17 @@ function handleSave(row, index) {
   })
 }
 function addPurchaseinventorys(rowList){
-  addPurchaseinventory(JSON.parse(JSON.stringify(rowList))).then((res) => {
+  let saveList = rowList.map((item) => {
+    return {
+      ...item,
+      quantity: undefined
+    }
+  })
+  addPurchaseinventory(JSON.parse(JSON.stringify(saveList))).then((res) => {
     // 当前行没有id视为首次新增
     if (res.data) {
       proxy.$message.success('保存成功！');
       form.purchaseinventoryList.map((row,index)=>{
-        console.log(row,"res.data")
         form.purchaseinventoryList[index].id = res.data[index]
         form.purchaseinventoryList[index].isSave = true;
       })
@@ -1215,7 +1218,6 @@ function addPurchaseinventorys(rowList){
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, 'selection');
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   selectedRows.value = selection;
@@ -1285,12 +1287,8 @@ function show() {
 function edit() {
   data.isAdding = false;
   data.isEdit = true;
-  // reset();
+
   visible.value = true;
-  // supplierListOptions.value = props.supplierListOptions;
-  // itemTypeOptions.value = props.itemTypeOptions;
-  // practitionerListOptions.value = props.practitionerListOptions;
-  // receiptHeaderForm.busNo = props.busNoAdd;
   receiptHeaderForm.value = editData.value.item.length > 0 ? editData.value.item[0] : {};
   receiptHeaderForm.busNo = editData.value.editRow.supplyBusNo;
   receiptHeaderForm.supplierId = editData.value.editRow.supplierId;
@@ -1318,8 +1316,6 @@ function edit() {
     });
   }, 100);
 
-  console.log(form.purchaseinventoryList, 'purchaseinventoryList.value');
-  console.log(receiptHeaderForm, 'receiptHeaderForm');
   loading.value = false;
 }
 
@@ -1428,7 +1424,6 @@ function handleDelete(row) {
 
 // 获取详情
 function getpurchaseInventoryDetails(){
-  console.log(route,router,receiptHeaderForm.busNo,receiptHeaderForm.busNo,12222)
   if(route.query.originalSupplyBusNo){
    let busNo = 0
 
@@ -1452,7 +1447,6 @@ function getpurchaseInventoryDetails(){
             }
           })
           handleChangePurposeTypeEnum(e.purposeTypeEnum)
-          console.log(e.purposeTypeEnum,"e.purposeTypeEnum")
         }
 
         if(e.supplierId){
@@ -1506,7 +1500,6 @@ function getpurchaseInventoryDetails(){
           form.purchaseinventoryList[index].totalPrice = 0
         }
       })
-      console.log(res.data,receiptHeaderForm,"获取详情");
     })
   }
 }
@@ -1541,41 +1534,7 @@ function handleChangePurposeTypeEnum(value,type) {
     });
   }
 }
-//  // 源仓库切换
-// function handleChangeSourceTypeEnum(value) {
-//   if (value == 16) {
-//     getPharmacyList().then((res) => {
-//       sourceTypeListOptions.value = res.data;
-//     });
-//   } else if (value == 11) {
-//     getDispensaryList().then((res) => {
-//       sourceTypeListOptions.value = res.data;
-//     });
-//   }
-// }
 
-function getBusNoInitList() {
-  console.log(route,route.query,"路由传值")
-  if(route.query.supplyBusNo){
-    receiptHeaderForm.busNo = route.query.supplyBusNo
-  }else{
-    if(!sessionStorage.getItem('busNo')){
-      // getBusNoInit().then((response) => {
-      //   console.log(response,'response',response.data)
-      //   receiptHeaderForm.busNo = response.data.busNo;
-      //   sessionStorage.setItem('busNo', receiptHeaderForm.busNo)
-      //   // busNoAdd.value = response.data.busNo; // 单据号新增
-      // })
-    }else{
-      receiptHeaderForm.busNo = sessionStorage.getItem('busNo')
-    }
-  }
- 
-}
- 
-// getTransferProductTypeList();
-// getBusNoInitList()
-// getPurchaseinventoryLists()
 getPurchaseinventoryTypeList()
 getpurchaseInventoryDetails()
 // defineExpose({
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue
similarity index 72%
rename from vue3/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue
index ce5a99c6..2b409e19 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue
@@ -4,27 +4,8 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="100px"
     >
-      <!-- <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker
-            v-model="queryParams.startTime"
-            type="datetime"
-            placeholder="请选择开始时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY/MM/DD HH:mm:ss"
-        />
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker
-            v-model="queryParams.endTime"
-            type="datetime"
-            placeholder="请选择结束时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY/MM/DD HH:mm:ss"
-        />
-      </el-form-item> -->
       <el-form-item label="开单时间：">
         <el-date-picker
           v-model="occurrenceTime"
@@ -35,10 +16,10 @@
           value-format="YYYY-MM-DD"
         />
       </el-form-item>
-      <el-form-item label="项目查询：" prop="searchKey">
+      <el-form-item label="药品查询：" prop="searchKey">
         <el-input
           v-model="queryParams.searchKey"
-          placeholder="输入名称/编码后回车查询"
+          placeholder="输入名称/拼音/编码后回车查询"
           clearable
           style="width: 220px"
           @keyup.enter="handleQuery"
@@ -170,80 +151,27 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-    <!-- <el-row
-      :gutter="10"
-      class="mb8"
-      style="
-        margin-top: 15px;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-      "
-    >
-      <el-col :span="3">
-        <span>制单人：{{ userStore.name }}</span>
-      </el-col>
-      <el-col :span="6">
-        <el-row
-          :gutter="8"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-          "
-        >
-          <el-col :span="10">
-            <span>合计金额：{{ totalAmount?totalAmount.toFixed(4):0 }}</span>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row> -->
   </div>
 </template>
 
 <script setup name="awaitingMedicineDetails">
 import {
   getAwaitingPendingMedicationPageList,
-  getInit,
   getPharmacyCabinetList,
-  getBusNoInit,
-  cancelSupply,
-  stopSupply,
 } from "./statisticalManagent";
 import useUserStore from "@/store/modules/user";
 import { ref } from "vue";
 const userStore = useUserStore();
-
-const router = useRouter();
 const { proxy } = getCurrentInstance();
-
 const inventoryOptions = ref([])
 const totalAmount = ref(0);
-const purchaseinventoryRef = ref(null); // 初始化 ref
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
-const chrgitmLv_enumTextOptions = ref([]);
-const locationIdList = ref([]);
 const inventoryScope = ref("")
 
 const data = reactive({
@@ -287,22 +215,13 @@ function getPharmacyCabinetLists() {
     {value:1,label:'待发药明细账'},
   ]
   inventoryScope.value = 1
-  getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
-    locationIdList.value = response.data
-  });
-  getInit().then((response) => {
-    chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions 
-  })
 }
 /** 查询调拨管理项目列表 */
 function getList() {
   loading.value = true;
   getAwaitingPendingMedicationPageList(queryParams.value).then((res) => {
-    console.log(res,"res----------------")
     loading.value = false;
     purchaseinventoryList.value = res.data.records
-    
     total.value = res.data.total;
   });
 }
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
similarity index 76%
rename from vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
index 2470b90d..f6801d38 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="100px"
     >
      <el-form-item label="药品名称：" prop="searchKey" label-width="120px">
@@ -195,42 +194,25 @@
   </div>
 </template>
 
-<script setup name="chkstockPartDetails">
+<script setup name="ChkstockPartDetails">
 import {
   getReportStocktakingPage,
   getInit,
   getPharmacyCabinetList,
-  getBusNoInit,
+
   cancelSupply,
   stopSupply,
 } from "./statisticalManagent";
 
-const router = useRouter();
 const { proxy } = getCurrentInstance();
 
-const purchaseinventoryRef = ref(null); // 初始化 ref
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
 const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
 
@@ -252,15 +234,8 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-function getBusNoInitList() {
-  getBusNoInit().then((response) => {
-    console.log(response,'response',response.data)
-    busNoAdd.value = response.data.busNo; // 单据号新增
-  });
-}
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
     locationIdList.value = response.data
   });
   getInit().then((response) => {
@@ -270,26 +245,9 @@ function getPharmacyCabinetLists() {
 /** 查询调拨管理项目列表 */
 function getList() {
   loading.value = true;
-  // // queryParams.value.locationId = +queryParams.value.locationId
-  // proxy.addoccurrenceTime(queryParams.value, occurrenceTime.value)
   getReportStocktakingPage(queryParams.value).then((res) => {
-    console.log(res,"res----------------")
     loading.value = false;
     purchaseinventoryList.value = res.data.records
-    
-    if(purchaseinventoryList.value&& purchaseinventoryList.value.length>0){
-    //   purchaseinventoryList.value.map((k,index)=>{
-    //     k.inventoryStatusEnum_enumText = k.inventoryStatusEnum==2?'未停供':(k.inventoryStatusEnum==3?'已停供':'')
-    //     k.quantityUnit = k.quantity / k.partPercent
-    //     const integerPart1 = Math.floor(k.quantityUnit); // 获取整数部分
-    //     const decimalPart1 = k.quantityUnit - integerPart1; // 获取小数部分
-
-    //     if(decimalPart1){
-    //       k.quantityUnit = integerPart1 + k.unitCode_dictText +
-    //       (decimalPart1*k.partPercent).toFixed(0) + k.minUnitCode_dictText
-    //     }
-    //   })
-    }
     total.value = res.data.total;
   });
 }
@@ -325,23 +283,6 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
-// 取消停供  停供
-function handlestopcancelSupply(row) {
-  if(row.inventoryStatusEnum == 2){
-    stopSupply(row.id).then((response) => {
-      proxy.$modal.msgSuccess("停供成功");
-      open.value = false
-      getList()
-    })
-  }
-  if(row.inventoryStatusEnum == 3){
-    cancelSupply(row.id).then((response) => {
-      proxy.$modal.msgSuccess("取消停供成功");
-      open.value = false
-      getList()
-    })
-  }
-}
 
 getList();
 getPharmacyCabinetLists()
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
new file mode 100644
index 00000000..86a6dc4b
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="earlyWarningRef"
+      :inline="true"
+      :rules="rules"
+      label-width="100px"
+    >
+      <el-form-item label="药品名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="请输入药品名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="效期小于（天）：" prop="remainingDays" label-width="150px">
+        <el-input
+          v-model="queryParams.remainingDays"
+          placeholder="请输入效期小于（天）"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="药品类别：" prop="categoryCode">
+        <el-select
+          v-model="queryParams.categoryCode"
+          placeholder="请选择药品类别"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="categoryCode in item_type"
+            :key="categoryCode.value"
+            :label="categoryCode.label"
+            :value="categoryCode.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="有效期介于：">
+        <el-date-picker
+          v-model="occurrenceTime"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 300px"
+          value-format="YYYY-MM-DD"
+        />
+      </el-form-item>
+      <el-form-item label="库存件数检查">
+        <el-radio-group v-model="queryParams.flg" @change="handleQuery">
+          <el-radio label="1" :value="1">是</el-radio>
+          <el-radio label="0" :value="0">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="药品类别"
+        align="center"
+        key="categoryCode_dictText"
+        prop="categoryCode_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品编码"
+        align="center"
+        key="busNo"
+        prop="busNo"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品名称"
+        align="center"
+        key="medicineName"
+        prop="medicineName"
+        width="240"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格"
+        align="center"
+        key="totalVolume"
+        prop="totalVolume"
+        width="270"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="厂家/产地"
+        align="center"
+        key="manufacturerText"
+        prop="manufacturerText"
+        width="320"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="生产批号"
+        align="center"
+        key="lotNumber"
+        prop="lotNumber"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="有效期至"
+        align="center"
+        key="expirationDate"
+        prop="expirationDate"
+        width="165"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.expirationDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="效期（天）"
+        align="center"
+        key="remainingDays"
+        prop="remainingDays"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="效期（月）"
+        align="center"
+        key="remainingMonth"
+        prop="remainingMonth"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="库存单位"
+        align="center"
+        key="minUnitCode_dictText"
+        prop="minUnitCode_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="库存量（最小单位）"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        width="150"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="该药总库存（最小单位）"
+        align="center"
+        key="specificationQuantity"
+        prop="specificationQuantity"
+        width="170"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="最小库存警戒量"
+        align="center"
+        key="itemMinQuantity"
+        prop="itemMinQuantity"
+        width="150"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="最大库存警戒量"
+        align="center"
+        key="itemMaxQuantity"
+        prop="itemMaxQuantity"
+        width="150"
+        :show-overflow-tooltip="true"
+      />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="earlyWarning">
+import { getExpirationWarning } from './statisticalManagent';
+
+const { proxy } = getCurrentInstance();
+
+const { item_type } = proxy.useDict('item_type');
+
+const purchaseinventoryList = ref([]);
+const loading = ref(true);
+const occurrenceTime = ref([]);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const supplyTypeOptions = ref(undefined);
+const supplyStatusOptions = ref(undefined);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    categoryCode: undefined,
+    remainingDays: 180,
+    expirationDateSTime: undefined,
+    expirationDateETime: undefined,
+    flg: undefined,
+  },
+  rules: {
+    remainingMonth: [
+      // { required: true, message: '单次最大剂量不能为空', trigger: 'blur' },
+      { validator: validateMaxUnit, trigger: 'blur' },
+    ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+function validateMaxUnit(rule, value, callback) {
+  const numberRegex = /^[0-9]+$/; // 正则表达式，确保输入为数字
+  if (!numberRegex.test(value)) {
+    callback(new Error('请输入有效的数字'));
+  } else {
+    callback();
+  }
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  const params = {
+    ...queryParams.value,
+    flg: queryParams.value.flg == 1 ? '1' : null,
+  };
+  getExpirationWarning(params).then((res) => {
+    loading.value = false;
+    purchaseinventoryList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  proxy.$refs['earlyWarningRef'].validate((valid) => {
+    if (valid) {
+      queryParams.value.expirationDateSTime =
+        occurrenceTime.value && occurrenceTime.value.length == 2
+          ? occurrenceTime.value[0] + ' 00:00:00'
+          : '';
+      queryParams.value.expirationDateETime =
+        occurrenceTime.value && occurrenceTime.value.length == 2
+          ? occurrenceTime.value[1] + ' 23:59:59'
+          : '';
+      queryParams.value.pageNo = 1;
+      getList();
+    }
+  });
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.expirationDateSTime = '';
+  queryParams.value.expirationDateETime = '';
+  occurrenceTime.value = '';
+  proxy.resetForm('earlyWarningRef');
+  getList();
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+getList();
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/financialClearing.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/financialClearing.vue
new file mode 100644
index 00000000..a11f2d8b
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/financialClearing.vue
@@ -0,0 +1,383 @@
+<template>
+    <div class="app-container">
+      <el-row :gutter="10" class="mb8">
+        <el-form
+          :model="queryParams"
+          ref="queryRef"
+          :inline="true"
+          label-width="85px"
+        >
+            <el-form-item label="结算经办机构：" prop="setlOptins" label-width="110px">
+            <el-input
+                v-model="queryParams.setlOptins"
+                placeholder="请输入结算经办机构"
+                clearable
+                style="width: 150px"
+                @keyup.enter="handleQuery"
+            />
+            </el-form-item>
+            <el-form-item label="结算日期：">
+            <el-date-picker
+                v-model="occurrenceTime"
+                value-format="YYYY-MM-DD"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 300px"
+            ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="清算类型：" prop="clrType">
+            <el-select
+                v-model="queryParams.clrType"
+                placeholder="请选择清算类型"
+                clearable
+                style="width: 150px"
+                @change="handleQuery"
+            >
+                <el-option
+                v-for="categoryCode in clrTypeOptions"
+                :key="categoryCode.value"
+                :label="categoryCode.label"
+                :value="categoryCode.value"
+                />
+            </el-select>
+            </el-form-item>
+        </el-form>
+        <el-button
+          type="primary"
+          plain
+          icon="Edit"
+          @click="handleQuery"
+          >统计</el-button
+        >
+          <el-button
+            type="primary"
+            plain
+            icon="Edit"
+            @click="handleApplyForLiquidation"
+            >申请清算</el-button
+          >
+        <!-- </el-col> -->
+      </el-row>
+      <div style="margin-bottom:5px">结算笔数：{{counts}}（其中 总费用：{{totalPrice1?totalPrice1.toFixed(2):0}}元， 基金支付金额：{{totalPrice2?totalPrice2.toFixed(2):0}}元， 账户支付金额：{{totalPrice3?totalPrice3.toFixed(2):0}}元，现金支付金额：{{totalPrice4?totalPrice4.toFixed(2):0}}元）</div>
+      <el-table
+        v-loading="loading"
+        :data="purchaseinventoryList"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column
+          label="个人编码"
+          align="center"
+          key="psnNo"
+          prop="psnNo"
+          width="190"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="患者姓名"
+          align="center"
+          key="patientName"
+          prop="patientName"
+          width="100"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="就诊ID"
+          align="center"
+          key="mdtrtId"
+          prop="mdtrtId"
+          width="270"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="结算ID"
+          align="center"
+          key="setlId"
+          prop="setlId"
+          width="270"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="总费用"
+          align="center"
+          key="medfeeSumamt"
+          prop="medfeeSumamt"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="基金支付金额"
+          align="center"
+          key="fundPaySumamt"
+          prop="fundPaySumamt"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="个人账户金额"
+          align="center"
+          key="acctPay"
+          prop="acctPay"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="结算时间"
+          align="center"
+          key="setlTime"
+          prop="setlTime"
+        
+          :show-overflow-tooltip="true"
+        >
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.setlTime) }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          label="是否退费"
+          align="center"
+          key="refdSetlFlag"
+          prop="refdSetlFlag"
+          :show-overflow-tooltip="true"
+        >
+          <template #default="scope">
+            <span>{{ scope.row.refdSetlFlag==1?'退费':'' }}</span>
+          </template>
+         </el-table-column> -->
+         <!-- <el-table-column
+            label="操作"
+            align="center"
+            width="150"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template #default="scope">
+              <el-button
+                type="danger"
+                link
+                icon="revoked-filled"
+                :disabled="scope.row.id == ''"
+                @click="revokedSelectedRows(scope.row)"
+              >
+                撤销
+              </el-button>
+            </template>
+          </el-table-column> -->
+      </el-table>
+    </div>
+  </template>
+  
+  <script setup name="reconciliationDetails">
+  import {
+    applyFinancialClearingList,
+    applyUnClearing,
+    autoApplyFinancialClearing,
+    applyFinancialClearing,
+    reconcileDetailList
+  } from "./statisticalManagent";
+  import { getToken } from "@/utils/auth";
+  import { formatDateStr } from '@/utils/index';
+  const { proxy } = getCurrentInstance();
+  const purchaseinventoryList = ref([]);
+  const loading = ref(false);
+  const ids = ref([]);
+  const single = ref(true);
+  const multiple = ref(true);
+  const total = ref(0);
+  const occurrenceTime = ref([
+    formatDateStr(getFirstDayOfMonth(new Date()), 'YYYY-MM-DD'), // 当前月份的第一天
+    formatDateStr(new Date(), 'YYYY-MM-DD') // 当天
+  ])
+  const clrTypeOptions = ref([]);
+  const filePath = ref("")
+  const purchaseinventoryReturnList = ref([])
+  const loadingReturn = ref(false)
+  const selectedRow = ref([])
+  const counts = ref(0)
+  const totalPrice1 = ref(0)
+  const totalPrice2 = ref(0)
+  const totalPrice3 = ref(0)
+  const totalPrice4 = ref(0)
+  
+  const fileSize = ref(10)
+  const uploadList = ref([]);
+  const baseUrl = import.meta.env.VITE_APP_BASE_API;
+  const fileType = ref(["zip","txt"]);
+  const data = reactive({
+    form: {},
+    queryParams: {
+      // pageNo: 1,
+      // pageSize: 10,
+      setlOptins: '229900', 
+      filePath: undefined, 
+      orgId:undefined,
+      clrType: undefined,
+      fileQuryNo: undefined, 
+      stmtBegnDate:undefined,
+      stmtEndDate:undefined,
+    },
+    rules: {},
+  });
+  
+  const { queryParams, form, rules } = toRefs(data);
+  
+  watch(
+    () => purchaseinventoryList.value,
+    (newVlaue) => {
+      if(newVlaue&&newVlaue.length>0){
+        handleTotalAmount()
+      }
+    },
+    { immediate: true }
+  )
+
+  /** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.stmtBegnDate =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[0] + " 00:00:00"
+      : "";
+  queryParams.value.stmtEndDate =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[1] + " 23:59:59"
+      : "";
+  // queryParams.value.pageNo = 1;
+  getList();
+}
+
+function getFirstDayOfMonth(date) {
+  return new Date(date.getFullYear(), date.getMonth(), 1);
+}
+  
+  // 对象转成指定字符串分隔
+  function listToString(list, separator) {
+    let strs = "";
+    separator = separator || ",";
+    for (let i in list) {
+      if (list[i].url) {
+        strs += list[i].url + separator;
+      }
+    }
+    return strs != '' ? strs.substr(0, strs.length - 1) : '';
+  }
+  /**计算合计金额 */
+  function handleTotalAmount() {
+    counts.value = purchaseinventoryList.value.length
+    totalPrice1.value = purchaseinventoryList.value.reduce(
+      (accumulator, currentRow) => {
+        return (accumulator + (Number(currentRow.medfeeSumamt) || 0))
+      },
+      0
+    );
+    totalPrice2.value = purchaseinventoryList.value.reduce(
+      (accumulator, currentRow) => {
+        return (accumulator + (Number(currentRow.fundPaySumamt) || 0))
+      },
+      0
+    );
+    totalPrice3.value = purchaseinventoryList.value.reduce(
+      (accumulator, currentRow) => {
+        return (accumulator + (Number(currentRow.acctPay) || 0))
+      },
+      0
+    );
+    // 现金支付金额
+    // totalPrice4.value = purchaseinventoryList.value.reduce(
+    //   (accumulator, currentRow) => {
+    //     return (accumulator + (Number(currentRow.profitAmount) || 0))
+    //   },
+    //   0
+    // );
+  }
+  function getPharmacyCabinetLists() {
+    clrTypeOptions.value = [
+      { value: 11, label: '门诊' },
+      { value: 21, label: '住院' },
+    ];
+  }
+  function handleSelectionChangeReturn(selection) {
+    idsReturn.value = selection.map((item) => item.id);
+    singleReturn.value = selection.length != 1;
+    multipleReturn.value = !selection.length;
+  }
+  
+  function getList() {
+    reconcileDetailList(queryParams.value).then((res) => {
+      // console.log(res,"res----------------")
+      // loading.value = false;
+      // purchaseinventoryList.value = [{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"4.72",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"7.43",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"1",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"-1",insutype:"410",clrType: 11,contractNo:"229900"}]
+     purchaseinventoryList.value = res.data.records ? res.data.records : res.data;
+      total.value = res.data.total;
+    });
+  }
+  
+  function handleApplyForLiquidation () {
+    let params = {}
+    params.clrType = queryParams.value.clrType?queryParams.value.clrType:""
+    params.setlOptins = queryParams.value.setlOptins?queryParams.value.setlOptins:""
+    params.stmtBegnDate = queryParams.value.stmtBegnDate?queryParams.value.stmtBegnDate:""
+    params.stmtEndDate = queryParams.value.stmtEndDate?queryParams.value.stmtEndDate:""
+    autoApplyFinancialClearing(params).then((res) => {
+    console.log(res.data,'res----------------');
+    loading.value = false;
+    });
+  }
+  function isAllSelected() {
+    return selectedRow.value.length === purchaseinventoryList.value.length;
+  }
+
+  function revokedSelectedRows(row) {
+    let queryParamsss = {
+        clrAppyEvtId:row.outResult,
+        clroptins:queryParams.value.setlOptins?queryParams.value.setlOptins:"", 
+    }
+    applyUnClearing(queryParamsss).then(res => {
+        proxy.$message.success('撤销成功')
+        getList()
+    }).catch(err => {
+        proxy.$message.error('撤销失败')
+    })
+  }
+  
+  /** 选择条数  */
+  function handleSelectionChange(selection) {
+    selectedRow.value = selection
+    console.log(selectedRow.value,"selectedRow.value")
+    ids.value = selection.map((item) => item.setlId);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+  }
+  //点击列表当前行
+  function handleRowClick(row) {
+    // editRowTK.value = row
+    console.log(row,"row")
+    // if(row.returnStatus==1){
+    //   loadingReturn.value = true
+    //   generatedReturnDetail(row.supplyBusNo).then((response) => {
+    //     purchaseinventoryReturnList.value = response.data
+    //     purchaseinventoryReturnList.value.map(k=>{
+    //       // k.returnStatus_text =  k.returnStatus==1?'已退库':''
+    //       k.originalSupplyBusNo = k.originalSupplyBusNo?k.originalSupplyBusNo:row.supplyBusNo
+    //     }) 
+      
+    //   })
+    //   loadingReturn.value = false
+    // }
+  }
+  
+  
+  getList();
+  getPharmacyCabinetLists()
+  </script>
+  <style scoped>
+  .custom-tree-node {
+    display: flex;
+    align-items: center;
+  }
+  
+  .title {
+    font-weight: bold;
+    font-size: large;
+    margin-bottom: 10px;
+  }
+  </style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
similarity index 58%
rename from vue3/src/views/medicationmanagement/statisticalManagement/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
index 79d18820..38d1f4a3 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
@@ -1,18 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
-     <el-form-item label="药品名称：" prop="searchKey" label-width="120px">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
+      <el-form-item label="药品名称：" prop="searchKey">
         <el-input
           v-model="queryParams.searchKey"
-          placeholder="项目编号/项目品名"
+          placeholder="药品编码/药品名称/名称拼音/供应商名"
           clearable
-          style="width: 200px"
+          style="width: 250px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
@@ -25,20 +19,20 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="剩余过期天数：" prop="remainingDays" label-width="120px">
+      <el-form-item label="剩余过期天数：" prop="remainingDays" label-width="110px">
         <el-input
           v-model="queryParams.remainingDays"
           placeholder="查询 ≤ X 天的记录"
           clearable
-          style="width: 200px;"
+          style="width: 200px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-     
-      <el-form-item label="项目类型：" prop="categoryCode">
+
+      <el-form-item label="药品类别：" prop="categoryCode">
         <el-select
           v-model="queryParams.categoryCode"
-          placeholder=""
+          placeholder="请选择药品类别"
           clearable
           style="width: 150px"
         >
@@ -50,10 +44,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="医保等级：" prop="chrgitmLv" label-width="120px">
+      <el-form-item label="医保等级：" prop="chrgitmLv">
         <el-select
           v-model="queryParams.chrgitmLv"
-          placeholder=""
+          placeholder="请选择医保等级"
           clearable
           style="width: 150px"
         >
@@ -65,25 +59,25 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库药房：" prop="locationId" label-width="100px">
+      <el-form-item label="仓库药房：" prop="locationId">
         <el-select
           v-model="queryParams.locationId"
-          placeholder=""
+          placeholder="请选择仓库药房"
           clearable
           style="width: 150px"
         >
           <el-option
-            v-for="supplyStatus in locationIdList" 
+            v-for="supplyStatus in locationIdList"
             :key="supplyStatus.value"
             :label="supplyStatus.name"
             :value="supplyStatus.id"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="库存范围：" prop="warehouseScope" label-width="100px">
+      <el-form-item label="库存范围：" prop="warehouseScope">
         <el-select
           v-model="queryParams.warehouseScope"
-          placeholder=""
+          placeholder="请选择库存范围"
           clearable
           style="width: 150px"
         >
@@ -95,7 +89,7 @@
           />
         </el-select>
       </el-form-item>
-       <!-- <el-form-item label="医院：" prop="hospital" label-width="100px">
+      <!-- <el-form-item label="医院：" prop="hospital" label-width="100px">
         <el-select
           v-model="queryParams.hospital"
           placeholder=""
@@ -114,7 +108,7 @@
 
     <el-row :gutter="10" class="mb8">
       <!-- 添加记录 -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -122,60 +116,43 @@
           @click="openAddaddTransferProductDialog"
           >备份</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
-        <!-- v-hasPermi="['system:user:import']" -->
-        <el-button
-          type="primary"
-          plain
-          icon="Search"
-          @click="handleQuery"
-          
-          >查询</el-button
-        >
+        <el-button type="primary" plain icon="Search" @click="handleQuery"> 查询 </el-button>
       </el-col>
       <el-col :span="1.5">
-        <!-- v-hasPermi="['system:user:export']" -->
-        <el-button
-          type="warning"
-          plain
-          icon="CircleClose"
-          @click="handleClear"
-          
-          >重置</el-button
-        >
+        <el-button type="warning" plain icon="CircleClose" @click="handleClear"> 重置 </el-button>
       </el-col>
     </el-row>
-
     <el-table
       v-loading="loading"
       :data="purchaseinventoryList"
+      max-height="600"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="50" align="center" />
-     <!-- <el-table-column
-        label="药品名称"
+      <el-table-column type="index" width="50" align="center" />
+      <el-table-column
+        label="药品类别"
         align="center"
-        key="name"
-        prop="name"
+        key="categoryCode_dictText"
+        prop="categoryCode_dictText"
         :show-overflow-tooltip="true"
-        width="110"
-      /> -->
+      />
       <el-table-column
-        label="项目编号"
+        label="药品编码"
         align="center"
         key="busNo"
         prop="busNo"
-         width="140"
+        width="130"
         :show-overflow-tooltip="true"
       />
-      <!-- itemTable -->
       <el-table-column
-        label="项目品名"
+        label="药品名称"
         align="center"
         key="medicineName"
         prop="medicineName"
-         width="140"
+        width="160"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -183,7 +160,6 @@
         align="center"
         key="locationName"
         prop="locationName"
-         width="140"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -191,6 +167,7 @@
         align="center"
         key="totalVolume"
         prop="totalVolume"
+        width="120"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -216,11 +193,11 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="库存（常规单位）"
+        label="库存（采购单位）"
         align="center"
         key="quantityUnit"
         prop="quantityUnit"
-         width="140px"
+        width="130px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -237,7 +214,7 @@
         prop="quantity"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
+      <el-table-column
         label="库存单位"
         align="center"
         key="minUnitCode_dictText"
@@ -251,13 +228,77 @@
         prop="partPercent"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
+      <el-table-column
         label="采购价格"
         align="center"
         key="price"
         prop="price"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="零售价"
+        align="center"
+        key="retailPrice"
+        prop="retailPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="进价总额"
+        align="center"
+        key="totalPrice"
+        prop="totalPrice"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span
+            :style="
+              scope.row.totalPrice == scope.row.totalSalePrice ? 'color: black' : 'color: red'
+            "
+            >{{ scope.row.totalPrice }}</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="零售价总额"
+        align="center"
+        key="totalSalePrice"
+        prop="totalSalePrice"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span
+            :style="
+              scope.row.totalPrice == scope.row.totalSalePrice ? 'color: black' : 'color: red'
+            "
+            >{{ scope.row.totalSalePrice }}</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="剂型"
+        align="center"
+        key="doseFormCode_dictText"
+        prop="doseFormCode_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="国药准字"
+        align="center"
+        key="approvalNumber"
+        prop="approvalNumber"
+        width="165"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="供应商"
+        align="center"
+        key="supplyName"
+        prop="supplyName"
+        width="170"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="生产日期"
         align="center"
@@ -282,15 +323,23 @@
           <span>{{ parseTime(scope.row.expirationDate) }}</span>
         </template>
       </el-table-column>
-       <el-table-column
+      <el-table-column
+        label="拼音码"
+        align="center"
+        key="pyStr"
+        prop="pyStr"
+        width="110"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
         label="剩余过期天数"
         align="center"
         key="remainingDays"
         prop="remainingDays"
-         width="140px"
+        width="110px"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
+      <el-table-column
         label="药品追溯码"
         align="center"
         key="traceNo"
@@ -298,49 +347,58 @@
         width="120px"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
+      <el-table-column
         label="药品停用"
         align="center"
         key="statusEnum_enumText"
         prop="statusEnum_enumText"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
+      <el-table-column
         label="货位"
         align="center"
         key="locationStoreName"
         prop="locationStoreName"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
+      <el-table-column
         label="仓库类型"
         align="center"
         key="formEnum_enumText"
         prop="formEnum_enumText"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
-        label="供应商"
-        align="center"
-        key="supplyId_dictText"
-        prop="supplyId_dictText"
-        :show-overflow-tooltip="true"
-      />
-       <el-table-column
+      <el-table-column
         label="停供状态"
         align="center"
         key="inventoryStatusEnum_enumText"
         prop="inventoryStatusEnum_enumText"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="追溯码入库数"
+        align="center"
+        key="inCount"
+        prop="inCount"
+        width="120px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="追溯码出库数"
+        align="center"
+        key="outCount"
+        prop="outCount"
+        width="120px"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="操作"
         align="center"
-        width="100"
+        width="180"
         fixed="right"
         class-name="small-padding fixed-width"
       >
-       <!-- 停供/停用3，取消停供/启用2 -->
+        <!-- 停供/停用3，取消停供/启用2 -->
         <template #default="scope">
           <!-- v-hasPermi="['system:user:remove']" -->
           <el-button
@@ -348,7 +406,6 @@
             type="primary"
             icon="Edit"
             @click="handlestopcancelSupply(scope.row)"
-            
             v-if="scope.row.inventoryStatusEnum == 2"
             >停供</el-button
           >
@@ -358,68 +415,74 @@
             type="primary"
             icon="Edit"
             @click="handlestopcancelSupply(scope.row)"
-            
             v-if="scope.row.inventoryStatusEnum == 3"
             >取消停供</el-button
           >
+          <el-button
+            link
+            type="primary"
+            icon="Edit"
+            @click="handleOpenPage(scope.row)"
+            >追溯码</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
+    <div style="float: right; margin-top: 10px; margin-right: 10px">
+      <span class="descriptions-item-label">进价合计金额：{{ salePriceTotal.toFixed(2) }}</span>
+      <span class="descriptions-item-label">零售价合计金额：{{ priceTotal.toFixed(2) }}</span>
+    </div>
     <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      :style="'margin-top: 35px;'"
       @pagination="getList"
     />
   </div>
+  <el-dialog
+    title="药品追溯码"
+    v-model="visible"
+    width="1400"
+    append-to-body
+    destroy-on-close
+    :draggable="true"
+  >
+    <traceabilityCodeManagement :recordInfo="recordInfo"></traceabilityCodeManagement>
+  </el-dialog>
 </template>
 
-<script setup name="statisticalManagement">
+<script setup name="StatisticalManagement">
 import {
   getproductReturnPage,
   getInit,
   getPharmacyCabinetList,
-  getBusNoInit,
   cancelSupply,
   stopSupply,
-} from "./statisticalManagent";
-
-// import Dialog from "./components/Dialog";
+  productPageTotal
+} from './statisticalManagent';
+import Decimal from 'decimal.js';
+import traceabilityCodeManagement from './traceabilityCodeManagement.vue';
 
-const router = useRouter();
 const { proxy } = getCurrentInstance();
 
-const {
-  item_type,
-  inventory_range,
-} = proxy.useDict(
-  "item_type",
-  "inventory_range",
-);
-const purchaseinventoryRef = ref(null); // 初始化 ref
+const { item_type, inventory_range } = proxy.useDict('item_type', 'inventory_range');
+
 const purchaseinventoryList = ref([]);
-const open = ref(false);
+const visible = ref(false);
+const recordInfo = ref({});
+
 const loading = ref(true);
-const showSearch = ref(true);
+
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
-const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
+const salePriceTotal = ref(0);
+const priceTotal = ref(0);
+const supplyTypeOptions = ref(undefined);
 const supplyStatusOptions = ref(undefined);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
 const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
 
@@ -428,14 +491,13 @@ const data = reactive({
   queryParams: {
     pageNo: 1,
     pageSize: 10,
-    searchKey: undefined, 
-    // medicationDefId: undefined, 
-    hospital:undefined, 
-    hospital: undefined,
-    categoryCode:undefined,
-    chrgitmLv:undefined,
+    searchKey: undefined,
+    remainingDays: undefined,
+    // hospital:undefined,
+    categoryCode: undefined,
+    chrgitmLv: undefined,
     warehouseScope: undefined,
-    locationId: undefined, 
+    locationId: undefined,
     // occurrenceTimeSTime:undefined,
     // occurrenceTimeETime:undefined,
   },
@@ -444,58 +506,63 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-function getBusNoInitList() {
-  getBusNoInit().then((response) => {
-    console.log(response,'response',response.data)
-    busNoAdd.value = response.data.busNo; // 单据号新增
-  });
-}
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
-    locationIdList.value = response.data
+    locationIdList.value = response.data;
   });
   getInit().then((response) => {
-    chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions 
-  })
+    chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions;
+  });
 }
 /** 查询调拨管理项目列表 */
 function getList() {
   loading.value = true;
-  // // queryParams.value.locationId = +queryParams.value.locationId
-  // proxy.addoccurrenceTime(queryParams.value, occurrenceTime.value)
+  salePriceTotal.value = 0;
+  priceTotal.value = 0;
   getproductReturnPage(queryParams.value).then((res) => {
-    console.log(res,"res----------------")
     loading.value = false;
-    purchaseinventoryList.value = res.data.records
-    
-    if(purchaseinventoryList.value&& purchaseinventoryList.value.length>0){
-      purchaseinventoryList.value.map((k,index)=>{
-        k.inventoryStatusEnum_enumText = k.inventoryStatusEnum==2?'未停供':(k.inventoryStatusEnum==3?'已停供':'')
-        k.quantityUnit = k.quantity / k.partPercent
+    purchaseinventoryList.value = res.data.records;
+    if (purchaseinventoryList.value && purchaseinventoryList.value.length > 0) {
+      purchaseinventoryList.value.map((k, index) => {
+        k.inventoryStatusEnum_enumText =
+          k.inventoryStatusEnum == 2 ? '未停供' : k.inventoryStatusEnum == 3 ? '已停供' : '';
+        k.quantityUnit = k.quantity / k.partPercent;
         const integerPart1 = Math.floor(k.quantityUnit); // 获取整数部分
         const decimalPart1 = k.quantityUnit - integerPart1; // 获取小数部分
 
-        if(decimalPart1){
-          k.quantityUnit = integerPart1 + k.unitCode_dictText +
-          (decimalPart1*k.partPercent).toFixed(0) + k.minUnitCode_dictText
+        if (decimalPart1) {
+          k.quantityUnit =
+            integerPart1 +
+            k.unitCode_dictText +
+            (decimalPart1 * k.partPercent).toFixed(0) +
+            k.minUnitCode_dictText;
         }
-      })
+        k.price = k.price ? k.price.toFixed(2) : 0;
+        k.retailPrice = k.retailPrice ? k.retailPrice.toFixed(2) : 0;
+        k.totalPrice = k.price * (Number(k.quantity) / k.partPercent);
+        k.totalPrice = k.totalPrice ? k.totalPrice.toFixed(2) : 0;
+        k.totalSalePrice = k.retailPrice * (Number(k.quantity) / k.partPercent);
+        k.totalSalePrice = k.totalSalePrice ? k.totalSalePrice.toFixed(2) : 0;
+      });
     }
     total.value = res.data.total;
   });
+  productPageTotal(queryParams.value).then((res) => {
+    salePriceTotal.value = res.data.totalPurchasePrice;
+    priceTotal.value = res.data.totalSalePrice;
+  })
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-//   queryParams.value.occurrenceTimeSTime =
-//     occurrenceTime.value && occurrenceTime.value.length == 2
-//       ? occurrenceTime.value[0] + " 00:00:00"
-//       : "";
-//   queryParams.value.occurrenceTimeETime =
-//     occurrenceTime.value && occurrenceTime.value.length == 2
-//       ? occurrenceTime.value[1] + " 23:59:59"
-//       : "";
+  //   queryParams.value.occurrenceTimeSTime =
+  //     occurrenceTime.value && occurrenceTime.value.length == 2
+  //       ? occurrenceTime.value[0] + " 00:00:00"
+  //       : "";
+  //   queryParams.value.occurrenceTimeETime =
+  //     occurrenceTime.value && occurrenceTime.value.length == 2
+  //       ? occurrenceTime.value[1] + " 23:59:59"
+  //       : "";
   queryParams.value.pageNo = 1;
   getList();
 }
@@ -503,10 +570,15 @@ function handleQuery() {
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  proxy.resetForm("queryRef");
+  proxy.resetForm('queryRef');
   getList();
 }
 
+function handleOpenPage (row) {
+  recordInfo.value = row;
+  visible.value = true;
+}
+
 /** 选择条数  */
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.id);
@@ -516,53 +588,43 @@ function handleSelectionChange(selection) {
 /** 备份 */
 function openAddaddTransferProductDialog() {
   // getTransferProductTypeList();
-  // getBusNoInitList()
   // nextTick(() => {
-    // proxy.$refs["transferProductRef"].show();
+  // proxy.$refs["transferProductRef"].show();
   // });
-//   const partItem = {partFlg: 'add',rowData: []}
+  //   const partItem = {partFlg: 'add',rowData: []}
   // item: JSON.stringify(partItem)
   // ,query:{item: JSON.stringify(partItem)}
-//   router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
+  //   router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
 }
 
 // 取消停供  停供
 function handlestopcancelSupply(row) {
-  if(row.inventoryStatusEnum == 2){
+  if (row.inventoryStatusEnum == 2) {
     stopSupply(row.id).then((response) => {
-      proxy.$modal.msgSuccess("停供成功");
-      open.value = false
-      getList()
-    })
+      proxy.$modal.msgSuccess('停供成功');
+      open.value = false;
+      getList();
+    });
   }
-  if(row.inventoryStatusEnum == 3){
+  if (row.inventoryStatusEnum == 3) {
     cancelSupply(row.id).then((response) => {
-      proxy.$modal.msgSuccess("取消停供成功");
-      open.value = false
-      getList()
-    })
+      proxy.$modal.msgSuccess('取消停供成功');
+      open.value = false;
+      getList();
+    });
   }
 }
 
 // 停供
-function handlestopSupply(row) {
- 
-}
-
+function handlestopSupply(row) {}
 
 // getTransferProductTypeList();
 getList();
-getPharmacyCabinetLists()
+getPharmacyCabinetLists();
 </script>
 <style scoped>
 .custom-tree-node {
   display: flex;
   align-items: center;
 }
-
-.title {
-  font-weight: bold;
-  font-size: large;
-  margin-bottom: 10px;
-}
 </style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
similarity index 90%
rename from vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
index 5fd187be..b29a0bbb 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="100px"
     >
      <!-- <el-form-item label="药品名称：" prop="searchKey" label-width="120px">
@@ -315,7 +314,7 @@
   </div>
 </template>
 
-<script setup name="inventoryProductDetails">
+<script setup name="InventoryProductDetails">
 import {
   getReportProductPage,
   getInit,
@@ -325,11 +324,7 @@ import {
   stopSupply,
 } from "./statisticalManagent";
 
-// import Dialog from "./components/Dialog";
-
-const router = useRouter();
 const { proxy } = getCurrentInstance();
-
 const {
   item_type,
   inventory_range,
@@ -337,29 +332,14 @@ const {
   "item_type",
   "inventory_range",
 );
-const purchaseinventoryRef = ref(null); // 初始化 ref
+
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
 const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
 
@@ -384,15 +364,8 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-function getBusNoInitList() {
-  getBusNoInit().then((response) => {
-    console.log(response,'response',response.data)
-    busNoAdd.value = response.data.busNo; // 单据号新增
-  });
-}
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
     locationIdList.value = response.data
   });
   getInit().then((response) => {
@@ -402,10 +375,7 @@ function getPharmacyCabinetLists() {
 /** 查询调拨管理项目列表 */
 function getList() {
   loading.value = true;
-  // // queryParams.value.locationId = +queryParams.value.locationId
-  // proxy.addoccurrenceTime(queryParams.value, occurrenceTime.value)
   getReportProductPage(queryParams.value).then((res) => {
-    console.log(res,"res----------------")
     loading.value = false;
     purchaseinventoryList.value = res.data.records
     
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/liquidationRecords.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/liquidationRecords.vue
new file mode 100644
index 00000000..d1d5ea53
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/liquidationRecords.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-form
+        :model="queryParams"
+        ref="queryRef"
+        :inline="true"
+        label-width="85px"
+      >
+          <el-form-item label="结算经办机构：" prop="setlOptins" label-width="110px">
+          <el-input
+              v-model="queryParams.setlOptins"
+              placeholder="请输入结算经办机构"
+              clearable
+              style="width: 150px"
+              @keyup.enter="handleQuery"
+          />
+          </el-form-item>
+          <el-form-item label="结算日期：">
+          <el-date-picker
+              v-model="occurrenceTime"
+              value-format="YYYY-MM-DD"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 300px"
+          ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="清算类型：" prop="clrType">
+          <el-select
+              v-model="queryParams.clrType"
+              placeholder="请选择清算类型"
+              clearable
+              style="width: 150px"
+          >
+              <el-option
+              v-for="categoryCode in clrTypeOptions"
+              :key="categoryCode.value"
+              :label="categoryCode.label"
+              :value="categoryCode.value"
+              />
+          </el-select>
+          </el-form-item>
+      </el-form> -->
+        <!-- <el-button
+          type="primary"
+          plain
+          icon="Edit"
+          @click="handleQuery"
+          >统计</el-button
+        > -->
+        <!-- <el-button
+          type="primary"
+          plain
+          icon="Edit"
+          @click="handleApplyForLiquidation"
+          >申请清算</el-button
+        > -->
+      <!-- </el-col> -->
+    <!-- </el-row> -->
+    <!-- <div style="margin-bottom:5px"> -->
+      <el-row :guutter="15">
+
+      <el-form
+        :model="totalPrice"
+        ref="priceRef"
+        :inline="true"
+      >
+      <el-row :guutter="15">
+          <el-form-item label="结算经办机构：" prop="setlOptins" label-width="160px">
+          <el-input
+              v-model="totalPrice.setlOptins"
+              placeholder="请输入结算经办机构"
+              clearable
+              style="width: 150px"
+              @keyup.enter="handleQuery"
+          />
+          </el-form-item>
+          <el-form-item label="结算日期：" label-width="130px">
+          <el-date-picker
+              v-model="occurrenceTime"
+              value-format="YYYY-MM-DD"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 300px"
+          ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="清算类型：" prop="clrType" label-width="160px">
+          <el-select
+              v-model="totalPrice.clrType"
+              placeholder="请选择清算类型"
+              clearable
+              style="width: 150px"
+          >
+              <el-option
+              v-for="categoryCode in clrTypeOptions"
+              :key="categoryCode.value"
+              :label="categoryCode.label"
+              :value="categoryCode.value"
+              />
+          </el-select>
+          </el-form-item>
+      </el-row>
+      <el-row :guutter="15">
+          <el-form-item label="医疗费总额：" prop="medfeeSumamt" label-width="160px">
+            <el-input
+              v-model="totalPrice.medfeeSumamt"
+              placeholder="请输入医疗费总额"
+              clearable
+              style="width: 150px"
+            />
+          </el-form-item>
+  <el-form-item label="基金支付总额：" prop="fundAppySum" label-width="160px">
+            <el-input
+              v-model="totalPrice.fundAppySum"
+              placeholder="请输入基金支付总额"
+              clearable
+              style="width: 150px"
+            />
+          </el-form-item>
+  <el-form-item label="个人账户支付金额：" prop="acctPay" label-width="160px">
+            <el-input
+              v-model="totalPrice.acctPay"
+              placeholder="请输入个人账户支付金额"
+              clearable
+              style="width: 150px"
+            />
+          </el-form-item>
+  <el-form-item label="现金支付金额：" prop="cashPayamt" label-width="160px">
+            <el-input
+              v-model="totalPrice.cashPayamt"
+              placeholder="请输入现金支付金额"
+              clearable
+              style="width: 150px"
+            />
+          </el-form-item>
+          <el-button
+          type="primary"
+          plain
+          icon="Edit"
+          @click="handOperatedApply"
+          >手动清算</el-button
+        >
+          
+      </el-row>
+
+      </el-form>
+    </el-row>
+
+    <!-- </div> -->
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+          label="申请清算ID"
+          align="center"
+          key="outResult"
+          prop="outResult"
+          width="270"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="开始时间"
+          align="center"
+          key="begndate"
+          prop="begndate"
+          width="150"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="结束时间"
+          align="center"
+          key="enddate"
+          prop="enddate"
+          width="150"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="清算类别"
+          align="center"
+          key="clrType"
+          prop="clrType"
+          width="100"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="总费用"
+          align="center"
+          key="medfeeSumamt"
+          prop="medfeeSumamt"
+          width="170"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="医保认可总费用"
+          align="center"
+          key="medSumfee"
+          prop="medSumfee"
+          width="170"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="基金申报金额"
+          align="center"
+          key="fundAppySum"
+          prop="fundAppySum"
+          width="170"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="现金支付总额"
+          align="center"
+          key="cashPayamt"
+          prop="cashPayamt"
+          width="170"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="个人账户金额"
+          align="center"
+          key="acctPay"
+          prop="acctPay"
+          width="170"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="状态"
+          align="center"
+          key="status"
+          prop="status"
+          width="170"
+          :show-overflow-tooltip="true"
+        >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.setlTime) }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        label="是否退费"
+        align="center"
+        key="refdSetlFlag"
+        prop="refdSetlFlag"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row.refdSetlFlag==1?'退费':'' }}</span>
+        </template>
+       </el-table-column> -->
+       <el-table-column
+          label="操作"
+          align="center"
+          width="300"
+          class-name="small-padding fixed-width"
+          fixed="right"
+        >
+          <template #default="scope">
+            <el-button
+              type="danger"
+              link
+              icon="revoked-filled"
+              :disabled="scope.row.id == ''"
+              @click="revokedSelectedRows(scope.row)"
+            >
+              撤销
+            </el-button>
+          </template>
+        </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script setup name="reconciliationDetails">
+import {
+  applyFinancialClearingList,
+  applyUnClearing,
+  autoApplyFinancialClearing,
+  reconcileDetailList,
+  handOperatedApplyFinancialClearing
+} from "./statisticalManagent";
+import { getToken } from "@/utils/auth";
+import { formatDateStr } from '@/utils/index';
+const { proxy } = getCurrentInstance();
+const purchaseinventoryList = ref([]);
+const loading = ref(false);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const occurrenceTime = ref([
+  formatDateStr(getFirstDayOfMonth(new Date()), 'YYYY-MM-DD'), // 当前月份的第一天
+  formatDateStr(new Date(), 'YYYY-MM-DD') // 当天
+])
+const clrTypeOptions = ref([]);
+const filePath = ref("")
+const purchaseinventoryReturnList = ref([])
+const loadingReturn = ref(false)
+const selectedRow = ref([])
+
+const fileSize = ref(10)
+const uploadList = ref([]);
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const fileType = ref(["zip","txt"]);
+const data = reactive({
+  form: {},
+  queryParams: {
+    // pageNo: 1,
+    // pageSize: 10,
+    setlOptins: '229900', 
+    filePath: undefined, 
+    orgId:undefined,
+    clrType: undefined,
+    fileQuryNo: undefined, 
+    stmtBegnDate:undefined,
+    stmtEndDate:undefined,
+  },
+  rules: {},
+});
+
+const totalPrice = reactive({
+  medfeeSumamt: 0,
+  fundAppySum: 0,
+  acctPay: 0,
+  cashPayamt: 0,
+  counts: 0,
+  medSumfee: 0.00
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+watch(
+  () => purchaseinventoryList.value,
+  (newVlaue) => {
+    if(newVlaue&&newVlaue.length>0){
+      handleTotalAmount()
+    }
+  },
+  { immediate: true }
+)
+
+/** 搜索按钮操作 */
+function handleQuery() {
+queryParams.value.stmtBegnDate =
+  occurrenceTime.value && occurrenceTime.value.length == 2
+    ? occurrenceTime.value[0] + " 00:00:00"
+    : "";
+queryParams.value.stmtEndDate =
+  occurrenceTime.value && occurrenceTime.value.length == 2
+    ? occurrenceTime.value[1] + " 23:59:59"
+    : "";
+// queryParams.value.pageNo = 1;
+getList();
+}
+
+function getFirstDayOfMonth(date) {
+return new Date(date.getFullYear(), date.getMonth(), 1);
+}
+
+// 对象转成指定字符串分隔
+function listToString(list, separator) {
+  let strs = "";
+  separator = separator || ",";
+  for (let i in list) {
+    if (list[i].url) {
+      strs += list[i].url + separator;
+    }
+  }
+  return strs != '' ? strs.substr(0, strs.length - 1) : '';
+}
+/**计算合计金额 */
+function handleTotalAmount() {
+  totalPrice.counts = purchaseinventoryList.value.length
+  totalPrice.medfeeSumamt = purchaseinventoryList.value.reduce(
+  (accumulator, currentRow) => {
+    return Number(
+      (accumulator + Number(currentRow.medfeeSumamt || 0)).toFixed(2)
+    );
+  },
+  0
+);
+  totalPrice.fundAppySum = purchaseinventoryList.value.reduce(
+    (accumulator, currentRow) => {
+      return Number(
+      (accumulator + Number(currentRow.fundPaySumamt || 0)).toFixed(2)
+    );
+    },
+    0
+  );
+  totalPrice.acctPay = purchaseinventoryList.value.reduce(
+    (accumulator, currentRow) => {
+      return Number(
+      (accumulator + Number(currentRow.acctPay || 0)).toFixed(2)
+    );
+    },
+    0
+  );
+  // 现金支付金额
+  // cashPayamt.value = purchaseinventoryList.value.reduce(
+  //   (accumulator, currentRow) => {
+  //     return (accumulator + (Number(currentRow.profitAmount) || 0))
+  //   },
+  //   0
+  // );
+}
+function getPharmacyCabinetLists() {
+  clrTypeOptions.value = [
+    { value: 11, label: '门诊' },
+    { value: 21, label: '住院' },
+  ];
+}
+function handleSelectionChangeReturn(selection) {
+  idsReturn.value = selection.map((item) => item.id);
+  singleReturn.value = selection.length != 1;
+  multipleReturn.value = !selection.length;
+}
+
+function getList() {
+  applyFinancialClearingList(queryParams.value).then((res) => {
+    // console.log(res,"res----------------")
+    // loading.value = false;
+    // purchaseinventoryList.value = [{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"4.72",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"7.43",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"1",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"-1",insutype:"410",clrType: 11,contractNo:"229900"}]
+   purchaseinventoryList.value = res.data.records ? res.data.records : res.data;
+    total.value = res.data.total;
+  });
+}
+
+function handleApplyForLiquidation () {
+  let params = {}
+  params.clrType = queryParams.value.clrType?queryParams.value.clrType:""
+  params.setlOptins = queryParams.value.setlOptins?queryParams.value.setlOptins:""
+  params.stmtBegnDate = queryParams.value.stmtBegnDate?queryParams.value.stmtBegnDate:""
+  params.stmtEndDate = queryParams.value.stmtEndDate?queryParams.value.stmtEndDate:""
+  autoApplyFinancialClearing(params).then((res) => {
+  console.log(res.data,'res----------------');
+  loading.value = false;
+  });
+}
+function isAllSelected() {
+  return selectedRow.value.length === purchaseinventoryList.value.length;
+}
+
+function revokedSelectedRows(row) {
+  let queryParamsss = {
+      clrAppyEvtId:row.outResult,
+      clroptins:queryParams.value.setlOptins?queryParams.value.setlOptins:"", 
+  }
+  applyUnClearing(queryParamsss).then(res => {
+      proxy.$message.success('撤销成功')
+      getList()
+  }).catch(err => {
+      proxy.$message.error('撤销失败')
+  })
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  selectedRow.value = selection
+  console.log(selectedRow.value,"selectedRow.value")
+  ids.value = selection.map((item) => item.setlId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+function handOperatedApply () {
+  const params = {...totalPrice}
+  params.clrOptins = queryParams.value.setlOptins?queryParams.value.setlOptins:""
+  params.begndate = queryParams.value.stmtBegnDate?queryParams.value.stmtBegnDate:""
+  params.enddate = queryParams.value.stmtEndDate?queryParams.value.stmtEndDate:""
+  params.clrType = queryParams.value.clrType?queryParams.value.clrType:""
+  handOperatedApplyFinancialClearing(params).then(res => { 
+  }).catch(err => {
+      proxy.$message.error('申请失败')
+  })
+}
+//点击列表当前行
+function handleRowClick(row) {
+  // editRowTK.value = row
+  console.log(row,"row")
+  // if(row.returnStatus==1){
+  //   loadingReturn.value = true
+  //   generatedReturnDetail(row.supplyBusNo).then((response) => {
+  //     purchaseinventoryReturnList.value = response.data
+  //     purchaseinventoryReturnList.value.map(k=>{
+  //       // k.returnStatus_text =  k.returnStatus==1?'已退库':''
+  //       k.originalSupplyBusNo = k.originalSupplyBusNo?k.originalSupplyBusNo:row.supplyBusNo
+  //     }) 
+    
+  //   })
+  //   loadingReturn.value = false
+  // }
+}
+
+
+getList();
+getPharmacyCabinetLists()
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
similarity index 86%
rename from vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
index 342bf0ed..ec80a54e 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="100px"
     >
      <el-form-item label="项目名称：" prop="searchKey" label-width="120px">
@@ -191,39 +190,18 @@ import {
   getReportLossPage,
   getInit,
   getPharmacyCabinetList,
-  getBusNoInit,
-  cancelSupply,
-  stopSupply,
-} from "./statisticalManagent";
 
-// import Dialog from "./components/Dialog";
+} from "./statisticalManagent";
 
-const router = useRouter();
 const { proxy } = getCurrentInstance();
 
-const purchaseinventoryRef = ref(null); // 初始化 ref
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
 const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
 
@@ -241,15 +219,8 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-function getBusNoInitList() {
-  getBusNoInit().then((response) => {
-    console.log(response,'response',response.data)
-    busNoAdd.value = response.data.busNo; // 单据号新增
-  });
-}
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
     locationIdList.value = response.data
   });
   getInit().then((response) => {
@@ -306,9 +277,4 @@ getPharmacyCabinetLists()
   align-items: center;
 }
 
-.title {
-  font-weight: bold;
-  font-size: large;
-  margin-bottom: 10px;
-}
 </style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
index f3a5f08f..9c2e1aa5 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
@@ -107,12 +107,12 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="项目查询/病人姓名：" prop="searchKey" label-width="150">
+      <el-form-item label="药品查询/病人姓名：" prop="searchKey" label-width="150">
         <el-input
           v-model="queryParams.searchKey"
-          placeholder="输入项目名称/编码/病人姓名后回车查询"
+          placeholder="输入药品名称/拼音/编码/病人姓名后回车查询"
           clearable
-          style="width: 270px"
+          style="width: 310px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
@@ -291,7 +291,7 @@
         align="center"
         key="busNo"
         prop="busNo"
-        width="140px"
+        width="130px"
         :show-overflow-tooltip="true"
       />
        <!-- <el-table-column
@@ -309,7 +309,7 @@
         align="center"
         key="ybNo"
         prop="ybNo"
-      
+        width="218px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -386,19 +386,6 @@
         :show-overflow-tooltip="true"
         width="120px"
       />
-      <el-table-column
-        v-if="inventoryScope==2||inventoryScope==4||inventoryScope==6"
-        label="发药时间"
-        align="center"
-        key="dispenseTime"
-        prop="dispenseTime"
-      
-        :show-overflow-tooltip="true"
-      >
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.dispenseTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column
         label="厂家/产地"
         align="center"
@@ -415,6 +402,18 @@
      
         :show-overflow-tooltip="true"
       /> 
+      <el-table-column
+        label="发药时间"
+        align="center"
+        key="dispenseTime"
+        prop="dispenseTime"
+      
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.dispenseTime) }}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination
       v-show="total > 0"
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/numberOfVisits.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/numberOfVisits.vue
new file mode 100644
index 00000000..fab1855d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/numberOfVisits.vue
@@ -0,0 +1,303 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="100px"
+    >
+      <el-form-item label="年份：" prop="visitsYear">
+        <el-date-picker
+          v-model="visitsYear"
+          type="year"
+          placeholder="请选择年份"
+          format="YYYY"
+          value-format="YYYY"
+        />
+      </el-form-item>
+      <el-form-item label="时间类型：" prop="dateType">
+        <el-select
+          v-model="queryParams.dateType"
+          placeholder=""
+          clearable
+          style="width: 150px"
+          @change="dateTypeChange"
+        >
+          <el-option
+            v-for="dateType in dateTypeOptions"
+            :key="dateType.value"
+            :label="dateType.label"
+            :value="dateType.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="就诊时间" prop="visitTime1" v-if="queryParams.dateType=='1'">
+        <el-date-picker
+          
+          v-model="queryParams.visitTime1"
+          type="datetime"
+          placeholder="请选择就诊时间"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+       </el-form-item>
+       
+      <el-form-item label="就诊时间" prop="visitTime2" v-if="queryParams.dateType=='2'">
+        <el-date-picker
+
+          @change="visitTimeChange"
+          v-model="queryParams.visitTime2"
+          type="week"
+          format="[Week] ww"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择就诊时间"
+        />
+      </el-form-item>
+      <el-form-item label="就诊时间" prop="visitTime3" v-if="queryParams.dateType=='3'">
+        <el-date-picker
+         
+          v-model="queryParams.visitTime3"
+          type="month"
+          placeholder="请选择就诊时间"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="报损日期：">
+        <el-date-picker
+          v-model="occurrenceTime"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 300px"
+          value-format="YYYY-MM-DD"
+        />
+      </el-form-item> -->
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="handleQuery"
+          
+          >查询</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button
+          type="warning"
+          plain
+          icon="CircleClose"
+          @click="handleClear"
+          
+          >重置</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+   
+      <el-table-column
+        label="就诊人数"
+        align="center"
+        key="itemQuantity"
+        prop="itemQuantity"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="发热人数"
+        align="center"
+        key="itemQuantity"
+        prop="itemQuantity"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="腹泻人数"
+        align="center"
+        key="itemQuantity"
+        prop="itemQuantity"
+        :show-overflow-tooltip="true"
+      />
+       <!-- <el-table-column
+        label="报损日期"
+        align="center"
+        key="approvalTime"
+        prop="approvalTime"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.approvalTime) }}</span>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="numberOfVisits">
+import {
+  getReportLossPage,
+
+
+} from "./statisticalManagent";
+const { proxy } = getCurrentInstance();
+import moment from "moment";
+const purchaseinventoryList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const occurrenceTime = ref([]);
+const dateTypeOptions = ref([]);
+const locationIdList = ref([]);
+const visitsYear = formatDate(new Date(),1)
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    dateType:"1",
+    visitTime1: formatDate(new Date(),2), 
+    visitTime2: formatDate(new Date(),3), 
+    visitTime3: formatDate(new Date(),4), 
+
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+function visitTimeChange(val){
+  getWeekDataList(val)
+}
+function getWeek(){
+  if(new Date().getDay()==1){ //当前是星期一
+    let weekTime = formatDate(new Date(),5,1)
+    return weekTime
+  }else if(new Date().getDay()==2){ //当前是星期二
+    let weekTime = formatDate(new Date(),5,2)
+    return weekTime
+  }else if(new Date().getDay()==3){ //当前是星期三
+    let weekTime = formatDate(new Date(),5,3)
+    return weekTime
+  }else if(new Date().getDay()==4){ //当前是星期四
+    let weekTime = formatDate(new Date(),5,4)
+    return weekTime
+  }else if(new Date().getDay()==5){ //当前是星期五
+    let weekTime = formatDate(new Date(),5,5)
+    return weekTime
+  }else if(new Date().getDay()==6){ //当前是星期六
+    let weekTime = formatDate(new Date(),5,6)
+    return weekTime
+  }else if(new Date().getDay()==7){ //当前是星期日
+    let weekTime = formatDate(new Date(),5,7)
+    return weekTime
+  }  
+}
+
+function getWeekDataList(val) {
+  let oneDayTime = 1000 * 60 * 60 * 24
+  let today =val?new Date(val):new Date(getWeek())
+  let todayDay = today.getDay() || 7
+  let startDate =new Date(today.getTime() + oneDayTime * (todayDay - 1))
+  let dateList = []
+  for (let i = 0; i < 7; i++) {
+    let temp =new Date(startDate.getTime() - i * oneDayTime)
+    let year = temp.getFullYear()
+    let month = temp.getMonth() + 1 < 10 ? '0' + (temp.getMonth() + 1) : temp.getMonth() + 1
+    let day = temp.getDate() < 10 ? '0' + temp.getDate() : temp.getDate()
+    dateList[i] = `${year}-${month}-${day}`
+  }
+  console.log(dateList,"选中周的时间")
+  return dateList
+}
+function getPharmacyCabinetLists() {
+  dateTypeOptions.value = [{value:"1",label:"每天"},{value:"2",label:"每周"},{value:"3",label:"每月"}]
+  queryParams.value.dateType = "1"
+  // getInit().then((response) => {
+  //   chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions 
+  // })
+}
+function dateTypeChange(val){
+  console.log(val,queryParams.value.visitTime2,"!@1")
+  if(val == "2"){ //每周
+    getWeekDataList()
+  }
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getReportLossPage(queryParams.value).then((res) => {
+    loading.value = false;
+    purchaseinventoryList.value = res.data.records
+    total.value = res.data.total;
+  });
+}
+function formatDate(cellValue,yearType,value) {
+  if (cellValue == null || cellValue == "") return "";
+  var date = new Date(cellValue) 
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
+  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
+  var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+  // var nowDayOfWeek = date.getDay(); // 今天本周的第几天
+  // var nowDay = nowDayOfWeek || 7;
+  // var startWeek = new Date(year, month, day + 1 - nowDay)
+  // console.log(startWeek,"startWeek")
+  if(yearType==2||yearType==1||yearType==3){
+    return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+  }else if(yearType==5){
+    day = date.getDate() < 10 ? '0' + date.getDate()-value : date.getDate()-value
+    console.log(day,"day")
+    return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+  }else{
+    return year + '-' + month
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  proxy.resetForm("queryRef");
+  getList();
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+getList();
+getPharmacyCabinetLists()
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
similarity index 95%
rename from vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
index 6eb1ab10..b1d7cc4c 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
@@ -410,7 +410,6 @@ function handleTotalAmount() {
   );
 }
 function getTotals(row,i){
-  console.log(row,i,"代码")
     let totalPriceSums = Number(purchaseinventoryList.value[i].totalPrice)
     // let totalReturnPriceSums = Number(purchaseinventoryList.value[i].refundPrice)
     for (let j=1; i-j>=0; j++) {
@@ -422,7 +421,6 @@ function getTotals(row,i){
     xiaojiTotal.value.push({inde:i+1,busNo:row.busNo,genderEnum_enumText:row.genderEnum_enumText,totalPrice:totalPriceSums.toFixed(4)||0.0000})
     // var totalPrice2 = 0
     // var refundPrice2 = 0
-    console.log(i+1,"i+1",xiaojiTotal)
     purchaseinventoryList.value.splice(i+1, 0, {busNo:row.busNo,genderEnum_enumText:row.genderEnum_enumText,departmentName:'小计',totalPrice:totalPriceSums.toFixed(4)||0.0000})
     // purchaseinventoryList.value.map(k=>{
     //     if(k.departmentName!='小计'){
@@ -446,39 +444,39 @@ const arraySpanMethod = ({
       let rowspan = 1;
       let totalPriceSum = 0
       // let totalReturnPriceSum = 0
-      for (let i = rowIndex + 1; i < purchaseinventoryList.value.length; i++) {
-        if (purchaseinventoryList.value[i].busNo === row.busNo) {
-          rowspan++;
-          totalPriceSum += Number(purchaseinventoryList.value[i].totalPrice)
-          // totalReturnPriceSum += Number(purchaseinventoryList.value[i].refundPrice)
-          console.log(purchaseinventoryList.value.length-1,i,xiaojiTotal.value,row.busNo,"!212122")
-          if(i==purchaseinventoryList.value.length-1){
-            
-            let findIndexTotal = xiaojiTotal.value.findIndex(k=>k.busNo==row.busNo)
-            if(findIndexTotal<0){
-              getTotals(row,i)
+      for (let i = rowIndex + 1; i < purchaseinventoryList.value.length+1; i++) {
+        if(purchaseinventoryList.value[i-1].departmentName!='合计'){
+          if (purchaseinventoryList.value[i]&&purchaseinventoryList.value[i].busNo === row.busNo) {
+            rowspan++;
+            totalPriceSum += Number(purchaseinventoryList.value[i].totalPrice)
+            // totalReturnPriceSum += Number(purchaseinventoryList.value[i].refundPrice)
+            if(i==purchaseinventoryList.value.length-1){
+              let findIndexTotal = xiaojiTotal.value.findIndex(k=>k.busNo==row.busNo)
+              if(findIndexTotal<0){
+                getTotals(row,i)
+              }
+            }else{
             }
-          }else{
-            console.log(purchaseinventoryList.value.length-1,i,"!21212")
-          }
-        } else {
-            console.log(purchaseinventoryList.value.length-1,i,"!212123")
+          } else {
             totalPriceSum += Number(row.totalPrice)
             // totalReturnPriceSum += Number(row.refundPrice)
             let findIndexTotal = xiaojiTotal.value.findIndex(k=>k.busNo==row.busNo)
             if(findIndexTotal<0){
               xiaojiTotal.value.push({inde:i,genderEnum_enumText:row.genderEnum_enumText,busNo:row.busNo,totalPrice:totalPriceSum})
               purchaseinventoryList.value.splice(i, 0, {busNo:row.busNo,genderEnum_enumText:row.genderEnum_enumText,departmentName:'小计',totalPrice:totalPriceSum.toFixed(4)||0.0000})
+              // console.log(purchaseinventoryList.value,"12121")
             }
             break;
+          }
         }
       }
+      // console.log(purchaseinventoryList.value,"12122")
       return { rowspan, colspan: 1 };
     } else {
+      // console.log(purchaseinventoryList.value,"12123")
       return { rowspan: 0, colspan: 0 };
     }
   // }else{ // 姓名列patientName
-  //   // console.log(columnIndex,"columnIndex")
   //   if (columnIndex ===2&&purchaseinventoryList.value.length>0) {
   //     if (rowIndex === 0 || (rowIndex > 0 && row.name !== purchaseinventoryList.value[rowIndex - 1]?.name)) {
   //       let rowspan = 1;
@@ -566,21 +564,17 @@ function getList(type) {
   // var refundPrice2 = 0
   // var purchaseinventoryLists = []
   // var purchaseinventoryListsArray = []
-  console.log(queryParams.value,"queryParams.value")
   getReportChargePage(queryParams.value).then((res) => {
     // purchaseinventoryLists = res.data.records||[] //转换数据结构
     // if(purchaseinventoryLists.length>0){
     //   purchaseinventoryLists.map(p=>{
-    //     // console.log(p.reportPageItemDto,"p.reportPageItemDto")
     //     purchaseinventoryListsArray = [...purchaseinventoryListsArray, ...p.reportPageItemDto]
     //     // purchaseinventoryList.value.concat(p.reportPageItemDto)
     //   }) 
     // }
-    // console.log(purchaseinventoryList.value,"purchaseinventoryList.value")
     // purchaseinventoryList.value = purchaseinventoryListsArray
     purchaseinventoryList.value = res.data.records||[]
     total.value = res.data.total
-    // console.log(purchaseinventoryList.value,"purchaseinventoryList.value")
     purchaseinventoryList.value.map(k=>{
       k.totalPrice = k.totalPrice?k.totalPrice.toFixed(4):'0.0000'
       k.price = k.price?k.price.toFixed(4):'0.0000'
@@ -616,7 +610,6 @@ function getList(type) {
         // purchaseinventoryListsAll = res.data.records||[]
         // if(purchaseinventoryListsAll.length>0){
         //   purchaseinventoryListsAll.map(p=>{
-        //     // console.log(p.reportPageItemDto,"p.reportPageItemDto")
         //     purchaseinventoryListsArrayAll = [...purchaseinventoryListsArrayAll, ...p.reportPageItemDto]
         //     // purchaseinventoryList.value.concat(p.reportPageItemDto)
         //   }) 
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
new file mode 100644
index 00000000..32508c6d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
@@ -0,0 +1,342 @@
+<!--
+ * @Author: X_bo v-hss@tbpartners.local
+ * @Date: 2025-09-01 16:37:41
+ * @LastEditTime: 2025-09-02 17:21:49
+ * @LastEditors: X_bo v-hss@tbpartners.local
+ * @Description: 
+ * @FilePath: \openhis-ui-vue3\src\views\medicationmanagement\statisticalManagement\pharmacyMonthlybalance.vue
+-->
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-col :span="4">
+        <div class="left-container">
+      <el-form
+        style="margin-top:20px;margin-left:20px;"
+        :model="queryParams"
+        ref="queryRef"
+        :inline="true"
+        label-width="90px"
+      >
+        <el-form-item label="开始时间：">
+          <el-date-picker
+            v-model="queryParams.dispenseDateSTime"
+            type="datetime"
+            placeholder="请选择开始时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            style="width: 200px;"
+            :clearable="false"
+            @change="handleTimeChange('start')"
+          />
+        </el-form-item>
+        <el-form-item label="结束时间：">
+          <el-date-picker
+            v-model="queryParams.dispenseDateETime"
+            type="datetime"
+            placeholder="请选择结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            style="width: 200px;"
+            :clearable="false"
+            @change="handleTimeChange('end')"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="Search"
+            @click="handleQuery"
+          >查询</el-button>
+          <el-button
+            type="warning"
+            icon="CircleClose"
+            @click="handleClear"
+          >重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        style="padding:0 20px;width:100%;margin-top:20px;"
+        v-loading="leftLoading"
+        :data="leftTableData"
+        @row-click="handleRowClick"
+      >
+        <el-table-column label="科室名" prop="orgName" :show-overflow-tooltip="true" />
+        <el-table-column label="耗材和药品总金额" prop="totalMoney" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <span class="link" @click.stop="handleRowClick(scope.row)">{{ scope.row.totalMoney }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+      </el-col>
+      <el-col :span="20">
+            <div class="right-container">
+      <el-form
+        style="margin-top:20px;margin-left:20px;"
+        :model="rightQueryParams"
+        :inline="true"
+        label-width="80px"
+      >
+        <el-form-item label="项目名：">
+          <el-input
+            v-model="rightQueryParams.name"
+            placeholder="请输入项目名称"
+            clearable
+            style="width: 200px;"
+            @keyup.enter="handleRightQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="Search"
+            @click="handleRightQuery"
+          >查询</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        style="padding:0 20px;margin-top:20px;"
+        v-loading="rightLoading"
+        :data="rightTableData"
+      >
+        <el-table-column label="项目名" prop="name" width="180" :show-overflow-tooltip="true" />
+        <el-table-column label="规格" prop="totalVolume" width="150" :show-overflow-tooltip="true" />
+        <el-table-column label="产品型号" prop="lotNumber" width="150" :show-overflow-tooltip="true" />
+        <el-table-column label="生产厂家" prop="manufacturerText" width="500" :show-overflow-tooltip="true" />
+        <el-table-column label="数量" prop="totalQuantity" width="100" :show-overflow-tooltip="true" />
+        <el-table-column label="单位" prop="unitCode_dictText" width="100" :show-overflow-tooltip="true" />
+        <el-table-column label="项目总价" prop="totalMoney" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="所属科室" prop="orgId_dictText" width="150" :show-overflow-tooltip="true" />
+        <el-table-column label="发放时间" prop="dispenseTime" width="240" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <span>{{ formatIsoDate(scope.row.dispenseTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <!-- 添加右侧分页组件 -->
+      <div class="pagination-container">
+        <el-pagination
+          v-model:current-page="rightQueryParams.pageNo"
+          v-model:page-size="rightQueryParams.pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="rightTotal"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+      </el-col>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script setup name="pharmacyStatisticsDetails">
+import { ref, reactive, toRefs, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { getMedDevInfo, getMedDevAll } from './statisticalManagent';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+
+// 左侧列表数据
+const leftTableData = ref([]);
+const leftLoading = ref(false);
+const selectedRow = ref(null);
+
+// 右侧列表数据
+const rightTableData = ref([]);
+const rightLoading = ref(false);
+// 添加右侧总条数
+const rightTotal = ref(0);
+
+// 查询参数
+// 初始化时就设置默认时间，防止被清空
+const today = new Date();
+const lastMonth = new Date();
+lastMonth.setMonth(lastMonth.getMonth() - 1);
+const data = reactive({
+  queryParams: {
+    dispenseDateSTime: formatDate(lastMonth),
+    dispenseDateETime: formatDate(today),
+  },
+  rightQueryParams: {
+    name: '',
+    orgId: '',
+    dispenseDateSTime: '',
+    dispenseDateETime: '',
+    // 添加分页参数
+    pageNo: 1,
+    pageSize: 20
+  },
+});
+
+const { queryParams, rightQueryParams } = toRefs(data);
+
+// 添加时间变化处理函数
+function handleTimeChange(type) {
+  if (type === 'start' && !queryParams.value.dispenseDateSTime) {
+    queryParams.value.dispenseDateSTime = formatDate(lastMonth);
+  } else if (type === 'end' && !queryParams.value.dispenseDateETime) {
+    queryParams.value.dispenseDateETime = formatDate(today);
+  }
+}
+
+// 获取左侧统计数据
+function getLeftList() {
+  leftLoading.value = true;
+  getMedDevAll(queryParams.value).then((res) => {
+    leftTableData.value = res.data.data || [];
+    leftLoading.value = false;
+  }).catch(() => {
+    leftLoading.value = false;
+  });
+}
+
+// 获取右侧详情数据
+function getRightList() {
+  rightLoading.value = true;
+  getMedDevInfo(rightQueryParams.value).then((res) => {
+    console.log(res)
+    rightTableData.value = res.data.data.records || [];
+    // 设置总条数
+    rightTotal.value = res.data.data.total || 0;
+    rightLoading.value = false;
+  }).catch(() => {
+    rightLoading.value = false;
+  });
+}
+
+// 左侧列表查询
+function handleQuery() {
+  getLeftList();
+}
+
+// 左侧列表清空 - 修改为不清空时间
+function handleClear() {
+  // 不再清空时间字段
+  proxy.resetForm("queryRef", ['dispenseDateSTime', 'dispenseDateETime']);
+  getLeftList();
+}
+
+// 点击左侧行
+function handleRowClick(row) {
+  selectedRow.value = row;
+  // 设置右侧查询参数
+  rightQueryParams.value.orgId = row.orgId;
+  rightQueryParams.value.dispenseDateSTime = queryParams.value.dispenseDateSTime;
+  rightQueryParams.value.dispenseDateETime = queryParams.value.dispenseDateETime;
+  // 重置页码
+  rightQueryParams.value.pageNo = 1;
+  // 查询右侧数据
+  getRightList();
+}
+
+// 右侧列表查询
+function handleRightQuery() {
+  getRightList();
+}
+
+// 初始加载
+onMounted(() => {
+  // 设置默认时间为近一个月
+  const endDate = new Date();
+  const startDate = new Date();
+  startDate.setMonth(startDate.getMonth() - 1);
+  queryParams.value.dispenseDateSTime = formatDate(startDate);
+  queryParams.value.dispenseDateETime = formatDate(endDate);
+  getLeftList();
+});
+
+// 格式化日期为YYYY-MM-DD HH:mm:ss
+function formatDate(date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+// 格式化ISO日期字符串为YYYY-MM-DD HH:mm:ss
+function formatIsoDate(isoString) {
+  if (!isoString) return '';
+  try {
+    const date = new Date(isoString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  } catch (error) {
+    console.error('Invalid ISO date string:', isoString);
+    return isoString;
+  }
+}
+
+// 分页处理函数
+function handleSizeChange(val) {
+  rightQueryParams.value.pageSize = val;
+  getRightList();
+}
+
+function handleCurrentChange(val) {
+  rightQueryParams.value.pageNo = val;
+  getRightList();
+}
+</script>
+
+<style scoped>
+.app-container {
+  display: flex;
+  gap: 20px;
+  height: 100%;
+}
+
+.left-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.left-container .el-table {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: hidden; /* 添加这行来隐藏水平滚动条 */
+  margin-top: 20px;
+  width: 100%; /* 确保表格宽度适应容器 */
+}
+
+.right-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.right-container .el-table {
+  flex: 1;
+  overflow: auto;
+}
+
+.link {
+  color: #409eff;
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+.pagination-container {
+  margin-top: 15px;
+  text-align: right;
+  margin-right: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
similarity index 88%
rename from vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
index fd299685..a330eb74 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="100px"
     >
     <el-form-item label="药品名称：" prop="searchKey">
@@ -309,49 +308,29 @@
   </div>
 </template>
 
-<script setup name="purchaseDocumentDetsils">
+<script setup name="PurchaseDocumentDetsils">
 import {
   getReportInboundPCage,
   getPharmacyCabinetList,
-  cancelSupply,
-  stopSupply,
   getInboundInit
 } from "./statisticalManagent";
 
-// import Dialog from "./components/Dialog";
-
-const router = useRouter();
 const { proxy } = getCurrentInstance();
 
-const {
-  item_type
-} = proxy.useDict(
-  "item_type"
-);
-const purchaseinventoryRef = ref(null); // 初始化 ref
+// const {
+//   item_type
+// } = proxy.useDict(
+//   "item_type"
+// );
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const approvalTime = ref([]);
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
 const supplierListOptions = ref([]);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
-const chrgitmLv_enumTextOptions = ref([]);
+// const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
 
 const data = reactive({
@@ -378,7 +357,6 @@ const { queryParams, form, rules } = toRefs(data);
 
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
     locationIdList.value = response.data
   });
   getInboundInit().then((response) => {
@@ -425,18 +403,6 @@ function handleSelectionChange(selection) {
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
-/** 备份 */
-function openAddaddTransferProductDialog() {
-  // getTransferProductTypeList();
-  // getBusNoInitList()
-  // nextTick(() => {
-    // proxy.$refs["transferProductRef"].show();
-  // });
-//   const partItem = {partFlg: 'add',rowData: []}
-  // item: JSON.stringify(partItem)
-  // ,query:{item: JSON.stringify(partItem)}
-//   router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
-}
 
 getList();
 getPharmacyCabinetLists()
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
similarity index 89%
rename from vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
index 1f02cb04..c6d4bc6b 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="100px"
     >
     <el-form-item label="药品名称：" prop="searchKey">
@@ -326,49 +325,28 @@
   </div>
 </template>
 
-<script setup name="purchaseReturnDetsils">
+<script setup name="PurchaseReturnDetsils">
 import {
   getReportPurchaseReturn,
   getPharmacyCabinetList,
-  cancelSupply,
-  stopSupply,
   getPurchaseReturnInit
 } from "./statisticalManagent";
 
-// import Dialog from "./components/Dialog";
-
-const router = useRouter();
 const { proxy } = getCurrentInstance();
-
-const {
-  item_type
-} = proxy.useDict(
-  "item_type"
-);
-const purchaseinventoryRef = ref(null); // 初始化 ref
+// const {
+//   item_type
+// } = proxy.useDict(
+//   "item_type"
+// );
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const approvalTime = ref([]);
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
 const supplierListOptions = ref([]);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
-const chrgitmLv_enumTextOptions = ref([]);
+// const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
 
 const data = reactive({
@@ -395,7 +373,6 @@ const { queryParams, form, rules } = toRefs(data);
 
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
     locationIdList.value = response.data
   });
   getPurchaseReturnInit().then((response) => {
@@ -442,18 +419,7 @@ function handleSelectionChange(selection) {
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
-/** 备份 */
-function openAddaddTransferProductDialog() {
-  // getTransferProductTypeList();
-  // getBusNoInitList()
-  // nextTick(() => {
-    // proxy.$refs["transferProductRef"].show();
-  // });
-//   const partItem = {partFlg: 'add',rowData: []}
-  // item: JSON.stringify(partItem)
-  // ,query:{item: JSON.stringify(partItem)}
-//   router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
-}
+
 
 getList();
 getPharmacyCabinetLists()
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/reconciliation.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliation.vue
similarity index 86%
rename from vue3/src/views/medicationmanagement/statisticalManagement/reconciliation.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliation.vue
index e6a242c2..924b3137 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/reconciliation.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliation.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
-      <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :inline="true"
-        label-width="100px"
-      >
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
         <el-form-item label="结算日期：">
           <el-date-picker
             v-model="occurrenceTime"
@@ -80,9 +75,23 @@
       <!-- </el-col> -->
       <!-- <el-col :span="1.5"> -->
       <!-- v-hasPermi="['system:user:export']" -->
-      <el-button type="primary" plain icon="Edit" @click="handleReconciliation" :disabled="ids.length==0">
+      <el-button
+        type="primary"
+        plain
+        icon="Edit"
+        @click="handleReconciliation"
+        :disabled="ids.length == 0"
+      >
         医保对总账
       </el-button>
+      <el-button
+        type="primary"
+        plain
+        icon="Edit"
+        @click="handleGetClroptins"
+      >
+        清算机构查询
+      </el-button>
       <!-- </el-col> -->
     </el-row>
     <!-- <div style="margin-bottom: 5px">
@@ -97,7 +106,7 @@
       v-loading="loading"
       :data="purchaseinventoryList"
       border
-      @select="clickRow" 
+      @select="clickRow"
       ref="refTables"
       @selection-change="handleSelectionChange"
     >
@@ -110,7 +119,12 @@
           {{ formatNumber(scope.row.medFeeSumAmt) + ' 元' }}
         </template>
       </el-table-column>
-      <el-table-column label="基金支付金额" align="right" prop="fundPaySumAmt" header-align="center">
+      <el-table-column
+        label="基金支付金额"
+        align="right"
+        prop="fundPaySumAmt"
+        header-align="center"
+      >
         <template #default="scope">
           {{ formatNumber(scope.row.fundPaySumAmt) + ' 元' }}
         </template>
@@ -157,10 +171,11 @@ import {
   ybRequestReconcile, // 医保对账
   getReconcileList, // 对账列表 结算
   getContractList, // 合同
+  getClroptins,
 } from './statisticalManagent';
+import { formatDate } from '@/utils/index';
 const { proxy } = getCurrentInstance();
-const { insutype } = 
-proxy.useDict( "insutype");
+const { insutype } = proxy.useDict('insutype');
 // 险种类型
 const purchaseinventoryList = ref([]);
 const loading = ref(false);
@@ -168,7 +183,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const occurrenceTime = ref([]);
+const occurrenceTime = ref([formatDate(new Date()), formatDate(new Date())]);
 const contractNoOptions = ref([]);
 const clrTypeOptions = ref([]);
 const selectedRow = ref(null);
@@ -201,7 +216,7 @@ const { queryParams, form, rules } = toRefs(data);
 function clickRow(row) {
   if (row.length > 1) {
     let del_row = row.shift(); // 删除选中的第一项
-    proxy.$refs["refTables"].toggleRowSelection(del_row, false); //改变table勾选状态
+    proxy.$refs['refTables'].toggleRowSelection(del_row, false); //改变table勾选状态
   }
 }
 function getContractLists() {
@@ -261,16 +276,18 @@ function handleReconciliation() {
   // loading.value = true;
   reconciliation.value = '';
   let queryParams = {
-    insuType:selectedRow.value.insutype.toString(),
-    clrType:selectedRow.value.clrType,
-    contractNo:selectedRow.value.contractNo.toString(),
-    stmtBegnDate:occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[0] + ' 00:00:00'
-      : '',
-    stmtEndDate:occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[1] + ' 23:59:59'
-      : '',
-  }
+    insuType: selectedRow.value.insutype.toString(),
+    clrType: selectedRow.value.clrType,
+    contractNo: selectedRow.value.contractNo.toString(),
+    stmtBegnDate:
+      occurrenceTime.value && occurrenceTime.value.length == 2
+        ? occurrenceTime.value[0] + ' 00:00:00'
+        : '',
+    stmtEndDate:
+      occurrenceTime.value && occurrenceTime.value.length == 2
+        ? occurrenceTime.value[1] + ' 23:59:59'
+        : '',
+  };
   ybRequestReconcile(queryParams).then((res) => {
     // loading.value = false;
     reconciliation.value = res.data;
@@ -279,12 +296,16 @@ function handleReconciliation() {
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  selectedRow.value = selection[selection.length-1]
+  selectedRow.value = selection[selection.length - 1];
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 
+function handleGetClroptins() {
+  getClroptins({ pageNum: 1, pageSize: 100, fixmedinsCode: 'H22010200672' }).then((res) => {});
+}
+
 getList();
 getContractLists();
 </script>
@@ -294,7 +315,6 @@ getContractLists();
   align-items: center;
 }
 
-
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   resize: none !important;
 }
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue
similarity index 63%
rename from vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue
index 0756824b..ac00b219 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue
@@ -7,7 +7,7 @@
         :inline="true"
         label-width="85px"
       >
-        <el-form-item label="结算经办机构" prop="setlOptins" label-width="100px">
+        <el-form-item label="结算经办机构：" prop="setlOptins" label-width="110px">
           <el-input
             v-model="queryParams.setlOptins"
             placeholder="请输入结算经办机构"
@@ -60,14 +60,44 @@
             @keyup.enter="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="本地文件路径：" prop="filePath" label-width="110px">
+        <!-- <el-form-item label="本地文件路径：" prop="filePath" label-width="110px">
           <el-input
             v-model="queryParams.filePath"
             placeholder="请输入本地文件路径"
             clearable
-            style="width: 150px"
+            style="width: 566px"
             @keyup.enter="handleQuery"
           />
+        </el-form-item> -->
+        <el-form-item>
+          <el-upload
+            multiple
+            :action="uploadFileUrl"
+            :before-upload="handleBeforeUpload"
+            :file-list="fileList"
+            limit=1
+            :on-error="handleUploadError"
+            :on-exceed="handleExceed"
+            :on-success="handleUploadSuccess"
+            :show-file-list="false"
+            :headers="headers"
+            class="upload-file-uploader"
+            ref="fileUpload"
+          >
+          <el-button
+            type="primary"
+            plain
+            icon="Edit"
+          
+            >上传文件</el-button
+            >
+          </el-upload>
+          <div class="el-upload__tip" v-if="showTip">
+            请上传
+            <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+            <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+            的文件
+          </div>
         </el-form-item>
       </el-form>
     <!-- <el-row :gutter="10" class="mb8"> -->
@@ -97,9 +127,17 @@
           @click="handleReconciliation"
           >开始明细对账</el-button
         >
+        <el-button
+          type="primary"
+          plain
+          icon="Edit"
+          :disabled="ids.length == 0"
+          @click="handleApplyForLiquidation"
+          >申请清算</el-button
+        >
       <!-- </el-col> -->
     </el-row>
-    <div style="margin-bottom:5px">结算笔数：{{counts}}（其中 总费用：{{totalPrice1}}元， 基金支付金额：{{totalPrice2}}元， 账户支付金额：{{totalPrice3}}元，现金支付金额：{{totalPrice4}}元）</div>
+    <div style="margin-bottom:5px">结算笔数：{{counts}}（其中 总费用：{{totalPrice1?totalPrice1.toFixed(2):0}}元， 基金支付金额：{{totalPrice2?totalPrice2.toFixed(2):0}}元， 账户支付金额：{{totalPrice3?totalPrice3.toFixed(2):0}}元，现金支付金额：{{totalPrice4?totalPrice4.toFixed(2):0}}元）</div>
     <el-table
       v-loading="loading"
       :data="purchaseinventoryList"
@@ -112,6 +150,15 @@
         align="center"
         key="psnNo"
         prop="psnNo"
+        width="190"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="患者姓名"
+        align="center"
+        key="patientName"
+        prop="patientName"
+        width="100"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -119,6 +166,7 @@
         align="center"
         key="mdtrtId"
         prop="mdtrtId"
+        width="270"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -126,6 +174,7 @@
         align="center"
         key="setlId"
         prop="setlId"
+        width="270"
         :show-overflow-tooltip="true"
       />
        <!-- <el-table-column
@@ -183,13 +232,29 @@
         prop="quantity"
         :show-overflow-tooltip="true"
       /> -->
-       <el-table-column
+      <el-table-column
+        label="结算时间"
+        align="center"
+        key="setlTime"
+        prop="setlTime"
+      
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.setlTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
         label="是否退费"
         align="center"
         key="refdSetlFlag"
         prop="refdSetlFlag"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template #default="scope">
+          <span>{{ scope.row.refdSetlFlag==1?'退费':'' }}</span>
+        </template>
+       </el-table-column>
        <!-- <el-table-column
         label="报销类型"
         align="center"
@@ -212,6 +277,17 @@
         :show-overflow-tooltip="true"
       /> -->
     </el-table>
+    <el-form :inline="true" label-width="90px" style="width: 100%; margin-top: 30px">
+      <el-form-item label="上传结果：" style="width: 100%">
+        <el-input
+          v-model="reconciliationDetail"
+          :autosize="{ minRows: 4, maxRows: 10 }"
+          type="textarea"
+          disabled
+          placeholder=""
+        />
+      </el-form-item>
+    </el-form>
     <!-- <pagination
       v-show="total > 0"
       :total="total"
@@ -323,7 +399,10 @@ import {
   reconcileDetailTxt,
   reconcileGeneral,
   getPharmacyCabinetList,
+  ybRequestFileUp,
+  applyFinancialClearing
 } from "./statisticalManagent";
+import { getToken } from "@/utils/auth";
 import { formatDate } from '@/utils/index';
 const { proxy } = getCurrentInstance();
 const purchaseinventoryList = ref([]);
@@ -332,6 +411,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
+const reconciliationDetail = ref("")
 const occurrenceTime = ref([formatDate(new Date()),formatDate(new Date())]);
 const clrTypeOptions = ref([]);
 const filePath = ref("")
@@ -344,6 +424,13 @@ const totalPrice2 = ref(0)
 const totalPrice3 = ref(0)
 const totalPrice4 = ref(0)
 
+const fileSize = ref(10)
+const uploadList = ref([]);
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/yb-request/file-up"); // 上传文件服务器地址
+const headers = ref({ Authorization: "Bearer " + getToken() });
+const fileList = ref([]);
+const fileType = ref(["zip","txt"]);
 const data = reactive({
   form: {},
   queryParams: {
@@ -371,7 +458,104 @@ watch(
   },
   { immediate: true }
 )
+function handleBeforeUpload(file) {
+  // 校检文件类型
+  if (fileType.value.length) {
+    const fileName = file.name.split('.');
+    const fileExt = fileName[fileName.length - 1];
+    const isTypeOk = fileType.value.indexOf(fileExt) >= 0;
+    if (!isTypeOk) {
+      proxy.$modal.msgError(`文件格式不正确, 请上传${fileType.value.join("/")}格式文件!`);
+      return false;
+    }
+  }
+  // 校检文件大小
+  if (fileSize.value) {
+    const isLt = file.size / 1024 / 1024 < fileSize.value;
+    if (!isLt) {
+      proxy.$modal.msgError(`上传文件大小不能超过10MB!`);
+      return false;
+    }
+  }
+  const formData = new FormData()
+  formData.append('file', file)
+  formData.append('filename', file.name)
+  ybRequestFileUp(formData).then((res) => {
+    if(res.code==200){
+      proxy.$modal.msgSuccess("上传成功")
+    }
+    
+  })
+  // proxy.$modal.loading("正在上传文件，请稍候...");
+  number.value++;
+  return true;
+}
+
+// 文件个数超出
+function handleExceed() {
+  proxy.$modal.msgError(`上传文件数量不能超过 1 个!`);
+}
 
+// 上传失败
+function handleUploadError(err) {
+  proxy.$modal.msgError("上传文件失败");
+}
+
+// 上传成功回调
+function handleUploadSuccess(res, file) {
+  if (res.code === 200) {
+    console.log(res,file,"file")
+    uploadList.value.push({ name: res.fileName, url: res.fileName });
+    uploadedSuccessfully();
+  } else {
+    number.value--;
+    proxy.$modal.closeLoading();
+    proxy.$modal.msgError(res.msg);
+    proxy.$refs.fileUpload.handleRemove(file);
+    uploadedSuccessfully();
+  }
+}
+// function submitFileForm() {
+//   proxy.$refs['fileUpload'].submit();
+// }
+// 上传结束处理
+function uploadedSuccessfully() {
+  if (number.value > 0 && uploadList.value.length === number.value) {
+    fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
+    uploadList.value = [];
+    number.value = 0;
+    // proxy.$refs['fileUpload'].submit();
+    emit("update:modelValue", listToString(fileList.value));
+    proxy.$modal.closeLoading();
+  }
+}
+// 删除文件
+function handleDelete(index) {
+  fileList.value.splice(index, 1);
+  emit("update:modelValue", listToString(fileList.value));
+}
+
+// 获取文件名称
+function getFileName(name) {
+  // 如果是url那么取最后的名字 如果不是直接返回
+  if (name.lastIndexOf("/") > -1) {
+    return name.slice(name.lastIndexOf("/") + 1);
+  } else {
+    return name;
+  }
+}
+
+// 对象转成指定字符串分隔
+function listToString(list, separator) {
+  let strs = "";
+  separator = separator || ",";
+  for (let i in list) {
+    if (list[i].url) {
+      strs += list[i].url + separator;
+    }
+  }
+  return strs != '' ? strs.substr(0, strs.length - 1) : '';
+}
 /**计算合计金额 */
 function handleTotalAmount() {
   counts.value = purchaseinventoryList.value.length
@@ -415,10 +599,10 @@ function handleSelectionChangeReturn(selection) {
 
 function getList() {
   reconcileDetailList(queryParams.value).then((res) => {
-    console.log(res,"res----------------")
+    // console.log(res,"res----------------")
     // loading.value = false;
-    // purchaseinventoryList.value = [{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"12",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"12",insutype:"410",clrType: 11,contractNo:"229900"}]
-    res.data.record ? res.data.record : res.data;
+    // purchaseinventoryList.value = [{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"4.72",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"7.43",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"1",insutype:"410",clrType: 11,contractNo:"229900"},{psnNo:"123",mdtrtId:"121",setlId:"1213",medfeeSumamt:"122",fundPaySumamt:"12",acctPay:"-1",insutype:"410",clrType: 11,contractNo:"229900"}]
+   purchaseinventoryList.value = res.data.record ? res.data.record : res.data;
     total.value = res.data.total;
   });
 }
@@ -457,6 +641,25 @@ function handleReconciliation() {
     loading.value = false;
   });
 }
+function handleApplyForLiquidation () {
+  if (isAllSelected()) {
+    let params = {}
+    params.clrType = queryParams.value.clrType?queryParams.value.clrType:""
+    params.clrOptins = queryParams.value.setlOptins?queryParams.value.setlOptins:""
+    params.stmtBegnDate = occurrenceTime.value[0]
+    params.stmtEndDate = occurrenceTime.value[1]
+    params.settlementIdList = ids.value
+    applyFinancialClearing(params).then((res) => {
+      console.log(res.data,'res----------------');
+      loading.value = false;
+    });
+  } else {
+    proxy.$message.warning('当前未全选');
+  }
+}
+function isAllSelected() {
+  return selectedRow.value.length === purchaseinventoryList.value.length;
+}
 function handleExport(){
   if(selectedRow.value.length==0){
     proxy.$message.error('请选择一行数据进行生成txt文件');
@@ -464,7 +667,21 @@ function handleExport(){
   }
   loading.value = true;
   reconcileDetailTxt({settlementIdList:ids.value}).then((res) => {
-    console.log(res.data, 'res----------------');
+    console.log(res.data,'res----------------');
+    let fileName = Date.now()+'.txt'; // 默认文件名
+    // 2. 创建Blob对象
+    const blob = new Blob([res], { type: 'application/octet-stream;charset=utf-8' });
+    // 3. 创建临时下载链接
+    const link = document.createElement('a');
+    const url = window.URL.createObjectURL(blob);
+    link.href = url;
+    link.download = fileName; // 设置下载文件名
+     // 4. 触发下载
+    document.body.appendChild(link);
+    link.click();
+    // 5. 清理资源
+    document.body.removeChild(link);
+    window.URL.revokeObjectURL(url);
     loading.value = false;
     if(res.data){
       queryParams.value.filePath = res.data.split("生成txt文件成功，文件路径：")?res.data.split("生成txt文件成功，文件路径：")[1]:""
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
index 1414564f..c3c848ed 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
@@ -195,7 +195,7 @@
   </div>
 </template>
 
-<script setup name="outPatientRegister">
+<script setup name="registrationFeeDetails">
 import {
   getReportRegisterPage,
   getDepartmentList,
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
similarity index 78%
rename from vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
index c8984db4..15eab1fb 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="90px"
     >
       <!-- <el-form-item label="单据号：" prop="busNo">
@@ -83,36 +82,6 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="项目类型：" prop="categoryCode">
-        <el-select
-          v-model="queryParams.categoryCode"
-          placeholder=""
-          clearable
-          style="width: 150px"
-        >
-          <el-option
-            v-for="categoryCode in item_type"
-            :key="categoryCode.value"
-            :label="categoryCode.label"
-            :value="categoryCode.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="单据类型：" prop="typeEnum">
-        <el-select
-          v-model="queryParams.typeEnum"
-          placeholder=""
-          clearable
-          style="width: 150px"
-        >
-          <el-option
-            v-for="categoryCode in item_type"
-            :key="categoryCode.value"
-            :label="categoryCode.label"
-            :value="categoryCode.value"
-          />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="供应商：" prop="supplierId">
         <el-select
           v-model="queryParams.supplierId"
@@ -330,52 +299,26 @@
 <script setup name="requisitionDetails">
 import {
   getRreportOutboundPage,
-  getInit,
   getPharmacyCabinetList,
-  getBusNoInit,
-  cancelSupply,
-  stopSupply,
   getDepartmentList,
   getOutboundInit
 } from "./statisticalManagent";
 
-// import Dialog from "./components/Dialog";
-
-const router = useRouter();
 const { proxy } = getCurrentInstance();
 
 const {
   item_type,
-  inventory_range,
-  purchase_type,
 } = proxy.useDict(
   "item_type",
-  "inventory_range",
-  "purchase_type"
 );
-const purchaseinventoryRef = ref(null); // 初始化 ref
+
 const purchaseinventoryList = ref([]);
-const open = ref(false);
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined); // 源仓库
-const chrgitmLv_enumTextListOptions = ref(undefined); //目的仓库
-const supplyStatusOptions = ref(undefined);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
 const supplierListOptions = ref([]);
 const locationIdList = ref([]);
 const issueDepartmentDto = ref([])
@@ -397,15 +340,9 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-function getBusNoInitList() {
-  getBusNoInit().then((response) => {
-    console.log(response,'response',response.data)
-    busNoAdd.value = response.data.busNo; // 单据号新增
-  });
-}
+
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
     locationIdList.value = response.data
   });
   getOutboundInit().then((response) => {
@@ -419,7 +356,6 @@ function getList() {
   })
   loading.value = true;
   getRreportOutboundPage(queryParams.value).then((res) => {
-    console.log(res,"res----------------")
     loading.value = false;
     purchaseinventoryList.value = res.data.records
     // if(purchaseinventoryList.value&& purchaseinventoryList.value.length>0){
@@ -461,44 +397,9 @@ function handleSelectionChange(selection) {
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
-/** 备份 */
-function openAddaddTransferProductDialog() {
-  // getTransferProductTypeList();
-  // getBusNoInitList()
-  // nextTick(() => {
-    // proxy.$refs["transferProductRef"].show();
-  // });
-//   const partItem = {partFlg: 'add',rowData: []}
-  // item: JSON.stringify(partItem)
-  // ,query:{item: JSON.stringify(partItem)}
-//   router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
-}
 
-// 取消停供  停供
-function handlestopcancelSupply(row) {
-  if(row.inventoryStatusEnum == 2){
-    stopSupply(row.id).then((response) => {
-      proxy.$modal.msgSuccess("停供成功");
-      open.value = false
-      getList()
-    })
-  }
-  if(row.inventoryStatusEnum == 3){
-    cancelSupply(row.id).then((response) => {
-      proxy.$modal.msgSuccess("取消停供成功");
-      open.value = false
-      getList()
-    })
-  }
-}
-
-// 停供
-function handlestopSupply(row) {
- 
-}
 
 
-// getTransferProductTypeList();
 getList();
 getPharmacyCabinetLists()
 </script>
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
similarity index 93%
rename from vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
index 975f912c..c0360485 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryRef"
       :inline="true"
-      v-show="showSearch"
       label-width="90px"
     >
       <!-- <el-form-item label="单据号：" prop="busNo">
@@ -342,41 +341,22 @@ import {
   getRreportReturnIssue,
   getReturnIssueInit,
   getPharmacyCabinetList,
-  getBusNoInit,
-  cancelSupply,
   getDepartmentList,
-  stopSupply,
+ 
 } from "./statisticalManagent";
 
-// import Dialog from "./components/Dialog";
-
-const router = useRouter();
 const { proxy } = getCurrentInstance();
-
-const purchaseinventoryRef = ref(null); // 初始化 ref
 const purchaseinventoryList = ref([]);
-const open = ref(false);
+
 const loading = ref(true);
-const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(""); // 单据号新增
-const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined)
-const supplyTypeOptions = ref(undefined); 
-const categoryCodeListOptions = ref(undefined);
+
 const supplierListOptions = ref(undefined); 
 const issueDepartmentDto = ref([]);
-const editRow = ref({});
-// 使用 ref 定义当前编辑的采购
-const currentData = ref({});
-// 是否停用
-const statusFlagOptions = ref(undefined);
-const chrgitmLv_enumTextOptions = ref([]);
 const purposeLocationIdList = ref([]);
 
 const data = reactive({
@@ -402,7 +382,7 @@ function getPharmacyCabinetLists() {
     issueDepartmentDto.value = response.data
   })
   getPharmacyCabinetList().then((response) => {
-    console.log(response,'response',response.data)
+
     purposeLocationIdList.value = response.data
   });
   getReturnIssueInit().then((response) => {
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
new file mode 100644
index 00000000..6b30b567
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
@@ -0,0 +1,426 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="90px"
+    >
+     <el-form-item label="药品名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="药品编码/药品名称/名称拼音/供应商名"
+          clearable
+          style="width: 250px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="编码：" prop="medicationDefId">
+        <el-input
+          v-model="queryParams.medicationDefId"
+          placeholder="编码："
+          clearable
+          style="width: 200px;"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="剩余过期天数：" prop="remainingDays" label-width="110px">
+        <el-input
+          v-model="queryParams.remainingDays"
+          placeholder="查询 ≤ X 天的记录"
+          clearable
+          style="width: 200px;"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item> -->
+     
+      <el-form-item label="药品类别：" prop="categoryCode">
+        <el-select
+          v-model="queryParams.categoryCode"
+          placeholder="请选择药品类别"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="categoryCode in item_type"
+            :key="categoryCode.value"
+            :label="categoryCode.label"
+            :value="categoryCode.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="医保等级：" prop="chrgitmLv" >
+        <el-select
+          v-model="queryParams.chrgitmLv"
+          placeholder="请选择医保等级"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="chrgitmLv_enumText in chrgitmLv_enumTextOptions"
+            :key="chrgitmLv_enumText.value"
+            :label="chrgitmLv_enumText.info"
+            :value="chrgitmLv_enumText.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库药房：" prop="locationId" >
+        <el-select
+          v-model="queryParams.locationId"
+          placeholder="请选择仓库药房"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="supplyStatus in locationIdList" 
+            :key="supplyStatus.value"
+            :label="supplyStatus.name"
+            :value="supplyStatus.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库存范围：" prop="warehouseScope">
+        <el-select
+          v-model="queryParams.warehouseScope"
+          placeholder="请选择库存范围"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="supplyStatus in inventory_range"
+            :key="supplyStatus.value"
+            :label="supplyStatus.label"
+            :value="supplyStatus.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="handleQuery"
+          
+          >查询</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button
+          type="warning"
+          plain
+          icon="CircleClose"
+          @click="handleClear"
+          
+          >重置</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="purchaseinventoryList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="药品类别"
+        align="center"
+        key="categoryCode_dictText"
+        prop="categoryCode_dictText"
+        :show-overflow-tooltip="true"
+  
+      />
+      <el-table-column
+        label="药品编码"
+        align="center"
+        key="busNo"
+        prop="busNo"
+        width="130"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品名称"
+        align="center"
+        key="medicineName"
+        prop="medicineName"
+        width="160"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格"
+        align="center"
+        key="totalVolume"
+        prop="totalVolume"
+        width="120"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="请领数量(本月药房入库数量)"
+        align="center"
+        key="quantityUnit"
+        prop="quantityUnit"
+        width="190px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="请领进价"
+        align="center"
+        key="price"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="请领零售价"
+        align="center"
+        key="retailPrice"
+        prop="retailPrice"
+        width="89px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="销售数量"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="销售进价"
+        align="center"
+        key="price"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="销售零售价"
+        align="center"
+        key="retailPrice"
+        prop="retailPrice"
+        width="89px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="返库数量(退货数量)"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        width="140px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="返库进价"
+        align="center"
+        key="price"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="返库零价"
+        align="center"
+        key="retailPrice"
+        prop="retailPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="报损数量"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="报损进价"
+        align="center"
+        key="price"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="报损零售价"
+        align="center"
+        key="retailPrice"
+        prop="retailPrice"
+        width="89px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="盘点数量"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="盘点进价"
+        align="center"
+        key="price"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
+     <el-table-column
+        label="本期库存数量"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        width="105px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="库存进价合计"
+        align="center"
+        key="totalPrice"
+        prop="totalPrice"
+        width="105"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="库存零价合计"
+        align="center"
+        key="totalSalePrice"
+        prop="totalSalePrice"
+        width="105"
+        :show-overflow-tooltip="true"
+      />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="settlementDoc">
+import {
+  getproductReturnPage,
+  getInit,
+  getPharmacyCabinetList,
+} from "./statisticalManagent";
+
+const { proxy } = getCurrentInstance();
+
+const {
+  item_type,
+  inventory_range,
+} = proxy.useDict(
+  "item_type",
+  "inventory_range",
+);
+
+const purchaseinventoryList = ref([]);
+
+const loading = ref(true);
+
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const supplyTypeOptions = ref(undefined); 
+const supplyStatusOptions = ref(undefined);
+const chrgitmLv_enumTextOptions = ref([]);
+const locationIdList = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined, 
+    remainingDays: undefined, 
+    // hospital:undefined, 
+    categoryCode:undefined,
+    chrgitmLv:undefined,
+    warehouseScope: undefined,
+    locationId: undefined, 
+    // occurrenceTimeSTime:undefined,
+    // occurrenceTimeETime:undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+function getPharmacyCabinetLists() {
+  getPharmacyCabinetList().then((response) => {
+    locationIdList.value = response.data
+  });
+  getInit().then((response) => {
+    chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions 
+  })
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getproductReturnPage(queryParams.value).then((res) => {
+    loading.value = false;
+    purchaseinventoryList.value = res.data.records
+    
+    if(purchaseinventoryList.value&& purchaseinventoryList.value.length>0){
+      purchaseinventoryList.value.map((k,index)=>{
+        k.inventoryStatusEnum_enumText = k.inventoryStatusEnum==2?'未停供':(k.inventoryStatusEnum==3?'已停供':'')
+        k.quantityUnit = k.quantity / k.partPercent
+        const integerPart1 = Math.floor(k.quantityUnit); // 获取整数部分
+        const decimalPart1 = k.quantityUnit - integerPart1; // 获取小数部分
+
+        if(decimalPart1){
+          k.quantityUnit = integerPart1 + k.unitCode_dictText +
+          (decimalPart1*k.partPercent).toFixed(0) + k.minUnitCode_dictText
+        }
+        k.price =  k.price?k.price.toFixed(2):0
+        k.retailPrice = k.retailPrice?k.retailPrice.toFixed(2):0
+        k.totalPrice = k.price * (Number(k.quantity) / k.partPercent)
+        k.totalPrice = k.totalPrice?k.totalPrice.toFixed(2):0
+        k.totalSalePrice = k.retailPrice * (Number(k.quantity) / k.partPercent)
+        k.totalSalePrice = k.totalSalePrice?k.totalSalePrice.toFixed(2):0
+      })
+    }
+    total.value = res.data.total;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+//   queryParams.value.occurrenceTimeSTime =
+//     occurrenceTime.value && occurrenceTime.value.length == 2
+//       ? occurrenceTime.value[0] + " 00:00:00"
+//       : "";
+//   queryParams.value.occurrenceTimeETime =
+//     occurrenceTime.value && occurrenceTime.value.length == 2
+//       ? occurrenceTime.value[1] + " 23:59:59"
+//       : "";
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  proxy.resetForm("queryRef");
+  getList();
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+getList();
+getPharmacyCabinetLists()
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
similarity index 75%
rename from vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
index a65daa19..dc4b25dc 100644
--- a/vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-// 查询管理列表
+// 查询库存明细列表
 export function getproductReturnPage(query) {
   return request({
     url:'/inventory-manage/product/product-page', 
@@ -137,7 +137,7 @@ export function ybRequestReconcile(data) {
 // 合同
 export function getContractList() {
   return request({
-    url: '/charge-manage/register/contract-list',
+    url: '/app-common/contract-list',
     method: 'get',
   })
 }
@@ -296,4 +296,107 @@ export function getReportRegisterInit() {
     url: '/report-manage/register/init',
     method: 'get'
   })
-}
\ No newline at end of file
+}
+// 文件上传
+export function ybRequestFileUp(data) {
+  return request({
+    url: '/yb-request/file-up',
+    method: 'post',
+    data: data
+  })
+}
+export function getExpirationWarning(query) {
+  return request({
+    url:'/inventory-manage/product/expiration-warning', 
+    method: 'get',
+    params: query
+  })
+}
+export function getClroptins(query) {
+  return request({
+    url:'/yb-request/select-clroptins', 
+    method: 'get',
+    params: query
+  })
+}
+
+export function applyFinancialClearing(data) {
+  return request({
+    url:'/yb-request/apply-financial-clearing', 
+    method: 'post',
+    data: data
+  })
+}
+
+export function applyFinancialClearingList(query) {
+  return request({
+    url:'/yb-request/apply-financial-clearing-list', 
+    method: 'get',
+    params: query
+  })
+}
+
+export function applyUnClearing(query) {
+  return request({
+    url:'/yb-request/apply-un-clearing', 
+    method: 'get',
+    params: query
+  })
+}
+
+export function autoApplyFinancialClearing(data) {
+  return request({
+    url:'/yb-request/auto-apply-financial-clearing', 
+    method: 'post',
+    data: data
+  })
+}
+
+export function traceabilityCodeManagementInit(data) {
+  return request({
+    url:'/inventory-manage/traceNo/init', 
+    method: 'get',
+    data: data
+  })
+}
+
+export function inventoryReceiptPage(query) {
+  return request({
+    url:'/inventory-manage/traceNo/inventory-receipt-page', 
+    method: 'get',
+    params: query
+  })
+}
+
+export function handOperatedApplyFinancialClearing(data) {
+  return request({
+    url:'/yb-request/hand-operated-apply-financial-clearing', 
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function productPageTotal(query) {
+  return request({
+    url:'/inventory-manage/product/product-page-total', 
+    method: 'get',
+    params: query
+  })
+}
+
+export function getMedDevInfo(query) {
+  return request({
+    url:'/report-manage/medication-device/med-dev-info', 
+    method: 'get',
+    params: query
+  })
+}
+
+export function getMedDevAll(query) {
+  return request({
+    url:'/report-manage/medication-device/med-dev-all', 
+    method: 'get',
+    params: query
+  })
+}
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue
new file mode 100644
index 00000000..a75b9a08
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue
@@ -0,0 +1,216 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="earlyWarningRef" :inline="true" :rules="rules" label-width="140px">
+      <el-form-item label="追溯码：" prop="searchKey" label-width="120px">
+        <el-input v-model="queryParams.searchKey" placeholder="请输入药品名称/追溯码" clearable @keyup.enter="handleQuery" style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="进出时间：">
+        <el-date-picker v-model="occurrenceTime" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
+          style="width: 300px" value-format="YYYY-MM-DD" />
+      </el-form-item>
+      <el-form-item label="追溯码状态：" prop="statusEnum" label-width="120px">
+        <el-select v-model="queryParams.statusEnum" placeholder="请选择追溯码状态" clearable style="width: 200px">
+          <el-option v-for="traceNoStatus in traceNoStatusOptions" :key="traceNoStatus.value"
+            :label="traceNoStatus.label" :value="traceNoStatus.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作类型：" prop="operationType" label-width="120px">
+        <el-select v-model="queryParams.operationType" placeholder="请选择操作类型" clearable style="width: 200px">
+          <el-option v-for="operationType in operationTypeOptions" :key="operationType.value"
+            :label="operationType.label" :value="operationType.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <!-- v-hasPermi="['system:user:import']" -->
+            <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- v-hasPermi="['system:user:export']" -->
+            <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form-item>
+    </el-form>
+
+
+
+    <el-table v-loading="loading" :data="purchaseinventoryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="药品名" align="center" key="name" prop="name"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="药房药库" align="center" key="locationName" prop="locationName" width="140"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="产品批号" align="center" key="lotNumber" prop="lotNumber" width="120"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="追溯码" align="center" key="traceNo" prop="traceNo" width="200"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="追溯码状态" align="center" key="statusEnum_enumText" prop="statusEnum_enumText" width="140"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="追溯码单位" align="center" key="unitCode_dictText" prop="unitCode_dictText" width="140"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="操作类型" align="center" key="operationType_enumText" prop="operationType_enumText" width="165"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="项目类型" align="center" key="itemType_enumText" prop="itemType_enumText" :show-overflow-tooltip="true" />
+      <el-table-column label="进出时间" align="center" key="createTime" prop="createTime" :show-overflow-tooltip="true" width="180" />
+    </el-table>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </div>
+</template>
+
+<script setup name="earlyWarning">
+import {
+  inventoryReceiptPage,
+  traceabilityCodeManagementInit
+} from "./statisticalManagent";
+import { onMounted } from 'vue';
+import { formatDateStr } from '@/utils';
+
+
+const { proxy } = getCurrentInstance();
+
+const {
+  item_type,
+} = proxy.useDict(
+  "item_type",
+);
+
+const purchaseinventoryList = ref([]);
+const loading = ref(true);
+const occurrenceTime = ref([])
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const locationIdList = ref(undefined);
+const traceNoStatusOptions = ref(undefined);
+const operationTypeOptions = ref(undefined);
+const itemTypeOptions = ref(undefined);
+
+const props = defineProps({
+  recordInfo: {
+    type: Object,
+    required: true,
+    default: () => ({})
+  }
+});
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    categoryCode: undefined,
+    remainingMonth: undefined,
+    createTimeSTime: undefined,
+    createTimeETime: undefined,
+  },
+  rules: {
+    remainingMonth: [
+      // { required: true, message: '单次最大剂量不能为空', trigger: 'blur' },
+      { validator: validateMaxUnit, trigger: 'blur' },
+    ],
+  },
+});
+
+onMounted(() => {
+  setDefaultDateRange();
+  getList();
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+function validateMaxUnit(rule, value, callback) {
+  const numberRegex = /^[0-9]+$/; // 正则表达式，确保输入为数字
+  if (!numberRegex.test(value)) {
+    callback(new Error('请输入有效的数字'));
+  } else {
+    callback();
+  }
+}
+function setDefaultDateRange() {
+  const today = new Date();
+  const oneMonthAgo = new Date(today);
+  oneMonthAgo.setMonth(today.getMonth() - 1);
+  occurrenceTime.value = [formatDateStr(oneMonthAgo, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
+  queryParams.value.createTimeSTime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[0] + " 00:00:00"
+      : "";
+  queryParams.value.createTimeETime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[1] + " 23:59:59"
+      : "";
+}
+function getInit() {
+  traceabilityCodeManagementInit().then((res) => {
+    locationIdList.value = res.data.locationOptions;
+    traceNoStatusOptions.value = res.data.traceNoStatusOptions;
+    operationTypeOptions.value = res.data.operationTypeOptions;
+    itemTypeOptions.value = res.data.itemTypeOptions;
+  });
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  queryParams.value.locationId = props.recordInfo.locationId;
+  queryParams.value.lotNumber = props.recordInfo.lotNumber;
+  queryParams.value.itemTable = props.recordInfo.itemTable;
+  queryParams.value.itemId = props.recordInfo.itemId;
+  inventoryReceiptPage(queryParams.value).then((res) => {
+    loading.value = false;
+    purchaseinventoryList.value = res.data.records
+    total.value = res.data.total;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  proxy.$refs['earlyWarningRef'].validate((valid) => {
+    if (valid) {
+      queryParams.value.createTimeSTime =
+        occurrenceTime.value && occurrenceTime.value.length == 2
+          ? occurrenceTime.value[0] + " 00:00:00"
+          : "";
+      queryParams.value.createTimeETime =
+        occurrenceTime.value && occurrenceTime.value.length == 2
+          ? occurrenceTime.value[1] + " 23:59:59"
+          : "";
+      queryParams.value.locationId = props.recordInfo.locationId;
+      queryParams.value.lotNumber = props.recordInfo.lotNumber;
+      queryParams.value.itemTable = props.recordInfo.itemTable;
+      queryParams.value.itemId = props.recordInfo.itemId;
+      queryParams.value.pageNo = 1;
+      getList();
+    }
+  })
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.createTimeSTime = ""
+  queryParams.value.createTimeETime = ""
+  occurrenceTime.value = ""
+  proxy.resetForm("earlyWarningRef");
+  getList();
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+getInit()
+
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/medicationmanagement/statisticalManagement/transferManagentDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/transferManagentDetails.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/statisticalManagement/transferManagentDetails.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/transferManagentDetails.vue
diff --git a/vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
similarity index 98%
rename from vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
index ac6a8a6c..2b712b7b 100644
--- a/vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
@@ -271,7 +271,7 @@
               >
             </el-col>
           </el-row>
-          <el-form :model="form" :rules="tableRules" ref="formRef">
+          <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'apply'">
             <el-table
               v-loading="loading"
               :data="form.purchaseinventoryList"
@@ -651,6 +651,24 @@
                   </el-form-item>
                 </template>
               </el-table-column>
+              <el-table-column
+              v-if="viewStatus != 'view'"
+              label="操作"
+              align="center"
+              width="80"
+              class-name="small-padding fixed-width"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="handleScan(scope.row, scope.$index)"
+                  >扫码</el-button
+                >
+              </template>
+            </el-table-column>
               <!-- <el-table-column
                 label="操作"
                 align="center"
@@ -723,6 +741,7 @@
           </el-row>
         </el-col>
       </el-row>
+      <TraceNoDialog :ypName="ypName" :openDialog="openTraceNoDialog" :rowData="rowData" @submit="submit" @cancel="openTraceNoDialog = false"/>
     <!-- </el-dialog> -->
   </div>
 </template>
@@ -749,11 +768,17 @@ import { formatDate,formatDateymd } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
 import { useStore } from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 const tagsViewStore = useTagsViewStore();
 const store = useStore();
 const router = useRouter();
 const route = useRoute();
 const userStore = useUserStore();
+const openTraceNoDialog = ref(false)
+const ypName = ref("");
+const currentIndex = ref("");
+const rowData = ref({})
+
 
 const { proxy } = getCurrentInstance();
 const {
@@ -1465,6 +1490,18 @@ function handleTotalAmount() {
     0
   );
 }
+function handleScan(row,index){
+  rowData.value = row
+  rowData.value.locationId = receiptHeaderForm.sourceLocationId
+  rowData.value.itemType = receiptHeaderForm.medicationType
+  ypName.value = row.name
+  openTraceNoDialog .value = true;
+  currentIndex.value = index
+}
+function submit(value){
+  form.purchaseinventoryList[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+}
 
 function handleBatchAdd(){
    proxy.$refs["receiptHeaderRef"].validate((valid) => {
diff --git a/vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.js b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.js
similarity index 100%
rename from vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.js
rename to openhis-ui-vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.js
diff --git a/vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.vue b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.vue
similarity index 100%
rename from vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/transferManagent/components/transferManagement.vue
diff --git a/vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
similarity index 98%
rename from vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
index 6e823e2f..177f846e 100644
--- a/vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
@@ -249,7 +249,7 @@
             >
           </el-col>
         </el-row>
-        <el-form :model="form" :rules="tableRules" ref="formRef">
+        <el-form :model="form" :rules="tableRules" ref="formRef" :disabled="viewStatus == 'apply'">
           <el-table
             v-loading="loading"
             :data="form.purchaseinventoryList"
@@ -603,6 +603,24 @@
                 </el-form-item>
               </template>
             </el-table-column>
+            <el-table-column
+              v-if="viewStatus != 'view'"
+              label="操作"
+              align="center"
+              width="80"
+              class-name="small-padding fixed-width"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="handleScan(scope.row, scope.$index)"
+                  >扫码</el-button
+                >
+              </template>
+            </el-table-column>
             <!-- <el-table-column
               v-if="!viewStatus"
               label="操作"
@@ -670,6 +688,7 @@
         </el-row>
       </el-col>
     </el-row>
+    <TraceNoDialog :ypName="ypName" :rowData="rowData" :openDialog="openTraceNoDialog" @submit="submit" @cancel="openTraceNoDialog = false"/>
   </div>
 </template>
 
@@ -690,6 +709,7 @@ import {
 } from "../components/transferManagement";
 import PopoverList from "@/components/OpenHis/popoverList/index.vue";
 import transferManagement from "../components/transferManagement.vue";
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import { formatDate,formatDateymd } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
 import { time } from "echarts";
@@ -701,6 +721,9 @@ const store = useStore();
 const router = useRouter();
 const route = useRoute();
 const userStore = useUserStore();
+const openTraceNoDialog = ref(false)
+const ypName = ref("");
+const rowData = ref({})
 
 const { proxy } = getCurrentInstance();
 const {
@@ -726,6 +749,7 @@ const row = ref({});
 const rowIndex = ref(-1);
 const totalAmount = ref(0);
 const editData = ref({})
+const currentIndex = ref("");
 
 const form = reactive({
   purchaseinventoryList: [],
@@ -1654,6 +1678,18 @@ function addTransferProducts(rowList){
     }
   });
 }
+function handleScan(row,index){
+  rowData.value = row
+  rowData.value.locationId = receiptHeaderForm.purposeLocationId
+  rowData.value.itemType = receiptHeaderForm.medicationType
+  ypName.value = row.name
+  openTraceNoDialog .value = true;
+  currentIndex.value = index
+}
+function submit(value){
+  form.purchaseinventoryList[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+}
 /** 选择条数  */
 function handleSelectionChange(selection) {
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
diff --git a/vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue
similarity index 99%
rename from vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue
rename to openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue
index b64573dd..aaeb7d26 100644
--- a/vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue
@@ -262,7 +262,7 @@
             @click="handleUpdate(scope.row)"
             
             :disabled="
-              scope.row.statusEnum != '1' && scope.row.statusEnum != '9'
+              scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
             "
             >编辑</el-button
           >
diff --git a/openhis-ui-vue3/src/views/medicineStorage/documentManagement/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/documentManagement/components/api.js
new file mode 100644
index 00000000..9d5c93a8
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/documentManagement/components/api.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/documentManagement/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/documentManagement/documentManagement-page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue b/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue
new file mode 100644
index 00000000..be92e930
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue
@@ -0,0 +1,337 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10">
+      <el-form ref="queryRef" :model="queryParams" label-width="100px" :inline="true">
+        <!-- 库房类型 -->
+        <el-form-item label="库房类型" prop="locationTypeEnum">
+          <el-select
+            v-model="queryParams.locationTypeEnum"
+            placeholder="请选择库房类型"
+            clearable
+            style="width: 240px"
+            filterable
+            @change="getList"
+          >
+            <el-option
+              v-for="item in warehouseTypeOption || []"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <!-- 库房 -->
+        <el-form-item label="库房" prop="locationId">
+          <el-select
+            v-model="queryParams.locationId"
+            placeholder="请选择库房"
+            clearable
+            style="width: 240px"
+            :disabled="!queryParams.locationTypeEnum"
+            @change="getList"
+          >
+            <el-option
+              v-for="item in currentLocationOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 单据类型 -->
+        <el-form-item label="单据类型" prop="typeEnum">
+          <el-select
+            v-model="queryParams.typeEnum"
+            placeholder="请选择单据类型"
+            clearable
+            style="width: 240px"
+            :disabled="!queryParams.locationTypeEnum"
+            @change="getList"
+          >
+            <el-option
+              v-for="item in currentOrderOptions"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单据状态" prop="statusEnum">
+          <el-select
+            v-model="queryParams.statusEnum"
+            placeholder="请选择单据类型"
+            clearable
+            style="width: 240px"
+            @change="getList"
+          >
+            <el-option
+              v-for="item in supplyStatusOptions"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 制单日期 -->
+        <el-form-item label="制单日期" prop="orderDate">
+          <el-date-picker
+            v-model="orderDateRange"
+            type="daterange"
+            clearable
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+
+        <!-- 审核日期 -->
+        <el-form-item label="审核日期" prop="approvalDate">
+          <el-date-picker
+            v-model="auditDateRange"
+            type="daterange"
+            clearable
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-table :data="orderList" v-loading="loading" style="width: 100%">
+      <el-table-column label="订单编号" prop="supplyBusNo" align="center" />
+      <el-table-column label="申请人" prop="applicantId_dictText" align="center" />
+      <el-table-column label="申请时间" prop="applyTime" align="center" />
+      <el-table-column label="批准时间" prop="approvalTime" align="center" />
+      <el-table-column label="批准人" prop="approverId_dictText" align="center" />
+      <el-table-column label="仓库" prop="locationId_dictText" align="center" />
+      <el-table-column label="状态" prop="statusEnum_enumText" align="center">
+        <template #default="scope">
+          <el-tag :type="statusEnumTagOptions[scope.row.statusEnum]?.type || 'info'">
+            {{ scope.row.statusEnum_enumText }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="供应商" prop="supplierId_dictText" align="center" />
+      <el-table-column label="单据类型" prop="typeEnum_enumText" align="center">
+        <template #default="scope">
+          <el-tag :type="typeEnumTagOptions[scope.row.typeEnum]?.type || 'info'">
+            {{ scope.row.typeEnum_enumText }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="180">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            icon="View"
+            @click="handleView(scope.row)"
+            v-if="isTypeEnumTagOptions(scope.row.typeEnum)"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { getInit, getOrderList } from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/openhis';
+const router = useRouter();
+// 制单日期
+const orderDateRange = ref([]);
+// 审核日期
+const auditDateRange = ref([]);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationTypeEnum: null,
+  typeEnum: null,
+  locationId: null,
+});
+// tag列表
+const typeEnumTagOptions = ref({
+  13: { value: 13, label: '采购订货', type: 'primary' },
+  1: { value: 1, label: '采购入库', type: 'success' },
+  5: { value: 5, label: '采购退货', type: 'danger' },
+  7: { value: 7, label: '领用出库', type: 'warning' },
+  9: { value: 9, label: '领用退货', type: 'success' },
+  6: { value: 6, label: '报损单', type: 'info' },
+  4: { value: 4, label: '商品盘点', type: 'warning' },
+  // 2: { value: 2, label: '商品调拨', type: 'info' },
+});
+// tag列表
+const statusEnumTagOptions = ref({
+  1: { value: 1, label: '待审核', type: 'warning' },
+  2: { value: 2, label: '审核中', type: 'primary' },
+  3: { value: 3, label: '同意', type: 'success' },
+  4: { value: 4, label: '驳回', type: 'danger' },
+  9: { value: 9, label: '已撤回', type: 'info' },
+  10: { value: 10, label: '待审请', type: 'warning' },
+});
+// 判断单据类型是否在 typeEnumTagOptions 中
+const isTypeEnumTagOptions = (type) => {
+  return Number(type) in typeEnumTagOptions.value;
+};
+// 当前选中的库房类型对应的单据类型选项
+const currentOrderOptions = computed(() => {
+  if (!queryParams.value.locationTypeEnum || !warehouseTypeOption.value.length) {
+    return [];
+  }
+  const currentType = warehouseTypeOption.value.find(
+    (item) => item.value === queryParams.value.locationTypeEnum
+  );
+  return currentType ? currentType.orderOption || [] : [];
+});
+
+// 当前选中的库房类型对应的库房选项
+const currentLocationOptions = computed(() => {
+  if (!queryParams.value.locationTypeEnum || !warehouseTypeOption.value.length) {
+    return [];
+  }
+  const currentType = warehouseTypeOption.value.find(
+    (item) => item.value === queryParams.value.locationTypeEnum
+  );
+  return currentType ? currentType.locationOption || [] : [];
+});
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNo = 1;
+  getList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  orderDateRange.value = [];
+  auditDateRange.value = [];
+  queryParams.value.locationTypeEnum = null;
+  queryParams.value.typeEnum = null;
+  queryParams.value.locationId = null;
+  handleQuery();
+};
+// 下拉框数据
+const warehouseTypeOption = ref([]);
+// 单据状态
+const supplyStatusOptions = ref([]);
+// 初始化
+const init = async () => {
+  try {
+    const res = await getInit();
+    warehouseTypeOption.value = res.data.warehouseTypeOption;
+    supplyStatusOptions.value = res.data.supplyStatusOptions;
+  } catch (error) {
+    console.error('初始化失败:', error);
+  }
+};
+// 订单列表
+const orderList = ref([]);
+const total = ref(0);
+// 加载状态
+const loading = ref(false);
+// 获取列表
+const getList = async () => {
+  loading.value = true;
+  try {
+    const params = {
+      ...queryParams.value,
+      applyTimeSTime:
+        orderDateRange.value && parseTime(orderDateRange.value[0], '{y}-{m}-{d}')
+          ? parseTime(orderDateRange.value[0], '{y}-{m}-{d}')
+          : null,
+      applyTimeETime:
+        orderDateRange.value && parseTime(orderDateRange.value[1], '{y}-{m}-{d}')
+          ? parseTime(orderDateRange.value[1], '{y}-{m}-{d}')
+          : null,
+      approvalTimeSTime:
+        auditDateRange.value && parseTime(auditDateRange.value[0], '{y}-{m}-{d}')
+          ? parseTime(auditDateRange.value[0], '{y}-{m}-{d}')
+          : null,
+      approvalTimeETime:
+        auditDateRange.value && parseTime(auditDateRange.value[1], '{y}-{m}-{d}')
+          ? parseTime(auditDateRange.value[1], '{y}-{m}-{d}')
+          : null,
+    };
+    const res = await getOrderList(params);
+    // 赋值
+    orderList.value = res.data.records;
+    // 总数
+    total.value = res.data.total;
+  } catch (error) {
+    console.error('获取列表失败:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+// 查看
+const handleView = (row) => {
+  switch (Number(row.typeEnum)) {
+    case 13:
+      // 采购订货
+      router.push({ path: '/medicineStorage/purchaseOrder/', query: { busNo: row.supplyBusNo } });
+      break;
+    case 1:
+      // 采购入库
+      router.push({ path: '/medicineStorage/stockInOrder/', query: { busNo: row.supplyBusNo } });
+      break;
+    case 5:
+      // 采购退货
+      router.push({ path: '/medicineStorage/returnOrder/', query: { busNo: row.supplyBusNo } });
+      break;
+    case 7:
+      // 领用出库
+      router.push({ path: '/medicineStorage/stockOutOrder/', query: { busNo: row.supplyBusNo } });
+      break;
+    case 9:
+      // 领用退货
+      router.push({
+        path: '/medicineStorage/returnToWarehouseOrder/',
+        query: { busNo: row.supplyBusNo },
+      });
+      break;
+    case 6:
+      // 报损单
+      router.push({ path: '/medicineStorage/profitLossOrder/', query: { busNo: row.supplyBusNo } });
+      break;
+    case 4:
+      // 商品盘点
+      router.push({
+        path: '/medicineStorage/stocktakingOrder/',
+        query: { busNo: row.supplyBusNo },
+      });
+      break;
+    default:
+      console.log('未知的单据类型:', row.typeEnum);
+      break;
+  }
+};
+
+// 监听库房类型变化，清空相关选项
+watch(
+  () => queryParams.value.locationTypeEnum,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      queryParams.value.typeEnum = null;
+      queryParams.value.locationId = null;
+    }
+  }
+);
+
+init();
+getList();
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/api.js
new file mode 100644
index 00000000..5d073bb9
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/api.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/profitLoss-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/addOrEdit-profitLossOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/delete-profitLossOrder?busNo=' +
+      data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/profitLoss-order/profitLoss-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
+// 订货单单据列表
+export function getPurchaseOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 获取单据详情
+export function getPurchaseOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/medicineList.vue
new file mode 100644
index 00000000..33885006
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/medicineList.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <el-table-column label="批次库存" align="center" prop="batchInventory" />
+      <el-table-column label="供应商" align="center" prop="supplierId_dictText" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+  locationId: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  queryParams.value = {
+    ...queryParams.value,
+    ...query,
+    locationId: props.locationId,
+  }
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderDialog.vue b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderDialog.vue
new file mode 100644
index 00000000..f77c7e92
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderDialog.vue
@@ -0,0 +1,343 @@
+<template>
+  <div>
+    <el-dialog
+      title="订单列表"
+      v-model="localDialogVisible"
+      width="960px"
+      append-to-body
+      @close="resetAllData"
+    >
+      <el-table
+        :data="orderList"
+        ref="tableRef"
+        width="100%"
+        highlight-current-row
+        height="470px"
+        @row-dblclick="handleRowDBClick"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="订单编号"
+          prop="supplyBusNo"
+          width="200"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
+        <el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
+        <el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
+            <el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
+        <el-table-column label="单据日期" prop="applyTime" width="200" align="center">
+          <template #default="scope">
+            {{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row justify="end" style="margin-top: 10px">
+        <el-pagination
+          :current-page="queryParams.pageNo"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 50, 100, 200]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="localTableDataTotal"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-show="localTableDataTotal > 0"
+        />
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
+import { ref, watch, getCurrentInstance } from 'vue';
+import { parseTime } from '@/utils/his';
+// 调用父组件方法
+const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 属性
+const props = defineProps({
+  // 对话框x显示
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+});
+// 本地对话框显示
+const localDialogVisible = ref(false);
+// 监听属性
+watch(
+  () => props.dialogVisible,
+  (newValue) => {
+    localDialogVisible.value = newValue;
+  }
+);
+// 获取当前行
+const currentRow = ref({});
+// 行点击 双击
+const handleRowClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+};
+// 行点击 双击
+const handleRowDBClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+  // 提交
+  handleSubmit();
+};
+// 订单列表
+const orderList = ref([]);
+// 订单列表总条数
+const localTableDataTotal = ref(0);
+// 当前locationId
+const currentLocationId = ref(undefined);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationId: undefined,
+});
+// 分页每页条数
+const handleSizeChange = (size) => {
+  queryParams.value.pageSize = size;
+  queryParams.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  queryParams.value.pageNo = page;
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+
+// 获取订货单列表
+const getOrderList = async (locationId) => {
+  try {
+    // 保存当前locationId
+    currentLocationId.value = locationId;
+
+    // 构建请求参数
+    const requestParams = {
+      // 仓库ID
+      locationId: locationId,
+      // 页码
+      pageNo: queryParams.value.pageNo,
+      // 每页条数
+      pageSize: queryParams.value.pageSize,
+      // 订单状态 3 ：审核通过
+      statusEnum: 3,
+    };
+    const res = await getPurchaseOrderList(requestParams);
+    if (res.data.records && res.data.records.length > 0) {
+      // 订货单列表
+      orderList.value = res.data.records || [];
+      // 订货单列表总条数
+      localTableDataTotal.value = res.data.total;
+    } else {
+      proxy.$message.error('获取订货单列表失败');
+    }
+  } catch (error) {
+    console.error('获取订货单列表失败:', error);
+  }
+};
+// 重置所有数据
+const resetAllData = () => {
+  // 重置分页参数
+  queryParams.value.pageNo = 1;
+  queryParams.value.pageSize = 10;
+  currentLocationId.value = undefined;
+  orderList.value = [];
+  localTableDataTotal.value = 0;
+};
+// 提交数据
+const handleSubmit = async () => {
+  // 取消按钮
+  handleCancel();
+  // 获取当前进货单的订单列表
+  await getCurrentOrderDetail();
+  // 传递数据给父组件
+  emit('updateTableData', {
+    currentOrderList: setCurrentOrderList.value,
+    currentOrderForm: setCurrentOrderForm.value,
+  });
+};
+// 设置当前进货单的订单列表
+const setCurrentOrderList = ref([]);
+// 设置当前进货单的订单表单
+const setCurrentOrderForm = ref({});
+
+// 获取当前进货单的订单列表
+const getCurrentOrderDetail = async () => {
+  const res = await getPurchaseOrderDetail({ busNo: currentRow.value.supplyBusNo });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    setCurrentOrderForm.value = {
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      practitionerId: data[0].applicantId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = true;
+      // 表格查看状态
+      item.isViewing = false;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    setCurrentOrderList.value = data;
+  }
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 取消按钮
+const handleCancel = () => {
+  emit('dialogCancel', {
+    dialogVisible: false,
+  });
+};
+defineOptions({
+  name: 'orderDialog',
+});
+
+defineExpose({
+  getOrderList,
+});
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderTable.vue
new file mode 100644
index 00000000..5d80635c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderTable.vue
@@ -0,0 +1,1686 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择开单日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="开单人" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请选择开单人"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请选择单据分类"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入摘要"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="itemBusNo" label="编号" fixed width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1300"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                      :locationId="localForm.locationId"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格" width="140">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 产品批号 -->
+          <el-table-column prop="lotNumber" label="产品批号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.lotNumber`"
+                :rules="rules.lotNumber"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].lotNumber"
+                  clearable
+                  placeholder="请输入产品批号"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].lotNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="itemQuantity"
+            label="现存数量"
+            width="120"
+            :rules="rules.itemQuantity"
+          >
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <el-input-number
+                  :min="0"
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].itemQuantity"
+                  @change="handleItemQuantityChange(localTableData[scope.$index])"
+                  controls-position="right"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="进价金额" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="retailPrice" label="当前销售价" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalRetailPrice" label="当前销售金额" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalRetailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 生产日期 -->
+          <el-table-column prop="startTime" label="生产日期" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.startTime`"
+                :rules="rules.startTime"
+              >
+                <span>
+                  {{ parseTime(localTableData[scope.$index].startTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 失效日期 -->
+          <el-table-column prop="endTime" label="失效日期" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.endTime`" :rules="rules.endTime">
+                <span>
+                  {{ parseTime(localTableData[scope.$index].endTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="supplierId_dictText" label="供应商" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.supplierId_dictText`"
+                :rules="rules.supplierId_dictText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].supplierId_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="specificationInventory" label="规格库存" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.specificationInventory`"
+                :rules="rules.specificationInventory"
+              >
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'max') ||
+                    getInventoryDisplay(scope.$index, 'maxUnit') ||
+                    getInventoryDisplay(scope.$index, 'min') ||
+                    getInventoryDisplay(scope.$index, 'minUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'max') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'maxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'min') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'minUnit') }}
+                  </span>
+                </span>
+                <span v-else>0</span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 批次库存 -->
+          <el-table-column prop="batchInventory" label="批次库存" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMax') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMaxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMin') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMinUnit') }}
+                  </span>
+                </span>
+                <span v-else> 0 </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="profitLoss" label="损益" width="100">
+            <template #default="scope">
+              <el-form-item>
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ localTableData[scope.$index].profitLoss }}
+                  </span>
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码 -->
+          <el-table-column prop="traceNo" label="药品追溯码" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNo"
+                  clearable
+                  placeholder="请输入药品追溯码"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码单位 -->
+          <el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.traceNoUnitCode`"
+                :rules="rules.traceNoUnitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNoUnitCode"
+                  placeholder="请选择药品追溯码单位"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNoUnitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column prop="remake" label="备注" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                @click="handleScan(scope.row, scope.$index)"
+                link
+                icon="Edit"
+              >
+                扫码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+    <!-- 扫码追溯码弹窗 -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
+    <!-- 订单对话框 -->
+    <orderDialog
+      ref="orderDialogRef"
+      :dialogVisible="dialogVisible"
+      @dialogSubmit="dialogSubmit"
+      @dialogCancel="dialogCancel"
+      @updateTableData="updateTableData"
+    ></orderDialog>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo, getMedicineList } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import orderDialog from './orderDialog.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 请领部门
+  pharmacyListOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isOrderImport: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入采购员', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入现存数量', trigger: 'blur' }],
+  lotNumber: [{ required: true, message: '请输入产品批号', trigger: 'blur' }],
+  purposeLocationId: [{ required: true, message: '请选择', trigger: 'blur' }],
+  startTime: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const endTime = localTableData.value[rowIndex]?.endTime;
+
+          if (endTime && value > endTime) {
+            callback(new Error('生产日期不能大于失效日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  endTime: [
+    { required: true, message: '请输入失效日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const startTime = localTableData.value[rowIndex]?.startTime;
+
+          if (startTime && value < startTime) {
+            callback(new Error('失效日期不能小于生产日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  packagingConditionEnum: [{ required: true, message: '请输入包装情况', trigger: 'blur' }],
+  acceptanceResultEnum: [{ required: true, message: '请选择验收结果', trigger: 'blur' }],
+  batchInventory: [{ required: true, message: '请输入批次库存', trigger: 'blur' }],
+  traceNo: [{ required: true, message: '请输入药品追溯码', trigger: 'blur' }],
+  traceNoUnitCode: [{ required: true, message: '请输入药品追溯码单位', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入供应商联系人', trigger: 'blur' }],
+  practitionerId: [{ required: true, message: '请输入开单人', trigger: 'blur' }],
+  invoiceNo: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 药品名称
+const ypName = ref('');
+// 药品追溯码
+const rowData = ref({});
+// 药品追溯码弹窗
+const openTraceNoDialog = ref(false);
+// 当前索引
+const currentIndex = ref(-1);
+
+// 订单组件对话框
+const dialogVisible = ref(false);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask ? parseFloat(currentUnit.priceMask).toFixed(2) : '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask
+        ? parseFloat(row.totalPriceMask || currentUnit?.totalPriceMask).toFixed(2)
+        : '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask ? parseFloat(currentUnit.retailPriceMask).toFixed(2) : '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask
+        ? parseFloat(row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask).toFixed(2)
+        : '';
+    default:
+      return '';
+  }
+};
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    case 'batchMax':
+      return currentUnit.batchInventoryMax || '';
+    case 'batchMaxUnit':
+      return currentUnit.batchInventoryMax > 0 ? currentUnit.batchInventoryMaxUnit : '';
+    case 'batchMin':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMin : '';
+    case 'batchMinUnit':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMinUnit : '';
+    default:
+      return '';
+  }
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+//  扫码
+const handleScan = (row, index) => {
+  // 判断是否存在产品批号
+  if (row.lotNumber) {
+    // 设置药品数据
+    rowData.value = row;
+    // 设置药品名称
+    ypName.value = row.name;
+    // 设置仓库
+    rowData.value.locationId = localForm.purposeLocationId;
+    // 设置药品类型
+    rowData.value.itemType = 1;
+    // 设置药品追溯码弹窗
+    openTraceNoDialog.value = true;
+    // 设置当前索引
+    currentIndex.value = index;
+  } else {
+    proxy.$message.warning('请先输入产品批号！');
+  }
+};
+// 药品追溯码提交
+const submit = (value) => {
+  localTableData.value[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  const isMaxUnit = row.unitCode === row.unitList[0].value;
+  if (isMaxUnit) {
+    row.price = row.priceMaxUnit;
+    row.retailPrice = row.retailPriceMaxUnit;
+  } else {
+    row.price = row.priceMinUnit;
+    row.retailPrice = row.retailPriceMinUnit;
+  }
+  // 进价金额
+  row.totalPrice = row.price * row.itemQuantity;
+  row.totalPriceMask = row.price * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPrice = row.retailPrice * row.itemQuantity;
+  row.totalRetailPriceMask = row.retailPrice * row.itemQuantity;
+  // 构建损益变化
+  buildProfitLoss(row);
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = parseFloat((quantity * price).toFixed(2));
+  row.totalPriceMask = parseFloat((quantity * price).toFixed(2));
+  // 销售金额
+  row.totalRetailPrice = parseFloat((quantity * retailPrice).toFixed(2));
+  row.totalRetailPriceMask = parseFloat((quantity * retailPrice).toFixed(2));
+
+  //构建损益变化
+  buildProfitLoss(row);
+  // console.log('handleItemQuantityChange', row);
+};
+// 构建损益变化
+const buildProfitLoss = (item) => {
+  // 当前选中最大单位
+  if (item.unitCode != item.minUnitCode) {
+    if (item.itemQuantity * item.partPercent > item.batchInventory) {
+      item.profitLoss = '↑';
+    } else if (item.itemQuantity * item.partPercent == item.batchInventory) {
+      item.profitLoss = '-';
+    } else {
+      item.profitLoss = '↓';
+    }
+  } else {
+    if (item.itemQuantity > item.batchInventory) {
+      item.profitLoss = '↑';
+    } else if (item.itemQuantity == item.batchInventory) {
+      item.profitLoss = '-';
+    } else {
+      item.profitLoss = '↓';
+    }
+  }
+};
+// 监听进货价数量变化
+const handleItemPriceChange = (row) => {
+  //  进价金额
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  //  进价金额(假)
+  row.totalPriceMask = parseFloat((row.itemQuantity * row.price).toFixed(2));
+};
+// 监听销售价数量变化
+const handleItemRetailPriceChange = (row) => {
+  // 销售金额
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+  // 销售金额(假)
+  row.totalRetailPriceMask = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+};
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 规格库存最大值
+    specificationInventoryMax: rowValue.specificationInventory,
+    // 批次库存最大值
+    batchInventoryMax: rowValue.batchInventory,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 生产日期
+    startTime: parseTime(rowValue.productionDate, '{y}-{m}-{d}'),
+    // 失效日期
+    endTime: parseTime(rowValue.expirationDate, '{y}-{m}-{d}'),
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  // 构建单位列表
+  buildUnitList(row);
+  // 构建进货价和销售价
+  buildPrice(row);
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.unitList[0].value;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+// 构建单位列表
+const buildUnitList = (row) => {
+  // 单位列表
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大值
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小智
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 规格库在最大单位
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 规格库存最小单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大值
+      item.batchInventoryMax = Math.floor(row.batchInventory / row.partPercent);
+      // 批次库存最小值
+      item.batchInventoryMin = row.batchInventory % row.partPercent;
+      // 批次库存最大单位
+      item.batchInventoryMaxUnit = row.unitCode_dictText;
+      // 批次库存最小单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = (parseFloat(row.retailPrice) / parseFloat(row.partPercent)).toFixed(2);
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大
+      item.specificationInventoryMin = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大
+      item.batchInventoryMin = row.batchInventory;
+      // 批次库存最大单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 采购员
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    purposeLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 采购员
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.purposeLocationId = orderData.purposeLocationId
+      ? orderData.purposeLocationId
+      : currentForm.locationId;
+    // 开单人
+    item.practitionerId = currentForm.practitionerId;
+    // 请领部门
+    item.purposeLocationId = currentForm.purposeLocationId;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isOrderImport: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 日期范围验证函数
+const validateDateRange = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (row && row.startTime && row.endTime) {
+    if (row.endTime < row.startTime) {
+      proxy.$message.error('失效日期不能小于生产日期');
+      // 清空失效日期
+      row.endTime = '';
+    }
+  }
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 更新表格数据
+const updateTableData = (updateValue) => {
+  // 更新表格数据
+  localTableData.value = localTableData.value.concat(updateValue.currentOrderList);
+  // 更新表单数据 - 合并数据而不是替换
+  localForm.value = { ...localForm.value, ...updateValue.currentOrderForm };
+
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: true,
+  });
+};
+
+// 对话框提交
+const dialogSubmit = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 对话框取消
+const dialogCancel = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 订货单导入
+const handleOrderImport = async () => {
+  // 对话框显示
+  dialogVisible.value = true;
+  // 获取订单列表
+  await proxy.$refs.orderDialogRef.getOrderList(localForm.value.locationId);
+};
+
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/index.vue
new file mode 100644
index 00000000..b3eac380
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/index.vue
@@ -0,0 +1,1081 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :packaging-condition-options="packagingConditionOptions"
+              :acceptance-resultory-options="acceptanceResultoryOptions"
+              :pharmacy-list-options="pharmacyListOptions"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 包装情况 packagingConditionOptions
+const packagingConditionOptions = ref([]);
+// 验收结果 acceptanceResultoryOptions
+const acceptanceResultoryOptions = ref([]);
+// 请领部门 pharmacyListOptions
+const pharmacyListOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions.value = res.data.packagingConditionOptions;
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions.value = res.data.acceptanceResultoryOptions;
+  // 请领部门
+  pharmacyListOptions.value = res.data.pharmacyListOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+    // 开单人
+    practitionerId: undefined,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isOrderImport: !isApproved,
+  });
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseFloat(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].purposeLocationId,
+      // 开单人
+      practitionerId: data[0].practitionerId,
+      // 请领部门
+      purposeLocationId: data[0].purposeLocationId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+      // 构建损益
+      buildProfitLoss(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 构建损益变化
+const buildProfitLoss = (item) => {
+  // 当前选中最大单位
+  if (item.unitCode != item.minUnitCode) {
+    if (item.itemQuantity * item.partPercent > item.batchInventory) {
+      item.profitLoss = '↑';
+    } else if (item.itemQuantity * item.partPercent == item.batchInventory) {
+      item.profitLoss = '-';
+    } else {
+      item.profitLoss = '↓';
+    }
+  } else {
+    if (item.itemQuantity > item.batchInventory) {
+      item.profitLoss = '↑';
+    } else if (item.itemQuantity == item.batchInventory) {
+      item.profitLoss = '-';
+    } else {
+      item.profitLoss = '↓';
+    }
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+    // 编辑
+    handleEdit(selectedOrder.value);
+    // 重新获取列表
+    await getList();
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isOrderImport = buttonState.isOrderImport;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/api.js
new file mode 100644
index 00000000..72deaa94
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/api.js
@@ -0,0 +1,66 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/addOrEdit-purchaseOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/delete-purchaseOrder?busNo=' +
+      data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
diff --git a/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/medicineList.vue
new file mode 100644
index 00000000..a0993aee
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/medicineList.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+  // 13 药品
+  typeEnum: 13,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/orderTable.vue
new file mode 100644
index 00000000..f6d17f95
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/components/orderTable.vue
@@ -0,0 +1,1396 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="100px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择开单日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="供应商" prop="supplierId">
+            <el-select
+              v-model="localForm.supplierId"
+              placeholder="请输入供应商"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplierOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="采购员" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请输入采购员"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请输入单据分类"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入摘要"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Warning"
+          @click="handleAlertOrder"
+          v-if="buttonShow.isAlertShow"
+        >
+          警戒订货
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="itemBusNo" label="编号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1000"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemQuantity" label="数量" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <el-input-number
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].itemQuantity"
+                  @change="handleItemQuantityChange(localTableData[scope.$index])"
+                  :min="0"
+                  :controls-position="'right'"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="进价金额">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="retailPrice" label="销售价">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalRetailPrice" label="销售金额">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalRetailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="200">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="specificationInventory" label="规格库存">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.specificationInventory`"
+                :rules="rules.specificationInventory"
+              >
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'max') ||
+                    getInventoryDisplay(scope.$index, 'maxUnit') ||
+                    getInventoryDisplay(scope.$index, 'min') ||
+                    getInventoryDisplay(scope.$index, 'minUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'max') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'maxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'min') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'minUnit') }}
+                  </span>
+                </span>
+                <span v-else>0</span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="approvalNumber" label="批注文号">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.approvalNumber`"
+                :rules="rules.approvalNumber"
+              >
+                <span>
+                  {{ localTableData[scope.$index].approvalNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="remake" label="备注">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`" :rules="rules.remake">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo, getMedicineList } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isAlertShow: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask || '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask || '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask || '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask || '';
+    default:
+      return '';
+  }
+};
+
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    default:
+      return '';
+  }
+};
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入采购员', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  // 进价金额
+  row.totalPrice =
+    row.unitList.find((item) => item.value === row.unitCode).priceMask * row.itemQuantity;
+  row.totalPriceMask =
+    row.unitList.find((item) => item.value === row.unitCode).priceMask * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPriceMask =
+    row.unitList.find((item) => item.value === row.unitCode).retailPriceMask * row.itemQuantity;
+  row.totalRetailPrice =
+    row.unitList.find((item) => item.value === row.unitCode).retailPriceMask * row.itemQuantity;
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = (quantity * price).toFixed(2);
+  row.totalPriceMask = (quantity * price).toFixed(2);
+  // 销售金额
+  row.totalRetailPrice = (quantity * retailPrice).toFixed(2);
+  row.totalRetailPriceMask = (quantity * retailPrice).toFixed(2);
+};
+
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  console.log(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小单位
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 单位名称
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 单位名称
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice / row.partPercent;
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMin = row.specificationInventory;
+      // 单位名称
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 采购员
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    purposeLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isAlertShow: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+// 警戒订货
+const handleAlertOrder = async () => {
+  // 清空表格数据
+  localTableData.value = [];
+  // 验证表单
+  if (!localForm.value.supplierId || !localForm.value.locationId) {
+    proxy.$message.warning('请选择供应商和仓库');
+    return;
+  }
+  // 获取药品列表
+  const medicineListData = await getMedicineListData();
+  // 遍历药品列表
+  buildEditFormData(medicineListData);
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: true,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: true,
+    // 警戒订货 按钮显示
+    isAlertShow: true,
+  });
+};
+// 构建编辑后的表单数据
+const buildEditFormData = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表格数据
+    data.forEach((item) => {
+      item.itemId = item.id;
+      item.itemBusNo = item.busNo;
+      item.itemName = item.name;
+      item.unitCode = item.unitCode;
+      item.unitCodeDictText = item.unitCode_dictText;
+      item.remake = item.remake;
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    localTableData.value = localTableData.value.concat(data);
+    // 订单编辑还是新增
+    localIsAddOrEditOrder.value = {
+      isAddOrder: true,
+      isEditOrder: false,
+    };
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.unitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // 进货价（假）
+    if (isMaxUnit) {
+      unit.priceMask = item.price;
+    } else {
+      unit.priceMask = item.price / item.partPercent;
+    }
+
+    // 销售价（假）
+    if (isMaxUnit) {
+      unit.retailPriceMask = item.retailPrice;
+    } else {
+      unit.retailPriceMask = item.retailPrice / item.partPercent;
+    }
+
+    // 进价金额（假）
+    unit.totalPriceMask = '';
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = '';
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.unitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % item.partPercent;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+
+// 获取药品列表
+const getMedicineListData = async () => {
+  const res = await getMedicineList({
+    supplierId: localForm.value.supplierId,
+    locationId: localForm.value.locationId,
+    pageNo: 1,
+    pageSize: 1000,
+  });
+  // 如果 res.data?.records 为空，则返回空数组
+  if (res.data.records.length === 0) {
+    proxy.$message.warning('本仓库和供应商没有找到药品信息');
+    return [];
+  }
+  // 更新分页数据
+  // localTableDataTotal.value = res.data?.total || 0;
+  return res.data?.records || [];
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        // resetAllData();
+        // 清空 父组件 tableFormRef 表单数据
+        emit('clearForm');
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        // resetAllData();
+        // 清空 父组件 tableFormRef 表单数据
+        emit('clearForm');
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 供应商
+    item.supplierId = currentForm.supplierId;
+    // 采购员
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.purposeLocationId = orderData.purposeLocationId
+      ? orderData.purposeLocationId
+      : currentForm.locationId;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isAlertShow: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue
new file mode 100644
index 00000000..a773aeb6
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue
@@ -0,0 +1,1008 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:purchase-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:purchase-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:purchase-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:purchase-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:purchase-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Shop /></el-icon>
+                        <span class="label">供应商：</span>
+                        <span class="value">{{ item.supplierId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @clearForm="clearForm"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isAlertShow: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isAlertShow: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isAlertShow: !isApproved,
+  });
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // 进货价（假）
+    if (isMaxUnit) {
+      unit.priceMask = item.price;
+    } else {
+      unit.priceMask = item.price / parseInt(item.partPercent);
+    }
+
+    // 销售价（假）
+    if (isMaxUnit) {
+      unit.retailPriceMask = item.retailPrice;
+    } else {
+      unit.retailPriceMask = item.retailPrice / parseInt(item.partPercent);
+    }
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].purposeLocationId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isAlertShow: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+
+    // 编辑
+    handleEdit(selectedOrder.value);
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isAlertShow: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+
+    // 编辑
+    handleEdit(selectedOrder.value);
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isAlertShow: false,
+    });
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isAlertShow = buttonState.isAlertShow;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/api.js
new file mode 100644
index 00000000..145d9650
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/api.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/return-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/addOrEdit-returnOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/delete-returnOrder?busNo=' + data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/return-order/return-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
+// 订货单单据列表
+export function getStockInOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/stockIn-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 获取单据详情
+export function getStockInOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/stockIn-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/medicineList.vue
new file mode 100644
index 00000000..8cf092d4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/medicineList.vue
@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <el-table-column label="供应商" align="center" prop="supplierId_dictText" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+  locationId: {
+    type: String,
+    default: '',
+  },
+  supplierId: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  queryParams.value = {
+    ...queryParams.value,
+    ...query,
+    locationId: props.locationId,
+    supplierId: props.supplierId,
+  }
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderDialog.vue b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderDialog.vue
new file mode 100644
index 00000000..c72e340c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderDialog.vue
@@ -0,0 +1,350 @@
+<template>
+  <div>
+    <el-dialog
+      title="订单列表"
+      v-model="localDialogVisible"
+      width="960px"
+      append-to-body
+      @close="resetAllData"
+    >
+      <el-table
+        :data="orderList"
+        ref="tableRef"
+        width="100%"
+        highlight-current-row
+        height="470px"
+        @row-dblclick="handleRowDBClick"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="订单编号"
+          prop="supplyBusNo"
+          width="200"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
+        <el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
+        <el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
+            <el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
+        <el-table-column label="单据日期" prop="applyTime" width="200" align="center">
+          <template #default="scope">
+            {{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row justify="end" style="margin-top: 10px">
+        <el-pagination
+          :current-page="queryParams.pageNo"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 50, 100, 200]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="localTableDataTotal"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-show="localTableDataTotal > 0"
+        />
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getStockInOrderList, getStockInOrderDetail } from './api';
+import { ref, watch, getCurrentInstance } from 'vue';
+import { parseTime } from '@/utils/his';
+// 调用父组件方法
+const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 属性
+const props = defineProps({
+  // 对话框x显示
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+});
+// 本地对话框显示
+const localDialogVisible = ref(false);
+// 监听属性
+watch(
+  () => props.dialogVisible,
+  (newValue) => {
+    localDialogVisible.value = newValue;
+  }
+);
+// 获取当前行
+const currentRow = ref({});
+// 行点击 双击
+const handleRowClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+};
+// 行点击 双击
+const handleRowDBClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+  // 提交
+  handleSubmit();
+};
+// 订单列表
+const orderList = ref([]);
+// 订单列表总条数
+const localTableDataTotal = ref(0);
+// 当前locationId
+const currentLocationId = ref(undefined);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationId: undefined,
+});
+// 分页每页条数
+const handleSizeChange = (size) => {
+  queryParams.value.pageSize = size;
+  queryParams.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  queryParams.value.pageNo = page;
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+
+// 获取订货单列表
+const getOrderList = async (locationId) => {
+  try {
+    // 保存当前locationId
+    currentLocationId.value = locationId;
+
+    // 构建请求参数
+    const requestParams = {
+      // 仓库ID
+      locationId: locationId,
+      // 页码
+      pageNo: queryParams.value.pageNo,
+      // 每页条数
+      pageSize: queryParams.value.pageSize,
+      // 订单状态 3 ：审核通过
+      statusEnum: 3,
+      // 是否查询原始单
+      originalBusNoFlg: 1,
+    };
+    const res = await getStockInOrderList(requestParams);
+    if (res.data.records && res.data.records.length > 0) {
+      // 订货单列表
+      orderList.value = res.data.records || [];
+      // 订货单列表总条数
+      localTableDataTotal.value = res.data.total;
+    } else {
+      // proxy.$message.error('获取订货单列表失败');
+    }
+  } catch (error) {
+    console.error('获取订货单列表失败:', error);
+  }
+};
+// 重置所有数据
+const resetAllData = () => {
+  // 重置分页参数
+  queryParams.value.pageNo = 1;
+  queryParams.value.pageSize = 10;
+  currentLocationId.value = undefined;
+  orderList.value = [];
+  localTableDataTotal.value = 0;
+};
+// 提交数据
+const handleSubmit = async () => {
+  // 取消按钮
+  handleCancel();
+  // 获取当前进货单的订单列表
+  await getCurrentOrderDetail();
+  // 传递数据给父组件
+  emit('updateTableData', {
+    currentOrderList: setCurrentOrderList.value,
+    currentOrderForm: setCurrentOrderForm.value,
+  });
+};
+// 设置当前进货单的订单列表
+const setCurrentOrderList = ref([]);
+// 设置当前进货单的订单表单
+const setCurrentOrderForm = ref({});
+
+// 获取当前进货单的订单列表
+const getCurrentOrderDetail = async () => {
+  if (!currentRow.value.supplyBusNo) {
+    return;
+  }
+  const res = await getStockInOrderDetail({ busNo: currentRow.value.supplyBusNo });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    setCurrentOrderForm.value = {
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      practitionerId: data[0].applicantId,
+      // 原始单据号
+      originalBusNo: data[0].busNo,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = true;
+      // 表格查看状态
+      item.isViewing = false;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    setCurrentOrderList.value = data;
+  }
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 取消按钮
+const handleCancel = () => {
+  emit('dialogCancel', {
+    dialogVisible: false,
+  });
+};
+defineOptions({
+  name: 'orderDialog',
+});
+
+defineExpose({
+  getOrderList,
+});
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderTable.vue
new file mode 100644
index 00000000..e9d03fc1
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/components/orderTable.vue
@@ -0,0 +1,1633 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择开单日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="供应商" prop="supplierId">
+            <el-select
+              v-model="localForm.supplierId"
+              placeholder="请选择供应商"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+              @change="handleSupplierChange"
+            >
+              <el-option
+                v-for="item in props.supplierOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="供应商联系人" prop="phone">
+            <el-input
+              v-model="localForm.phone"
+              placeholder="请输入供应商联系人"
+              style="width: 220px"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="开单人" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请选择开单人"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请选择单据分类"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发票号" prop="invoiceNo">
+            <el-input
+              v-model="localForm.invoiceNo"
+              placeholder="请输入发票号"
+              clearable
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入摘要"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Upload"
+          @click="handleOrderImport"
+          v-if="buttonShow.isOrderImport"
+        >
+          进货单导入
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="itemBusNo" label="编号" fixed width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1300"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                      :locationId="localForm.locationId"
+                      :supplierId="localForm.supplierId"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 产品批号 -->
+          <el-table-column prop="lotNumber" label="产品批号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.lotNumber`"
+                :rules="rules.lotNumber"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].lotNumber"
+                  clearable
+                  placeholder="请输入产品批号"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].lotNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemQuantity" label="数量" width="120" :rules="rules.itemQuantity">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <el-input-number
+                  :min="0"
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].itemQuantity"
+                  @change="handleItemQuantityChange(localTableData[scope.$index])"
+                  controls-position="right"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="进价金额" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="retailPrice" label="当前销售价" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalRetailPrice" label="当前销售金额" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalRetailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 失效日期 -->
+          <el-table-column prop="endTime" label="失效日期" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.endTime`" :rules="rules.endTime">
+                <span>
+                  {{ parseTime(localTableData[scope.$index].endTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 禁用日期 -->
+          <el-table-column prop="occurrenceTime" label="禁用日期" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.occurrenceTime`"
+                :rules="rules.occurrenceTime"
+              >
+                <el-date-picker
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].occurrenceTime"
+                  type="date"
+                  placeholder="请选择失效日期"
+                  value-format="YYYY-MM-DD"
+                  format="YYYY-MM-DD"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ parseTime(localTableData[scope.$index].occurrenceTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <!-- 批次库存 -->
+          <el-table-column prop="batchInventory" label="批次库存" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMax') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMaxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMin') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMinUnit') }}
+                  </span>
+                </span>
+                <span v-else> 0 </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="approvalNumber" label="批注文号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.approvalNumber`"
+                :rules="rules.approvalNumber"
+              >
+                <span>
+                  {{ localTableData[scope.$index].approvalNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <!-- 药品追溯码 -->
+          <el-table-column prop="traceNo" label="药品追溯码" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNo"
+                  clearable
+                  placeholder="请输入药品追溯码"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码单位 -->
+          <el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.traceNoUnitCode`"
+                :rules="rules.traceNoUnitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNoUnitCode"
+                  placeholder="请选择药品追溯码单位"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNoUnitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column prop="remake" label="备注" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                @click="handleScan(scope.row, scope.$index)"
+                link
+                icon="Edit"
+              >
+                扫码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+    <!-- 扫码追溯码弹窗 -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
+    <!-- 订单对话框 -->
+    <orderDialog
+      ref="orderDialogRef"
+      :dialogVisible="dialogVisible"
+      @dialogSubmit="dialogSubmit"
+      @dialogCancel="dialogCancel"
+      @updateTableData="updateTableData"
+    ></orderDialog>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo, getMedicineList } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import orderDialog from './orderDialog.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isOrderImport: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入开单人', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  lotNumber: [{ required: true, message: '请输入产品批号', trigger: 'blur' }],
+  endTime: [{ required: true, message: '请输入失效日期', trigger: 'blur' }],
+  occurrenceTime: [{ required: true, message: '请输入禁用日期', trigger: 'blur' }],
+  packagingConditionEnum: [{ required: true, message: '请输入包装情况', trigger: 'blur' }],
+  acceptanceResultEnum: [{ required: true, message: '请选择验收结果', trigger: 'blur' }],
+  batchInventory: [{ required: true, message: '请输入批次库存', trigger: 'blur' }],
+  traceNo: [{ required: true, message: '请输入药品追溯码', trigger: 'blur' }],
+  traceNoUnitCode: [{ required: true, message: '请输入药品追溯码单位', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入供应商联系人', trigger: 'blur' }],
+  practitionerId: [{ required: true, message: '请输入开单人', trigger: 'blur' }],
+  invoiceNo: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 药品名称
+const ypName = ref('');
+// 药品追溯码
+const rowData = ref({});
+// 药品追溯码弹窗
+const openTraceNoDialog = ref(false);
+// 当前索引
+const currentIndex = ref(-1);
+
+// 订单组件对话框
+const dialogVisible = ref(false);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask ? parseFloat(currentUnit.priceMask).toFixed(2) : '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask
+        ? parseFloat(row.totalPriceMask || currentUnit?.totalPriceMask).toFixed(2)
+        : '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask ? parseFloat(currentUnit.retailPriceMask).toFixed(2) : '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask
+        ? parseFloat(row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask).toFixed(2)
+        : '';
+    default:
+      return '';
+  }
+};
+
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    case 'batchMax':
+      return currentUnit.batchInventoryMax || '';
+    case 'batchMaxUnit':
+      return currentUnit.batchInventoryMax > 0 ? currentUnit.batchInventoryMaxUnit : '';
+    case 'batchMin':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMin : '';
+    case 'batchMinUnit':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMinUnit : '';
+    default:
+      return '';
+  }
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+//  扫码
+const handleScan = (row, index) => {
+  // 判断是否存在产品批号
+  if (row.lotNumber) {
+    // 设置药品数据
+    rowData.value = row;
+    // 设置药品名称
+    ypName.value = row.name;
+    // 设置仓库
+    rowData.value.locationId = localForm.sourceLocationId;
+    // 设置药品类型
+    rowData.value.itemType = 1;
+    // 设置药品追溯码弹窗
+    openTraceNoDialog.value = true;
+    // 设置当前索引
+    currentIndex.value = index;
+  } else {
+    proxy.$message.warning('请先输入产品批号！');
+  }
+};
+// 药品追溯码提交
+const submit = (value) => {
+  localTableData.value[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  const isMaxUnit = row.unitCode === row.unitList[0].value;
+  if (isMaxUnit) {
+    row.price = row.priceMaxUnit;
+    row.retailPrice = row.retailPriceMaxUnit;
+  } else {
+    row.price = row.priceMinUnit;
+    row.retailPrice = row.retailPriceMinUnit;
+  }
+  // 进价金额
+  row.totalPrice = row.price * row.itemQuantity;
+  row.totalPriceMask = row.price * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPrice = row.retailPrice * row.itemQuantity;
+  row.totalRetailPriceMask = row.retailPrice * row.itemQuantity;
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = parseFloat((quantity * price).toFixed(2));
+  row.totalPriceMask = parseFloat((quantity * price).toFixed(2));
+  // 销售金额
+  row.totalRetailPrice = parseFloat((quantity * retailPrice).toFixed(2));
+  row.totalRetailPriceMask = parseFloat((quantity * retailPrice).toFixed(2));
+};
+// 监听进货价数量变化
+const handleItemPriceChange = (row) => {
+  //  进价金额
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  //  进价金额(假)
+  row.totalPriceMask = parseFloat((row.itemQuantity * row.price).toFixed(2));
+};
+// 监听销售价数量变化
+const handleItemRetailPriceChange = (row) => {
+  // 销售金额
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+  // 销售金额(假)
+  row.totalRetailPriceMask = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+};
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 规格库存最大值
+    specificationInventoryMax: rowValue.specificationInventory,
+    // 批次库存最大值
+    batchInventoryMax: rowValue.batchInventory,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 生产日期
+    startTime: parseTime(rowValue.productionDate, '{y}-{m}-{d}'),
+    // 失效日期
+    endTime: parseTime(rowValue.expirationDate, '{y}-{m}-{d}'),
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  // 构建单位列表
+  buildUnitList(row);
+  // 构建进货价和销售价
+  buildPrice(row);
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.unitList[0].value;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+// 构建单位列表
+const buildUnitList = (row) => {
+  // 单位列表
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大值
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小智
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 规格库在最大单位
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 规格库存最小单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大值
+      item.batchInventoryMax = Math.floor(row.batchInventory / row.partPercent);
+      // 批次库存最小值
+      item.batchInventoryMin = row.batchInventory % row.partPercent;
+      // 批次库存最大单位
+      item.batchInventoryMaxUnit = row.unitCode_dictText;
+      // 批次库存最小单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = (parseFloat(row.retailPrice) / parseFloat(row.partPercent)).toFixed(2);
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大
+      item.specificationInventoryMin = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大
+      item.batchInventoryMin = row.batchInventory;
+      // 批次库存最大单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 开单人
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    sourceLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+// 供应商选择变化
+const handleSupplierChange = async () => {
+  // 清空表格数据
+  localTableData.value = [];
+  // 供应商联系人
+  localForm.value.phone = props.supplierOption.find(
+    (item) => item.value === localForm.value.supplierId
+  )?.phone;
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 供应商
+    item.supplierId = currentForm.supplierId;
+    // 开单人
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.sourceLocationId = orderData.sourceLocationId
+      ? orderData.sourceLocationId
+      : currentForm.locationId;
+    // 供应商联系人
+    item.phone = currentForm.phone;
+    // 开单人
+    item.practitionerId = currentForm.practitionerId;
+    // 发票号
+    item.invoiceNo = currentForm.invoiceNo;
+    // 原始单据号
+    item.originalBusNo = currentForm.originalBusNo;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isOrderImport: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 日期范围验证函数
+const validateDateRange = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (row && row.endTime && row.occurrenceTime) {
+    if (row.occurrenceTime < row.endTime) {
+      proxy.$message.error('失效日期不能小于禁用日期');
+      // 清空失效日期
+      row.occurrenceTime = '';
+    }
+  }
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 更新表格数据
+const updateTableData = (updateValue) => {
+  // 更新表格数据
+  localTableData.value = localTableData.value.concat(updateValue.currentOrderList);
+  // 更新表单数据 - 合并数据而不是替换
+  localForm.value = { ...localForm.value, ...updateValue.currentOrderForm };
+
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: true,
+  });
+};
+
+// 对话框提交
+const dialogSubmit = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 对话框取消
+const dialogCancel = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 订货单导入
+const handleOrderImport = async () => {
+  // 对话框显示
+  dialogVisible.value = true;
+  // 获取订单列表
+  await proxy.$refs.orderDialogRef.getOrderList(localForm.value.locationId);
+};
+
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/index.vue
new file mode 100644
index 00000000..90fa6aad
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnOrder/index.vue
@@ -0,0 +1,1058 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:return-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:return-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:return-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:return-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:return-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Shop /></el-icon>
+                        <span class="label">供应商：</span>
+                        <span class="value">{{ item.supplierId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :packaging-condition-options="packagingConditionOptions"
+              :acceptance-resultory-options="acceptanceResultoryOptions"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 包装情况 packagingConditionOptions
+const packagingConditionOptions = ref([]);
+// 验收结果 acceptanceResultoryOptions
+const acceptanceResultoryOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions.value = res.data.packagingConditionOptions;
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions.value = res.data.acceptanceResultoryOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+    // 开单人
+    practitionerId: undefined,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isOrderImport: !isApproved,
+  });
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseFloat(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].sourceLocationId,
+      // 开单人
+      practitionerId: data[0].practitionerId,
+      // 发票号
+      invoiceNo: data[0].invoiceNo,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+    // 编辑
+    handleEdit(selectedOrder);
+    // 重新获取列表
+    await getList();
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isOrderImport = buttonState.isOrderImport;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/api.js
new file mode 100644
index 00000000..d236a62d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/api.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/returnToWarehouse-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/addOrEdit-returnToWarehouseOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/delete-returnToWarehouseOrder?busNo=' +
+      data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/returnToWarehouse-order/returnToWarehouse-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
+// 订货单单据列表
+export function getPurchaseOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 获取单据详情
+export function getPurchaseOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/medicineList.vue
new file mode 100644
index 00000000..e0b8db2c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/medicineList.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <el-table-column label="供应商" align="center" prop="supplierId_dictText" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+  locationId: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  queryParams.value = {
+    ...queryParams.value,
+    ...query,
+    locationId: props.locationId,
+  }
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderDialog.vue b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderDialog.vue
new file mode 100644
index 00000000..f77c7e92
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderDialog.vue
@@ -0,0 +1,343 @@
+<template>
+  <div>
+    <el-dialog
+      title="订单列表"
+      v-model="localDialogVisible"
+      width="960px"
+      append-to-body
+      @close="resetAllData"
+    >
+      <el-table
+        :data="orderList"
+        ref="tableRef"
+        width="100%"
+        highlight-current-row
+        height="470px"
+        @row-dblclick="handleRowDBClick"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="订单编号"
+          prop="supplyBusNo"
+          width="200"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
+        <el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
+        <el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
+            <el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
+        <el-table-column label="单据日期" prop="applyTime" width="200" align="center">
+          <template #default="scope">
+            {{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row justify="end" style="margin-top: 10px">
+        <el-pagination
+          :current-page="queryParams.pageNo"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 50, 100, 200]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="localTableDataTotal"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-show="localTableDataTotal > 0"
+        />
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
+import { ref, watch, getCurrentInstance } from 'vue';
+import { parseTime } from '@/utils/his';
+// 调用父组件方法
+const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 属性
+const props = defineProps({
+  // 对话框x显示
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+});
+// 本地对话框显示
+const localDialogVisible = ref(false);
+// 监听属性
+watch(
+  () => props.dialogVisible,
+  (newValue) => {
+    localDialogVisible.value = newValue;
+  }
+);
+// 获取当前行
+const currentRow = ref({});
+// 行点击 双击
+const handleRowClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+};
+// 行点击 双击
+const handleRowDBClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+  // 提交
+  handleSubmit();
+};
+// 订单列表
+const orderList = ref([]);
+// 订单列表总条数
+const localTableDataTotal = ref(0);
+// 当前locationId
+const currentLocationId = ref(undefined);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationId: undefined,
+});
+// 分页每页条数
+const handleSizeChange = (size) => {
+  queryParams.value.pageSize = size;
+  queryParams.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  queryParams.value.pageNo = page;
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+
+// 获取订货单列表
+const getOrderList = async (locationId) => {
+  try {
+    // 保存当前locationId
+    currentLocationId.value = locationId;
+
+    // 构建请求参数
+    const requestParams = {
+      // 仓库ID
+      locationId: locationId,
+      // 页码
+      pageNo: queryParams.value.pageNo,
+      // 每页条数
+      pageSize: queryParams.value.pageSize,
+      // 订单状态 3 ：审核通过
+      statusEnum: 3,
+    };
+    const res = await getPurchaseOrderList(requestParams);
+    if (res.data.records && res.data.records.length > 0) {
+      // 订货单列表
+      orderList.value = res.data.records || [];
+      // 订货单列表总条数
+      localTableDataTotal.value = res.data.total;
+    } else {
+      proxy.$message.error('获取订货单列表失败');
+    }
+  } catch (error) {
+    console.error('获取订货单列表失败:', error);
+  }
+};
+// 重置所有数据
+const resetAllData = () => {
+  // 重置分页参数
+  queryParams.value.pageNo = 1;
+  queryParams.value.pageSize = 10;
+  currentLocationId.value = undefined;
+  orderList.value = [];
+  localTableDataTotal.value = 0;
+};
+// 提交数据
+const handleSubmit = async () => {
+  // 取消按钮
+  handleCancel();
+  // 获取当前进货单的订单列表
+  await getCurrentOrderDetail();
+  // 传递数据给父组件
+  emit('updateTableData', {
+    currentOrderList: setCurrentOrderList.value,
+    currentOrderForm: setCurrentOrderForm.value,
+  });
+};
+// 设置当前进货单的订单列表
+const setCurrentOrderList = ref([]);
+// 设置当前进货单的订单表单
+const setCurrentOrderForm = ref({});
+
+// 获取当前进货单的订单列表
+const getCurrentOrderDetail = async () => {
+  const res = await getPurchaseOrderDetail({ busNo: currentRow.value.supplyBusNo });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    setCurrentOrderForm.value = {
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      practitionerId: data[0].applicantId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = true;
+      // 表格查看状态
+      item.isViewing = false;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    setCurrentOrderList.value = data;
+  }
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 取消按钮
+const handleCancel = () => {
+  emit('dialogCancel', {
+    dialogVisible: false,
+  });
+};
+defineOptions({
+  name: 'orderDialog',
+});
+
+defineExpose({
+  getOrderList,
+});
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderTable.vue
new file mode 100644
index 00000000..3b7bff0f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/components/orderTable.vue
@@ -0,0 +1,1680 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="开单人" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请选择"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="申请部门" prop="sourceLocationId">
+            <el-select
+              v-model="localForm.sourceLocationId"
+              placeholder="请选择"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.pharmacyListOptions || []"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="申请人" prop="practitionerId">
+            <el-select
+              v-model="localForm.practitionerId"
+              placeholder="请选择"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请选择"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Upload"
+          @click="handleOrderImport"
+          v-if="buttonShow.isOrderImport"
+        >
+          药房退货单导入
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="itemBusNo" label="编号" fixed width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1300"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                      :locationId="localForm.locationId"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格" width="140">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 产品批号 -->
+          <el-table-column prop="lotNumber" label="产品批号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.lotNumber`"
+                :rules="rules.lotNumber"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].lotNumber"
+                  clearable
+                  placeholder="请输入产品批号"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].lotNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemQuantity" label="数量" width="120" :rules="rules.itemQuantity">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <el-input-number
+                  :min="0"
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].itemQuantity"
+                  @change="handleItemQuantityChange(localTableData[scope.$index])"
+                  controls-position="right"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="进价金额" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="retailPrice" label="当前销售价" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalRetailPrice" label="当前销售金额" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalRetailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 生产日期 -->
+          <el-table-column prop="startTime" label="生产日期" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.startTime`"
+                :rules="rules.startTime"
+              >
+                <span>
+                  {{ parseTime(localTableData[scope.$index].startTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 失效日期 -->
+          <el-table-column prop="endTime" label="失效日期" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.endTime`" :rules="rules.endTime">
+                <span>
+                  {{ parseTime(localTableData[scope.$index].endTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="supplierId_dictText" label="供应商" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.supplierId_dictText`"
+                :rules="rules.supplierId_dictText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].supplierId_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="specificationInventory" label="规格库存" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.specificationInventory`"
+                :rules="rules.specificationInventory"
+              >
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'max') ||
+                    getInventoryDisplay(scope.$index, 'maxUnit') ||
+                    getInventoryDisplay(scope.$index, 'min') ||
+                    getInventoryDisplay(scope.$index, 'minUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'max') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'maxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'min') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'minUnit') }}
+                  </span>
+                </span>
+                <span v-else>0</span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 批次库存 -->
+          <el-table-column prop="batchInventory" label="批次库存" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMax') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMaxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMin') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMinUnit') }}
+                  </span>
+                </span>
+                <span v-else> 0 </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码 -->
+          <el-table-column prop="traceNo" label="药品追溯码" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNo"
+                  clearable
+                  placeholder="请输入药品追溯码"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码单位 -->
+          <el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.traceNoUnitCode`"
+                :rules="rules.traceNoUnitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNoUnitCode"
+                  placeholder="请选择药品追溯码单位"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNoUnitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column prop="remake" label="备注" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                @click="handleScan(scope.row, scope.$index)"
+                link
+                icon="Edit"
+              >
+                扫码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+    <!-- 扫码追溯码弹窗 -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
+    <!-- 订单对话框 -->
+    <orderDialog
+      ref="orderDialogRef"
+      :dialogVisible="dialogVisible"
+      @dialogSubmit="dialogSubmit"
+      @dialogCancel="dialogCancel"
+      @updateTableData="updateTableData"
+    ></orderDialog>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo, getMedicineList } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import orderDialog from './orderDialog.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 申请部门
+  pharmacyListOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isOrderImport: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入采购员', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  lotNumber: [{ required: true, message: '请输入产品批号', trigger: 'blur' }],
+  sourceLocationId: [{ required: true, message: '请选择', trigger: 'blur' }],
+  startTime: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const endTime = localTableData.value[rowIndex]?.endTime;
+
+          if (endTime && value > endTime) {
+            callback(new Error('生产日期不能大于失效日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  endTime: [
+    { required: true, message: '请输入失效日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const startTime = localTableData.value[rowIndex]?.startTime;
+
+          if (startTime && value < startTime) {
+            callback(new Error('失效日期不能小于生产日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  packagingConditionEnum: [{ required: true, message: '请输入包装情况', trigger: 'blur' }],
+  acceptanceResultEnum: [{ required: true, message: '请选择验收结果', trigger: 'blur' }],
+  batchInventory: [{ required: true, message: '请输入批次库存', trigger: 'blur' }],
+  traceNo: [{ required: true, message: '请输入药品追溯码', trigger: 'blur' }],
+  traceNoUnitCode: [{ required: true, message: '请输入药品追溯码单位', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入供应商联系人', trigger: 'blur' }],
+  practitionerId: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
+  invoiceNo: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 药品名称
+const ypName = ref('');
+// 药品追溯码
+const rowData = ref({});
+// 药品追溯码弹窗
+const openTraceNoDialog = ref(false);
+// 当前索引
+const currentIndex = ref(-1);
+
+// 订单组件对话框
+const dialogVisible = ref(false);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask ? parseFloat(currentUnit.priceMask).toFixed(2) : '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask
+        ? parseFloat(row.totalPriceMask || currentUnit?.totalPriceMask).toFixed(2)
+        : '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask ? parseFloat(currentUnit.retailPriceMask).toFixed(2) : '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask
+        ? parseFloat(row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask).toFixed(2)
+        : '';
+    default:
+      return '';
+  }
+};
+
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    case 'batchMax':
+      return currentUnit.batchInventoryMax || '';
+    case 'batchMaxUnit':
+      return currentUnit.batchInventoryMax > 0 ? currentUnit.batchInventoryMaxUnit : '';
+    case 'batchMin':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMin : '';
+    case 'batchMinUnit':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMinUnit : '';
+    default:
+      return '';
+  }
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+//  扫码
+const handleScan = (row, index) => {
+  // 判断是否存在产品批号
+  if (row.lotNumber) {
+    // 设置药品数据
+    rowData.value = row;
+    // 设置药品名称
+    ypName.value = row.name;
+    // 设置仓库
+    rowData.value.locationId = localForm.purposeLocationId;
+    // 设置药品类型
+    rowData.value.itemType = 1;
+    // 设置药品追溯码弹窗
+    openTraceNoDialog.value = true;
+    // 设置当前索引
+    currentIndex.value = index;
+  } else {
+    proxy.$message.warning('请先输入产品批号！');
+  }
+};
+// 药品追溯码提交
+const submit = (value) => {
+  localTableData.value[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  const isMaxUnit = row.unitCode === row.unitList[0].value;
+  if (isMaxUnit) {
+    row.price = row.priceMaxUnit;
+    row.retailPrice = row.retailPriceMaxUnit;
+  } else {
+    row.price = row.priceMinUnit;
+    row.retailPrice = row.retailPriceMinUnit;
+  }
+  // 进价金额
+  row.totalPrice = row.price * row.itemQuantity;
+  row.totalPriceMask = row.price * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPrice = row.retailPrice * row.itemQuantity;
+  row.totalRetailPriceMask = row.retailPrice * row.itemQuantity;
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = parseFloat((quantity * price).toFixed(2));
+  row.totalPriceMask = parseFloat((quantity * price).toFixed(2));
+  // 销售金额
+  row.totalRetailPrice = parseFloat((quantity * retailPrice).toFixed(2));
+  row.totalRetailPriceMask = parseFloat((quantity * retailPrice).toFixed(2));
+};
+// 监听进货价数量变化
+const handleItemPriceChange = (row) => {
+  //  进价金额
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  //  进价金额(假)
+  row.totalPriceMask = parseFloat((row.itemQuantity * row.price).toFixed(2));
+};
+// 监听销售价数量变化
+const handleItemRetailPriceChange = (row) => {
+  // 销售金额
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+  // 销售金额(假)
+  row.totalRetailPriceMask = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+};
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 规格库存最大值
+    specificationInventoryMax: rowValue.specificationInventory,
+    // 批次库存最大值
+    batchInventoryMax: rowValue.batchInventory,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 生产日期
+    startTime: parseTime(rowValue.productionDate, '{y}-{m}-{d}'),
+    // 失效日期
+    endTime: parseTime(rowValue.expirationDate, '{y}-{m}-{d}'),
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  // 构建单位列表
+  buildUnitList(row);
+  // 构建进货价和销售价
+  buildPrice(row);
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.unitList[0].value;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+// 构建单位列表
+const buildUnitList = (row) => {
+  // 单位列表
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大值
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小智
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 规格库在最大单位
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 规格库存最小单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大值
+      item.batchInventoryMax = Math.floor(row.batchInventory / row.partPercent);
+      // 批次库存最小值
+      item.batchInventoryMin = row.batchInventory % row.partPercent;
+      // 批次库存最大单位
+      item.batchInventoryMaxUnit = row.unitCode_dictText;
+      // 批次库存最小单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = (parseFloat(row.retailPrice) / parseFloat(row.partPercent)).toFixed(2);
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大
+      item.specificationInventoryMin = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大
+      item.batchInventoryMin = row.batchInventory;
+      // 批次库存最大单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 采购员
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    sourceLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 采购员
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.purposeLocationId = orderData.purposeLocationId
+      ? orderData.purposeLocationId
+      : currentForm.locationId;
+    // 开单人
+    item.practitionerId = currentForm.practitionerId;
+    // 申请部门
+    item.sourceLocationId = currentForm.sourceLocationId;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isOrderImport: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 日期范围验证函数
+const validateDateRange = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (row && row.startTime && row.endTime) {
+    if (row.endTime < row.startTime) {
+      proxy.$message.error('失效日期不能小于生产日期');
+      // 清空失效日期
+      row.endTime = '';
+    }
+  }
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 更新表格数据
+const updateTableData = (updateValue) => {
+  // 更新表格数据
+  localTableData.value = localTableData.value.concat(updateValue.currentOrderList);
+  // 更新表单数据 - 合并数据而不是替换
+  localForm.value = { ...localForm.value, ...updateValue.currentOrderForm };
+
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: true,
+  });
+};
+
+// 对话框提交
+const dialogSubmit = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 对话框取消
+const dialogCancel = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 订货单导入
+const handleOrderImport = async () => {
+  // 对话框显示
+  dialogVisible.value = true;
+  // 获取订单列表
+  await proxy.$refs.orderDialogRef.getOrderList(localForm.value.locationId);
+};
+
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/index.vue
new file mode 100644
index 00000000..cee07d56
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/returnToWarehouseOrder/index.vue
@@ -0,0 +1,1058 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :packaging-condition-options="packagingConditionOptions"
+              :acceptance-resultory-options="acceptanceResultoryOptions"
+              :pharmacy-list-options="pharmacyListOptions"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 包装情况 packagingConditionOptions
+const packagingConditionOptions = ref([]);
+// 验收结果 acceptanceResultoryOptions
+const acceptanceResultoryOptions = ref([]);
+// 请领部门 pharmacyListOptions
+const pharmacyListOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions.value = res.data.packagingConditionOptions;
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions.value = res.data.acceptanceResultoryOptions;
+  // 请领部门
+  pharmacyListOptions.value = res.data.pharmacyListOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+    // 开单人
+    practitionerId: undefined,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isOrderImport: !isApproved,
+  });
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseFloat(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].purposeLocationId,
+      // 开单人
+      practitionerId: data[0].practitionerId,
+      // 请领部门
+      sourceLocationId: data[0].sourceLocationId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+    // 编辑
+    handleEdit(selectedOrder);
+    // 重新获取列表
+    await getList();
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isOrderImport = buttonState.isOrderImport;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/api.js
new file mode 100644
index 00000000..6992f1c7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/api.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/stockIn-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/addOrEdit-stockInOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/delete-stockInOrder?busNo=' +
+      data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockIn-order/stockIn-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
+// 订货单单据列表
+export function getPurchaseOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 获取单据详情
+export function getPurchaseOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/medicineList.vue
new file mode 100644
index 00000000..23ce36d3
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/medicineList.vue
@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <!-- <el-table-column label="批次库存" align="center" prop="batchInventory" /> -->
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderDialog.vue b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderDialog.vue
new file mode 100644
index 00000000..1702ec9d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderDialog.vue
@@ -0,0 +1,350 @@
+<template>
+  <div>
+    <el-dialog
+      title="订单列表"
+      v-model="localDialogVisible"
+      width="960px"
+      append-to-body
+      @close="resetAllData"
+    >
+      <el-table
+        :data="orderList"
+        ref="tableRef"
+        width="100%"
+        highlight-current-row
+        height="470px"
+        @row-dblclick="handleRowDBClick"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="订单编号"
+          prop="supplyBusNo"
+          width="200"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
+        <el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
+        <el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
+            <el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
+        <el-table-column label="单据日期" prop="applyTime" width="200" align="center">
+          <template #default="scope">
+            {{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row justify="end" style="margin-top: 10px">
+        <el-pagination
+          :current-page="queryParams.pageNo"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 50, 100, 200]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="localTableDataTotal"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-show="localTableDataTotal > 0"
+        />
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
+import { ref, watch, getCurrentInstance } from 'vue';
+import { parseTime } from '@/utils/his';
+// 调用父组件方法
+const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 属性
+const props = defineProps({
+  // 对话框x显示
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+});
+// 本地对话框显示
+const localDialogVisible = ref(false);
+// 监听属性
+watch(
+  () => props.dialogVisible,
+  (newValue) => {
+    localDialogVisible.value = newValue;
+  }
+);
+// 获取当前行
+const currentRow = ref({});
+// 行点击 双击
+const handleRowClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+};
+// 行点击 双击
+const handleRowDBClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+  // 提交
+  handleSubmit();
+};
+// 订单列表
+const orderList = ref([]);
+// 订单列表总条数
+const localTableDataTotal = ref(0);
+// 当前locationId
+const currentLocationId = ref(undefined);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationId: undefined,
+});
+// 分页每页条数
+const handleSizeChange = (size) => {
+  queryParams.value.pageSize = size;
+  queryParams.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  queryParams.value.pageNo = page;
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+
+// 获取订货单列表
+const getOrderList = async (locationId) => {
+  try {
+    // 保存当前locationId
+    currentLocationId.value = locationId;
+
+    // 构建请求参数
+    const requestParams = {
+      // 仓库ID
+      locationId: locationId,
+      // 页码
+      pageNo: queryParams.value.pageNo,
+      // 每页条数
+      pageSize: queryParams.value.pageSize,
+      // 订单状态 3 ：审核通过
+      statusEnum: 3,
+      // 是否查询原始单
+      originalBusNoFlg: 1,
+    };
+    const res = await getPurchaseOrderList(requestParams);
+    if (res.data.records && res.data.records.length > 0) {
+      // 订货单列表
+      orderList.value = res.data.records || [];
+      // 订货单列表总条数
+      localTableDataTotal.value = res.data.total;
+    } else {
+      proxy.$message.error('获取订货单列表失败');
+    }
+  } catch (error) {
+    console.error('获取订货单列表失败:', error);
+  }
+};
+// 重置所有数据
+const resetAllData = () => {
+  // 重置分页参数
+  queryParams.value.pageNo = 1;
+  queryParams.value.pageSize = 10;
+  currentLocationId.value = undefined;
+  orderList.value = [];
+  localTableDataTotal.value = 0;
+};
+// 提交数据
+const handleSubmit = async () => {
+  // 取消按钮
+  handleCancel();
+  // 获取当前进货单的订单列表
+  await getCurrentOrderDetail();
+  // 传递数据给父组件
+  emit('updateTableData', {
+    currentOrderList: setCurrentOrderList.value,
+    currentOrderForm: setCurrentOrderForm.value,
+  });
+};
+// 设置当前进货单的订单列表
+const setCurrentOrderList = ref([]);
+// 设置当前进货单的订单表单
+const setCurrentOrderForm = ref({});
+
+// 获取当前进货单的订单列表
+const getCurrentOrderDetail = async () => {
+  if (!currentRow.value.supplyBusNo) {
+    return;
+  }
+  const res = await getPurchaseOrderDetail({ busNo: currentRow.value.supplyBusNo });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    setCurrentOrderForm.value = {
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      practitionerId: data[0].applicantId,
+      // 原始单据号
+      originalBusNo: data[0].busNo,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = true;
+      // 表格查看状态
+      item.isViewing = false;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    setCurrentOrderList.value = data;
+  }
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 取消按钮
+const handleCancel = () => {
+  emit('dialogCancel', {
+    dialogVisible: false,
+  });
+};
+defineOptions({
+  name: 'orderDialog',
+});
+
+defineExpose({
+  getOrderList,
+});
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderTable.vue
new file mode 100644
index 00000000..e3856a76
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/components/orderTable.vue
@@ -0,0 +1,1776 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择开单日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="供应商" prop="supplierId">
+            <el-select
+              v-model="localForm.supplierId"
+              placeholder="请选择供应商"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+              @change="handleSupplierChange"
+            >
+              <el-option
+                v-for="item in props.supplierOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="供应商联系人" prop="phone">
+            <el-input
+              v-model="localForm.phone"
+              placeholder="请输入供应商联系人"
+              style="width: 220px"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="采购员" prop="practitionerId">
+            <el-select
+              v-model="localForm.practitionerId"
+              placeholder="请输入采购员"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="开单人" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请选择开单人"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请选择单据分类"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发票号" prop="invoiceNo">
+            <el-input
+              v-model="localForm.invoiceNo"
+              placeholder="请输入发票号"
+              clearable
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入摘要"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Upload"
+          @click="handleOrderImport"
+          v-if="buttonShow.isOrderImport"
+        >
+          订货单导入
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="itemBusNo" label="编号" fixed width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1000"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格" width="140">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 产品批号 -->
+          <el-table-column prop="lotNumber" label="产品批号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.lotNumber`"
+                :rules="rules.lotNumber"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].lotNumber"
+                  clearable
+                  placeholder="请输入产品批号"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].lotNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemQuantity" label="数量" width="120" :rules="rules.itemQuantity">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <el-input-number
+                  :min="0"
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].itemQuantity"
+                  @change="handleItemQuantityChange(localTableData[scope.$index])"
+                  controls-position="right"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].price"
+                  clearable
+                  placeholder="请输入进货价"
+                  style="width: 180px"
+                  @change="handleItemPriceChange(localTableData[scope.$index])"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="进价金额" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="retailPrice" label="当前销售价" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].retailPrice"
+                  clearable
+                  placeholder="请输入当前销售价"
+                  style="width: 180px"
+                  @change="handleItemRetailPriceChange(localTableData[scope.$index])"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalRetailPrice" label="当前销售金额" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalRetailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 生产日期 -->
+          <el-table-column prop="startTime" label="生产日期" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.startTime`"
+                :rules="rules.startTime"
+              >
+                <span>
+                  {{ parseTime(localTableData[scope.$index].startTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 失效日期 -->
+          <el-table-column prop="endTime" label="失效日期" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.endTime`" :rules="rules.endTime">
+                <span>
+                  {{ parseTime(localTableData[scope.$index].endTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="specificationInventory" label="规格库存" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.specificationInventory`"
+                :rules="rules.specificationInventory"
+              >
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'max') ||
+                    getInventoryDisplay(scope.$index, 'maxUnit') ||
+                    getInventoryDisplay(scope.$index, 'min') ||
+                    getInventoryDisplay(scope.$index, 'minUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'max') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'maxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'min') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'minUnit') }}
+                  </span>
+                </span>
+                <span v-else>0</span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 批次库存 -->
+          <el-table-column prop="batchInventory" label="批次库存" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMax') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMaxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMin') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMinUnit') }}
+                  </span>
+                </span>
+                <span v-else> 0 </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="approvalNumber" label="批注文号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.approvalNumber`"
+                :rules="rules.approvalNumber"
+              >
+                <span>
+                  {{ localTableData[scope.$index].approvalNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 包装情况 -->
+          <el-table-column prop="packagingConditionEnum" label="包装情况" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.packagingConditionEnum`"
+                :rules="rules.packagingConditionEnum"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].packagingConditionEnum"
+                  placeholder="请选择包装情况"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in props.packagingConditionOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].packagingConditionEnum_enumText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 验收结果 -->
+          <el-table-column prop="acceptanceResultEnum" label="验收结果" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.acceptanceResultEnum`"
+                :rules="rules.acceptanceResultEnum"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].acceptanceResultEnum"
+                  placeholder="请选择验收结果"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in props.acceptanceResultoryOptions || []"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].acceptanceResultEnum_enumText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <!-- 药品追溯码 -->
+          <el-table-column prop="traceNo" label="药品追溯码" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNo"
+                  clearable
+                  placeholder="请输入药品追溯码"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码单位 -->
+          <el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.traceNoUnitCode`"
+                :rules="rules.traceNoUnitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNoUnitCode"
+                  placeholder="请选择药品追溯码单位"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNoUnitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column prop="remake" label="备注" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                @click="handleScan(scope.row, scope.$index)"
+                link
+                icon="Edit"
+              >
+                扫码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+    <!-- 扫码追溯码弹窗 -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
+    <!-- 订单对话框 -->
+    <orderDialog
+      ref="orderDialogRef"
+      :dialogVisible="dialogVisible"
+      @dialogSubmit="dialogSubmit"
+      @dialogCancel="dialogCancel"
+      @updateTableData="updateTableData"
+    ></orderDialog>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo, getMedicineList } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import orderDialog from './orderDialog.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isOrderImport: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入采购员', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  lotNumber: [{ required: true, message: '请输入产品批号', trigger: 'blur' }],
+  startTime: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const endTime = localTableData.value[rowIndex]?.endTime;
+
+          if (endTime && value > endTime) {
+            callback(new Error('生产日期不能大于失效日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  endTime: [
+    { required: true, message: '请输入失效日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const startTime = localTableData.value[rowIndex]?.startTime;
+
+          if (startTime && value < startTime) {
+            callback(new Error('失效日期不能小于生产日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  packagingConditionEnum: [{ required: true, message: '请输入包装情况', trigger: 'blur' }],
+  acceptanceResultEnum: [{ required: true, message: '请选择验收结果', trigger: 'blur' }],
+  batchInventory: [{ required: true, message: '请输入批次库存', trigger: 'blur' }],
+  traceNo: [{ required: true, message: '请输入药品追溯码', trigger: 'blur' }],
+  traceNoUnitCode: [{ required: true, message: '请输入药品追溯码单位', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入供应商联系人', trigger: 'blur' }],
+  practitionerId: [{ required: true, message: '请输入开单人', trigger: 'blur' }],
+  invoiceNo: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 药品名称
+const ypName = ref('');
+// 药品追溯码
+const rowData = ref({});
+// 药品追溯码弹窗
+const openTraceNoDialog = ref(false);
+// 当前索引
+const currentIndex = ref(-1);
+
+// 订单组件对话框
+const dialogVisible = ref(false);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask ? parseFloat(currentUnit.priceMask).toFixed(2) : '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask
+        ? parseFloat(row.totalPriceMask || currentUnit?.totalPriceMask).toFixed(2)
+        : '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask ? parseFloat(currentUnit.retailPriceMask).toFixed(2) : '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask
+        ? parseFloat(row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask).toFixed(2)
+        : '';
+    default:
+      return '';
+  }
+};
+
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    case 'batchMax':
+      return currentUnit.batchInventoryMax || '';
+    case 'batchMaxUnit':
+      return currentUnit.batchInventoryMax > 0 ? currentUnit.batchInventoryMaxUnit : '';
+    case 'batchMin':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMin : '';
+    case 'batchMinUnit':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMinUnit : '';
+    default:
+      return '';
+  }
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+//  扫码
+const handleScan = (row, index) => {
+  // 判断是否存在产品批号
+  if (row.lotNumber) {
+    // 设置药品数据
+    rowData.value = row;
+    // 设置药品名称
+    ypName.value = row.name;
+    // 设置仓库
+    rowData.value.locationId = localForm.purposeLocationId;
+    // 设置药品类型
+    rowData.value.itemType = 1;
+    // 设置药品追溯码弹窗
+    openTraceNoDialog.value = true;
+    // 设置当前索引
+    currentIndex.value = index;
+  } else {
+    proxy.$message.warning('请先输入产品批号！');
+  }
+};
+// 药品追溯码提交
+const submit = (value) => {
+  localTableData.value[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  const isMaxUnit = row.unitCode === row.unitList[0].value;
+  if (isMaxUnit) {
+    row.price = row.priceMaxUnit;
+    row.retailPrice = row.retailPriceMaxUnit;
+  } else {
+    row.price = row.priceMinUnit;
+    row.retailPrice = row.retailPriceMinUnit;
+  }
+  // 进价金额
+  row.totalPrice = row.price * row.itemQuantity;
+  row.totalPriceMask = row.price * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPrice = row.retailPrice * row.itemQuantity;
+  row.totalRetailPriceMask = row.retailPrice * row.itemQuantity;
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = parseFloat((quantity * price).toFixed(2));
+  row.totalPriceMask = parseFloat((quantity * price).toFixed(2));
+  // 销售金额
+  row.totalRetailPrice = parseFloat((quantity * retailPrice).toFixed(2));
+  row.totalRetailPriceMask = parseFloat((quantity * retailPrice).toFixed(2));
+};
+// 监听进货价数量变化
+const handleItemPriceChange = (row) => {
+  //  进价金额
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  //  进价金额(假)
+  row.totalPriceMask = parseFloat((row.itemQuantity * row.price).toFixed(2));
+};
+// 监听销售价数量变化
+const handleItemRetailPriceChange = (row) => {
+  // 销售金额
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+  // 销售金额(假)
+  row.totalRetailPriceMask = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+};
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 规格库存最大值
+    specificationInventoryMax: rowValue.specificationInventory,
+    // 批次库存最大值
+    batchInventoryMax: rowValue.batchInventory,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 生产日期
+    startTime: parseTime(rowValue.productionDate, '{y}-{m}-{d}'),
+    // 失效日期
+    endTime: parseTime(rowValue.expirationDate, '{y}-{m}-{d}'),
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  // 构建单位列表
+  buildUnitList(row);
+  // 构建进货价和销售价
+  buildPrice(row);
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.unitList[0].value;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+// 构建单位列表
+const buildUnitList = (row) => {
+  // 单位列表
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大值
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小智
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 规格库在最大单位
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 规格库存最小单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大值
+      item.batchInventoryMax = Math.floor(row.batchInventory / row.partPercent);
+      // 批次库存最小值
+      item.batchInventoryMin = row.batchInventory % row.partPercent;
+      // 批次库存最大单位
+      item.batchInventoryMaxUnit = row.unitCode_dictText;
+      // 批次库存最小单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = (parseFloat(row.retailPrice) / parseFloat(row.partPercent)).toFixed(2);
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大
+      item.specificationInventoryMin = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大
+      item.batchInventoryMin = row.batchInventory;
+      // 批次库存最大单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 采购员
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    purposeLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+// 供应商选择变化
+const handleSupplierChange = async () => {
+  // 清空表格数据
+  localTableData.value = [];
+  // 供应商联系人
+  localForm.value.phone = props.supplierOption.find(
+    (item) => item.value === localForm.value.supplierId
+  )?.phone;
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 供应商
+    item.supplierId = currentForm.supplierId;
+    // 采购员
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.purposeLocationId = orderData.purposeLocationId
+      ? orderData.purposeLocationId
+      : currentForm.locationId;
+    // 供应商联系人
+    item.phone = currentForm.phone;
+    // 开单人
+    item.practitionerId = currentForm.practitionerId;
+    // 发票号
+    item.invoiceNo = currentForm.invoiceNo;
+    // 原始单号
+    item.originalBusNo = currentForm.originalBusNo;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isOrderImport: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 日期范围验证函数
+const validateDateRange = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (row && row.startTime && row.endTime) {
+    if (row.endTime < row.startTime) {
+      proxy.$message.error('失效日期不能小于生产日期');
+      // 清空失效日期
+      row.endTime = '';
+    }
+  }
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 更新表格数据
+const updateTableData = (updateValue) => {
+  // 更新表格数据
+  localTableData.value = localTableData.value.concat(updateValue.currentOrderList);
+  // 更新表单数据 - 合并数据而不是替换
+  localForm.value = { ...localForm.value, ...updateValue.currentOrderForm };
+
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: true,
+  });
+};
+
+// 对话框提交
+const dialogSubmit = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 对话框取消
+const dialogCancel = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 订货单导入
+const handleOrderImport = async () => {
+  // 对话框显示
+  dialogVisible.value = true;
+  // 获取订单列表
+  await proxy.$refs.orderDialogRef.getOrderList(localForm.value.locationId);
+};
+
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue
new file mode 100644
index 00000000..23b38a62
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue
@@ -0,0 +1,1056 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Shop /></el-icon>
+                        <span class="label">供应商：</span>
+                        <span class="value">{{ item.supplierId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :packaging-condition-options="packagingConditionOptions"
+              :acceptance-resultory-options="acceptanceResultoryOptions"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 包装情况 packagingConditionOptions
+const packagingConditionOptions = ref([]);
+// 验收结果 acceptanceResultoryOptions
+const acceptanceResultoryOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions.value = res.data.packagingConditionOptions;
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions.value = res.data.acceptanceResultoryOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+    // 开单人
+    practitionerId: undefined,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isOrderImport: !isApproved,
+  });
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = item.retailPrice / parseInt(item.partPercent);
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].purposeLocationId,
+      // 开单人
+      practitionerId: data[0].practitionerId,
+      // 发票号
+      invoiceNo: data[0].invoiceNo,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+    // 编辑
+    handleEdit(selectedOrder);
+    // 重新获取列表
+    await getList();
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isOrderImport = buttonState.isOrderImport;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/api.js
new file mode 100644
index 00000000..6869ce6f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/api.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/stockOut-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/addOrEdit-stockOutOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/delete-stockOutOrder?busNo=' +
+      data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stockOut-order/stockOut-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
+// 订货单单据列表
+export function getPurchaseOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 获取单据详情
+export function getPurchaseOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/medicineList.vue
new file mode 100644
index 00000000..e0b8db2c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/medicineList.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <el-table-column label="供应商" align="center" prop="supplierId_dictText" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+  locationId: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  queryParams.value = {
+    ...queryParams.value,
+    ...query,
+    locationId: props.locationId,
+  }
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderDialog.vue b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderDialog.vue
new file mode 100644
index 00000000..f77c7e92
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderDialog.vue
@@ -0,0 +1,343 @@
+<template>
+  <div>
+    <el-dialog
+      title="订单列表"
+      v-model="localDialogVisible"
+      width="960px"
+      append-to-body
+      @close="resetAllData"
+    >
+      <el-table
+        :data="orderList"
+        ref="tableRef"
+        width="100%"
+        highlight-current-row
+        height="470px"
+        @row-dblclick="handleRowDBClick"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="订单编号"
+          prop="supplyBusNo"
+          width="200"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
+        <el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
+        <el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
+            <el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
+        <el-table-column label="单据日期" prop="applyTime" width="200" align="center">
+          <template #default="scope">
+            {{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row justify="end" style="margin-top: 10px">
+        <el-pagination
+          :current-page="queryParams.pageNo"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 50, 100, 200]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="localTableDataTotal"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-show="localTableDataTotal > 0"
+        />
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
+import { ref, watch, getCurrentInstance } from 'vue';
+import { parseTime } from '@/utils/his';
+// 调用父组件方法
+const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 属性
+const props = defineProps({
+  // 对话框x显示
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+});
+// 本地对话框显示
+const localDialogVisible = ref(false);
+// 监听属性
+watch(
+  () => props.dialogVisible,
+  (newValue) => {
+    localDialogVisible.value = newValue;
+  }
+);
+// 获取当前行
+const currentRow = ref({});
+// 行点击 双击
+const handleRowClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+};
+// 行点击 双击
+const handleRowDBClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+  // 提交
+  handleSubmit();
+};
+// 订单列表
+const orderList = ref([]);
+// 订单列表总条数
+const localTableDataTotal = ref(0);
+// 当前locationId
+const currentLocationId = ref(undefined);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationId: undefined,
+});
+// 分页每页条数
+const handleSizeChange = (size) => {
+  queryParams.value.pageSize = size;
+  queryParams.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  queryParams.value.pageNo = page;
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+
+// 获取订货单列表
+const getOrderList = async (locationId) => {
+  try {
+    // 保存当前locationId
+    currentLocationId.value = locationId;
+
+    // 构建请求参数
+    const requestParams = {
+      // 仓库ID
+      locationId: locationId,
+      // 页码
+      pageNo: queryParams.value.pageNo,
+      // 每页条数
+      pageSize: queryParams.value.pageSize,
+      // 订单状态 3 ：审核通过
+      statusEnum: 3,
+    };
+    const res = await getPurchaseOrderList(requestParams);
+    if (res.data.records && res.data.records.length > 0) {
+      // 订货单列表
+      orderList.value = res.data.records || [];
+      // 订货单列表总条数
+      localTableDataTotal.value = res.data.total;
+    } else {
+      proxy.$message.error('获取订货单列表失败');
+    }
+  } catch (error) {
+    console.error('获取订货单列表失败:', error);
+  }
+};
+// 重置所有数据
+const resetAllData = () => {
+  // 重置分页参数
+  queryParams.value.pageNo = 1;
+  queryParams.value.pageSize = 10;
+  currentLocationId.value = undefined;
+  orderList.value = [];
+  localTableDataTotal.value = 0;
+};
+// 提交数据
+const handleSubmit = async () => {
+  // 取消按钮
+  handleCancel();
+  // 获取当前进货单的订单列表
+  await getCurrentOrderDetail();
+  // 传递数据给父组件
+  emit('updateTableData', {
+    currentOrderList: setCurrentOrderList.value,
+    currentOrderForm: setCurrentOrderForm.value,
+  });
+};
+// 设置当前进货单的订单列表
+const setCurrentOrderList = ref([]);
+// 设置当前进货单的订单表单
+const setCurrentOrderForm = ref({});
+
+// 获取当前进货单的订单列表
+const getCurrentOrderDetail = async () => {
+  const res = await getPurchaseOrderDetail({ busNo: currentRow.value.supplyBusNo });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    setCurrentOrderForm.value = {
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      practitionerId: data[0].applicantId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = true;
+      // 表格查看状态
+      item.isViewing = false;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    setCurrentOrderList.value = data;
+  }
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 取消按钮
+const handleCancel = () => {
+  emit('dialogCancel', {
+    dialogVisible: false,
+  });
+};
+defineOptions({
+  name: 'orderDialog',
+});
+
+defineExpose({
+  getOrderList,
+});
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue
new file mode 100644
index 00000000..78a7af04
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue
@@ -0,0 +1,1680 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择开单日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="开单人" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请选择开单人"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="请领部门" prop="purposeLocationId">
+            <el-select
+              v-model="localForm.purposeLocationId"
+              placeholder="请选择请领部门"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.pharmacyListOptions || []"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="请领人" prop="practitionerId">
+            <el-select
+              v-model="localForm.practitionerId"
+              placeholder="请选择开单人"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请选择单据分类"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入摘要"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Upload"
+          @click="handleOrderImport"
+          v-if="buttonShow.isOrderImport"
+        >
+          药房请领单导入
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="itemBusNo" label="编号" fixed width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1300"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                      :locationId="localForm.locationId"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 产品批号 -->
+          <el-table-column prop="lotNumber" label="产品批号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.lotNumber`"
+                :rules="rules.lotNumber"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].lotNumber"
+                  clearable
+                  placeholder="请输入产品批号"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].lotNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemQuantity" label="数量" width="120" :rules="rules.itemQuantity">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <el-input-number
+                  :min="0"
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].itemQuantity"
+                  @change="handleItemQuantityChange(localTableData[scope.$index])"
+                  controls-position="right"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="进价金额" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="retailPrice" label="当前销售价" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalRetailPrice" label="当前销售金额" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'totalRetailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 生产日期 -->
+          <el-table-column prop="startTime" label="生产日期" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.startTime`"
+                :rules="rules.startTime"
+              >
+                <span>
+                  {{ parseTime(localTableData[scope.$index].startTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 失效日期 -->
+          <el-table-column prop="endTime" label="失效日期" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.endTime`" :rules="rules.endTime">
+                <span>
+                  {{ parseTime(localTableData[scope.$index].endTime, '{y}-{m}-{d}') || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="supplierId_dictText" label="供应商" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.supplierId_dictText`"
+                :rules="rules.supplierId_dictText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].supplierId_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="specificationInventory" label="规格库存" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.specificationInventory`"
+                :rules="rules.specificationInventory"
+              >
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'max') ||
+                    getInventoryDisplay(scope.$index, 'maxUnit') ||
+                    getInventoryDisplay(scope.$index, 'min') ||
+                    getInventoryDisplay(scope.$index, 'minUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'max') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'maxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'min') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'minUnit') }}
+                  </span>
+                </span>
+                <span v-else>0</span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 批次库存 -->
+          <el-table-column prop="batchInventory" label="批次库存" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMax') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMaxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMin') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMinUnit') }}
+                  </span>
+                </span>
+                <span v-else> 0 </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码 -->
+          <el-table-column prop="traceNo" label="药品追溯码" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNo"
+                  clearable
+                  placeholder="请输入药品追溯码"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码单位 -->
+          <el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.traceNoUnitCode`"
+                :rules="rules.traceNoUnitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNoUnitCode"
+                  placeholder="请选择药品追溯码单位"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNoUnitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column prop="remake" label="备注" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                @click="handleScan(scope.row, scope.$index)"
+                link
+                icon="Edit"
+              >
+                扫码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+    <!-- 扫码追溯码弹窗 -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
+    <!-- 订单对话框 -->
+    <orderDialog
+      ref="orderDialogRef"
+      :dialogVisible="dialogVisible"
+      @dialogSubmit="dialogSubmit"
+      @dialogCancel="dialogCancel"
+      @updateTableData="updateTableData"
+    ></orderDialog>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo, getMedicineList } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import orderDialog from './orderDialog.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 请领部门
+  pharmacyListOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isOrderImport: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入采购员', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  lotNumber: [{ required: true, message: '请输入产品批号', trigger: 'blur' }],
+  purposeLocationId: [{ required: true, message: '请选择', trigger: 'blur' }],
+  startTime: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const endTime = localTableData.value[rowIndex]?.endTime;
+
+          if (endTime && value > endTime) {
+            callback(new Error('生产日期不能大于失效日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  endTime: [
+    { required: true, message: '请输入失效日期', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        if (value) {
+          const currentRow = rule.field.split('.')[1]; // 获取当前行索引
+          const rowIndex = parseInt(currentRow);
+          const startTime = localTableData.value[rowIndex]?.startTime;
+
+          if (startTime && value < startTime) {
+            callback(new Error('失效日期不能小于生产日期'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: ['blur', 'change'],
+    },
+  ],
+  packagingConditionEnum: [{ required: true, message: '请输入包装情况', trigger: 'blur' }],
+  acceptanceResultEnum: [{ required: true, message: '请选择验收结果', trigger: 'blur' }],
+  batchInventory: [{ required: true, message: '请输入批次库存', trigger: 'blur' }],
+  traceNo: [{ required: true, message: '请输入药品追溯码', trigger: 'blur' }],
+  traceNoUnitCode: [{ required: true, message: '请输入药品追溯码单位', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入供应商联系人', trigger: 'blur' }],
+  practitionerId: [{ required: true, message: '请输入开单人', trigger: 'blur' }],
+  invoiceNo: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 药品名称
+const ypName = ref('');
+// 药品追溯码
+const rowData = ref({});
+// 药品追溯码弹窗
+const openTraceNoDialog = ref(false);
+// 当前索引
+const currentIndex = ref(-1);
+
+// 订单组件对话框
+const dialogVisible = ref(false);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask ? parseFloat(currentUnit.priceMask).toFixed(2) : '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask
+        ? parseFloat(row.totalPriceMask || currentUnit?.totalPriceMask).toFixed(2)
+        : '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask ? parseFloat(currentUnit.retailPriceMask).toFixed(2) : '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask
+        ? parseFloat(row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask).toFixed(2)
+        : '';
+    default:
+      return '';
+  }
+};
+
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    case 'batchMax':
+      return currentUnit.batchInventoryMax || '';
+    case 'batchMaxUnit':
+      return currentUnit.batchInventoryMax > 0 ? currentUnit.batchInventoryMaxUnit : '';
+    case 'batchMin':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMin : '';
+    case 'batchMinUnit':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMinUnit : '';
+    default:
+      return '';
+  }
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+//  扫码
+const handleScan = (row, index) => {
+  // 判断是否存在产品批号
+  if (row.lotNumber) {
+    // 设置药品数据
+    rowData.value = row;
+    // 设置药品名称
+    ypName.value = row.name;
+    // 设置仓库
+    rowData.value.locationId = localForm.sourceLocationId;
+    // 设置药品类型
+    rowData.value.itemType = 1;
+    // 设置药品追溯码弹窗
+    openTraceNoDialog.value = true;
+    // 设置当前索引
+    currentIndex.value = index;
+  } else {
+    proxy.$message.warning('请先输入产品批号！');
+  }
+};
+// 药品追溯码提交
+const submit = (value) => {
+  localTableData.value[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  const isMaxUnit = row.unitCode === row.unitList[0].value;
+  if (isMaxUnit) {
+    row.price = row.priceMaxUnit;
+    row.retailPrice = row.retailPriceMaxUnit;
+  } else {
+    row.price = row.priceMinUnit;
+    row.retailPrice = row.retailPriceMinUnit;
+  }
+  // 进价金额
+  row.totalPrice = row.price * row.itemQuantity;
+  row.totalPriceMask = row.price * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPrice = row.retailPrice * row.itemQuantity;
+  row.totalRetailPriceMask = row.retailPrice * row.itemQuantity;
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = parseFloat((quantity * price).toFixed(2));
+  row.totalPriceMask = parseFloat((quantity * price).toFixed(2));
+  // 销售金额
+  row.totalRetailPrice = parseFloat((quantity * retailPrice).toFixed(2));
+  row.totalRetailPriceMask = parseFloat((quantity * retailPrice).toFixed(2));
+};
+// 监听进货价数量变化
+const handleItemPriceChange = (row) => {
+  //  进价金额
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  //  进价金额(假)
+  row.totalPriceMask = parseFloat((row.itemQuantity * row.price).toFixed(2));
+};
+// 监听销售价数量变化
+const handleItemRetailPriceChange = (row) => {
+  // 销售金额
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+  // 销售金额(假)
+  row.totalRetailPriceMask = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+};
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 规格库存最大值
+    specificationInventoryMax: rowValue.specificationInventory,
+    // 批次库存最大值
+    batchInventoryMax: rowValue.batchInventory,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 生产日期
+    startTime: parseTime(rowValue.productionDate, '{y}-{m}-{d}'),
+    // 失效日期
+    endTime: parseTime(rowValue.expirationDate, '{y}-{m}-{d}'),
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  // 构建单位列表
+  buildUnitList(row);
+  // 构建进货价和销售价
+  buildPrice(row);
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.unitList[0].value;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+// 构建单位列表
+const buildUnitList = (row) => {
+  // 单位列表
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大值
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小智
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 规格库在最大单位
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 规格库存最小单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大值
+      item.batchInventoryMax = Math.floor(row.batchInventory / row.partPercent);
+      // 批次库存最小值
+      item.batchInventoryMin = row.batchInventory % row.partPercent;
+      // 批次库存最大单位
+      item.batchInventoryMaxUnit = row.unitCode_dictText;
+      // 批次库存最小单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = (parseFloat(row.retailPrice) / parseFloat(row.partPercent)).toFixed(2);
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大
+      item.specificationInventoryMin = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大
+      item.batchInventoryMin = row.batchInventory;
+      // 批次库存最大单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 采购员
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    sourceLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 采购员
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.sourceLocationId = orderData.sourceLocationId
+      ? orderData.sourceLocationId
+      : currentForm.locationId;
+    // 开单人
+    item.practitionerId = currentForm.practitionerId;
+    // 请领部门
+    item.purposeLocationId = currentForm.purposeLocationId;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isOrderImport: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 日期范围验证函数
+const validateDateRange = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (row && row.startTime && row.endTime) {
+    if (row.endTime < row.startTime) {
+      proxy.$message.error('失效日期不能小于生产日期');
+      // 清空失效日期
+      row.endTime = '';
+    }
+  }
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 更新表格数据
+const updateTableData = (updateValue) => {
+  // 更新表格数据
+  localTableData.value = localTableData.value.concat(updateValue.currentOrderList);
+  // 更新表单数据 - 合并数据而不是替换
+  localForm.value = { ...localForm.value, ...updateValue.currentOrderForm };
+
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: true,
+  });
+};
+
+// 对话框提交
+const dialogSubmit = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 对话框取消
+const dialogCancel = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 订货单导入
+const handleOrderImport = async () => {
+  // 对话框显示
+  dialogVisible.value = true;
+  // 获取订单列表
+  await proxy.$refs.orderDialogRef.getOrderList(localForm.value.locationId);
+};
+
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue
new file mode 100644
index 00000000..bebc1f2f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue
@@ -0,0 +1,1058 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :packaging-condition-options="packagingConditionOptions"
+              :acceptance-resultory-options="acceptanceResultoryOptions"
+              :pharmacy-list-options="pharmacyListOptions"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 包装情况 packagingConditionOptions
+const packagingConditionOptions = ref([]);
+// 验收结果 acceptanceResultoryOptions
+const acceptanceResultoryOptions = ref([]);
+// 请领部门 pharmacyListOptions
+const pharmacyListOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions.value = res.data.packagingConditionOptions;
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions.value = res.data.acceptanceResultoryOptions;
+  // 请领部门
+  pharmacyListOptions.value = res.data.pharmacyListOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+    // 开单人
+    practitionerId: undefined,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isOrderImport: !isApproved,
+  });
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseFloat(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].sourceLocationId,
+      // 开单人
+      practitionerId: data[0].practitionerId,
+      // 请领部门
+      purposeLocationId: data[0].purposeLocationId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+    // 编辑
+    handleEdit(selectedOrder);
+    // 重新获取列表
+    await getList();
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isOrderImport = buttonState.isOrderImport;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/api.js b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/api.js
new file mode 100644
index 00000000..3e51f6e0
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/api.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+
+// 药库订货单初始化
+export function getInit () {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/init',
+    method: 'get',
+  });
+}
+// 订货单单据列表：显示所有单据 左边框
+export function getOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/stocktaking-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 根据供应商获取药品：对应添加/编辑时加下一行数据后，点击项目时调用的接口
+export function getMedicineList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/medication-info',
+    method: 'get',
+    params: query,
+  });
+}
+// 获取单据号：添加时，获取新单据号。编辑的逻辑是先删除后新增。
+export function getBusNo () {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/busNo-init',
+    method: 'get',
+  });
+}
+
+// 添加/编辑采购单：添加/编辑采购单
+export function addOrEditOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/addOrEdit-stocktakingOrder',
+    method: 'PUT',
+    data,
+  });
+}
+// 删除单据
+export function deleteOrder (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/delete-stocktakingOrder?busNo=' +
+      data,
+    method: 'DELETE',
+  });
+}
+// 同意审批
+export function agreeApproval (data) {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/agree-approval?busNo=' + data,
+    method: 'PUT',
+  });
+}
+// 获取单据详情
+export function getOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/stocktaking-order/stocktaking-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
+
+// 订货单单据列表
+export function getPurchaseOrderList (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 获取单据详情
+export function getPurchaseOrderDetail (query) {
+  return request ({
+    url: '/pharmacy-warehouse/purchase-order/purchase-order-detail-page',
+    method: 'GET',
+    params: query,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/medicineList.vue
new file mode 100644
index 00000000..33885006
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/medicineList.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
+      <el-table-column label="项目编码" align="center" prop="busNo" width="150" />
+      <el-table-column label="项目名称" align="center" prop="name" width="180" />
+      <el-table-column label="进货价" align="center" prop="price" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
+      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="规格库存" align="center" prop="specificationInventory" />
+      <el-table-column label="批次库存" align="center" prop="batchInventory" />
+      <el-table-column label="供应商" align="center" prop="supplierId_dictText" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
+      <el-table-column label="批准文号" align="center" prop="approvalNumber" />
+    </el-table>
+  </div>
+</template>
+        
+<script setup>
+import { getMedicineList } from './api';
+import { watch } from 'vue';
+import { throttle } from 'lodash-es';
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: '',
+  },
+  locationId: {
+    type: String,
+    default: '',
+  },
+});
+// 选择药品
+const emit = defineEmits(['selectRow']);
+//
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  searchKey: props.searchKey,
+});
+// 药品列表
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+// 获取药品列表
+const getList = (query) => {
+  queryParams.value = {
+    ...queryParams.value,
+    ...query,
+    locationId: props.locationId,
+  }
+  getMedicineList(query || queryParams.value).then((res) => {
+    medicineList.value = res.data.records;
+  });
+};
+
+// 点击行
+const clickRow = (row) => {
+  // console.log(row, 'row');
+  emit('selectRow', row);
+};
+
+// 监听搜索关键字
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey;
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+// 获取药品列表
+getList();
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderDialog.vue b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderDialog.vue
new file mode 100644
index 00000000..f77c7e92
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderDialog.vue
@@ -0,0 +1,343 @@
+<template>
+  <div>
+    <el-dialog
+      title="订单列表"
+      v-model="localDialogVisible"
+      width="960px"
+      append-to-body
+      @close="resetAllData"
+    >
+      <el-table
+        :data="orderList"
+        ref="tableRef"
+        width="100%"
+        highlight-current-row
+        height="470px"
+        @row-dblclick="handleRowDBClick"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="订单编号"
+          prop="supplyBusNo"
+          width="200"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
+        <el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
+        <el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
+            <el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
+        <el-table-column label="单据日期" prop="applyTime" width="200" align="center">
+          <template #default="scope">
+            {{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row justify="end" style="margin-top: 10px">
+        <el-pagination
+          :current-page="queryParams.pageNo"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 50, 100, 200]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="localTableDataTotal"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-show="localTableDataTotal > 0"
+        />
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
+import { ref, watch, getCurrentInstance } from 'vue';
+import { parseTime } from '@/utils/his';
+// 调用父组件方法
+const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 属性
+const props = defineProps({
+  // 对话框x显示
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+});
+// 本地对话框显示
+const localDialogVisible = ref(false);
+// 监听属性
+watch(
+  () => props.dialogVisible,
+  (newValue) => {
+    localDialogVisible.value = newValue;
+  }
+);
+// 获取当前行
+const currentRow = ref({});
+// 行点击 双击
+const handleRowClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+};
+// 行点击 双击
+const handleRowDBClick = (row) => {
+  // 设置当前行
+  currentRow.value = row;
+  // 提交
+  handleSubmit();
+};
+// 订单列表
+const orderList = ref([]);
+// 订单列表总条数
+const localTableDataTotal = ref(0);
+// 当前locationId
+const currentLocationId = ref(undefined);
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  locationId: undefined,
+});
+// 分页每页条数
+const handleSizeChange = (size) => {
+  queryParams.value.pageSize = size;
+  queryParams.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  queryParams.value.pageNo = page;
+  // 重新获取数据
+  if (currentLocationId.value) {
+    getOrderList(currentLocationId.value);
+  }
+};
+
+// 获取订货单列表
+const getOrderList = async (locationId) => {
+  try {
+    // 保存当前locationId
+    currentLocationId.value = locationId;
+
+    // 构建请求参数
+    const requestParams = {
+      // 仓库ID
+      locationId: locationId,
+      // 页码
+      pageNo: queryParams.value.pageNo,
+      // 每页条数
+      pageSize: queryParams.value.pageSize,
+      // 订单状态 3 ：审核通过
+      statusEnum: 3,
+    };
+    const res = await getPurchaseOrderList(requestParams);
+    if (res.data.records && res.data.records.length > 0) {
+      // 订货单列表
+      orderList.value = res.data.records || [];
+      // 订货单列表总条数
+      localTableDataTotal.value = res.data.total;
+    } else {
+      proxy.$message.error('获取订货单列表失败');
+    }
+  } catch (error) {
+    console.error('获取订货单列表失败:', error);
+  }
+};
+// 重置所有数据
+const resetAllData = () => {
+  // 重置分页参数
+  queryParams.value.pageNo = 1;
+  queryParams.value.pageSize = 10;
+  currentLocationId.value = undefined;
+  orderList.value = [];
+  localTableDataTotal.value = 0;
+};
+// 提交数据
+const handleSubmit = async () => {
+  // 取消按钮
+  handleCancel();
+  // 获取当前进货单的订单列表
+  await getCurrentOrderDetail();
+  // 传递数据给父组件
+  emit('updateTableData', {
+    currentOrderList: setCurrentOrderList.value,
+    currentOrderForm: setCurrentOrderForm.value,
+  });
+};
+// 设置当前进货单的订单列表
+const setCurrentOrderList = ref([]);
+// 设置当前进货单的订单表单
+const setCurrentOrderForm = ref({});
+
+// 获取当前进货单的订单列表
+const getCurrentOrderDetail = async () => {
+  const res = await getPurchaseOrderDetail({ busNo: currentRow.value.supplyBusNo });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    setCurrentOrderForm.value = {
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      practitionerId: data[0].applicantId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = true;
+      // 表格查看状态
+      item.isViewing = false;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    setCurrentOrderList.value = data;
+  }
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 取消按钮
+const handleCancel = () => {
+  emit('dialogCancel', {
+    dialogVisible: false,
+  });
+};
+defineOptions({
+  name: 'orderDialog',
+});
+
+defineExpose({
+  getOrderList,
+});
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderTable.vue
new file mode 100644
index 00000000..86e6f929
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/components/orderTable.vue
@@ -0,0 +1,1681 @@
+<template>
+  <div>
+    <el-row :gutter="10">
+      <el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
+        <el-row :gutter="10">
+          <el-form-item label="单据号" prop="busNo">
+            <el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
+          </el-form-item>
+          <el-form-item label="开单日期" prop="applyTime">
+            <el-date-picker
+              v-model="localForm.applyTime"
+              placeholder="请选择开单日期"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="盘点人" prop="applicantId">
+            <el-select
+              v-model="localForm.applicantId"
+              placeholder="请选择盘点人"
+              style="width: 140px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.practitionerOption || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据分类" prop="categoryEnum">
+            <el-select
+              v-model="localForm.categoryEnum"
+              placeholder="请选择单据分类"
+              style="width: 180px"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            >
+              <el-option
+                v-for="item in props.supplyCategoryOptions || []"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="摘要(A)" prop="reason">
+            <el-input
+              type="textarea"
+              v-model="localForm.reason"
+              placeholder="请输入摘要"
+              style="width: 300px"
+              :rows="1"
+              :disabled="!localIsAddOrEditOrder.isAddOrder && !localIsAddOrEditOrder.isEditOrder"
+              clearable
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-row>
+    <!-- 审核信息 -->
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核人</label>
+          <el-tag type="warning" plain>
+            {{
+              (props.practitionerOption || []).find(
+                (item) => item.value === localAuditForm.approverId
+              )?.label || '暂无'
+            }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核日期</label>
+          <el-tag type="primary" plain>
+            {{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="form-item">
+          <label class="form-label">审核状态:</label>
+          <el-tag
+            :type="localAuditForm.statusEnum_enumText === '同意' ? 'success' : 'danger'"
+            plain
+          >
+            {{ localAuditForm.statusEnum_enumText || '暂无' }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAddRow"
+          v-if="buttonShow.isAddShow"
+        >
+          添加行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          @click="handleDeleteRow"
+          v-if="buttonShow.isDeleteShow"
+        >
+          删除行
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Check"
+          @click="handleSave"
+          v-if="buttonShow.isSaveShow"
+        >
+          保存
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10">
+      <el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
+        <el-table
+          :data="localTableData"
+          ref="tableRef"
+          class="table-container"
+          max-height="calc(100vh - 400px)"
+          min-height="100px"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="itemBusNo" label="编号" fixed width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemBusNo`"
+                :rules="rules.itemBusNo"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemBusNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="itemName" label="品名" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemName`"
+                :rules="rules.itemName"
+              >
+                <PopoverList
+                  v-if="localTableData[scope.$index].isEditing"
+                  @search="handleSearch"
+                  :width="1300"
+                  :modelValue="localTableData[scope.$index].itemName"
+                >
+                  <template #popover-content="{}">
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                      :locationId="localForm.locationId"
+                    />
+                  </template>
+                </PopoverList>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].itemName || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalVolume" label="规格" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalVolume`"
+                :rules="rules.totalVolume"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalVolume || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 产品批号 -->
+          <el-table-column prop="lotNumber" label="产品批号" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.lotNumber`"
+                :rules="rules.lotNumber"
+              >
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].lotNumber"
+                  clearable
+                  placeholder="请输入产品批号"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].lotNumber || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCode" label="单位" width="100">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.unitCode`"
+                :rules="rules.unitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].unitCode"
+                  :disabled="!localTableData[scope.$index].unitCode"
+                  @change="handleUnitCodeChange(localTableData[scope.$index])"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].unitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="totalQuantity"
+            label="实盘数量"
+            width="120"
+            :rules="rules.totalQuantity"
+          >
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalQuantity`"
+                :rules="rules.totalQuantity"
+              >
+                <el-input-number
+                  :min="0"
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].totalQuantity"
+                  @change="handleItemTotalQuantityChange(localTableData[scope.$index])"
+                  controls-position="right"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].totalQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <!-- 批次库存 -->
+          <el-table-column prop="batchInventory" label="账面数量" width="100">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
+                <span
+                  v-if="
+                    getInventoryDisplay(scope.$index, 'batchMax') ||
+                    getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
+                    getInventoryDisplay(scope.$index, 'batchMin') ||
+                    getInventoryDisplay(scope.$index, 'batchMinUnit')
+                  "
+                >
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMax') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMaxUnit') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMin') }}
+                  </span>
+                  <span>
+                    {{ getInventoryDisplay(scope.$index, 'batchMinUnit') }}
+                  </span>
+                </span>
+                <span v-else> 0 </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="实盘进价金额" width="140">
+            <template #default="scope">
+              <el-form-item>
+                <span>
+                  {{ localTableData[scope.$index].totalQuantityPrice || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="batchInventory" label="账面进价金额" width="140">
+            <template #default="scope">
+              <el-form-item>
+                <span> {{ localTableData[scope.$index].accountInPrice || '' }} </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="batchInventory" label="实盘零价金额" width="140">
+            <template #default="scope">
+              <el-form-item>
+                <span> {{ localTableData[scope.$index].totalQuantityRetailPrice || '' }} </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="batchInventory" label="账面零价金额" width="140">
+            <template #default="scope">
+              <el-form-item>
+                <span> {{ localTableData[scope.$index].accountRetailPrice || '' }} </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="itemQuantity"
+            label="盈亏数量"
+            width="120"
+            :rules="rules.itemQuantity"
+          >
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.itemQuantity`"
+                :rules="rules.itemQuantity"
+              >
+                <span>
+                  {{ localTableData[scope.$index].itemQuantity || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="totalPrice" label="盈亏进价金额" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
+                <span>
+                  {{ localTableData[scope.$index].totalPrice || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="totalRetailPrice" label="盈亏销售价金额" width="140">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.totalRetailPrice`"
+                :rules="rules.totalRetailPrice"
+              >
+                <span>
+                  {{ localTableData[scope.$index].totalRetailPrice || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="reasonCode" label="盈亏类型" width="140">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.reasonCode`"
+                :rules="rules.reasonCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].reasonCode"
+                  placeholder="请选择盈亏类型"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in profit_reason"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ profit_reason[localTableData[scope.$index].reasonCode]?.label || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="进货价" width="120">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.price`">
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'price') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码 -->
+          <el-table-column prop="retailPrice" label="当前销售价" width="120">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.retailPrice`"
+                :rules="rules.retailPrice"
+              >
+                <span>
+                  {{ getPriceDisplay(scope.$index, 'retailPrice') }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="traceNo" label="药品追溯码" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNo"
+                  clearable
+                  placeholder="请输入药品追溯码"
+                  style="width: 180px"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNo || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 药品追溯码单位 -->
+          <el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.traceNoUnitCode`"
+                :rules="rules.traceNoUnitCode"
+              >
+                <el-select
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].traceNoUnitCode"
+                  placeholder="请选择药品追溯码单位"
+                  style="width: 180px"
+                >
+                  <el-option
+                    v-for="item in localTableData[scope.$index].unitList || []"
+                    :key="item.value"
+                    :label="item.value_dictText"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].traceNoUnitCode_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="supplierId_dictText" label="供应商" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.supplierId_dictText`"
+                :rules="rules.supplierId_dictText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].supplierId_dictText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="manufacturerText" label="厂家/产地" width="220">
+            <template #default="scope">
+              <el-form-item
+                :prop="`localTableData.${scope.$index}.manufacturerText`"
+                :rules="rules.manufacturerText"
+              >
+                <span>
+                  {{ localTableData[scope.$index].manufacturerText || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column prop="remake" label="备注" width="180">
+            <template #default="scope">
+              <el-form-item :prop="`localTableData.${scope.$index}.remake`">
+                <el-input
+                  v-if="localTableData[scope.$index].isEditing"
+                  v-model="localTableData[scope.$index].remake"
+                />
+                <span v-else-if="localTableData[scope.$index].isViewing">
+                  {{ localTableData[scope.$index].remake || '' }}
+                </span>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                @click="handleScan(scope.row, scope.$index)"
+                link
+                icon="Edit"
+              >
+                扫码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-row>
+    <el-row justify="end">
+      <el-pagination
+        :current-page="localForm.pageNo"
+        :page-size="localForm.pageSize"
+        :page-sizes="[10, 50, 100, 200]"
+        :small="small"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="localTableDataTotal"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        v-show="localTableDataTotal > 0"
+      />
+    </el-row>
+    <!-- 扫码追溯码弹窗 -->
+    <TraceNoDialog
+      :ypName="ypName"
+      :rowData="rowData"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
+    <!-- 订单对话框 -->
+    <orderDialog
+      ref="orderDialogRef"
+      :dialogVisible="dialogVisible"
+      @dialogSubmit="dialogSubmit"
+      @dialogCancel="dialogCancel"
+      @updateTableData="updateTableData"
+    ></orderDialog>
+  </div>
+</template>
+
+<script setup>
+import { addOrEditOrder, getBusNo } from './api';
+import { nextTick, ref, watch } from 'vue';
+import medicineList from './medicineList.vue';
+import orderDialog from './orderDialog.vue';
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import { parseTime } from '@/utils/his';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+
+// 获取字典
+const { profit_reason } = proxy.useDict('profit_reason');
+// 调用父组件方法
+const emit = defineEmits(['update:form', 'getList', 'updateButtonState', 'clearForm']);
+
+// 属性
+const props = defineProps({
+  // 父组件 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 父组件 表格总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 父组件 表格每页条数
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 父组件 表单数据
+  form: {
+    type: Object,
+    default: () => ({
+      busNo: undefined,
+      applyTime: undefined,
+      supplierId: undefined,
+      applicantId: undefined,
+      reason: undefined,
+      status: undefined,
+      approverId: undefined,
+    }),
+  },
+  // 父组件 订单编辑还是新增
+  isAddOrEditOrder: {
+    type: Object,
+    default: () => ({
+      isAddOrder: false,
+      isEditOrder: false,
+    }),
+  },
+  // 父组件 审核表单数据
+  auditForm: {
+    type: Object,
+    default: () => ({
+      approvalTime: undefined,
+      statusEnum_enumText: undefined,
+      approverId_dictText: undefined,
+    }),
+  },
+  // 查询供应商列表 supplierOption
+  supplierOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 查询经手人列表 practitionerOption
+  practitionerOption: {
+    type: Array,
+    default: () => [],
+  },
+  // 单据分类 supplyCategoryOptions
+  supplyCategoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 请领部门
+  pharmacyListOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 按钮显示
+  buttonShow: {
+    type: Object,
+    default: () => ({
+      isAddShow: false,
+      isDeleteShow: false,
+      isSaveShow: false,
+      isEditShow: false,
+      isOrderImport: false,
+    }),
+  },
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions: {
+    type: Array,
+    default: () => [],
+  },
+  // 表格数据总条数
+  tableDataTotal: {
+    type: Number,
+    default: 0,
+  },
+});
+// 本地表单数据，用于接收 props.form
+const localForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+});
+//  本地表格数据 用于接收 props.tableData
+const localTableData = ref([]);
+// 本地表格数据总条数
+const localTableDataTotal = ref(0);
+
+// 加载
+const loading = ref(false);
+// 品名搜索
+const medicineSearchKey = ref('');
+// 选择相关变量
+const ids = ref([]);
+const selectedRows = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 审核表单数据
+const localAuditForm = ref({
+  approvalTime: undefined,
+  statusEnum_enumText: undefined,
+  approverId_dictText: undefined,
+});
+// 订单编辑还是新增
+const localIsAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 验证规则
+const rules = {
+  // busNo: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  supplierId: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  applicantId: [{ required: true, message: '请输入采购员', trigger: 'blur' }],
+  categoryEnum: [{ required: true, message: '请输入单据类型', trigger: 'blur' }],
+  applyTime: [{ required: true, message: '请输入开单日期', trigger: 'blur' }],
+  itemBusNo: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '请输入品名', trigger: 'blur' }],
+  totalVolume: [{ required: true, message: '请输入规格', trigger: 'blur' }],
+  unitCode: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+  totalQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  itemQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  lotNumber: [{ required: true, message: '请输入产品批号', trigger: 'blur' }],
+  purposeLocationId: [{ required: true, message: '请选择', trigger: 'blur' }],
+  reasonCode: [{ required: true, message: '请选择盈亏类型', trigger: 'blur' }],
+  packagingConditionEnum: [{ required: true, message: '请输入包装情况', trigger: 'blur' }],
+  acceptanceResultEnum: [{ required: true, message: '请选择验收结果', trigger: 'blur' }],
+  batchInventory: [{ required: true, message: '请输入批次库存', trigger: 'blur' }],
+  traceNo: [{ required: true, message: '请输入药品追溯码', trigger: 'blur' }],
+  traceNoUnitCode: [{ required: true, message: '请输入药品追溯码单位', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入供应商联系人', trigger: 'blur' }],
+  practitionerId: [{ required: true, message: '请输入开单人', trigger: 'blur' }],
+  invoiceNo: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+  // price: [{ required: true, message: '请输入进货价', trigger: 'blur' }],
+  // totalPrice: [{ required: true, message: '请输入进价金额', trigger: 'blur' }],
+  // retailPrice: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
+  // totalRetailPrice: [{ required: true, message: '请输入销售金额', trigger: 'blur' }],
+  manufacturerText: [{ required: true, message: '请输入厂家/产地', trigger: 'blur' }],
+  specificationInventory: [{ required: true, message: '请输入规格库存', trigger: 'blur' }],
+  approvalNumber: [{ required: true, message: '请输入批注文号', trigger: 'blur' }],
+};
+// 药品名称
+const ypName = ref('');
+// 药品追溯码
+const rowData = ref({});
+// 药品追溯码弹窗
+const openTraceNoDialog = ref(false);
+// 当前索引
+const currentIndex = ref(-1);
+
+// 订单组件对话框
+const dialogVisible = ref(false);
+// 计算属性：获取指定行的当前单位数据
+const getCurrentUnitData = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (!row || !row.unitList) return null;
+
+  return row.unitList.find((item) => item.value === row.unitCode) || null;
+};
+
+// 计算属性：获取指定行的价格显示值
+const getPriceDisplay = (rowIndex, priceType) => {
+  const row = localTableData.value[rowIndex];
+  if (!row) return '';
+
+  const currentUnit = getCurrentUnitData(rowIndex);
+
+  // 根据价格类型返回对应的值
+  switch (priceType) {
+    case 'price':
+      return currentUnit?.priceMask ? parseFloat(currentUnit.priceMask).toFixed(2) : '';
+    case 'totalPrice':
+      return row.totalPriceMask || currentUnit?.totalPriceMask
+        ? parseFloat(row.totalPriceMask || currentUnit?.totalPriceMask).toFixed(2)
+        : '';
+    case 'retailPrice':
+      return currentUnit?.retailPriceMask ? parseFloat(currentUnit.retailPriceMask).toFixed(2) : '';
+    case 'totalRetailPrice':
+      return row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask
+        ? parseFloat(row.totalRetailPriceMask || currentUnit?.totalRetailPriceMask).toFixed(2)
+        : '';
+    default:
+      return '';
+  }
+};
+
+// 计算属性：获取指定行的库存显示值
+const getInventoryDisplay = (rowIndex, type) => {
+  const currentUnit = getCurrentUnitData(rowIndex);
+  if (!currentUnit) return '';
+
+  switch (type) {
+    case 'max':
+      return currentUnit.specificationInventoryMax || '';
+    case 'maxUnit':
+      return currentUnit.specificationInventoryMax > 0
+        ? currentUnit.specificationInventoryMaxUnit
+        : '';
+    case 'min':
+      return currentUnit.specificationInventoryMin > 0 ? currentUnit.specificationInventoryMin : '';
+    case 'minUnit':
+      return currentUnit.specificationInventoryMin > 0
+        ? currentUnit.specificationInventoryMinUnit
+        : '';
+    case 'batchMax':
+      return currentUnit.batchInventoryMax || '';
+    case 'batchMaxUnit':
+      return currentUnit.batchInventoryMax > 0 ? currentUnit.batchInventoryMaxUnit : '';
+    case 'batchMin':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMin : '';
+    case 'batchMinUnit':
+      return currentUnit.batchInventoryMin > 0 ? currentUnit.batchInventoryMinUnit : '';
+    default:
+      return '';
+  }
+};
+// 监听 props.isAddOrEditOrder 的变化
+watch(
+  () => props.isAddOrEditOrder,
+  (newVal) => {
+    localIsAddOrEditOrder.value = { ...newVal };
+  }
+);
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal) => {
+    localForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+// 监听 props.tableData 的变化
+watch(
+  () => props.tableData,
+  (newVal) => {
+    localTableData.value = [...newVal];
+  },
+  { deep: true }
+);
+// 监听 props.tableDataTotal 的变化
+watch(
+  () => props.tableDataTotal,
+  (newVal) => {
+    localTableDataTotal.value = newVal;
+  }
+);
+// 监听 props.auditForm 的变化
+watch(
+  () => props.auditForm,
+  (newVal) => {
+    localAuditForm.value = { ...newVal };
+  },
+  { deep: true }
+);
+
+// 品名搜索
+const handleSearch = (value) => {
+  medicineSearchKey.value = value;
+};
+// 获取单据号
+const getInitBusNo = async () => {
+  const res = await getBusNo();
+  return res.data.busNo;
+};
+// 药品追溯码提交
+const submit = (value) => {
+  localTableData.value[currentIndex.value].traceNo = value;
+  openTraceNoDialog.value = false;
+};
+// 分页当前页
+const handleCurrentChange = (page) => {
+  localForm.value.pageNo = page;
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: page,
+    pageSize: localForm.value.pageSize,
+  });
+};
+//  扫码
+const handleScan = (row, index) => {
+  // 判断是否存在产品批号
+  if (row.lotNumber) {
+    // 设置药品数据
+    rowData.value = row;
+    // 设置药品名称
+    ypName.value = row.name;
+    // 设置仓库
+    rowData.value.locationId = localForm.purposeLocationId;
+    // 设置药品类型
+    rowData.value.itemType = 1;
+    // 设置药品追溯码弹窗
+    openTraceNoDialog.value = true;
+    // 设置当前索引
+    currentIndex.value = index;
+  } else {
+    proxy.$message.warning('请先输入产品批号！');
+  }
+};
+// 分页每页条数
+const handleSizeChange = (size) => {
+  localForm.value.pageSize = size;
+  localForm.value.pageNo = 1; // 切换每页条数时重置到第一页
+  // 通知父组件更新查询参数并重新获取数据
+  emit('update:query-params', {
+    pageNo: 1,
+    pageSize: size,
+  });
+};
+
+// 行点击
+const handleRowClick = (row) => {
+  // 判断订单是否可以编辑
+  if (!isAllowEdit(row)) {
+    return;
+  }
+  // 设置表格编辑状态
+  row.isEditing = true;
+  // 设置表格查看状态
+  row.isViewing = false;
+};
+// 判断订单是否可以编辑
+const isAllowEdit = (row) => {
+  // 已审批的订单不能编辑
+  if (
+    localAuditForm.value.statusEnum === 3 ||
+    localAuditForm.value.statusEnum_enumText === '同意'
+  ) {
+    return false; // 已审批，不能编辑
+  }
+  return true; // 未审批，可以编辑
+};
+// 监听单位变化
+const handleUnitCodeChange = (row) => {
+  const isMaxUnit = row.unitCode !== row.minUnitCode;
+  if (isMaxUnit) {
+    row.price = row.priceMaxUnit;
+    row.retailPrice = row.retailPriceMaxUnit;
+
+    // 账单进价金额
+    row.accountPrice = ((row.batchInventory / parseInt(row.partPercent)) * row.price).toFixed(2);
+    // 账单销售金额
+    row.accountRetailPrice = (
+      (row.batchInventory / parseInt(row.partPercent)) *
+      row.retailPrice
+    ).toFixed(2);
+  } else {
+    row.price = row.priceMinUnit;
+    row.retailPrice = row.retailPriceMinUnit;
+
+    // 账目进价金额  = 批次库存 * 进货价
+    row.accountInPrice = row.batchInventory * row.price;
+    // 账目销售价金额  = 批次库存 * 销售价
+    row.accountRetailPrice = row.batchInventory * row.retailPrice;
+  }
+  // 进价金额
+  row.totalPrice = row.price * row.itemQuantity;
+  row.totalPriceMask = row.price * row.itemQuantity;
+  // 销售金额
+  row.totalRetailPrice = row.retailPrice * row.itemQuantity;
+  row.totalRetailPriceMask = row.retailPrice * row.itemQuantity;
+
+  // 实盘进价金额
+  row.totalQuantityPrice = parseFloat((row.totalQuantity * row.price).toFixed(2));
+  // 实盘销售金额
+  row.totalQuantityRetailPrice = parseFloat((row.totalQuantity * row.retailPrice).toFixed(2));
+};
+// 监听数量变化
+const handleItemQuantityChange = (row) => {
+  // 转换为数值并保留2位小数
+  const quantity = parseFloat(row.itemQuantity) || 0;
+  const price = parseFloat(row.price) || 0;
+  const retailPrice = parseFloat(row.retailPrice) || 0;
+
+  // 进价金额
+  row.totalPrice = parseFloat((quantity * price).toFixed(2));
+  row.totalPriceMask = parseFloat((quantity * price).toFixed(2));
+  // 销售金额
+  row.totalRetailPrice = parseFloat((quantity * retailPrice).toFixed(2));
+  row.totalRetailPriceMask = parseFloat((quantity * retailPrice).toFixed(2));
+};
+// 监听实盘数量变化 构建实盘进价金额 构建实盘销售金额
+const handleItemTotalQuantityChange = (row) => {
+  // 判断当前单位是否为最大单位
+  const isMaxUnit = row.unitCode !== row.minUnitCode;
+  if (isMaxUnit) {
+    // 盈亏数量 =  实盘数量 - 批次库存数 / 拆零比
+    row.itemQuantity = parseFloat(
+      (row.totalQuantity - row.batchInventory / parseInt(row.partPercent)).toFixed(2)
+    );
+  } else {
+    // 盈亏数量 =  实盘数量 - 批次库存数
+    row.itemQuantity = parseFloat((row.totalQuantity - row.batchInventory).toFixed(2));
+  }
+  // 盈亏进价金额 =  盈亏数量 * 进货价
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  // 盈亏销售金额  =  盈亏数量 * 进货价
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+
+  // 实盘进价金额 = 实盘数量 * 进货价
+  row.totalQuantityPrice = parseFloat((row.totalQuantity * row.price).toFixed(2));
+  // 实盘销售金额 = 实盘数量 * 销售价
+  row.totalQuantityRetailPrice = parseFloat((row.totalQuantity * row.retailPrice).toFixed(2));
+};
+// 监听进货价数量变化
+const handleItemPriceChange = (row) => {
+  //  进价金额
+  row.totalPrice = parseFloat((row.itemQuantity * row.price).toFixed(2));
+  //  进价金额(假)
+  row.totalPriceMask = parseFloat((row.itemQuantity * row.price).toFixed(2));
+};
+// 监听销售价数量变化
+const handleItemRetailPriceChange = (row) => {
+  // 销售金额
+  row.totalRetailPrice = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+  // 销售金额(假)
+  row.totalRetailPriceMask = parseFloat((row.itemQuantity * row.retailPrice).toFixed(2));
+};
+// 选择药品
+const selectRow = (rowValue, index) => {
+  localTableData.value[index] = {
+    // 选中行药品数据
+    ...rowValue,
+    // 药品 id
+    itemId: rowValue.id,
+    // 药品编号
+    itemBusNo: rowValue.busNo,
+    // 药品名称
+    itemName: rowValue.name,
+    // 单位
+    unitCode: rowValue.unitCode,
+    // 单位名称
+    unitCodeDictText: rowValue.unitCode_dictText,
+    // 备注
+    remake: rowValue.remake,
+    // 规格库存最大值
+    specificationInventoryMax: rowValue.specificationInventory,
+    // 批次库存最大值
+    batchInventoryMax: rowValue.batchInventory,
+    // 只用于显示
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 验收结果
+    acceptanceResultEnum: 1,
+  };
+  // 重新构建价格单位 规格库存 进价 售价表格数据
+  rebuildTableData(localTableData.value[index]);
+  // 手动触发验证
+  nextTick(() => {
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemBusNo`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.itemName`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.totalVolume`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.unitCode`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.price`);
+    // proxy.$refs.tableFormRef.validateField(`localTableData.${index}.retailPrice`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.manufacturerText`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.specificationInventory`);
+    proxy.$refs.tableFormRef.validateField(`localTableData.${index}.approvalNumber`);
+  });
+};
+// 重新构建价格单位 规格库存 进价 售价表格数据
+const rebuildTableData = (row) => {
+  // 构建单位列表
+  buildUnitList(row);
+  // 构建进货价和销售价
+  buildPrice(row);
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode !== item.minUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseInt(item.partPercent)).toFixed(
+      2
+    );
+
+    // 账目进价数量  = 批次库存 * 进货价 * 拆零比率
+    item.accountInPrice = ((item.batchInventory / parseInt(item.partPercent)) * item.price).toFixed(
+      2
+    );
+    // 账目销售价数量  = 批次库存 * 销售价  * 拆零比率
+    item.accountRetailPrice = (
+      (item.batchInventory / parseInt(item.partPercent)) *
+      item.retailPrice
+    ).toFixed(2);
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+
+    // 账目进价数量  = 批次库存 * 进货价
+    item.accountInPrice = item.batchInventory * item.price;
+    // 账目销售价数量  = 批次库存 * 销售价
+    item.accountRetailPrice = item.batchInventory * item.retailPrice;
+  }
+};
+// 构建单位列表
+const buildUnitList = (row) => {
+  // 单位列表
+  (row.unitList || []).forEach((item) => {
+    // 最大单位
+    if (item.value === row.unitCode) {
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price;
+      // 销售价（假）
+      item.retailPriceMask = row.retailPrice;
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大值
+      item.specificationInventoryMax = Math.floor(row.specificationInventory / row.partPercent);
+      // 规格库存最小智
+      item.specificationInventoryMin = row.specificationInventory % row.partPercent;
+      // 规格库在最大单位
+      item.specificationInventoryMaxUnit = row.unitCode_dictText;
+      // 规格库存最小单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大值
+      item.batchInventoryMax = Math.floor(row.batchInventory / row.partPercent);
+      // 批次库存最小值
+      item.batchInventoryMin = row.batchInventory % row.partPercent;
+      // 批次库存最大单位
+      item.batchInventoryMaxUnit = row.unitCode_dictText;
+      // 批次库存最小单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    } else {
+      // 最小单位
+      // 假数据 只做显示用 不参与计算 用于显示
+      // 进货价（假）
+      item.priceMask = row.price / row.partPercent;
+      // 销售价（假）
+      item.retailPriceMask = (parseFloat(row.retailPrice) / parseFloat(row.partPercent)).toFixed(2);
+
+      // 进价金额（假）
+      item.totalPriceMask = row.totalPrice;
+      // 销售金额（假）
+      item.totalRetailPriceMask = row.totalRetailPrice;
+
+      // 规格库存
+      item.specificationInventoryOriginal = row.specificationInventory;
+      // 规格库存最大
+      item.specificationInventoryMin = row.specificationInventory;
+      // 规格库存最大单位
+      item.specificationInventoryMinUnit = row.minUnitCode_dictText;
+
+      // 批次库存
+      item.batchInventoryOriginal = row.batchInventory;
+      // 批次库存最大
+      item.batchInventoryMin = row.batchInventory;
+      // 批次库存最大单位
+      item.batchInventoryMinUnit = row.minUnitCode_dictText;
+    }
+  });
+};
+// 校验是否有空行
+const isEmptyRow = () => {
+  // 如果 localTableData的长度大于 1 时在判断否有空行
+  if (!localTableData.value) {
+    return true;
+  }
+  return localTableData.value.some((row) => !row.itemId || !row.itemQuantity || !row.itemName);
+};
+// 新增一个空行
+const addEmptyRow = () => {
+  localTableData.value.push({
+    // 单据号
+    busNo: localForm.value.busNo,
+    // 开单日期
+    applyTime: localForm.value.applyTime,
+    // 采购员
+    applicantId: localForm.value.applicantId,
+    // 摘要
+    reason: localForm.value.reason,
+    // 单据分类
+    categoryEnum: localForm.value.categoryEnum,
+    // 供应商
+    supplierId: localForm.value.supplierId,
+    // 仓库
+    purposeLocationId: localForm.value.locationId,
+    // 表格需要的字段
+    itemBusNo: '',
+    // 药品 id
+    itemId: '',
+    // 品名
+    itemName: '',
+    // 规格
+    totalVolume: '',
+    // 单位
+    unitCode: '',
+    // 数量
+    itemQuantity: 0,
+    // 进货价
+    price: '',
+    // 进价金额
+    totalPrice: '',
+    // 销售价
+    retailPrice: '',
+    // 销售金额
+    totalRetailPrice: '',
+    // 生产厂家
+    manufacturerText: '',
+    // 规格库存
+    specificationInventory: '',
+    // 批注文号
+    approvalNumber: '',
+    // 验收结果
+    acceptanceResultEnum: 1,
+    // 包装情况
+    packagingConditionEnum: 1,
+    // 备注
+    remake: '',
+    // 编辑状态
+    isEditing: true,
+    // 查看状态
+    isViewing: false,
+  });
+  nextTick(() => {
+    // 处理本地按钮状态
+    emit('updateButtonState', {
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: true,
+      // 保存行 按钮显示
+      isSaveShow: true,
+      // 编辑行 按钮显示
+      isEditShow: true,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 添加行
+const handleAddRow = async () => {
+  // 验证表单
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  // 如果当前没有数据，直接添加空行
+  if (!localTableData.value || localTableData.value.length === 0) {
+    // 确保 localTableData 存在
+    if (!localTableData.value) {
+      localTableData.value = [];
+    }
+    // 添加一个包含所有字段的空对象
+    addEmptyRow();
+
+    return;
+  }
+
+  // 如果有数据，检查是否有空行
+  if (isEmptyRow()) {
+    proxy.$message.error('请填写完整信息');
+    return;
+  }
+
+  // 添加一个包含所有字段的空对象
+  addEmptyRow();
+};
+
+// 验证表单
+const validateFormRef = () => {
+  return new Promise((resolve) => {
+    proxy.$refs.formRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 验证表格
+const validateTableFormRef = () => {
+  if (!localTableData.value || localTableData.value.length === 0) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    proxy.$refs.tableFormRef.validate((valid) => {
+      resolve(valid);
+    });
+  });
+};
+
+// 保存行
+const handleSave = async () => {
+  // 验证表单头部
+  const formValid = await validateFormRef();
+  if (!formValid) {
+    return;
+  }
+  if (!formValid) {
+    return;
+  }
+
+  // 验证表格数据
+  const tableValid = await validateTableFormRef();
+
+  if (!tableValid) {
+    return;
+  }
+
+  // 保存当前数据状态，防止在确认过程中被修改
+  const currentTableData = JSON.parse(JSON.stringify(localTableData.value));
+  const currentFormData = JSON.parse(JSON.stringify(localForm.value));
+
+  // 是否确认保存数据
+  const isConfirm = await proxy.$modal.confirm('确认保存数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+  if (!isConfirm) {
+    return;
+  }
+
+  // 加载中
+  loading.value = true;
+  // 使用保存的数据状态重构数据
+  const editData = await buildEditForm(currentTableData, currentFormData);
+
+  // 判断是新增还是编辑
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('新增成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+        // 关闭加载
+        loading.value = false;
+      }
+    });
+  } else if (localIsAddOrEditOrder.value.isEditOrder) {
+    addOrEditOrder(editData).then((res) => {
+      if (res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 调用父组件的 getList 方法
+        emit('getList');
+        // 清空表单
+        resetAllData();
+      } else {
+        proxy.$message.error('保存失败');
+      }
+      // 关闭加载
+      loading.value = false;
+    });
+  }
+};
+// 重构数据
+const buildEditForm = async (data, formData = null) => {
+  const formDataCopy = [...data];
+  // 获取单据号
+  let busNo = '';
+  if (localIsAddOrEditOrder.value.isAddOrder) {
+    busNo = await getInitBusNo();
+  } else {
+    busNo = data[0].busNo;
+  }
+  // 订单数据
+  const orderData = data[0];
+  // 使用传入的表单数据，如果没有则使用当前的localForm
+  const currentForm = formData || localForm.value;
+  // 表格数据
+  formDataCopy.forEach((item) => {
+    // 单据号
+    item.busNo = busNo;
+    // 开单日期
+    item.applyTime = currentForm.applyTime;
+    // 采购员
+    item.applicantId = currentForm.applicantId;
+    // 单据分类
+    item.categoryEnum = currentForm.categoryEnum;
+    // 摘要
+    item.reason = currentForm.reason;
+    // 仓库
+    item.purposeLocationId = orderData.purposeLocationId
+      ? orderData.purposeLocationId
+      : currentForm.locationId;
+    // 开单人
+    item.practitionerId = currentForm.practitionerId;
+    // 请领部门
+    item.purposeLocationId = currentForm.purposeLocationId;
+  });
+  // 重构数据
+  return formDataCopy;
+};
+// 清空表单
+const resetAllData = () => {
+  // 清空表单数据
+  localForm.value = {};
+
+  // 清空审核表单数据
+  localAuditForm.value = {};
+
+  // 清空表格数据
+  localTableData.value = [];
+
+  // 重置订单状态
+  localIsAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+
+  // 重置按钮状态为初始状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+  });
+};
+// 删除行
+const handleDeleteRow = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$message.warning('请选择要删除的行');
+    return;
+  }
+
+  proxy
+    .$confirm('确认删除选中的行吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      // 从 tableData 中删除选中的行
+      const selectedIndexes = [];
+
+      // 获取选中行在 localTableData 中的索引
+      selectedRows.value.forEach((selectedRow) => {
+        const index = localTableData.value.findIndex(
+          (row) => row.itemBusNo === selectedRow.itemBusNo && row.itemName === selectedRow.itemName
+        );
+        if (index !== -1) {
+          selectedIndexes.push(index);
+        }
+      });
+
+      // 按索引从大到小排序，避免删除时索引变化的问题
+      selectedIndexes.sort((a, b) => b - a);
+
+      // 删除选中的行
+      selectedIndexes.forEach((index) => {
+        localTableData.value.splice(index, 1);
+      });
+
+      // 清空选择
+      selectedRows.value = [];
+      ids.value = [];
+
+      // 如果删除后没有数据了，更新按钮状态
+      if (localTableData.value.length === 0) {
+        emit('updateButtonState', {
+          // 审核 按钮禁用
+          isAuditDisabled: true,
+          // 取消 按钮禁用
+          isCancelDisabled: true,
+          // 删除 按钮禁用
+          isDeleteDisabled: true,
+          // 添加 按钮禁用
+          isAddDisabled: false,
+          // 编辑 按钮禁用
+          isEditDisabled: true,
+          // 添加行 按钮显示
+          isAddShow: true,
+          // 删除行 按钮显示
+          isDeleteShow: true,
+          // 保存行 按钮显示
+          isSaveShow: true,
+          // 编辑行 按钮显示
+          isEditShow: false,
+          // 警戒订货 按钮显示
+          isOrderImport: true,
+        });
+      }
+
+      proxy.$message.success('删除成功');
+    })
+    .catch(() => {
+      // 用户取消删除
+    });
+};
+
+// 日期范围验证函数
+const validateDateRange = (rowIndex) => {
+  const row = localTableData.value[rowIndex];
+  if (row && row.startTime && row.endTime) {
+    if (row.endTime < row.startTime) {
+      proxy.$message.error('失效日期不能小于生产日期');
+      // 清空失效日期
+      row.endTime = '';
+    }
+  }
+};
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRows.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 更新表格数据
+const updateTableData = (updateValue) => {
+  // 更新表格数据
+  localTableData.value = localTableData.value.concat(updateValue.currentOrderList);
+  // 更新表单数据 - 合并数据而不是替换
+  localForm.value = { ...localForm.value, ...updateValue.currentOrderForm };
+
+  // 更新按钮状态
+  emit('updateButtonState', {
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: true,
+    // 删除行 按钮显示
+    isDeleteShow: true,
+    // 保存行 按钮显示
+    isSaveShow: true,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: true,
+  });
+};
+
+// 对话框提交
+const dialogSubmit = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 对话框取消
+const dialogCancel = (value) => {
+  //对话框关闭
+  dialogVisible.value = value.dialogVisible;
+};
+// 订货单导入
+const handleOrderImport = async () => {
+  // 对话框显示
+  dialogVisible.value = true;
+  // 获取订单列表
+  await proxy.$refs.orderDialogRef.getOrderList(localForm.value.locationId);
+};
+
+// 组件名称
+defineOptions({ name: 'orderTable' });
+// 暴露方法给父组件
+defineExpose({
+  resetAllData,
+});
+</script>
+
+<style scoped>
+/* 表格中的表单项样式 */
+.table-form-item {
+  margin-bottom: 0 !important;
+  display: block !important;
+}
+
+/* 确保表格行有足够的高度显示错误信息 */
+.el-table .el-table__row {
+  min-height: 100px;
+}
+
+/* 表格单元格样式 */
+.el-table .el-table__cell {
+  padding-bottom: 25px;
+}
+
+/* 输入框样式 */
+.el-table .el-input {
+  width: 100%;
+}
+
+/* 确保表格占满容器宽度 */
+.el-table {
+  width: 100% !important;
+}
+
+/* 确保表格容器占满宽度 */
+.el-form {
+  width: 100%;
+}
+
+/* 确保行容器占满宽度 */
+.el-row {
+  width: 100%;
+}
+
+/* 自定义表单项样式 */
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18px;
+}
+
+.form-label {
+  width: 100px;
+  text-align: right;
+  padding-right: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+
+/* 强制显示错误信息 */
+.el-form-item__error {
+  position: static !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+  display: block !important;
+  margin-top: 2px !important;
+  font-size: 12px !important;
+  color: #f56c6c !important;
+}
+
+/* 确保表单项内容正确显示 */
+.el-form-item__content {
+  display: block !important;
+  width: 100% !important;
+}
+
+/* 表格单元格内容样式 */
+.el-table .cell {
+  padding: 8px 0;
+}
+.table-container {
+  width: 100%;
+}
+</style> 
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/index.vue
new file mode 100644
index 00000000..f0f6abf2
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicineStorage/stocktakingOrder/index.vue
@@ -0,0 +1,1071 @@
+<!-- 药库订货单 -->
+<template>
+  <div class="medicine-container app-container">
+    <!-- 顶部按钮 -->
+    <el-row :gutter="20" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="Plus"
+          plain
+          @click="handleAdd"
+          :disabled="isAddDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:add']"
+        >
+          新增
+        </el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Edit"
+          plain
+          @click="handleEdit"
+          :disabled="isEditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:edit']"
+          >编辑</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Delete"
+          plain
+          @click="handleDelete"
+          :disabled="isDeleteDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:delete']"
+        >
+          删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="Close"
+          plain
+          @click="handleCancel"
+          :disabled="isCancelDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:cancel']"
+        >
+          取消
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Check"
+          plain
+          @click="handleAudit"
+          :disabled="isAuditDisabled"
+          v-hasPermi="['pharmacy-warehouse:stockIn-order:audit']"
+        >
+          审核
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <!-- 左侧搜索 -->
+      <el-col :span="4" style="border: 1px solid #ebeef5; height: calc(100vh - 200px)">
+        <el-row :gutter="10" style="margin-top: 10px">
+          <el-col :span="24">
+            <el-form ref="tableFormRef" :model="tableForm" style="width: 100%" :rules="rules">
+              <el-form-item label="库房：" label-width="100px">
+                <el-select
+                  v-model="tableForm.locationId"
+                  placeholder="请选择库房"
+                  clearable
+                  filterable
+                  @change="handleLocationChange(tableForm.locationId)"
+                >
+                  <el-option
+                    v-for="item in cabinetListOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-form
+            ref="queryParamsRef"
+            :model="queryParams"
+            style="width: 100%"
+            :rules="rules"
+            @submit.prevent
+          >
+            <el-form-item label="单据搜索" label-width="100px">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="请输入单据号"
+                @keyup.enter="getList"
+                clearable
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getList" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row :gutter="10">
+          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+            <div class="order-list-container">
+              <!-- 有数据时显示列表 -->
+              <template v-if="orderList.length > 0">
+                <div
+                  v-for="item in orderList"
+                  :key="item.supplyBusNo"
+                  :class="['order-item', { 'is-active': selectedOrder === item }]"
+                  @click="handleOrderClick(item)"
+                >
+                  <el-card class="order-card" shadow="hover">
+                    <div class="order-header">
+                      <div class="order-number">
+                        <el-icon><Document /></el-icon>
+                        <span class="number-text">{{ item.supplyBusNo }}</span>
+                      </div>
+                    </div>
+                    <div class="order-content">
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">采购员：</span>
+                        <span class="value">{{ item.applicantId_dictText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><User /></el-icon>
+                        <span class="label">审核状态：</span>
+                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                        <el-tag type="danger" v-else>
+                          {{ item.statusEnum_enumText }}
+                        </el-tag>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Files /></el-icon>
+                        <span class="label">单据类型：</span>
+                        <span class="value">{{ item.typeEnum_enumText }}</span>
+                      </div>
+                      <div class="info-item">
+                        <el-icon class="info-icon"><Calendar /></el-icon>
+                        <span class="label">单据日期：</span>
+                        <span class="value">{{
+                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                        }}</span>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </template>
+
+              <!-- 空状态显示 -->
+              <div v-else class="empty-state">
+                <el-empty description="暂无单据" :image-size="80">
+                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                </el-empty>
+              </div>
+            </div>
+          </el-scrollbar>
+        </el-row>
+      </el-col>
+      <!-- 右侧表格 -->
+      <el-col :span="20">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <orderTable
+              ref="orderTableRef"
+              :form="tableForm"
+              :table-data="tableData"
+              :audit-form="auditForm"
+              :table-data-total="tableDataTotal"
+              :is-add-or-edit-order="isAddOrEditOrder"
+              :supplier-option="supplierOption"
+              :supply-type-options="supplyTypeOptions"
+              :supply-status-options="supplyStatusOptions"
+              :supply-category-options="supplyCategoryOptions"
+              :practitioner-option="practitionerOption"
+              :packaging-condition-options="packagingConditionOptions"
+              :acceptance-resultory-options="acceptanceResultoryOptions"
+              :pharmacy-list-options="pharmacyListOptions"
+              :button-show="buttonShow"
+              @update:query-params="handleQueryParamsUpdate"
+              @update:form="handleFormUpdate"
+              @getList="getList"
+              @updateButtonState="handleUpdateButtonState"
+            >
+            </orderTable>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import orderTable from './components/orderTable.vue';
+import {
+  getInit,
+  getOrderList,
+  deleteOrder,
+  agreeApproval,
+  getOrderDetail,
+} from './components/api';
+import useUserStore from '@/store/modules/user';
+import { parseTime } from '@/utils/his';
+
+const route = useRoute();
+const router = useRouter();
+
+// 获取 pinia 中用户信息
+const userInfo = useUserStore();
+// 左侧查询参数
+const queryParams = ref({
+  searchKey: '',
+});
+// 获取当前实例
+const { proxy } = getCurrentInstance();
+// 右侧表格查询参数 + 分页参数 + 添加查询参数
+const tableForm = ref({
+  locationId: undefined,
+  busNo: undefined,
+  applyTime: undefined,
+  applicantId: undefined,
+  reason: undefined,
+  categoryEnum: undefined,
+  supplierId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+// 右侧表格数据
+const tableData = ref([]);
+// 右侧审核表单
+const auditForm = ref({
+  approvalTime: undefined,
+  statusEnum: undefined,
+  statusEnum_enumText: undefined,
+  approverId: undefined,
+});
+// 订单编辑还是新增
+const isAddOrEditOrder = ref({
+  isAddOrder: false,
+  isEditOrder: false,
+});
+// 仓库列表 cabinetList
+const cabinetListOptions = ref([]);
+// 查询经手人列表 practitionerOption
+const practitionerOption = ref([]);
+// 查询供应商列表 supplierOption
+const supplierOption = ref([]);
+// 审批状态 supplyStatusOptions
+const supplyStatusOptions = ref([]);
+// 单据类型 supplyTypeOptions
+const supplyTypeOptions = ref([]);
+// 单据分类 supplyCategoryOptions
+const supplyCategoryOptions = ref([]);
+// 包装情况 packagingConditionOptions
+const packagingConditionOptions = ref([]);
+// 验收结果 acceptanceResultoryOptions
+const acceptanceResultoryOptions = ref([]);
+// 请领部门 pharmacyListOptions
+const pharmacyListOptions = ref([]);
+// 订货单单据列表 orderList
+const orderList = ref([]);
+// 订货单单据列表总条数
+const tableDataTotal = ref(0);
+// 选中的单据ID
+const selectedOrder = ref(null);
+// 是否禁用新增按钮
+const isAddDisabled = ref(false);
+// 是否禁用编辑按钮
+const isEditDisabled = ref(true);
+// 是否禁用取消按钮
+const isCancelDisabled = ref(true);
+// 是否禁用删除按钮
+const isDeleteDisabled = ref(true);
+// 是否禁用审核按钮
+const isAuditDisabled = ref(true);
+// 按钮显示 buttonShow
+const buttonShow = ref({
+  isAddShow: false,
+  isDeleteShow: false,
+  isSaveShow: false,
+  isEditShow: false,
+});
+const rules = ref({
+  locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
+});
+
+// 初始化 获取下拉列表
+const init = async () => {
+  const res = await getInit();
+  // 仓库列表 cabinetListOptions
+  cabinetListOptions.value = res.data.cabinetListOptions;
+  // 查询经手人列表 practitionerList
+  practitionerOption.value = res.data.practitionerOption;
+  // 查询供应商列表 supplierOption
+  supplierOption.value = res.data.supplierOption;
+  // 审批状态 supplyStatusOptions
+  supplyStatusOptions.value = res.data.supplyStatusOptions;
+  // 单据类型 supplyTypeOptions
+  supplyTypeOptions.value = res.data.supplyTypeOptions;
+  // 单据分类
+  supplyCategoryOptions.value = res.data.supplyCategoryOptions;
+  // 包装情况 packagingConditionOptions
+  packagingConditionOptions.value = res.data.packagingConditionOptions;
+  // 验收结果 acceptanceResultoryOptions
+  acceptanceResultoryOptions.value = res.data.acceptanceResultoryOptions;
+  // 请领部门
+  pharmacyListOptions.value = res.data.pharmacyListOptions;
+};
+
+// 获取订货单单据列表
+const getList = async () => {
+  const res = await getOrderList(queryParams.value);
+  // 订货单单据列表 orderList
+  orderList.value = res.data.records;
+};
+
+// 新增按钮
+const handleAdd = async () => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+  // 校验库房ID
+  if (!tableForm.value.locationId) {
+    proxy.$modal.msgWarning('新增单据前，请选择库房');
+    return;
+  }
+
+  // 右侧表单数据
+  tableForm.value = {
+    // 采购员
+    applicantId: userInfo.practitionerId,
+    // 单据日期
+    applyTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+    // 库房ID
+    locationId: tableForm.value.locationId,
+    // 开单人
+    practitionerId: undefined,
+  };
+
+  // 订单编辑还是新增
+  isAddOrEditOrder.value = {
+    isAddOrder: true,
+    isEditOrder: false,
+  };
+
+  // 延迟执行
+  nextTick(() => {
+    // 更新按钮状态为编辑模式
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: false,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: true,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: true,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: true,
+    });
+  });
+};
+// 清空当前表格数据
+const resetFormAndTableData = () => {
+  // 清空右侧表格数据
+  tableData.value = [];
+  // 清空审核表单数据
+  auditForm.value = {};
+  // 清空右侧表格数据总条数
+  tableDataTotal.value = 0;
+};
+
+// 编辑按钮
+const handleEdit = async (order) => {
+  // 清空当前表格数据 和 选中状态
+  resetFormAndTableData();
+
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要编辑的单据');
+    return;
+  }
+  const res = await getOrderDetail({
+    busNo: selectedOrder.value.supplyBusNo,
+    pageNo: tableForm.value.pageNo,
+    pageSize: tableForm.value.pageSize,
+  });
+  // 构建编辑后的表单数据
+  buildEditForm(res.data.records);
+  // 更新表格数据总条数
+  tableDataTotal.value = res.data.total;
+  // 根据订单状态更新按钮状态
+  const isApproved = order.statusEnum_enumText === '同意' || order.statusEnum === 3;
+  if (isApproved) {
+    // 设置编辑状态
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: false,
+    };
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+    return;
+  }
+  // 设置编辑状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: true,
+  };
+
+  // 更新按钮状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: isApproved,
+    // 取消 按钮禁用
+    isCancelDisabled: false,
+    // 删除 按钮禁用
+    isDeleteDisabled: isApproved,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: !isApproved,
+    // 删除行 按钮显示
+    isDeleteShow: !isApproved,
+    // 保存行 按钮显示
+    isSaveShow: !isApproved,
+    // 编辑行 按钮显示
+    isEditShow: !isApproved,
+    // 警戒订货 按钮显示
+    isOrderImport: !isApproved,
+  });
+};
+// 构建进货价和销售价
+const buildPrice = (item) => {
+  // 判断当前单位是最大单位还是最小单位
+  const isMaxUnit = item.unitCode === item.maxUnitCode;
+  if (isMaxUnit) {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = item.price;
+    item.priceMinUnit = item.price / parseInt(item.partPercent);
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = item.retailPrice;
+    item.retailPriceMinUnit = (parseFloat(item.retailPrice) / parseFloat(item.partPercent)).toFixed(
+      2
+    );
+  } else {
+    // 进货价
+    item.price = item.price;
+    item.priceMaxUnit = parseFloat((item.price * parseInt(item.partPercent)).toFixed(2));
+    item.priceMinUnit = item.price;
+
+    // 销售价
+    item.retailPrice = item.retailPrice;
+    item.retailPriceMaxUnit = parseFloat(
+      (item.retailPrice * parseInt(item.partPercent)).toFixed(2)
+    );
+    item.retailPriceMinUnit = item.retailPrice;
+  }
+  // 盈亏进价金额 =  盈亏数量 * 进货价
+  item.totalPrice = parseFloat((item.itemQuantity * item.price).toFixed(2));
+  // 盈亏销售金额  =  盈亏数量 * 进货价
+  item.totalRetailPrice = parseFloat((item.itemQuantity * item.retailPrice).toFixed(2));
+
+  // 实盘进价金额 = 实盘数量 * 进货价
+  item.totalQuantityPrice = parseFloat((item.totalQuantity * item.price).toFixed(2));
+  // 实盘销售金额 = 实盘数量 * 销售价
+  item.totalQuantityRetailPrice = parseFloat((item.totalQuantity * item.retailPrice).toFixed(2));
+  // 账目进价金额  = 批次库存 * 进货价
+  item.accountInPrice = item.batchInventory * item.price;
+  // 账目销售价金额  = 批次库存 * 销售价
+  item.accountRetailPrice = item.batchInventory * item.retailPrice;
+};
+//  构建单位列表
+const buildUnitList = (item) => {
+  // 表格单位列表
+  (item.unitList || []).forEach((unit) => {
+    // 判断当前单位是最大单位还是最小单位
+    const isMaxUnit = unit.value === item.maxUnitCode;
+    const isMinUnit = unit.value === item.minUnitCode;
+
+    // // 进货价（假）
+    unit.priceMask = item.price;
+
+    // 销售价（假）
+    unit.retailPriceMask = item.retailPrice;
+
+    // 进价金额（假）
+    unit.totalPriceMask = (parseFloat(item.price) * parseFloat(item.itemQuantity)).toFixed(2);
+
+    // 销售金额（假）
+    unit.totalRetailPriceMask = (
+      parseFloat(item.retailPrice) * parseFloat(item.itemQuantity)
+    ).toFixed(2);
+
+    // 规格库存
+    unit.specificationInventoryOriginal = item.specificationInventory;
+
+    // 规格库存显示逻辑
+    if (isMaxUnit) {
+      // 最大单位：显示为 "X盒"
+      unit.specificationInventoryMax = Math.floor(
+        item.specificationInventory / parseInt(item.partPercent)
+      );
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.specificationInventoryMin = item.specificationInventory % parseInt(item.partPercent);
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = Math.floor(item.batchInventory / parseInt(item.partPercent));
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.maxUnitCode_dictText : '';
+      unit.batchInventoryMin = item.batchInventory % parseInt(item.partPercent);
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else if (isMinUnit) {
+      // 最小单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    } else {
+      // 其他单位：显示为 "X瓶"
+      unit.specificationInventoryMax = item.specificationInventory;
+      unit.specificationInventoryMaxUnit =
+        unit.specificationInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.specificationInventoryMin = 0;
+      unit.specificationInventoryMinUnit =
+        unit.specificationInventoryMin > 0 ? item.minUnitCode_dictText : '';
+
+      // 批次库存
+      unit.batchInventoryMax = item.batchInventory;
+      unit.batchInventoryMaxUnit = unit.batchInventoryMax > 0 ? item.minUnitCode_dictText : '';
+      unit.batchInventoryMin = 0;
+      unit.batchInventoryMinUnit = unit.batchInventoryMin > 0 ? item.minUnitCode_dictText : '';
+    }
+  });
+};
+// 构建编辑后的表单数据
+const buildEditForm = (data) => {
+  // 构建表格数据
+  if (data.length > 0) {
+    // 表单数据
+    tableForm.value = {
+      // 单据号
+      busNo: data[0].busNo,
+      // 单据日期
+      applyTime: data[0].applyTime,
+      // 供应商
+      supplierId: data[0].supplierId,
+      // 供应商联系人
+      phone: data[0].phone,
+      // 采购员
+      applicantId: data[0].applicantId,
+      // 单据类型
+      categoryEnum: data[0].categoryEnum,
+      // 摘要
+      reason: data[0].reason,
+      // 仓库
+      locationId: data[0].purposeLocationId,
+      // 开单人
+      practitionerId: data[0].practitionerId,
+      // 请领部门
+      purposeLocationId: data[0].purposeLocationId,
+    };
+    // 表格数据
+    data.forEach((item) => {
+      // 表格编辑状态
+      item.isEditing = false;
+      // 表格查看状态
+      item.isViewing = true;
+      // 判断当前单位是否是最大单位
+      buildPrice(item);
+      // 构建单位列表
+      buildUnitList(item);
+    });
+    // 更新表格数据
+    tableData.value = data;
+
+    // 审核表格数据
+    auditForm.value = {
+      // 审核时间
+      approvalTime: data[0].approvalTime,
+      // 审核状态
+      statusEnum: data[0].statusEnum,
+      // 审核状态文本
+      statusEnum_enumText: data[0].statusEnum_enumText,
+      // 审核人
+      approverId: data[0].approverId,
+    };
+    // 订单编辑还是新增
+    isAddOrEditOrder.value = {
+      isAddOrder: false,
+      isEditOrder: true,
+    };
+  }
+};
+// 取消按钮
+const handleCancel = () => {
+  // 更新按钮状态为初始状态
+  handleUpdateButtonState({
+    // 审核 按钮禁用
+    isAuditDisabled: true,
+    // 取消 按钮禁用
+    isCancelDisabled: true,
+    // 删除 按钮禁用
+    isDeleteDisabled: true,
+    // 添加 按钮禁用
+    isAddDisabled: false,
+    // 编辑 按钮禁用
+    isEditDisabled: true,
+    // 添加行 按钮显示
+    isAddShow: false,
+    // 删除行 按钮显示
+    isDeleteShow: false,
+    // 保存行 按钮显示
+    isSaveShow: false,
+    // 编辑行 按钮显示
+    isEditShow: false,
+    // 警戒订货 按钮显示
+    isOrderImport: false,
+  });
+
+  // 清空表单
+  clearForm();
+};
+
+// 清空表单
+const clearForm = () => {
+  // 清空表单数据
+  tableForm.value = {};
+  tableData.value = [];
+  // 清空右侧表格数据
+  proxy.$refs.orderTableRef.resetAllData();
+  // 重置订单状态
+  isAddOrEditOrder.value = {
+    isAddOrder: false,
+    isEditOrder: false,
+  };
+};
+// 删除按钮
+const handleDelete = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要删除的单据');
+    return;
+  }
+
+  // 校验是否可以删除（已审批的单据不能删除）
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('已审批的单据不能删除');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认删除该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 删除单据
+    await deleteOrder(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('删除成功');
+    // 清空右侧表格数据
+    clearForm();
+    // 重新获取列表 库房ID
+    await getList(tableForm.value.locationId);
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('删除失败');
+      console.error('删除失败:', error);
+    }
+  }
+};
+// 审核按钮
+const handleAudit = async () => {
+  if (!selectedOrder.value) {
+    proxy.$modal.msgError('请选择要审核的单据');
+    return;
+  }
+
+  // 校验是否是已审批状态
+  if (selectedOrder.value.statusEnum_enumText === '同意' || selectedOrder.value.statusEnum === 3) {
+    proxy.$modal.msgError('该单据已审批，不能重复审批');
+    return;
+  }
+
+  try {
+    await proxy.$modal.confirm('确认同意该采购单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 同意审批
+    await agreeApproval(selectedOrder.value.supplyBusNo);
+    proxy.$modal.msgSuccess('同意审批成功');
+    // 编辑
+    handleEdit(selectedOrder);
+    // 重新获取列表
+    await getList();
+
+    // 清空选中状态
+    selectedOrder.value = null;
+    // 更新按钮状态为初始状态
+    handleUpdateButtonState({
+      // 审核 按钮禁用
+      isAuditDisabled: true,
+      // 取消 按钮禁用
+      isCancelDisabled: true,
+      // 删除 按钮禁用
+      isDeleteDisabled: true,
+      // 添加 按钮禁用
+      isAddDisabled: false,
+      // 编辑 按钮禁用
+      isEditDisabled: true,
+      // 添加行 按钮显示
+      isAddShow: false,
+      // 删除行 按钮显示
+      isDeleteShow: false,
+      // 保存行 按钮显示
+      isSaveShow: false,
+      // 编辑行 按钮显示
+      isEditShow: false,
+      // 警戒订货 按钮显示
+      isOrderImport: false,
+    });
+  } catch (error) {
+    if (error !== 'cancel') {
+      proxy.$modal.msgError('同意审批失败');
+      console.error('同意审批失败:', error);
+    }
+  }
+};
+
+// 处理订单点击事件
+const handleOrderClick = (order) => {
+  // 选中订单
+  selectedOrder.value = order;
+  // 编辑
+  handleEdit(order);
+};
+
+// 处理查询参数更新
+const handleQueryParamsUpdate = (newParams) => {
+  // 更新右侧表格的分页参数
+  tableForm.value.pageNo = newParams.pageNo;
+  tableForm.value.pageSize = newParams.pageSize;
+
+  // 如果有选中的订单，重新获取订单详情
+  if (selectedOrder.value) {
+    handleEdit(selectedOrder.value);
+  }
+};
+//
+// 处理库房变化
+const handleLocationChange = (locationId) => {
+  queryParams.value.locationId = locationId;
+  // 重新获取列表
+  getList();
+};
+//
+// 处理表单更新
+const handleFormUpdate = (newForm) => {
+  tableForm.value = { ...tableForm.value, ...newForm };
+};
+
+// 处理按钮状态更新
+const handleUpdateButtonState = (buttonState) => {
+  // 按钮禁用
+  // 审核 按钮禁用
+  isAuditDisabled.value = buttonState.isAuditDisabled;
+  // 取消 按钮禁用
+  isCancelDisabled.value = buttonState.isCancelDisabled;
+  // 删除 按钮禁用
+  isDeleteDisabled.value = buttonState.isDeleteDisabled;
+  // 添加 按钮禁用
+  isAddDisabled.value = buttonState.isAddDisabled;
+  // 编辑 按钮禁用
+  isEditDisabled.value = buttonState.isEditDisabled;
+  // 按钮显示
+  // 添加行 按钮显示
+  buttonShow.value.isAddShow = buttonState.isAddShow;
+  // 删除行 按钮显示
+  buttonShow.value.isDeleteShow = buttonState.isDeleteShow;
+  // 保存行 按钮显示
+  buttonShow.value.isSaveShow = buttonState.isSaveShow;
+  // 编辑行 按钮显示
+  buttonShow.value.isEditShow = buttonState.isEditShow;
+  // 警戒订货 按钮显示
+  buttonShow.value.isOrderImport = buttonState.isOrderImport;
+};
+// 监听路由变化
+watch(
+  () => route.query,
+  async (newQuery) => {
+    //console.log('路由参数发生变化:', newQuery);
+    if (newQuery.busNo) {
+      queryParams.value.searchKey = newQuery.busNo;
+      await getList();
+      // 设置选中状态
+      selectedOrder.value = orderList.value.find((item) => item.supplyBusNo === newQuery.busNo);
+      // 编辑按钮
+      handleEdit(selectedOrder.value);
+      // 清空路由参数
+      // router.replace({ query: {} });
+    }
+  },
+  { immediate: true }
+);
+// 下拉列表初始化
+init();
+</script>
+
+<style scoped lang="scss">
+.medicine-container :deep(.el-row) {
+  margin-bottom: 10px;
+}
+.medicine-container :deep(.el-row:last-child) {
+  margin-bottom: 0;
+}
+
+// 订单列表容器
+.order-list-container {
+  width: 100%;
+  padding: 0;
+}
+
+// 订单列表项样式
+.order-item {
+  width: 100%;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border-radius: 6px;
+  overflow: hidden;
+  margin: 4px 0;
+
+  &:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+
+    .order-card {
+      border-color: #409eff;
+    }
+  }
+
+  &.is-active {
+    .order-card {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #ecf5ff 0%, #f0f9ff 100%);
+    }
+
+    .order-number .number-text {
+      color: #409eff;
+      font-weight: 600;
+    }
+  }
+}
+
+// 订单卡片样式
+.order-card {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  background: #fff;
+  overflow: hidden;
+
+  :deep(.el-card__body) {
+    padding: 12px;
+  }
+}
+
+// 订单头部样式
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.order-number {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex: 1;
+
+  .el-icon {
+    color: #409eff;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .number-text {
+    font-size: 13px;
+    font-weight: 500;
+    color: #303133;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.order-status {
+  flex-shrink: 0;
+
+  .el-tag {
+    border-radius: 10px;
+    font-weight: 500;
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+}
+
+// 订单内容样式
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 0;
+  min-width: 0;
+
+  .info-icon {
+    color: #909399;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
+
+  .label {
+    color: #606266;
+    font-size: 12px;
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+
+  .value {
+    color: #303133;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+    flex: 1;
+  }
+}
+
+// 空状态样式
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+
+  :deep(.el-empty__description) {
+    color: #909399;
+    font-size: 14px;
+  }
+
+  :deep(.el-button) {
+    margin-top: 16px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .order-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .info-item {
+    padding: 2px 0;
+  }
+
+  .empty-state {
+    height: 150px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/vue3/src/views/monitor/cache/index.vue b/openhis-ui-vue3/src/views/monitor/cache/index.vue
similarity index 100%
rename from vue3/src/views/monitor/cache/index.vue
rename to openhis-ui-vue3/src/views/monitor/cache/index.vue
diff --git a/vue3/src/views/monitor/cache/list.vue b/openhis-ui-vue3/src/views/monitor/cache/list.vue
similarity index 100%
rename from vue3/src/views/monitor/cache/list.vue
rename to openhis-ui-vue3/src/views/monitor/cache/list.vue
diff --git a/vue3/src/views/monitor/druid/index.vue b/openhis-ui-vue3/src/views/monitor/druid/index.vue
similarity index 100%
rename from vue3/src/views/monitor/druid/index.vue
rename to openhis-ui-vue3/src/views/monitor/druid/index.vue
diff --git a/vue3/src/views/monitor/job/index.vue b/openhis-ui-vue3/src/views/monitor/job/index.vue
similarity index 100%
rename from vue3/src/views/monitor/job/index.vue
rename to openhis-ui-vue3/src/views/monitor/job/index.vue
diff --git a/vue3/src/views/monitor/job/log.vue b/openhis-ui-vue3/src/views/monitor/job/log.vue
similarity index 100%
rename from vue3/src/views/monitor/job/log.vue
rename to openhis-ui-vue3/src/views/monitor/job/log.vue
diff --git a/vue3/src/views/monitor/logininfor/index.vue b/openhis-ui-vue3/src/views/monitor/logininfor/index.vue
similarity index 100%
rename from vue3/src/views/monitor/logininfor/index.vue
rename to openhis-ui-vue3/src/views/monitor/logininfor/index.vue
diff --git a/vue3/src/views/monitor/online/index.vue b/openhis-ui-vue3/src/views/monitor/online/index.vue
similarity index 100%
rename from vue3/src/views/monitor/online/index.vue
rename to openhis-ui-vue3/src/views/monitor/online/index.vue
diff --git a/vue3/src/views/monitor/operlog/index.vue b/openhis-ui-vue3/src/views/monitor/operlog/index.vue
similarity index 100%
rename from vue3/src/views/monitor/operlog/index.vue
rename to openhis-ui-vue3/src/views/monitor/operlog/index.vue
diff --git a/vue3/src/views/monitor/server/index.vue b/openhis-ui-vue3/src/views/monitor/server/index.vue
similarity index 100%
rename from vue3/src/views/monitor/server/index.vue
rename to openhis-ui-vue3/src/views/monitor/server/index.vue
diff --git a/vue3/src/views/patientmanagement/outpatienrecords/component/api.js b/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/component/api.js
similarity index 100%
rename from vue3/src/views/patientmanagement/outpatienrecords/component/api.js
rename to openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/component/api.js
diff --git a/vue3/src/views/patientmanagement/outpatienrecords/index.vue b/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
similarity index 100%
rename from vue3/src/views/patientmanagement/outpatienrecords/index.vue
rename to openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
diff --git a/vue3/src/views/patientmanagement/patientmanagement/component/api.js b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/component/api.js
similarity index 100%
rename from vue3/src/views/patientmanagement/patientmanagement/component/api.js
rename to openhis-ui-vue3/src/views/patientmanagement/patientmanagement/component/api.js
diff --git a/vue3/src/views/patientmanagement/patientmanagement/index.vue b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
similarity index 93%
rename from vue3/src/views/patientmanagement/patientmanagement/index.vue
rename to openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
index 72a5273b..aaee50fd 100644
--- a/vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -33,8 +33,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-          >添加病人</el-button
+          >新增患者</el-button
         >
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -77,7 +76,6 @@
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:menu:edit']"
             >修改</el-button
           >
           <el-button
@@ -85,7 +83,6 @@
             type="primary"
             icon="View"
             @click="handleSee(scope.row)"
-            v-hasPermi="['system:menu:add']"
             >查看</el-button
           >
         </template>
@@ -180,6 +177,15 @@
               <el-input v-model="form.birthDate" v-show="false" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+          <el-form-item label="年龄" prop="age">
+            <el-input
+              v-model="form.age"
+              :disabled="isViewMode"
+              @input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
+            />
+          </el-form-item>
+        </el-col>
           <el-col :span="6">
             <el-form-item label="国家编码" prop="countryCode">
               <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
@@ -403,12 +409,40 @@ const data = reactive({
   },
   rules: {
     name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-    idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
+    age: [{ required: true, message: '年龄不能为空', trigger: 'change' }],
     phone: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   },
 });
 const { queryParams, form, rules, isViewMode } = toRefs(data);
 
+watch(
+  () => form.value.idCard,
+  (newIdCard) => {
+    if (newIdCard && newIdCard.length === 18) {
+      const birthYear = parseInt(newIdCard.substring(6, 10));
+      const birthMonth = parseInt(newIdCard.substring(10, 12));
+      const birthDay = parseInt(newIdCard.substring(12, 14));
+      
+      const today = new Date();
+      const currentYear = today.getFullYear();
+      const currentMonth = today.getMonth() + 1;
+      const currentDay = today.getDate();
+      
+      let age = currentYear - birthYear;
+      
+      // 如果当前月份小于出生月份，或者月份相同但当前日期小于出生日期，则年龄减1
+      if (
+        currentMonth < birthMonth ||
+        (currentMonth === birthMonth && currentDay < birthDay)
+      ) {
+        age--;
+      }
+      
+      form.value.age = age;
+    }
+  }
+);
+
 const handleChange = () => {
   const checkedNodes = selectedOptions.value.map((code) => {
     const node = findNodeByCode(options.value, code);
@@ -507,14 +541,14 @@ function handleAdd() {
   selectedOptions.value = [];
   isViewMode.value = false;
   open.value = true;
-  title.value = '添加病人';
+  title.value = '新增患者';
 }
 //查看按钮
 function handleSee(row) {
   isViewMode.value = true;
   form.value = row;
   open.value = true;
-  title.value = '查看病人';
+  title.value = '查看患者';
 }
 
 /** 修改按钮操作 */
diff --git a/vue3/src/views/pharmacymanagement/westernmedicine/components/api.js b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
similarity index 100%
rename from vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
rename to openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json
new file mode 100644
index 00000000..1f40663f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json
@@ -0,0 +1,533 @@
+{
+  "panels": [
+    {
+      "index": 1,
+      "name": 2,
+      "paperType": "A5",
+      "height": 210,
+      "width": 148,
+      "paperHeader": 6,
+      "paperFooter": 595.2755905511812,
+      "printElements": [
+        {
+          "options": {
+            "left": 150,
+            "top": 16.5,
+            "height": 22.5,
+            "width": 120,
+            "title": "长春大学医院",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontFamily": "Microsoft YaHei",
+            "fontSize": 18,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 187.5,
+            "top": 54,
+            "height": 10.5,
+            "width": 43.5,
+            "title": "处方签",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 13.5,
+            "textAlign": "justify",
+            "qrCodeLevel": 0
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 34.5,
+            "top": 76.5,
+            "height": 12,
+            "width": 171,
+            "title": "医保编号：",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 252,
+            "top": 76.5,
+            "height": 10.5,
+            "width": 163.5,
+            "title": "就诊类型：",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 252,
+            "top": 93,
+            "height": 12,
+            "width": 163.5,
+            "title": "费用性质",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "contractName"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 34.5,
+            "top": 94.5,
+            "height": 12,
+            "width": 171,
+            "title": "处方编号",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "prescriptionNo"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 28.5,
+            "top": 112.5,
+            "height": 9,
+            "width": 387,
+            "borderWidth": "1.5",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": { "title": "横线", "type": "hline" }
+        },
+        {
+          "options": {
+            "left": 195,
+            "top": 121.5,
+            "height": 12,
+            "width": 63,
+            "title": "性别",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "genderEnum_enumText"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 294,
+            "top": 121.5,
+            "height": 12,
+            "width": 79.5,
+            "title": "年龄",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "age"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 123,
+            "height": 12,
+            "width": 133.5,
+            "title": "姓名",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "patientName"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 141,
+            "height": 12,
+            "width": 192,
+            "title": "门诊号",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "encounterId"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 295.5,
+            "top": 142.5,
+            "height": 12,
+            "width": 124.5,
+            "title": "科室",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "organizationName"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 160.5,
+            "height": 12,
+            "width": 384,
+            "title": "临床诊断",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "conditionName"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 36,
+            "top": 178.5,
+            "height": 12,
+            "width": 124.5,
+            "title": "电话",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "phone"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 228,
+            "top": 178.5,
+            "height": 12,
+            "width": 189,
+            "title": "开具日期",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9,
+            "field": "reqAuthoredTime"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 30,
+            "top": 195,
+            "height": 9,
+            "width": 387,
+            "borderWidth": "1.5",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": { "title": "横线", "type": "hline" }
+        },
+        {
+          "options": {
+            "left": 30,
+            "top": 201,
+            "height": 13.5,
+            "width": 19.5,
+            "title": "Rp",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 9,
+            "fontWeight": "500",
+            "qrCodeLevel": 0
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 25.5,
+            "top": 225,
+            "height": 229.5,
+            "width": 381,
+            "field": "prescriptionList",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "tableBorder": "noBorder",
+            "tableHeaderBorder": "noBorder",
+            "tableHeaderCellBorder": "noBorder",
+            "tableHeaderBackground": "#ffffff",
+            "tableBodyRowBorder": "noBorder",
+            "tableBodyCellBorder": "noBorder",
+            "tableFooterBorder": "noBorder",
+            "tableFooterCellBorder": "noBorder",
+            "lHeight": 180,
+            "groupFieldsFormatter": "function(type,options,data){ return ['medicineName'] }",
+            "tableBodyRowHeight": 15,
+            "columns": [
+              [
+                {
+                  "width": 86.5148548770295,
+                  "title": "名称",
+                  "titleSync": false,
+                  "field": "medicineName",
+                  "checked": true,
+                  "columnId": "medicineName",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "vAlign": "top",
+                  "renderFormatter": "function(value,row,colIndex,options,rowIndex){ return value + '<br/>' + '用法用量'; }",
+                  "styler2": "function(value,row,index,options){ return {padding: '5px 5px' }; }",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 87.49337048145199,
+                  "title": "规格",
+                  "titleSync": false,
+                  "field": "totalVolume",
+                  "checked": true,
+                  "columnId": "totalVolume",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "vAlign": "top",
+                  "renderFormatter": "function(value,row,colIndex,options,rowIndex){ return value + '<br/>'+ row.dose + row.doseUnitCode_dictText + ' ' + row.methodCode_dictText; }",
+                  "styler2": "function(value,row,index,options){ return {padding: '5px 5px' }; }",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 42.00221340893656,
+                  "title": "单价",
+                  "titleSync": false,
+                  "field": "unitPrice",
+                  "checked": true,
+                  "columnId": "unitPrice",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "vAlign": "top",
+                  "renderFormatter": "function(value,row,colIndex,options,rowIndex){ return value + '<br/>' + '' }",
+                  "styler2": "function(value,row,index,options){ return {padding: '5px 5px' }; }",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 56.015045170547694,
+                  "title": "数量",
+                  "titleSync": false,
+                  "field": "quantity",
+                  "checked": true,
+                  "columnId": "quantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "vAlign": "top",
+                  "renderFormatter": "function(value,row,colIndex,options,rowIndex){ return value + '<br/>' + '' }",
+                  "styler2": "function(value,row,index,options){ return {padding: '5px 5px' }; }",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 52.006536852055035,
+                  "title": "金额",
+                  "titleSync": false,
+                  "field": "totalPrice",
+                  "checked": true,
+                  "columnId": "totalPrice",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "vAlign": "top",
+                  "renderFormatter": "function(value,row,colIndex,options,rowIndex){ return value + '<br/>' + '' }",
+                  "styler2": "function(value,row,index,options){ return {padding: '5px 5px' }; }",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 56.96797920997919,
+                  "title": "等级",
+                  "titleSync": false,
+                  "field": "contractName",
+                  "checked": true,
+                  "columnId": "contractName",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "vAlign": "top",
+                  "renderFormatter": "function(value,row,colIndex,options,rowIndex){ return value + '<br/>' + row.rateCode_dictText }",
+                  "styler2": "function(value,row,index,options){ return {padding: '5px 5px' }; }",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 79.2099792099792,
+                  "title": "等级",
+                  "checked": false,
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                }
+              ]
+            ]
+          },
+          "printElementType": {
+            "title": "表格",
+            "type": "table",
+            "editable": true,
+            "columnDisplayEditable": true,
+            "columnDisplayIndexEditable": true,
+            "columnTitleEditable": true,
+            "columnResizable": true,
+            "columnAlignEditable": true,
+            "isEnableEditField": true,
+            "isEnableContextMenu": true,
+            "isEnableInsertRow": true,
+            "isEnableDeleteRow": true,
+            "isEnableInsertColumn": true,
+            "isEnableDeleteColumn": true,
+            "isEnableMergeCell": true
+          }
+        },
+        {
+          "options": {
+            "left": 30,
+            "top": 520.5,
+            "height": 12,
+            "width": 79.5,
+            "title": "医师：",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 126,
+            "top": 520.5,
+            "height": 12,
+            "width": 79.5,
+            "title": "发药：高艳敏",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 228,
+            "top": 520.5,
+            "height": 12,
+            "width": 79.5,
+            "title": "划价：",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 324,
+            "top": 520.5,
+            "height": 12,
+            "width": 79.5,
+            "title": "调配：宋丹丹",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "fontSize": 9
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 30,
+            "top": 540,
+            "height": 9,
+            "width": 387,
+            "borderWidth": "1.5",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": { "title": "横线", "type": "hline" }
+        },
+        {
+          "options": {
+            "left": 30,
+            "top": 547.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "注：1.本处方当日作废"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 553.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "总金额："
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        },
+        {
+          "options": {
+            "left": 48,
+            "top": 567,
+            "height": 9.75,
+            "width": 120,
+            "title": "2.延长处方用量时间原因"
+          },
+          "printElementType": { "title": "文本", "type": "text" }
+        }
+      ],
+      "paperNumberDisabled": true,
+      "paperNumberContinue": true,
+      "overPrintOptions": { "content": "", "opacity": 0.7, "type": 1 },
+      "watermarkOptions": {
+        "content": "",
+        "fillStyle": "rgba(184, 184, 184, 0.3)",
+        "fontSize": "14px",
+        "rotate": 25,
+        "width": 200,
+        "height": 200,
+        "timestamp": false,
+        "format": "YYYY-MM-DD HH:mm"
+      },
+      "panelLayoutOptions": {
+        "layoutType": "column",
+        "layoutRowGap": 0,
+        "layoutColumnGap": 0
+      }
+    }
+  ]
+}
diff --git a/vue3/src/views/pharmacymanagement/westernmedicine/index.vue b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
similarity index 76%
rename from vue3/src/views/pharmacymanagement/westernmedicine/index.vue
rename to openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
index 1b525c75..d61cbf8b 100644
--- a/vue3/src/views/pharmacymanagement/westernmedicine/index.vue
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           style="min-width: 500px"
         >
-          <el-form-item label="姓名或证件号" prop="condition">
+          <el-form-item label="患者信息" prop="condition">
             <el-input
               v-model="queryParams.condition"
               placeholder="请输入姓名/证件号"
@@ -19,7 +19,7 @@
               @keyup.enter="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="发药状态" prop="departmentId" style="margin-left: 40px">
+          <el-form-item label="发药状态" prop="departmentId" style="margin-left: 10px">
             <el-select
               v-model="queryParams.statusEnum"
               placeholder="请选择发药状态"
@@ -62,9 +62,9 @@
               />
             </el-select>
           </el-form-item> -->
-          <el-form-item style="float: right">
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-form-item style="margin-left: 15px">
+            <el-button type="primary" @click="handleQuery">搜索</el-button>
+            <el-button @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -76,10 +76,8 @@
         highlight-current-row
         @row-click="handleCurrentChange"
       >
-        <el-table-column prop="departmentName" label="科室" width="150" align="center" />
         <el-table-column prop="patientName" label="姓名" width="130" align="center" />
         <el-table-column prop="genderEnum_enumText" label="性别" width="80" align="center" />
-        <!-- <el-table-column prop="ageString" label="开单医生" width="80" /> -->
         <el-table-column prop="receptionTime" label="就诊日期" align="center">
           <template #default="scope">
             {{ scope.row.receptionTime ? formatDate(scope.row.receptionTime) : '-' }}
@@ -142,9 +140,9 @@
             }}元</el-col
           >
         </el-row> -->
-        <span style="color: #606266; font-size: 14px; font-weight: 700; margin-right: 15px"
-          >调配药师</span
-        >
+        <span style="color: #606266; font-size: 14px; font-weight: 700; margin-right: 15px">
+          调配药师
+        </span>
         <el-select v-model="preparerDoctor" placeholder="调配药师" style="width: 160px">
           <el-option
             v-for="item in preparerDoctorOptions"
@@ -153,6 +151,28 @@
             :value="item.value"
           />
         </el-select>
+        <span style="color: #606266; font-size: 14px; font-weight: 700; margin-right: 15px">
+          药品分类
+        </span>
+        <el-select
+          v-model="tcmFlag"
+          placeholder="药品分类"
+          style="width: 160px"
+          @change="
+            () => {
+              if (currentRow.encounterId) {
+                getMedicineList(currentRow.encounterId);
+              }
+            }
+          "
+        >
+          <el-option
+            v-for="item in medCategoryCode"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
         <el-button
           :disabled="medicineInfoList && medicineInfoList.length == 0"
           type="primary"
@@ -163,7 +183,6 @@
         </el-button>
         <el-button type="primary" @click="handleScan()" style="margin-left: 30px"> 扫码 </el-button>
         <el-button
-          :disabled="medicineInfoList && medicineInfoList.length == 0"
           type="primary"
           @click="printPrescription()"
           style="margin-left: 30px"
@@ -181,30 +200,58 @@
         ref="tableRef"
       >
         <el-table-column type="selection" width="55" align="center" fixed="left" />
-        <el-table-column prop="departmentName" label="科室" width="90" align="center" />
-        <el-table-column prop="doctorName" label="开单医生" width="100" align="center" />
+        <el-table-column prop="prescriptionNo" label="处方号" width="140" align="center" />
+        <el-table-column prop="medicineName" label="药品名称" width="180" align="center" />
         <el-table-column prop="statusEnum_enumText" label="发药状态" width="100" align="center">
           <template #default="scope">
-            <el-tag :type="tagType(scope.row.statusEnum)">{{
-              scope.row.statusEnum_enumText
-            }}</el-tag>
+            <el-tag :type="tagType(scope.row.statusEnum)">
+              {{ scope.row.statusEnum_enumText }}
+            </el-tag>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="itemType" label="项目类型" width="100" align="center" /> -->
-        <el-table-column prop="conditionName" label="诊断" width="120" align="center" />
-        <el-table-column prop="prescriptionNo" label="处方号" width="120" align="center" />
-        <!-- <el-table-column prop="markers" label="成组" width="60" align="center">
-          <template #default="scope">
-            <span>{{ markers[scope.$index] }}</span>
-          </template>
-        </el-table-column> -->
-        <el-table-column prop="flag" label="组合" width="60" align="center" />
         <el-table-column prop="quantity" label="发药数量" width="100" align="center">
           <template #default="scope">
             {{ scope.row.quantity }}{{ scope.row.unitCode_dictText }}
           </template>
         </el-table-column>
+        <!-- <el-table-column prop="flag" label="组合" width="60" align="center" /> -->
         <!-- <el-table-column prop="quantity" label="发药数量" width="100" align="center" /> -->
+        <el-table-column prop="totalVolume" label="规格" width="100" align="center" />
+        <!-- <el-table-column prop="unitCode_dictText" label="单位" width="100" align="center" /> -->
+        <el-table-column
+          prop="doseUnitCode_dictText"
+          label="单次剂量"
+          width="100"
+          align="center"
+          v-if="tcmFlag == '0'"
+        >
+          <template #default="scope">
+            {{ scope.row.dose }}{{ scope.row.doseUnitCode_dictText }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="traceNo"
+          label="追溯码"
+          width="180"
+          align="center"
+          v-if="tcmFlag == '0'"
+        >
+          <template #default="scope">
+            <el-tooltip
+              :content="formatContent(scope.row.traceNo)"
+              placement="top"
+              popper-class="custom-tooltip"
+            >
+              <el-input
+                :ref="'traceNoRef' + scope.$index"
+                @input="handleTraceNoInput(scope.row, scope.$index)"
+                v-model="scope.row.traceNo"
+                placeholder="请输入追溯码"
+              />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column prop="lotNumber" label="批次号" width="120" align="center" />
         <el-table-column
           prop="totalPrice"
           label="金额"
@@ -213,24 +260,13 @@
           align="right"
           header-align="center"
         />
-        <el-table-column prop="medicineName" label="药品名称" width="120" align="center" />
-        <el-table-column prop="lotNumber" label="批次号" width="120" align="center" />
-        <el-table-column prop="totalVolume" label="规格" width="100" align="center" />
-        <!-- <el-table-column prop="unitCode_dictText" label="单位" width="100" align="center" /> -->
-        <el-table-column prop="doseUnitCode_dictText" label="单次剂量" width="100" align="center">
-          <template #default="scope">
-            {{ scope.row.dose }}{{ scope.row.doseUnitCode_dictText }}
-          </template>
-        </el-table-column>
+        <el-table-column prop="departmentName" label="科室" width="90" align="center" />
+        <el-table-column prop="doctorName" label="开单医生" width="100" align="center" />
+        <el-table-column prop="conditionName" label="诊断" width="120" align="center" />
         <!-- <el-table-column prop="dose" label="剂量" width="100" align="center" /> -->
         <el-table-column prop="rateCode" label="频次" width="100" align="center" />
         <el-table-column prop="methodCode_dictText" label="用法" width="100" align="center" />
         <el-table-column prop="dispensePerDuration" label="天数" width="80" align="center" />
-        <el-table-column prop="traceNo" label="追溯码" width="180" align="center">
-          <template #default="scope">
-            <el-input v-model="scope.row.traceNo" placeholder="请输入追溯码" />
-          </template>
-        </el-table-column>
         <el-table-column
           label="操作"
           align="center"
@@ -298,63 +334,12 @@
         </span>
       </template>
     </el-dialog>
-    <el-dialog
-      title="药品追溯码"
-      v-model="openTraceNo"
-      width="800"
-      append-to-body
-      destroy-on-close
-      :draggable="true"
-      @opened="
-        () => {
-          console.log(123);
-          traceNoTempRef.focus();
-        }
-      "
-    >
-      <!-- <div>
-        <el-input
-          v-model="traceNo"
-          style="width: 260px; margin-right: 20px"
-          @change="handelTraceNo"
-        />
-        <el-button type="warning" plain icon="CircleClose" @click="handleClear">清除</el-button>
-      </div> -->
-      <div>
-        <div style="font-size: 16px">
-          选择追溯码
-          <el-input
-            ref="traceNoTempRef"
-            v-model="traceNoTemp"
-            style="width: 260px; margin-right: 20px"
-            @input="throttledGetList"
-          />
-          <el-button
-            type="warning"
-            plain
-            icon="CircleClose"
-            @click="handleClear"
-            style="float: right"
-            >清除</el-button
-          >
-        </div>
-        <el-input
-          ref="inputRef"
-          v-model="traceNo"
-          type="textarea"
-          disabled
-          :rows="15"
-          @input="throttledGetList"
-          style="width: 100%; margin-top: 10px; margin-right: 20px"
-        />
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submit">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <TraceNoDialog
+      :ypName="ypName"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
   </div>
 </template>
 
@@ -372,6 +357,9 @@ import {
 } from './components/api';
 import { formatDate, formatDateStr } from '@/utils/index';
 import { debounce } from 'lodash-es';
+import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
+import { hiprint } from 'vue-plugin-hiprint';
+import templateJson from './components/templateJson.json';
 
 const showSearch = ref(true);
 const total = ref(0);
@@ -396,12 +384,24 @@ const selectedItems = ref(new Set());
 const traceNoList = ref([]);
 const traceNo = ref('');
 const traceNoTemp = ref('');
+const tcmFlag = ref('0');
 const openTraceNo = ref(false);
 const isManualSelection = ref(false);
 const groups = ref({});
-const traceNoTempRef = ref();
+const openTraceNoDialog = ref(false);
+const ypName = ref('');
 
 const { proxy } = getCurrentInstance();
+const medCategoryCode = ref([
+  {
+    label: '西药中成药',
+    value: '0',
+  },
+  {
+    label: '中药',
+    value: '1',
+  },
+]);
 
 const data = reactive({
   form: {},
@@ -421,22 +421,21 @@ onMounted(() => {
   getList();
 });
 function handleScan() {
-  openTraceNo.value = true;
-  // traceNo.value = '';
-  // traceNoList.value = [];
-  // document.addEventListener('keydown', function (event) {
-  //   // 检查是否为条码输入
-  //   if (event.key === 'Enter' || event.key === 'Tab') {
-  //     // 某些扫码枪在输入后可能发送Enter或Tab键
-  //     traceNo.value = event.target.value;
-  //     traceNoList.value.push(traceNo.value);
-  //     // 处理条码数据
-  //   }
-  // });
+  openTraceNoDialog.value = true;
 }
-function submit() {
-  itemTraceNo(traceNoList.value).then((res) => {
+function submit(value) {
+  let list = [];
+  if (value) {
+    list = value.split(',');
+  }
+  itemTraceNo(list).then((res) => {
     if (res.code === 200) {
+      if (!res.data) {
+        proxy.$modal.msgWarning('未在库存中匹配到追溯码，请在发药列表中单独扫描');
+        openTraceNoDialog.value = false;
+        proxy.$refs['traceNoRef0'].focus();
+        return;
+      }
       medicineInfoList.value.forEach((item, index) => {
         if (res.data[item.medicineId] && res.data[item.medicineId].split(',') > item.quantity) {
           proxy.$modal.msgWarning('操作失败');
@@ -444,20 +443,10 @@ function submit() {
         }
         medicineInfoList.value[index].traceNo = res.data[item.medicineId];
       });
-      openTraceNo.value = false;
-      traceNoList.value = [];
+      openTraceNoDialog.value = false;
     }
   });
 }
-function handleClear() {
-  traceNo.value = '';
-  traceNoList.value = [];
-}
-function cancel() {
-  openTraceNo.value = false;
-  traceNoList.value = [];
-  traceNo.value = '';
-}
 // 设置默认日期范围为当天
 function setDefaultDateRange() {
   const today = new Date();
@@ -486,7 +475,7 @@ function getList() {
     backReason.value = response.data.notPerformedReasonOptions;
     dispenseStatusOptions.value = response.data.dispenseStatusOptions;
     preparerDoctorOptions.value = response.data.preparerDoctorOptions;
-    preparerDoctor.value = preparerDoctorOptions.value[0].value;
+    preparerDoctor.value = preparerDoctorOptions.value[1].value;
   });
 }
 //打印中西药处方
@@ -498,34 +487,87 @@ async function printPrescription() {
   }
   console.log(selectedRows, personInfo, 'selectedRows');
   // 计算总价
-
-  const result = {
-    data: selectedRows.map((item) => ({
-      ...item,
-      patientName: personInfo.value.patientName,
-      genderEnum_enumText: personInfo.value.genderEnum_enumText,
-      age: personInfo.value.age,
-      organizationName: personInfo.value.organizationName,
-    })),
-  };
-  // 将对象转换为 JSON 字符串
-  let jsonString = JSON.stringify(result, null, 2);
-  await window.chrome.webview.hostObjects.CSharpAccessor.PrintReport(
-    '西药(中成药)处方笺.grf',
-    jsonString
-  )
-    .then((response) => {
-      //返回结果是jsonString，可判断其调用是否成功
-      console.log(response, 'response');
-      var res = JSON.parse(response);
-      if (!res.IsSuccess) {
-        proxy.$modal.msgError('调用打印插件失败:' + res.ErrorMessage);
+  // const result = {
+  //   data: selectedRows.map((item) => ({
+  //     ...item,
+  //     patientName: personInfo.value.patientName,
+  //     genderEnum_enumText: personInfo.value.genderEnum_enumText,
+  //     age: personInfo.value.age,
+  //     phone: personInfo.value.phone,
+  //     hospitalName: personInfo.value.hospitalName,
+  //     patientBusNo: personInfo.value.patientBusNo,
+  //     quantity: item.quantity,
+  //     unitCode_dictText: item.unitCode_dictText,
+  //     organizationName: personInfo.value.organizationName,
+  //   })),
+  // };
+  // 按 prescriptionNo 分组
+  const groupedRows = {};
+    selectedRows.forEach(row => {
+      const prescriptionNo = row.prescriptionNo;
+      if (!groupedRows[prescriptionNo]) {
+        groupedRows[prescriptionNo] = [];
       }
-    })
-    .catch((error) => {
-      proxy.$modal.msgError('调用打印插件失败:' + error);
+      groupedRows[prescriptionNo].push(row);
     });
+    
+    console.log('按处方号分组的结果:', groupedRows);
+    
+    // 如果您需要将分组后的数据转换为数组形式
+    const groupedArray = Object.values(groupedRows);
+    console.log('分组后的数组形式:', groupedArray);
+
+  const result = [];
+  groupedArray.forEach((item, index) => {
+    result.push({
+      ...personInfo.value,
+      prescriptionNo: item[0].prescriptionNo,
+      reqAuthoredTime: item[0].reqAuthoredTime,
+      prescriptionList: item,
+    })
+  })
+
+  // 将对象转换为 JSON 字符串
+  // let jsonString = JSON.stringify(result, null, 2);
+  console.log(result, 'result');
+  // 模板对象获取
+
+  const printElements = templateJson;
+  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+  const printerList = hiprintTemplate.getPrinterList();
+  console.log(hiprintTemplate, '打印机列表');
+  hiprintTemplate.print2(result, {
+    printer: 'Microsoft Print to PDF',
+    title: '打印标题',
+    height: 210,
+    width: 148,
+  }); //开始打印
+  // 直接打印回调
+  // 发送任务到打印机成功
+  hiprintTemplate.on('printSuccess', function (e) {
+    console.log('打印成功');
+  })
+  // 发送任务到打印机失败
+  hiprintTemplate.on('printError', function (e) {
+    console.log('打印失败');
+  })
+
+  // await CefSharp.BindObjectAsync('boundAsync');
+  // await boundAsync
+  //   .printReport('西药(中成药)处方笺.grf', jsonString)
+  //   .then((response) => {
+  //     //返回结果是jsonString，可判断其调用是否成功
+  //     console.log(response, 'response');
+  //     var res = JSON.parse(response);
+  //     if (!res.IsSuccess) {
+  //       proxy.$modal.msgError('调用打印插件失败:' + res.ErrorMessage);
+  //     }
+  //   })
+  //   .catch((error) => {
+  //     proxy.$modal.msgError('调用打印插件失败:' + error);
+  //   });
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
   setDefaultDateRange();
@@ -589,7 +631,7 @@ function getRowMarkers(groupCounts, data) {
 
 function spanMethod({ row, column, rowIndex, columnIndex }) {
   // 定义需要合并的列范围（前6列，包括selection列）
-  const columnsToMerge = [1, 2, 3, 4, 5, 17]; // 假设selection列是第0列，其他列依次是1, 2, 3, 4, 5
+  const columnsToMerge = [1, 16]; // 假设selection列是第0列，其他列依次是1, 2, 3, 4, 5
 
   // 检查当前列是否在需要合并的列范围内
   if (columnsToMerge.includes(columnIndex)) {
@@ -650,7 +692,15 @@ function handleCurrentChange(row) {
   console.log('当前选中行的数据：', currentRow.value);
   currentRow.value.statusEnum = undefined;
   currentRow.value.dispenseStatus = queryParams.value.statusEnum;
-  listWesternmedicine(currentRow.value).then((response) => {
+  getMedicineList(row.encounterId);
+}
+
+function getMedicineList(encounterId) {
+  listWesternmedicine({
+    encounterId: encounterId,
+    statusEnum: queryParams.value.statusEnum,
+    tcmFlag: tcmFlag.value,
+  }).then((response) => {
     console.log('121212', response);
     personInfo.value = response.data.prescriptionPatientInfoDto;
     medicineInfoList.value = Array.isArray(response.data.prescriptionMedicineInfoDtoList)
@@ -700,7 +750,11 @@ function submitMedicine(saveList) {
     if (res.code == 200) {
       updateMedicion(saveList).then((response) => {
         proxy.$modal.msgSuccess('发药成功');
-        listWesternmedicine(currentRow.value).then((response) => {
+        listWesternmedicine({
+          encounterId: currentRow.value.encounterId,
+          statusEnum: queryParams.value.statusEnum,
+          tcmFlag: tcmFlag.value,
+        }).then((response) => {
           medicineInfoList.value = Array.isArray(response.data.prescriptionMedicineInfoDtoList)
             ? response.data.prescriptionMedicineInfoDtoList
             : [response.data.prescriptionMedicineInfoDtoList];
@@ -714,6 +768,34 @@ function submitMedicine(saveList) {
   });
 }
 const throttledGetList = debounce(handelTraceNo, 500);
+const traceNoInput = debounce(handleTraceNoInput, 500);
+
+function formatContent(value) {
+  let content = '';
+  if (value && value.endsWith(',')) {
+    value = value.slice(0, -1);
+  }
+  if (value) {
+    value.split(',').forEach((item, index) => {
+      content += `[${index + 1}] ${item}\n`;
+    });
+    return content;
+  }
+}
+function handleTraceNoInput(row, index) {
+  if (row.traceNo) {
+    // 先移除所有逗号
+    let cleanStr = row.traceNo.replace(/,/g, '');
+    // 每20个字符插入一个逗号
+    let formattedStr = cleanStr.replace(/(.{20})/g, '$1,');
+    // 如果最后一个字符是逗号则移除
+    formattedStr = formattedStr.replace(/,$/, '');
+    row.traceNo = formattedStr;
+
+    // 保持输入焦点
+    proxy.$refs['traceNoRef' + index].focus();
+  }
+}
 
 let inputValue = '';
 function handelTraceNo(value) {
@@ -776,7 +858,11 @@ function handleConfirm() {
   backMedicion(selectedPrescriptionNo.value, notPerformedReasonEnum.value).then((response) => {
     proxy.$modal.msgSuccess('作废成功');
   });
-  listWesternmedicine(currentRow.value).then((response) => {
+  listWesternmedicine({
+    encounterId: currentRow.value.encounterId,
+    statusEnum: queryParams.value.statusEnum,
+    tcmFlag: tcmFlag.value,
+  }).then((response) => {
     console.log('1212*******12', response);
     medicineInfoList.value = Array.isArray(response.data.prescriptionMedicineInfoDtoList)
       ? response.data.prescriptionMedicineInfoDtoList
@@ -806,7 +892,7 @@ function handleCancel() {
 }
 
 .left {
-  width: 28%;
+  width: 25%;
 
   .form {
     width: 100%;
@@ -817,7 +903,7 @@ function handleCancel() {
 
 .right {
   margin-left: 2%;
-  width: 70%;
+  width: 74%;
 }
 
 :deep(.el-table tbody tr:hover > td) {
diff --git a/vue3/src/views/redirect/index.vue b/openhis-ui-vue3/src/views/redirect/index.vue
similarity index 100%
rename from vue3/src/views/redirect/index.vue
rename to openhis-ui-vue3/src/views/redirect/index.vue
diff --git a/vue3/src/views/register.vue b/openhis-ui-vue3/src/views/register.vue
similarity index 100%
rename from vue3/src/views/register.vue
rename to openhis-ui-vue3/src/views/register.vue
diff --git a/vue3/src/views/system/config/index.vue b/openhis-ui-vue3/src/views/system/config/index.vue
similarity index 100%
rename from vue3/src/views/system/config/index.vue
rename to openhis-ui-vue3/src/views/system/config/index.vue
diff --git a/vue3/src/views/system/dept/index.vue b/openhis-ui-vue3/src/views/system/dept/index.vue
similarity index 100%
rename from vue3/src/views/system/dept/index.vue
rename to openhis-ui-vue3/src/views/system/dept/index.vue
diff --git a/vue3/src/views/system/dict/data.vue b/openhis-ui-vue3/src/views/system/dict/data.vue
similarity index 100%
rename from vue3/src/views/system/dict/data.vue
rename to openhis-ui-vue3/src/views/system/dict/data.vue
diff --git a/vue3/src/views/system/dict/index.vue b/openhis-ui-vue3/src/views/system/dict/index.vue
similarity index 100%
rename from vue3/src/views/system/dict/index.vue
rename to openhis-ui-vue3/src/views/system/dict/index.vue
diff --git a/vue3/src/views/system/menu/index.vue b/openhis-ui-vue3/src/views/system/menu/index.vue
similarity index 100%
rename from vue3/src/views/system/menu/index.vue
rename to openhis-ui-vue3/src/views/system/menu/index.vue
diff --git a/vue3/src/views/system/notice/index.vue b/openhis-ui-vue3/src/views/system/notice/index.vue
similarity index 100%
rename from vue3/src/views/system/notice/index.vue
rename to openhis-ui-vue3/src/views/system/notice/index.vue
diff --git a/vue3/src/views/system/post/index.vue b/openhis-ui-vue3/src/views/system/post/index.vue
similarity index 100%
rename from vue3/src/views/system/post/index.vue
rename to openhis-ui-vue3/src/views/system/post/index.vue
diff --git a/vue3/src/views/system/role/authUser.vue b/openhis-ui-vue3/src/views/system/role/authUser.vue
similarity index 100%
rename from vue3/src/views/system/role/authUser.vue
rename to openhis-ui-vue3/src/views/system/role/authUser.vue
diff --git a/vue3/src/views/system/role/index.vue b/openhis-ui-vue3/src/views/system/role/index.vue
similarity index 100%
rename from vue3/src/views/system/role/index.vue
rename to openhis-ui-vue3/src/views/system/role/index.vue
diff --git a/vue3/src/views/system/role/selectUser.vue b/openhis-ui-vue3/src/views/system/role/selectUser.vue
similarity index 100%
rename from vue3/src/views/system/role/selectUser.vue
rename to openhis-ui-vue3/src/views/system/role/selectUser.vue
diff --git a/vue3/src/views/system/tenant/bindUser.vue b/openhis-ui-vue3/src/views/system/tenant/bindUser.vue
similarity index 100%
rename from vue3/src/views/system/tenant/bindUser.vue
rename to openhis-ui-vue3/src/views/system/tenant/bindUser.vue
diff --git a/vue3/src/views/system/tenant/index.vue b/openhis-ui-vue3/src/views/system/tenant/index.vue
similarity index 70%
rename from vue3/src/views/system/tenant/index.vue
rename to openhis-ui-vue3/src/views/system/tenant/index.vue
index db334857..cceede08 100644
--- a/vue3/src/views/system/tenant/index.vue
+++ b/openhis-ui-vue3/src/views/system/tenant/index.vue
@@ -71,7 +71,10 @@
           <el-tooltip content="所属用户" placement="top">
             <el-button link type="primary" icon="User" @click="handleSetUser(scope.row)"></el-button>
           </el-tooltip>
-          <el-tooltip content="个性化配置" placement="top">
+          <el-tooltip content="合同管理" placement="top">
+            <el-button link type="primary" icon="Document" @click="handleSetContract(scope.row)"></el-button>
+          </el-tooltip>
+          <el-tooltip content="基本配置" placement="top">
             <el-button link type="primary" icon="Setting" @click="handleSetOption(scope.row)"></el-button>
           </el-tooltip>
         </template>
@@ -107,19 +110,49 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 修改租户配置项对话框 -->
+    <el-dialog :title="optionTitle" v-model="optionOpen" width="1600px" append-to-body class="tenant-option-dialog">
+      <el-form ref="optionRef" :model="optionForm" label-width="300px" class="three-column-form">
+        <div class="form-grid">
+          <el-form-item v-for="item in dynamicFormList" :key="item.code" :label="`${item.code}（${item.name}）`" :prop="item.code"
+            class="grid-item">
+            <el-input v-model="item.content" :placeholder="`请输入${item.name}`" clearable />
+          </el-form-item>
+        </div>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer" style="margin-top: 15px;">
+          <el-button type="primary" @click="submitOptionForm">确 定</el-button>
+          <el-button @click="cancelSubmitOption">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Tenant">
-import { getTenantPage, getTenantDetail, addTenant, editTenant, delTenant, enableTenant, disableTenant } from "@/api/system/tenant";
+import { getTenantPage, getTenantDetail, addTenant, editTenant, delTenant, enableTenant, disableTenant, getTenantOptionDetailList, saveTenantOptionDetailList, getTenantOptionFormList } from "@/api/system/tenant";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
+const dynamicFormList = ref([]);
+// 当前租户信息
+const currentTenantId = ref(null);
+const currentTenantName = ref('');
+// 配置项值存储对象
+const optionContents = ref([]);
+// 配置项表单数据
+const optionForm = reactive({
+  tenantId: null,
+  optionList: []
+});
 
 const tenantList = ref([]);
 const open = ref(false);
+const optionOpen = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
@@ -127,11 +160,13 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+const optionTitle = ref("");
 const dateRange = ref([]);
 
 
 const data = reactive({
   form: {},
+  optionForm: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -235,9 +270,9 @@ function handleStatusChange(row) {
 function handleSetUser(row) {
   router.push("/system/tenant-user/set/" + row.id);
 }
-/** 个性化配置 */
-function handleSetOption(row) {
-  router.push("/system/tenant-option/set/" + row.id);
+/** 合同管理 */
+function handleSetContract(row) {
+  router.push("/system/tenant-contract/set/" + row.id);
 }
 /** 重置新增的表单以及其他数据  */
 function reset() {
@@ -291,5 +326,109 @@ function cancel() {
   reset();
 }
 
+/** 打开配置项对话框 */
+async function handleSetOption(row) {
+  try {
+    loading.value = true;
+    // 设置当前租户信息
+    currentTenantId.value = row.id;
+    currentTenantName.value = row.tenantName;
+    optionTitle.value = `基本配置`;
+    // 重置表单
+    resetOption();
+    optionForm.tenantId = row.id;
+    // 获取动态表单配置
+    const formListRes = await getTenantOptionFormList();
+    dynamicFormList.value = formListRes.data || [];
+    // 获取租户已有配置
+    const detailRes = await getTenantOptionDetailList(row.id);
+    if (detailRes.data) {
+      dynamicFormList.value.forEach(item => {
+        const existingConfig = detailRes.data.find(c => c.code === item.code);
+        item.content = existingConfig ? existingConfig.content : '';
+      });
+    } else {
+      // 初始化空内容
+      dynamicFormList.value.forEach(item => {
+        item.content = '';
+      });
+    }
+    optionOpen.value = true;
+  } catch (error) {
+    console.error('获取配置项失败:', error);
+    proxy.$modal.msgError("获取配置项失败");
+  } finally {
+    loading.value = false;
+  }
+}
+/** Option提交按钮 */
+async function submitOptionForm() {
+  try {
+    // 准备提交数据
+    const submitData = {
+      tenantId: optionForm.tenantId,
+      optionList: dynamicFormList.value
+    };
+    // 调用保存接口
+    loading.value = true;
+    const res = await saveTenantOptionDetailList(submitData);
+    if (res.code === 200) {
+      proxy.$modal.msgSuccess("配置保存成功");
+      optionOpen.value = false;
+    } else {
+      proxy.$modal.msgError(res.msg || "配置保存失败");
+    }
+  } catch (error) {
+    console.error('表单验证失败:', error);
+  } finally {
+    loading.value = false;
+  }
+}
+/** 重置配置项表单 */
+function resetOption() {
+  dynamicFormList.value.forEach(item => {
+    item.content = '';
+  });
+  if (proxy.$refs["optionRef"]) {
+    proxy.$refs["optionRef"].resetFields();
+  }
+}
+/** 取消配置项提交 */
+function cancelSubmitOption() {
+  optionOpen.value = false;
+  resetOption();
+}
+
 getList();
 </script>
+
+<style>
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 20px 15px;
+}
+
+.grid-item {
+  margin-bottom: 0;
+  background: white;
+  border-radius: 8px;
+  padding: 5px;
+  transition: all 0.3s ease;
+}
+
+.grid-item :deep(.el-input) {
+  width: 100%;
+}
+
+/* 描述文本样式 */
+.item-description {
+  font-size: 12px;
+  color: #7f8c8d;
+  margin-top: 8px;
+  line-height: 1.4;
+  padding: 5px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/system/tenant/setContract.vue b/openhis-ui-vue3/src/views/system/tenant/setContract.vue
new file mode 100644
index 00000000..8eb36fc0
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/tenant/setContract.vue
@@ -0,0 +1,267 @@
+<template>
+   <div class="app-container">
+
+      <el-row :gutter="10" class="mb8">
+         <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="addContract">新增</el-button>
+         </el-col>
+         <el-col :span="1.5">
+            <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
+         </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="contractList">
+         <el-table-column label="合同名称" prop="contractName" :show-overflow-tooltip="true" />
+         <el-table-column label="状态" align="center" key="status_dictText" prop="status_dictText"
+            :show-overflow-tooltip="true" />
+         <el-table-column label="合同类别" align="center" key="category_dictText" prop="category_dictText"
+            :show-overflow-tooltip="true" />
+         <el-table-column label="合同编码" prop="busNo" :show-overflow-tooltip="true" />
+         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+               <el-tooltip content="修改" placement="top">
+                  <el-button link type="primary" icon="Edit" @click="editContract(scope.row)"></el-button>
+               </el-tooltip>
+               <el-tooltip content="删除" placement="top">
+                  <el-button link type="primary" icon="Delete" @click="handelDel(scope.row)"></el-button>
+               </el-tooltip>
+            </template>
+         </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+         v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+
+      <!-- 添加或修改合同对话框 -->
+      <el-dialog :title="title" v-model="open" width="1200px" append-to-body class="tenant-option-dialog">
+         <el-form ref="contractRef" :model="form" label-width="180px" class="three-column-form">
+            <div class="form-grid">
+               <el-form-item label="合同名称" prop="contractName">
+                  <el-input v-model="form.contractName" placeholder="请输入合同名称" clearable />
+               </el-form-item>
+               <el-form-item label="合同编码" prop="busNo">
+                  <el-input v-model="form.busNo" placeholder="请输入合同编码" clearable />
+               </el-form-item>
+               <el-form-item label="状态" prop="statusEnum">
+                  <el-input v-model="form.statusEnum" placeholder="请输入状态" clearable />
+               </el-form-item>
+               <el-form-item label="合同类别" prop="categoryEnum">
+                  <el-select v-model="form.categoryEnum" placeholder="请选择合同类别" clearable>
+                    <el-option
+                      v-for="category in category_enum"
+                      :key="category.value"
+                      :label="category.label"
+                      :value="category.value"
+                    />
+                  </el-select>
+               </el-form-item>
+               <el-form-item label="机构" prop="orgId">
+                  <el-input v-model="form.orgId" placeholder="请输入机构" clearable />
+               </el-form-item>
+               <el-form-item label="是否医保" prop="ybFlag">
+                  <el-input v-model="form.ybFlag" placeholder="请输入是否医保" clearable />
+               </el-form-item>
+               <el-form-item label="优先使用标志" prop="sort">
+                  <el-input v-model="form.sort" placeholder="请输入优先使用标志" clearable />
+               </el-form-item>
+               <el-form-item label="医保区划" prop="admVs">
+                  <el-input v-model="form.admVs" placeholder="请输入医保区划代码" clearable />
+               </el-form-item>
+               <el-form-item label="医保PrvKey" prop="cliPrvKey">
+                  <el-input v-model="form.cliPrvKey" placeholder="请输入医保PrvKey" clearable type="password"
+                     show-password />
+               </el-form-item>
+               <el-form-item label="医保PubKey" prop="cliPubKey">
+                  <el-input v-model="form.cliPubKey" placeholder="请输入医保PubKey" clearable />
+               </el-form-item>
+               <el-form-item label="服务端公钥" prop="serverPubKey">
+                  <el-input v-model="form.serverPubKey" placeholder="请输入服务端公钥" clearable />
+               </el-form-item>
+               <el-form-item label="授权范围" prop="scope">
+                  <el-input v-model="form.scope" placeholder="请输入授权范围" clearable />
+               </el-form-item>
+               <el-form-item label="授权类型" prop="grantType">
+                  <el-input v-model="form.grantType" placeholder="请选择授权类型" clearable />
+               </el-form-item>
+               <el-form-item label="医保账号" prop="username">
+                  <el-input v-model="form.username" placeholder="请输入医保账号" clearable />
+               </el-form-item>
+               <el-form-item label="医保密码" prop="password">
+                  <el-input v-model="form.password" placeholder="请输入医保密码" clearable type="password" show-password />
+               </el-form-item>
+               <el-form-item label="客户端ID" prop="clientId">
+                  <el-input v-model="form.clientId" placeholder="请输入客户端ID" clearable />
+               </el-form-item>
+               <el-form-item label="客户端密钥" prop="clientSecret">
+                  <el-input v-model="form.clientSecret" placeholder="请输入客户端密钥" clearable type="password"
+                     show-password />
+               </el-form-item>
+               <el-form-item label="机构代码" prop="fixmedinsCode">
+                  <el-input v-model="form.fixmedinsCode" placeholder="请输入机构代码" clearable />
+               </el-form-item>
+               <el-form-item label="机构名称" prop="fixmedinsName">
+                  <el-input v-model="form.fixmedinsName" placeholder="请输入机构名称" clearable />
+               </el-form-item>
+            </div>
+         </el-form>
+         <template #footer>
+            <div class="dialog-footer" style="margin-top: 15px;">
+               <el-button type="primary" @click="submitForm">确 定</el-button>
+               <el-button @click="cancel">取 消</el-button>
+            </div>
+         </template>
+      </el-dialog>
+
+   </div>
+</template>
+
+<script setup name="SetContract">
+import { getTenantContractPage, getTenantContractDetail, addTenantContract, editTenantContract, delTenantContract } from "@/api/system/tenant";
+const { proxy } = getCurrentInstance();
+
+const {
+   category_enum
+} = proxy.useDict(
+  'category_enum'
+);
+
+const route = useRoute();
+
+const contractList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+   form: {},
+   queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      tenantId: route.params.tenantId,
+   },
+   rules: {
+      contractName: [
+         { required: true, message: "合同名称不能为空", trigger: "blur" },
+      ],
+      busNo: [
+         { required: true, message: "合同编码不能为空", trigger: "blur" },
+      ],
+   }
+})
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询列表 */
+function getList() {
+   loading.value = true;
+   getTenantContractPage(queryParams.value).then(response => {
+      contractList.value = response.data.records;
+      total.value = response.data.total;
+      loading.value = false;
+   });
+}
+// 返回按钮
+function handleClose() {
+   const obj = { path: "/system/basicmanage/tenant" };
+   proxy.$tab.closeOpenPage(obj);
+}
+/** 重置新增的表单以及其他数据  */
+function reset() {
+   form.value = {
+      id: undefined,
+      contractName: undefined,
+      busNo: undefined,
+   };
+   proxy.resetForm("contractForm");
+}
+/** 新增 */
+function addContract() {
+   reset();
+   open.value = true;
+   title.value = "新增合同";
+}
+/** 编辑 */
+function editContract(row) {
+   reset();
+   getTenantContractDetail(row.id).then(response => {
+      form.value = {
+         ...response.data,
+         categoryEnum: String(response.data.categoryEnum)
+      };
+      open.value = true;
+      title.value = "修改合同";
+   }
+   )
+}
+/** 提交按钮 */
+function submitForm() {
+   form.value.tenantId = route.params.tenantId
+   proxy.$refs["contractRef"].validate(valid => {
+      if (valid) {
+         if (form.value.id != undefined) {
+            editTenantContract(form.value).then(response => {
+               proxy.$modal.msgSuccess("修改成功");
+               open.value = false;
+               getList();
+            });
+         } else {
+            addTenantContract(form.value).then(response => {
+               proxy.$modal.msgSuccess("新增成功");
+               open.value = false;
+               getList();
+            });
+         }
+      }
+   });
+}
+/** 删除 */
+function handelDel(row) {
+   proxy.$modal.confirm("确认要删除该合同吗？").then(function () {
+      return delTenantContract([row.id]);
+   }).then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+   }).catch(() => { });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+getList();
+</script>
+
+<style>
+.form-grid {
+   display: grid;
+   grid-template-columns: repeat(2, 1fr);
+   gap: 20px 15px;
+}
+
+.grid-item {
+   margin-bottom: 0;
+   background: white;
+   border-radius: 8px;
+   padding: 5px;
+   transition: all 0.3s ease;
+}
+
+.grid-item :deep(.el-input) {
+   width: 100%;
+}
+
+/* 描述文本样式 */
+.item-description {
+   font-size: 12px;
+   color: #7f8c8d;
+   margin-top: 8px;
+   line-height: 1.4;
+   padding: 5px;
+   background-color: #f9f9f9;
+   border-radius: 4px;
+}
+</style>
diff --git a/vue3/src/views/system/tenant/setUser.vue b/openhis-ui-vue3/src/views/system/tenant/setUser.vue
similarity index 100%
rename from vue3/src/views/system/tenant/setUser.vue
rename to openhis-ui-vue3/src/views/system/tenant/setUser.vue
diff --git a/vue3/src/views/system/user copy/authRole.vue b/openhis-ui-vue3/src/views/system/user copy/authRole.vue
similarity index 100%
rename from vue3/src/views/system/user copy/authRole.vue
rename to openhis-ui-vue3/src/views/system/user copy/authRole.vue
diff --git a/vue3/src/views/system/user copy/index.vue b/openhis-ui-vue3/src/views/system/user copy/index.vue
similarity index 100%
rename from vue3/src/views/system/user copy/index.vue
rename to openhis-ui-vue3/src/views/system/user copy/index.vue
diff --git a/vue3/src/views/system/user copy/profile/index.vue b/openhis-ui-vue3/src/views/system/user copy/profile/index.vue
similarity index 100%
rename from vue3/src/views/system/user copy/profile/index.vue
rename to openhis-ui-vue3/src/views/system/user copy/profile/index.vue
diff --git a/vue3/src/views/system/user copy/profile/resetPwd.vue b/openhis-ui-vue3/src/views/system/user copy/profile/resetPwd.vue
similarity index 100%
rename from vue3/src/views/system/user copy/profile/resetPwd.vue
rename to openhis-ui-vue3/src/views/system/user copy/profile/resetPwd.vue
diff --git a/vue3/src/views/system/user copy/profile/userAvatar.vue b/openhis-ui-vue3/src/views/system/user copy/profile/userAvatar.vue
similarity index 100%
rename from vue3/src/views/system/user copy/profile/userAvatar.vue
rename to openhis-ui-vue3/src/views/system/user copy/profile/userAvatar.vue
diff --git a/vue3/src/views/system/user copy/profile/userInfo.vue b/openhis-ui-vue3/src/views/system/user copy/profile/userInfo.vue
similarity index 100%
rename from vue3/src/views/system/user copy/profile/userInfo.vue
rename to openhis-ui-vue3/src/views/system/user copy/profile/userInfo.vue
diff --git a/vue3/src/views/system/user/authRole.vue b/openhis-ui-vue3/src/views/system/user/authRole.vue
similarity index 100%
rename from vue3/src/views/system/user/authRole.vue
rename to openhis-ui-vue3/src/views/system/user/authRole.vue
diff --git a/vue3/src/views/system/user/index.vue b/openhis-ui-vue3/src/views/system/user/index.vue
similarity index 99%
rename from vue3/src/views/system/user/index.vue
rename to openhis-ui-vue3/src/views/system/user/index.vue
index e4bc46e1..1a61e2ff 100644
--- a/vue3/src/views/system/user/index.vue
+++ b/openhis-ui-vue3/src/views/system/user/index.vue
@@ -107,7 +107,7 @@
               >删除</el-button
             >
           </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
                   <el-button
                      type="info"
                      plain
@@ -124,7 +124,7 @@
                      @click="handleExport"
                      v-hasPermi="['system:user:export']"
                   >导出</el-button>
-               </el-col> -->
+               </el-col>
           <right-toolbar
             v-model:showSearch="showSearch"
             @queryTable="getList"
diff --git a/vue3/src/views/system/user/profile/index.vue b/openhis-ui-vue3/src/views/system/user/profile/index.vue
similarity index 100%
rename from vue3/src/views/system/user/profile/index.vue
rename to openhis-ui-vue3/src/views/system/user/profile/index.vue
diff --git a/vue3/src/views/system/user/profile/resetPwd.vue b/openhis-ui-vue3/src/views/system/user/profile/resetPwd.vue
similarity index 100%
rename from vue3/src/views/system/user/profile/resetPwd.vue
rename to openhis-ui-vue3/src/views/system/user/profile/resetPwd.vue
diff --git a/vue3/src/views/system/user/profile/userAvatar.vue b/openhis-ui-vue3/src/views/system/user/profile/userAvatar.vue
similarity index 100%
rename from vue3/src/views/system/user/profile/userAvatar.vue
rename to openhis-ui-vue3/src/views/system/user/profile/userAvatar.vue
diff --git a/vue3/src/views/system/user/profile/userInfo.vue b/openhis-ui-vue3/src/views/system/user/profile/userInfo.vue
similarity index 100%
rename from vue3/src/views/system/user/profile/userInfo.vue
rename to openhis-ui-vue3/src/views/system/user/profile/userInfo.vue
diff --git a/vue3/src/views/tool/gen/basicInfoForm.vue b/openhis-ui-vue3/src/views/tool/gen/basicInfoForm.vue
similarity index 100%
rename from vue3/src/views/tool/gen/basicInfoForm.vue
rename to openhis-ui-vue3/src/views/tool/gen/basicInfoForm.vue
diff --git a/vue3/src/views/tool/gen/createTable.vue b/openhis-ui-vue3/src/views/tool/gen/createTable.vue
similarity index 100%
rename from vue3/src/views/tool/gen/createTable.vue
rename to openhis-ui-vue3/src/views/tool/gen/createTable.vue
diff --git a/vue3/src/views/tool/gen/editTable.vue b/openhis-ui-vue3/src/views/tool/gen/editTable.vue
similarity index 100%
rename from vue3/src/views/tool/gen/editTable.vue
rename to openhis-ui-vue3/src/views/tool/gen/editTable.vue
diff --git a/vue3/src/views/tool/gen/genInfoForm.vue b/openhis-ui-vue3/src/views/tool/gen/genInfoForm.vue
similarity index 100%
rename from vue3/src/views/tool/gen/genInfoForm.vue
rename to openhis-ui-vue3/src/views/tool/gen/genInfoForm.vue
diff --git a/vue3/src/views/tool/gen/importTable.vue b/openhis-ui-vue3/src/views/tool/gen/importTable.vue
similarity index 100%
rename from vue3/src/views/tool/gen/importTable.vue
rename to openhis-ui-vue3/src/views/tool/gen/importTable.vue
diff --git a/vue3/src/views/tool/gen/index.vue b/openhis-ui-vue3/src/views/tool/gen/index.vue
similarity index 100%
rename from vue3/src/views/tool/gen/index.vue
rename to openhis-ui-vue3/src/views/tool/gen/index.vue
diff --git a/vue3/src/views/tool/swagger/index.vue b/openhis-ui-vue3/src/views/tool/swagger/index.vue
similarity index 100%
rename from vue3/src/views/tool/swagger/index.vue
rename to openhis-ui-vue3/src/views/tool/swagger/index.vue
diff --git a/vue3/vite.config.js b/openhis-ui-vue3/vite.config.js
similarity index 91%
rename from vue3/vite.config.js
rename to openhis-ui-vue3/vite.config.js
index fe196a33..21633c92 100644
--- a/vue3/vite.config.js
+++ b/openhis-ui-vue3/vite.config.js
@@ -42,12 +42,17 @@ export default defineConfig (({mode, command}) => {
         '/dev-api': {
           target: 'http://localhost:18080/openhis',
           // target: 'http://192.168.31.30:18080/openhis', // zwh
-          //  target: 'http://192.168.1.110:18080/openhis', // wh
+          //  target: 'http://192.168.31.50:18080/openhis', // wh
           // target: 'http://192.168.31.190:18080/openhis', // yangmo
           // target: 'http://60.188.247.175:18080/openhis',// 公网
           changeOrigin: true,
           rewrite: p => p.replace (/^\/dev-api/, ''),
         },
+        '/ybplugin':{
+          target: 'http://localhost:5000',
+          changeOrigin: true,
+          rewrite: p => p.replace (/^\/ybplugin/, ''),
+        }
       },
     },
     //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
diff --git a/vue3/vite/plugins/auto-import.js b/openhis-ui-vue3/vite/plugins/auto-import.js
similarity index 100%
rename from vue3/vite/plugins/auto-import.js
rename to openhis-ui-vue3/vite/plugins/auto-import.js
diff --git a/vue3/vite/plugins/compression.js b/openhis-ui-vue3/vite/plugins/compression.js
similarity index 100%
rename from vue3/vite/plugins/compression.js
rename to openhis-ui-vue3/vite/plugins/compression.js
diff --git a/vue3/vite/plugins/index.js b/openhis-ui-vue3/vite/plugins/index.js
similarity index 48%
rename from vue3/vite/plugins/index.js
rename to openhis-ui-vue3/vite/plugins/index.js
index b043ef80..a082e347 100644
--- a/vue3/vite/plugins/index.js
+++ b/openhis-ui-vue3/vite/plugins/index.js
@@ -12,27 +12,27 @@ export default function createVitePlugins(viteEnv, isBuild = false) {
     vitePlugins.push(createSvgIcon(isBuild))    
 	// 住院代码影响打包 打包时暂时替换为空文件
     // 新增排除住院管理模块的插件
-    vitePlugins.push({
-        name: 'exclude-in-hospital-management',
-        enforce: 'pre',
-        load(id) {
-        const normalizedPath = id.replace(/\\/g, '/')
-        if (normalizedPath.includes('/src/views/inHospitalManagement/') 
-            || normalizedPath.includes('/src/views/inpatientDoctor/') 
-            || normalizedPath.includes('/src/views/inpatientNurse/')) {
-            return {
-            code: `
-                <template>
-                </template>
-                <script>
-                </script>
-            `,
-            map: null
-            }
-        }
-        return null
-        }
-    })
+    // vitePlugins.push({
+    //     name: 'exclude-in-hospital-management',
+    //     enforce: 'pre',
+    //     load(id) {
+    //     const normalizedPath = id.replace(/\\/g, '/')
+    //     if (normalizedPath.includes('/src/views/inHospitalManagement/') 
+    //         || normalizedPath.includes('/src/views/inpatientDoctor/') 
+    //         || normalizedPath.includes('/src/views/inpatientNurse/')) {
+    //         return {
+    //         code: `
+    //             <template>
+    //             </template>
+    //             <script>
+    //             </script>
+    //         `,
+    //         map: null
+    //         }
+    //     }
+    //     return null
+    //     }
+    // })
 	isBuild && vitePlugins.push(...createCompression(viteEnv))
     return vitePlugins
 }
diff --git a/vue3/vite/plugins/setup-extend.js b/openhis-ui-vue3/vite/plugins/setup-extend.js
similarity index 100%
rename from vue3/vite/plugins/setup-extend.js
rename to openhis-ui-vue3/vite/plugins/setup-extend.js
diff --git a/vue3/vite/plugins/svg-icon.js b/openhis-ui-vue3/vite/plugins/svg-icon.js
similarity index 100%
rename from vue3/vite/plugins/svg-icon.js
rename to openhis-ui-vue3/vite/plugins/svg-icon.js
diff --git a/vue3/src/views/basicmanage/ordersCombination/index.vue b/vue3/src/views/basicmanage/ordersCombination/index.vue
deleted file mode 100644
index d2e2f546..00000000
--- a/vue3/src/views/basicmanage/ordersCombination/index.vue
+++ /dev/null
@@ -1,336 +0,0 @@
-<template>
-  <div
-    class="app-container"
-    style="padding: 10px 20px; display: flex; justify-content: space-between"
-  >
-    <div style="width: 25%">
-      <!-- <div style="height: 30px; background-color: #f5f5f5; border-bottom: 1px solid #eee">
-        <span style="color: #606266">组套信息</span>
-      </div> -->
-      <div style="margin: 10px 0; display: flex; gap: 10px">
-        <el-button type="primary" @click="handleAdd">添加组套</el-button>
-        <el-input
-          style="width: 250px"
-          placeholder="输入组套名称"
-          v-model="queryParams.name"
-          @keyup.enter="getList"
-        >
-          <template #append>
-            <el-button icon="Search" @click="getList" />
-          </template>
-        </el-input>
-        <el-select placeholder="组套类型" v-model="queryParams.typeEnum">
-          <el-option
-            v-for="item in typeOption"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
-      <el-table
-        :data="combinationList"
-        border
-        highlight-current-row
-        max-height="750"
-        @row-click="handleGetCombinationList"
-      >
-        <el-table-column type="index" :index="(index) => index + 1" />
-        <el-table-column prop="name" label="名称" align="left">
-          <template #default="scope">
-            <span v-if="!scope.row.isEdit">{{ scope.row.name }}</span>
-            <el-input v-else v-model="scope.row.name" placeholder="组套名称" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="typeEnum_enumText" label="类型" width="100" align="center">
-          <template #default="scope">
-            <el-tag v-if="!scope.row.isEdit" type="default">
-              {{ scope.row.typeEnum_enumText }}
-            </el-tag>
-            <el-select v-else placeholder="类型" v-model="scope.row.typeEnum">
-              <el-option
-                v-for="item in typeOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="使用范围" width="100" align="center">
-          <template #default="scope">
-            <el-tag v-if="!scope.row.isEdit" type="default">
-              {{ scope.row.rangeCode_dictText }}
-            </el-tag>
-            <el-select
-              v-else
-              placeholder="使用范围"
-              v-model="scope.row.rangeCode"
-              @change="rangeCodeChange(scope.row, scope.$index)"
-            >
-              <el-option
-                v-for="item in use_range"
-                :disabled="item.value != 3"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="使用人" width="100" align="center">
-          <template #default="scope">
-            <el-tag v-if="!scope.row.isEdit" type="default">
-              {{ scope.row.practitionerName }}
-            </el-tag>
-            <el-select
-              v-else
-              placeholder="使用人"
-              v-model="scope.row.practitionerId"
-              :disabled="scope.row.rangeCode != 1"
-              @change="practitionerIdChange(scope.row, scope.$index)"
-            >
-              <el-option
-                v-for="item in userPractitionerPCage"
-                :key="item.practitionerId"
-                :label="item.nickName"
-                :value="item.practitionerId"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="科室" width="100" align="center">
-          <template #default="scope">
-            <el-tag v-if="!scope.row.isEdit" type="default">
-              {{ scope.row.orgName }}
-            </el-tag>
-            <el-select
-              v-else
-              placeholder="科室"
-              v-model="scope.row.orgId"
-              :disabled="scope.row.rangeCode != 2"
-              @change="orgIdChange(scope.row, scope.$index)"
-            >
-              <el-option
-                v-for="item in departmentList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column prop="name" label="操作" align="center" width="70">
-          <template #default="scope">
-            <el-button
-              v-if="scope.row.isEdit"
-              type="primary"
-              link
-              @click="handleSave(scope.row, scope.$index)"
-            >
-              保存
-            </el-button>
-            <el-button v-else type="primary" link @click="handleEdit(scope.row, scope.$index)">
-              编辑
-            </el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-    </div>
-    <div style="width: 74%">
-      <!-- <div style="margin: 10px 0; display: flex; gap: 10px">
-        <el-button type="primary" @click="handleAddTable">添加项目</el-button>
-        <el-button v-if="editingIndex === -1" type="primary" @click="handleEditTable" plain>
-          编辑
-        </el-button>
-        <el-button v-else type="primary" @click="handleSaveTable" plain>保存</el-button>
-      </div> -->
-      <div style="margin: 10px 0; display: flex; gap: 10px">
-        <Prescriptionlist ref="prescriptionRef" :comtination="combinationList[currentIndex]" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup name="">
-import {
-  getOrderGroup,
-  saveOrderGroup,
-  getAdviceBaseInfo,
-  getDepartmentList,
-  getUserPractitionerPCage,
-} from './components/api';
-import Prescriptionlist from './components/prescriptionlist.vue';
-import useUserStore from '@/store/modules/user';
-import { ref } from 'vue';
-const { proxy } = getCurrentInstance();
-const { method_code, unit_code, rate_code, use_range } = proxy.useDict(
-  'method_code',
-  'unit_code',
-  'rate_code',
-  'use_range'
-);
-
-const queryParams = ref({});
-const combinationList = ref([]);
-const combinationInfoList = ref([]);
-const adviceBaseOption = ref([]);
-const editingIndex = ref(-1);
-const userStore = useUserStore();
-const currentIndex = ref(-1);
-const groupItem = ref({});
-const groupId = ref(null);
-const userPractitionerPCage = ref([]);
-const departmentList = ref([]);
-const typeOption = ref([
-  { label: '医嘱组套', value: 1 },
-  { label: '中医协定处方', value: 2 },
-  { label: '划价组套', value: 3 },
-]);
-
-getList();
-function getList() {
-  getOrderGroup().then((res) => {
-    combinationList.value = res.data.records;
-  });
-  getAdviceBaseInfo({ organizationId: userStore.orgId }).then((res) => {
-    // todo organizationId获取的参数需要修改
-    adviceBaseOption.value = res.data.records;
-  });
-}
-function practitionerIdChange(row, index) {
-  let practitionerName = userPractitionerPCage.value.filter(
-    (e) => e.practitionerId == row.practitionerId
-  );
-  combinationList.value[index].practitionerName = practitionerName[0].nickName;
-}
-function orgIdChange(row, index) {
-  let orgName = departmentList.value.filter((e) => e.id == row.orgId);
-  combinationList.value[index].orgName = orgName[0].name;
-}
-function rangeCodeChange(row, index) {
-  if (row.rangeCode == 1) {
-    // 个人
-    getUserPractitionerPCage({ pageNo: 1, pageSize: 100 }).then((res) => {
-      userPractitionerPCage.value = res.data.records;
-      combinationList.value[index].orgId = '';
-      combinationList.value[index].orgName = '';
-    });
-  } else if (row.rangeCode == 2) {
-    //科室
-    getDepartmentList().then((res) => {
-      departmentList.value = res.data;
-      combinationList.value[index].practitionerId = '';
-      combinationList.value[index].practitionerName = '';
-    });
-  }
-}
-function handleAdd() {
-  // 检查combinationList中是否存在isEdit为true的项
-  const hasEditableItem = combinationList.value.some((item) => item.isEdit);
-  if (!hasEditableItem) {
-    combinationList.value.unshift({ isEdit: true });
-    combinationInfoList.value.forEach((item, index) => {
-      if (!item.isEdit) {
-        item.isEdit = true;
-        editingIndex.value = 0;
-      }
-    });
-    combinationInfoList.value.push({ isEdit: true });
-  } else {
-    proxy.$modal.msgWarning('请先保存当前行！');
-  }
-  currentIndex.value = 0;
-  console.log(combinationList.value, 'combinationList.value');
-}
-
-function handleAddTable() {
-  combinationInfoList.value.forEach((item, index) => {
-    if (!item.isEdit) {
-      item.isEdit = true;
-      editingIndex.value = 0;
-    }
-  });
-  combinationInfoList.value.push({ isEdit: true });
-}
-
-function handleGetCombinationList(row) {
-  if (groupItem.value && row.id === groupItem.value.id) {
-    return;
-  }
-  groupItem.value = row;
-  groupId.value = row.id;
-  if (row.groupJson) {
-    try {
-      const parsedData = JSON.parse(row.groupJson);
-      if (Array.isArray(parsedData)) {
-        combinationInfoList.value = parsedData.map((item) => ({
-          ...item,
-          isEdit: false,
-        }));
-      } else {
-        combinationInfoList.value = [parsedData].map((item) => ({
-          ...item,
-          isEdit: false,
-        }));
-      }
-    } catch (error) {
-      combinationInfoList.value = [];
-    }
-  } else {
-    combinationInfoList.value = [];
-  }
-  editingIndex.value = -1;
-  if (row.id) {
-    currentIndex.value = combinationList.value.findIndex((item) => item.id === row.id);
-  } else {
-    currentIndex.value = 0;
-  }
-}
-
-function handleDelete(row, index) {
-  combinationInfoList.value.splice(index, 1);
-}
-
-function handleSave(row) {
-  combinationInfoList.value.forEach((item, index) => {
-    if (item.isEdit) {
-      item.isEdit = false;
-      editingIndex.value = -1;
-    }
-  });
-  row.isEdit = false;
-  // let params = groupItem.value
-  let params = row;
-  params.groupJson = JSON.stringify(combinationInfoList.value);
-  saveOrderGroup(params).then((res) => {});
-}
-
-function handleEdit(row) {
-  combinationInfoList.value.forEach((item, index) => {
-    if (item.isEdit) {
-      item.isEdit = true;
-      editingIndex.value = 0;
-    }
-  });
-  row.isEdit = true;
-}
-
-function handleEditTable() {
-  if ((combinationInfoList.value[0].isEdit = true)) {
-    editingIndex.value = 0;
-  }
-}
-
-function handleSaveTable() {
-  combinationInfoList.value.forEach((item, index) => {
-    if (item.isEdit) {
-      item.isEdit = false;
-      editingIndex.value = -1;
-    }
-  });
-  let params = groupItem.value;
-  params.groupJson = JSON.stringify(combinationInfoList.value);
-  saveOrderGroup(params).then((res) => {});
-}
-</script>
\ No newline at end of file
diff --git a/vue3/src/views/clinicmanagement/disposal/index.vue b/vue3/src/views/clinicmanagement/disposal/index.vue
deleted file mode 100644
index 79b0ed05..00000000
--- a/vue3/src/views/clinicmanagement/disposal/index.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="app-container" style="display: flex; gap: 10px; height: 90vh">
-    <div style="width: 25%">
-      <div style="height: 100px; padding: 10px 0">
-        <div style="display: flex; gap: 50px">
-          <el-input
-            v-model="queryParams.searchKey"
-            placeholder="请输入患者名"
-            style="width: 220px"
-            @keyup.enter="getEncounterList"
-          >
-            <template #append>
-              <el-button icon="Search" @click="getEncounterList" />
-            </template>
-          </el-input>
-          <el-select
-            v-model="queryParams.departmentId"
-            placeholder="请选择科室"
-            @change="getEncounterList"
-            clearable
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </div>
-        <div style="display: flex; gap: 10px; margin-top: 15px">
-          <el-date-picker
-            v-model="encounterDate"
-            type="daterange"
-            range-separator="~"
-            value-format="YYYY-MM-DD"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            style="width: 80%"
-            @change="getEncounterList"
-          />
-          <el-button type="primary" @click="getEncounterList">搜索</el-button>
-        </div>
-      </div>
-      <el-table
-        :data="encounterList"
-        border
-        style="width: 100%"
-        @row-click="handleGetDisposalList"
-        height="650"
-        highlight-current-row
-      >
-        <el-table-column prop="departmentName" align="center" width="100" label="科室" />
-        <el-table-column prop="patientName" align="center" label="姓名" />
-        <el-table-column prop="genderEnum_enumText" align="center" width="70" label="性别" />
-        <el-table-column prop="encounterDate" align="center" label="就诊日期" />
-      </el-table>
-      <pagination
-        v-show="patientTotal > 0"
-        :total="patientTotal"
-        v-model:page="queryParams.pageNo"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-    <div style="width: 40%">
-      <div style="height: 100px">
-        <el-card>
-          <el-descriptions title="" :column="4">
-            <el-descriptions-item label="姓名：">
-              {{ patientInfo.patientName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="性别：">
-              {{ patientInfo.genderEnum_enumText }}
-            </el-descriptions-item>
-            <el-descriptions-item label="证件号：">
-              {{ patientInfo.idCard }}
-            </el-descriptions-item>
-            <el-descriptions-item label="就诊科室：">
-              {{ patientInfo.organizationName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="就诊日期：">
-              {{ patientInfo.encounterDate }}
-            </el-descriptions-item>
-            <el-descriptions-item label="门诊诊断：">
-              {{ patientInfo.conditionName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="总金额：">
-              {{ patientInfo.totalPrice }}
-            </el-descriptions-item>
-          </el-descriptions>
-        </el-card>
-      </div>
-
-      <el-table
-        :data="disposalList"
-        border
-        style="width: 100%"
-        height="650"
-        @row-click="handleGetExecuteList"
-        highlight-current-row
-      >
-        <el-table-column prop="itemName" align="center" width="180" label="项目名称" />
-        <el-table-column prop="unitPrice" align="center" label="单价" />
-        <el-table-column prop="totalPrice" align="center" label="总价" />
-        <el-table-column prop="quantity" align="center" label="数量" />
-        <el-table-column prop="frequency" align="center" label="次数" />
-        <el-table-column prop="chargeStatusEnum_enumText" align="center" label="收费状态" />
-        <el-table-column prop="unitCode" align="center" label="单位" />
-        <el-table-column label="操作" width="80" align="center" fixed="right">
-          <template #default="scope">
-            <el-button type="primary" link @click="handleExecute(scope.row)"> 执行 </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div style="width: 34%">
-      <el-table :data="executeList" border style="width: 100%" height="750">
-        <el-table-column prop="performerName" align="center" width="100" label="执行人" />
-        <el-table-column prop="locationName" align="center" label="执行科室" />
-        <el-table-column prop="deviceName" align="center" label="耗材名称" />
-        <el-table-column prop="quantity" align="center" label="耗材数" />
-        <el-table-column prop="occurrenceTime" align="center" label="执行时间" />
-        <el-table-column prop="" label="操作" width="80" align="center" fixed="right">
-          <template #default="scope">
-            <el-button type="primary" link @click="handelCancel(scope.row)"> 取消 </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { getList, getDisposalList, getExecuteList, execute, cancel, init } from './components/api';
-
-const queryParams = ref({
-  pageSize: 50,
-  pageNum: 1,
-});
-const patientInfo = ref({});
-const patientTotal = ref(0);
-const encounterList = ref([]);
-const disposalList = ref([]);
-const executeList = ref([]);
-const encounterDate = ref([]);
-const options = ref([]);
-const { proxy } = getCurrentInstance();
-getEncounterList();
-function getEncounterList() {
-  if (encounterDate.value) {
-    queryParams.value.encounterDateSTime = encounterDate.value[0] + ' 00:00:00';
-    queryParams.value.encounterDateETime = encounterDate.value[1] + ' 23:59:59';
-  } else {
-    queryParams.value.encounterDateSTime = undefined;
-    queryParams.value.encounterDateETime = undefined;
-  }
-  getList(queryParams.value).then((res) => {
-    patientTotal.value = res.data.total;
-    encounterList.value = res.data.records;
-  });
-}
-
-initOption();
-function initOption() {
-  init().then((res) => {
-    options.value = res.data.departmentOptions;
-  });
-}
-
-function handleGetDisposalList(row) {
-  getDisposalList(row.encounterId).then((res) => {
-    disposalList.value = res.data.outpatientDisposalActivityInfoDtoList;
-    patientInfo.value = res.data.outpatientDisposalPatientInfoDto;
-  });
-}
-
-function handleGetExecuteList(row) {
-  getExecuteList({ busNo: row.busNo, activityId: row.activityId, type: row.type }).then((res) => {
-    executeList.value = res.data;
-  });
-}
-
-function handleExecute(row) {
-  execute({ itemId: row.id, type: row.type }).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess('操作成功');
-    }
-  });
-}
-
-function handelCancel(row) {
-  cancel({ busNo: row.busNo, activityId: row.activityId, type: row.type }).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess('操作成功');
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-:deep( .el-card__body) {
-  padding: 14px 20px 10px 20px !important;
-}
-
-.el-card.is-always-shadow {
-  box-shadow: none;
-}
-</style>
\ No newline at end of file
diff --git a/vue3/src/views/doctorstation/index1.vue b/vue3/src/views/doctorstation/index1.vue
deleted file mode 100644
index cdb5d72d..00000000
--- a/vue3/src/views/doctorstation/index1.vue
+++ /dev/null
@@ -1,878 +0,0 @@
-<template>
-  <div
-    style="
-      display: flex;
-      justify-content: flex-start;
-      align-items: flex-start;
-      height: 85vh;
-      width: 100%;
-    "
-  >
-    <el-tabs
-      type="border-card"
-      v-model="activeTab"
-      @tab-click="handleClick(activeTab)"
-      style="width: 30%; height: 100%; margin: 20px 10px 0px 20px"
-    >
-      <el-tab-pane label="待诊" name="wait">
-        <patientlist
-          ref="waitPatientListRef"
-          @cellClick="cellClick"
-          @toCurrent="toCurrent"
-          :status="1"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="现诊" name="current">
-        <patientlist
-          ref="currentPatientListRef"
-          @cellClick="cellClick"
-          @toCurrent="toCurrent"
-          :status="2"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="完诊" name="finish">
-        <patientlist
-          ref="finishPatientListRef"
-          @cellClick="cellClick"
-          @toCurrent="toCurrent"
-          :status="4"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="暂离" name="leave">
-        <patientlist
-          ref="leavePatientListRef"
-          @cellClick="cellClick"
-          @toCurrent="toCurrent"
-          :status="3"
-        />
-      </el-tab-pane>
-    </el-tabs>
-    <el-tabs
-      v-if="activeTab === 'current' || activeTab === 'finish'"
-      type="border-card"
-      addable
-      @tab-click="handleDetClick"
-      style="width: 100%; height: 100%; margin: 20px 10px 0px 0px"
-    >
-      <el-tab-pane label="病历" v-loading="emrLoading">
-        <div style="margin-bottom: 15px; padding-left: 40px">
-          <el-row :gutter="24">
-            <el-col :span="12">
-              <el-descriptions>
-                <el-descriptions-item label="就诊科室:"> 内科 </el-descriptions-item>
-                <el-descriptions-item label="支付类型:">
-                  {{ patientInfo ? patientInfo.typeCode_dictText : '' }}
-                </el-descriptions-item>
-              </el-descriptions>
-            </el-col>
-            <el-col :span="12">
-              <el-button
-                type="primary"
-                @click="addEmr()"
-                style="margin-left: 20px"
-                :disabled="buttonDisabled || activeTab != 'current'"
-                >保存病历</el-button
-              >
-              <el-button
-                type="primary"
-                @click="handleEmrTemplate()"
-                style="margin-left: 20px"
-                :disabled="buttonDisabled || activeTab != 'current'"
-                >病历模板</el-button
-              >
-              <el-button
-                type="primary"
-                @click="handleSaveTemplate()"
-                style="margin-left: 20px"
-                :disabled="buttonDisabled || activeTab != 'current'"
-                >另存模板</el-button
-              >
-              <el-button
-                type="primary"
-                @click="handleEmrHistory()"
-                style="margin-left: 20px"
-                :disabled="buttonDisabled || activeTab != 'current'"
-                >历史病历</el-button
-              >
-              <el-button
-                type="primary"
-                @click="handleReceive()"
-                style="margin-left: 20px"
-                :disabled="buttonDisabled || activeTab != 'current'"
-                >打印病历</el-button
-              >
-            </el-col>
-          </el-row>
-        </div>
-        <div style="height: 650px; overflow-y: auto; overflow-x: hidden">
-          <el-form
-            ref="emrRef"
-            :model="form"
-            :rules="rules"
-            label-width="80px"
-            :disabled="activeTab != 'current'"
-          >
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="身高" prop="height" style="width: 100%">
-                  <el-input placeholder="" v-model="form.height" class="input-with-bottom-border">
-                    <template #suffix>cm</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="体重" prop="weight" style="width: 100%">
-                  <el-input placeholder="" v-model="form.weight" class="input-with-bottom-border">
-                    <template #suffix>kg</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="体温" prop="temperature" style="width: 100%">
-                  <el-input
-                    placeholder=""
-                    v-model="form.temperature"
-                    class="input-with-bottom-border"
-                  >
-                    <template #suffix>℃</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="脉搏" prop="pulse" style="width: 100%">
-                  <el-input placeholder="" v-model="form.pulse" class="input-with-bottom-border">
-                    <template #suffix>次/分</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <!-- <el-col :span="6">
-              <el-form-item
-                label="血糖"
-                prop="chiefComplaint"
-                style="width: 100%"
-              >
-                <el-input placeholder="" class="input-with-bottom-border">
-                  <template #suffix></template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="血糖"
-                prop="chiefComplaint"
-                style="width: 100%"
-              >
-                <el-input placeholder="" class="input-with-bottom-border">
-                  <template #suffix>mmol/L</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="收缩压"
-                prop="chiefComplaint"
-                style="width: 100%"
-              >
-                <el-input placeholder="" class="input-with-bottom-border">
-                  <template #suffix>mmHg</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="舒张压"
-                prop="chiefComplaint"
-                style="width: 100%"
-              >
-                <el-input placeholder="" class="input-with-bottom-border">
-                  <template #suffix>mmHg</template>
-                </el-input>
-              </el-form-item>
-            </el-col> -->
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="18">
-                <el-form-item label="主诉" prop="chiefComplaint">
-                  <el-input
-                    v-model="form.chiefComplaint"
-                    type="textarea"
-                    :rows="1"
-                    placeholder=""
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="发病日期" prop="onsetDate">
-                  <el-date-picker
-                    v-model="form.onsetDate"
-                    type="date"
-                    size="default"
-                    style="width: 100% !important"
-                    placement="bottom"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="现病史" prop="currentIllnessHistory">
-              <el-input
-                v-model="form.currentIllnessHistory"
-                type="textarea"
-                :rows="2"
-                placeholder=""
-              />
-            </el-form-item>
-            <el-form-item label="既往史" prop="pastMedicalHistory">
-              <el-input
-                v-model="form.pastMedicalHistory"
-                type="textarea"
-                :rows="2"
-                placeholder=""
-              />
-            </el-form-item>
-            <el-form-item label="月经史" prop="menstrualHistory">
-              <el-input v-model="form.menstrualHistory" type="textarea" :rows="2" placeholder="" />
-            </el-form-item>
-            <el-form-item label="过敏史" prop="allergyHistory">
-              <el-input v-model="form.allergyHistory" type="textarea" :rows="2" placeholder="" />
-            </el-form-item>
-            <el-form-item label="查体" prop="physicalExamination">
-              <el-input
-                v-model="form.physicalExamination"
-                type="textarea"
-                :rows="2"
-                placeholder=""
-              />
-            </el-form-item>
-            <el-form-item label="处理" prop="treatment">
-              <el-input v-model="form.treatment" type="textarea" :rows="2" placeholder="" />
-            </el-form-item>
-            <el-form-item label="辅助检查" prop="auxiliaryExamination">
-              <el-input
-                v-model="form.auxiliaryExamination"
-                type="textarea"
-                :rows="2"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="诊断" v-loading="emrLoading">
-        <el-row :gutter="24">
-          <el-col :span="4" :xs="24">
-            <el-input
-              v-model="form.phone"
-              placeholder="诊断名称"
-              clearable
-              style="width: 100%; margin-bottom: 10px"
-              @keyup.enter="queryDiagnosisUse"
-            >
-              <template #append>
-                <el-button icon="Search" @click="queryDiagnosisUse" />
-              </template>
-            </el-input>
-            <el-tree
-              :data="tree"
-              :props="{ label: 'name', children: 'children' }"
-              highlight-current
-              default-expand-all
-              @node-click="handleNodeClick"
-            >
-              <template #default="{ node, data }">
-                <span class="custom-tree-node">
-                  <span>{{ node.label }}</span>
-                  <span class="tree-node-actions">
-                    <el-button
-                      style="color: #000000"
-                      v-if="node.level === 1 && data.name != '常用' && data.name != '历史'"
-                      type="text"
-                      size="mini"
-                      @click.stop="addChild(data)"
-                    >
-                      <el-icon><Plus /></el-icon>
-                    </el-button>
-                    <el-button
-                      style="color: #000000"
-                      v-if="
-                        node.level === 2 &&
-                        node.parent.data.name != '常用' &&
-                        node.parent.data.name != '历史'
-                      "
-                      type="text"
-                      size="mini"
-                      @click.stop="deleteChild(data)"
-                    >
-                      <el-icon><Minus /></el-icon>
-                    </el-button>
-                  </span>
-                </span>
-              </template>
-            </el-tree>
-          </el-col>
-          <el-col :span="20" :xs="24">
-            <div style="margin-bottom: 10px">
-              <el-button
-                type="primary"
-                plain
-                @click="handleAddDiagnosis()"
-                :disabled="buttonDisabled || activeTab != 'current'"
-              >
-                新增诊断
-              </el-button>
-              <el-button
-                type="primary"
-                plain
-                @click="handleSaveDiagnosis()"
-                :disabled="buttonDisabled || activeTab != 'current'"
-              >
-                保存诊断
-              </el-button>
-            </div>
-            <el-table
-              ref="diagnosisTableRef"
-              :data="diagnosisList"
-              @cell-click="clickRow"
-              @selection-change="handleSelectionChange"
-              height="650"
-            >
-              <el-table-column label="序号" type="index" width="50" />
-              <el-table-column label="诊断名称" align="center" prop="name">
-                <template #default="scope">
-                  <el-popover
-                    :popper-style="{ padding: '0' }"
-                    placement="bottom-start"
-                    :visible="scope.row.showPopover"
-                    trigger="manual"
-                    :width="500"
-                  >
-                    <diagnosislist
-                      :diagnosisSearchkey="diagnosisSearchkey"
-                      @selectDiagnosis="handleSelsectDiagnosis"
-                    />
-                    <template #reference>
-                      <el-input
-                        v-model="scope.row.name"
-                        placeholder="请选择诊断"
-                        @input="handleChange"
-                        @focus="handleFocus(scope.row, scope.$index)"
-                        @blur="handleBlur(scope.row)"
-                        :disabled="activeTab != 'current'"
-                      />
-                    </template>
-                  </el-popover>
-                </template>
-              </el-table-column>
-              <el-table-column label="医保码" align="center" prop="ybNo" />
-              <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
-                <template #default="scope">
-                  <el-checkbox
-                    label="主诊断"
-                    :trueLabel="1"
-                    :falseLabel="0"
-                    v-model="scope.row.maindiseFlag"
-                    border
-                    size="small"
-                    :disabled="activeTab != 'current'"
-                    @change="(value) => handleMaindise(value, scope.$index)"
-                  />
-                  <el-select
-                    v-model="scope.row.verificationStatusEnum"
-                    placeholder=" "
-                    style="width: 40%; padding-bottom: 5px; padding-left: 10px"
-                    size="small"
-                    :disabled="activeTab != 'current'"
-                    @change="handle"
-                  >
-                    <el-option
-                      v-for="item in diagnosisOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center">
-                <template #default="scope">
-                  <el-button
-                    link
-                    type="primary"
-                    :disabled="activeTab != 'current'"
-                    @click="handleDeleteDiagnosis(scope.$index)"
-                    >删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-col>
-        </el-row>
-      </el-tab-pane>
-      <el-tab-pane label="处方" v-loading="emrLoading">
-        <prescriptionlist :patientInfo="patientInfo" />
-      </el-tab-pane>
-      <template #addIcon>
-        <!-- 展示用户信息 -->
-        <el-button class="plain-button">
-          {{
-            patientInfo
-              ? patientInfo.patientName +
-                ' / ' +
-                patientInfo.age +
-                ' / ' +
-                patientInfo.genderEnum_enumText +
-                ' / ' +
-                patientInfo.typeCode_dictText
-              : ''
-          }}
-        </el-button>
-      </template>
-    </el-tabs>
-    <el-dialog
-      :title="emrTitle"
-      v-model="openEmrTemplate"
-      width="600px"
-      append-to-body
-      destroy-on-close
-    >
-      <emrtemplate v-if="showDialog == 'emrTemplate'" @selectRow="templateSelect" />
-      <emrhistory v-if="showDialog == 'emrHistory'" />
-      <div v-if="showDialog == 'saveTemplate'">
-        <span>模板名称：<el-input v-model="templateName" /></span>
-        <el-radio-group v-model="radio">
-          <el-radio :label="1">个人</el-radio>
-          <el-radio :label="2">科室</el-radio>
-          <el-radio :label="3">全院</el-radio>
-        </el-radio-group>
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submit">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <diagnosisdialog
-      :openDiagnosis="openDiagnosis"
-      @close="closeDiagnosisDialog"
-      :radio="orgOrUser"
-    />
-  </div>
-</template>
-
-<script setup name="Doctorstation">
-import patientlist from './components/patientlist.vue';
-import {
-  saveEmr,
-  getEmrDetail,
-  saveEmrTemplate,
-  getConditionDefinitionInfo,
-  saveDiagnosis,
-  diagnosisInit,
-  deleteDiagnosisBind,
-  getEncounterDiagnosis,
-} from './components/api';
-import prescriptionlist from './components/prescriptionlist.vue';
-import emrtemplate from './components/emrTemplate.vue';
-import emrhistory from './components/emrhistory.vue';
-import diagnosisdialog from './components/diagnosisdialog.vue';
-import diagnosislist from './components/diagnosislist.vue';
-import { computed, ref } from 'vue';
-
-const activeTab = ref('wait');
-const form = ref({});
-const patientInfo = ref();
-const { proxy } = getCurrentInstance();
-const openEmrTemplate = ref(false);
-const templateName = ref('');
-const showDialog = ref('');
-const emrTitle = ref('');
-const emrLoading = ref(false);
-const diagnosisList = ref([]);
-const openDiagnosis = ref(false);
-const tree = ref([]);
-const buttonDisabled = computed(() => {
-  return !patientInfo.value;
-});
-const waitPatientListRef = ref(null);
-const currentPatientListRef = ref(null);
-const finishPatientListRef = ref(null);
-const leavePatientListRef = ref(null);
-const rowIndex = ref(-1);
-const diagnosisSearchkey = ref('');
-// const emrContext = ref({});
-const radio = ref(1);
-const rules = ref({
-  chiefComplaint: [{ required: true, message: '请输入主诉', trigger: 'blur' }],
-});
-const diagnosisOptions = ref([]);
-const orgOrUser = ref();
-/**
- * 患者列表行点击回调
- * @param column 患者信息
- */
-function cellClick(column) {
-  patientInfo.value = column;
-  console.log(column);
-  if (activeTab.value == 'wait') {
-    form.value = {};
-  } else {
-    emrLoading.value = true;
-    getEmrDetail(column.encounterId).then((res) => {
-      if (res.data) {
-        form.value = JSON.parse(res.data.contextJson);
-      } else {
-        form.value = {};
-      }
-      setTimeout(() => {
-        emrLoading.value = false;
-      }, 100);
-    });
-    getEncounterDiagnosis(patientInfo.value.encounterId).then((res) => {
-      if (res.code == 200) {
-        diagnosisList.value = res.data;
-      }
-    });
-    getTree();
-  }
-}
-
-// 监听 activeTab 的变化
-watch(activeTab, (newTab) => {
-  switch (newTab) {
-    case 'wait':
-      if (waitPatientListRef.value) {
-        waitPatientListRef.value.refreshList();
-      }
-      break;
-    case 'current':
-      if (currentPatientListRef.value) {
-        currentPatientListRef.value.refreshList();
-      }
-      break;
-    case 'finish':
-      if (finishPatientListRef.value) {
-        finishPatientListRef.value.refreshList();
-      }
-      break;
-    case 'leave':
-      if (leavePatientListRef.value) {
-        leavePatientListRef.value.refreshList();
-      }
-      break;
-  }
-});
-
-init();
-function init() {
-  diagnosisInit().then((res) => {
-    if (res.code == 200) {
-      diagnosisOptions.value = res.data.verificationStatusOptions;
-    }
-  });
-}
-
-function handleMaindise(value, index) {
-  diagnosisList.value[index].maindiseFlag = value ? 1 : 0;
-  console.log(diagnosisList.value);
-}
-
-function handleClick(e) {
-  patientInfo.value = null;
-  diagnosisList.value = [];
-  form.value = {};
-}
-
-/**
- * 保存病历
- */
-function addEmr() {
-  saveEmr({
-    patientId: patientInfo.value.patientId,
-    encounterId: patientInfo.value.encounterId,
-    contextJson: form.value,
-  }).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess('保存成功');
-    }
-  });
-}
-
-function handleChange(value) {
-  diagnosisSearchkey.value = value;
-}
-
-function handleNodeClick(data) {
-  // 检查节点是否为根节点
-  if (data.children && data.children.length > 0) {
-    // 如果是根节点，不执行任何操作
-    return;
-  }
-  const isDuplicate = diagnosisList.value.some(
-    (diagnosis) => diagnosis.ybNo === data.ybNo || diagnosis.name === data.name
-  );
-  if (isDuplicate) {
-    proxy.$modal.msgWarning('该诊断项已存在');
-    return;
-  }
-  diagnosisList.value.push({
-    ybNo: data.ybNo,
-    name: data.name,
-    verificationStatusEnum: 4,
-  });
-}
-
-/**
- * 病历模板
- */
-function handleEmrTemplate() {
-  emrTitle.value = '病历模板';
-  showDialog.value = 'emrTemplate';
-  openEmrTemplate.value = true;
-}
-/**
- * 选择病历模板
- */
-function templateSelect(row) {
-  form.value = row;
-}
-
-/**
- * 添加子节点
- */
-function addChild(data) {
-  orgOrUser.value = data.name;
-  openDiagnosis.value = true;
-}
-
-/**
- * 删除子节点
- */
-function deleteChild(data) {
-  console.log(data);
-
-  deleteDiagnosisBind(data.id).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess('删除成功');
-      getTree();
-    }
-  });
-}
-
-function cancel() {
-  openEmrTemplate.value = false;
-  openDiagnosis.value = false;
-}
-
-/**
- * 历史病历
- */
-function handleEmrHistory() {
-  emrTitle.value = '历史病历';
-  showDialog.value = 'emrHistory';
-  openEmrTemplate.value = true;
-}
-
-/**
- * 保存病历模板
- */
-function handleSaveTemplate() {
-  emrTitle.value = '保存模板';
-  showDialog.value = 'saveTemplate';
-  openEmrTemplate.value = true;
-}
-
-/**
- * 弹窗确认操作，包括保存病历模板/选择病历模板/选择历史病历
- */
-function submit() {
-  switch (showDialog.value) {
-    case 'saveTemplate':
-      saveEmrTemplate({
-        templateName: templateName.value,
-        useScopeCode: radio.value,
-        contextJson: form.value,
-      }).then((res) => {
-        if (res.code == 200) {
-          openEmrTemplate.value = false;
-          proxy.$modal.msgSuccess('保存成功');
-        }
-      });
-      break;
-    case 'emrTemplate':
-      openEmrTemplate.value = false;
-      break;
-    case 'emrHistory':
-      break;
-  }
-}
-
-/**
- * 获取诊断树列表
- */
-function getTree() {
-  getConditionDefinitionInfo(patientInfo.value ? patientInfo.value.patientId : '').then((res) => {
-    if (res.code == 200) {
-      // 手动构造树列表
-      tree.value[0] = {
-        name: '历史',
-        children: res.data.patientHistoryList,
-      };
-      tree.value[1] = {
-        name: '常用',
-        children: res.data.doctorCommonUseList,
-      };
-      tree.value[2] = {
-        name: '个人',
-        children: res.data.userPersonalList,
-      };
-      tree.value[3] = {
-        name: '科室',
-        children: res.data.organizationList,
-      };
-      console.log(tree.value);
-    }
-  });
-}
-
-/**
- * 添加诊断
- */
-function handleAddDiagnosis() {
-  diagnosisList.value.push({
-    showPopover: false,
-    name: undefined,
-    verificationStatusEnum: 4,
-  });
-}
-
-/**
- * 删除诊断
- */
-function handleDeleteDiagnosis(index) {
-  diagnosisList.value.splice(index, 1);
-}
-
-/**
- * 保存诊断
- */
-function handleSaveDiagnosis() {
-  if (diagnosisList.value.length == 0) {
-    proxy.$modal.msgWarning('诊断不能为空');
-  } else if (!diagnosisList.value.some((diagnosis) => diagnosis.maindiseFlag === 1)) {
-    proxy.$modal.msgWarning('至少添加一条主诊断');
-  } else if (diagnosisList.value.filter((diagnosis) => diagnosis.maindiseFlag === 1).length > 1) {
-    proxy.$modal.msgWarning('只能有一条主诊断');
-  } else {
-    saveDiagnosis({
-      patientId: patientInfo.value.patientId,
-      encounterId: patientInfo.value.encounterId,
-      diagnosisChildList: diagnosisList.value,
-    }).then((res) => {
-      if (res.code == 200) {
-        getTree();
-        proxy.$modal.msgSuccess('保存成功');
-      }
-    });
-  }
-}
-
-/**
- * 关闭诊断弹窗
- */
-function closeDiagnosisDialog(str) {
-  if (str === 'success') {
-    proxy.$modal.msgSuccess('操作成功');
-  }
-  openDiagnosis.value = false;
-  getTree();
-}
-
-function queryDiagnosisUse(value) {}
-
-/**
- * 选择诊断并赋值到列表
- */
-function handleSelsectDiagnosis(row) {
-  console.log(row);
-  diagnosisList.value[rowIndex.value].ybNo = row.ybNo;
-  diagnosisList.value[rowIndex.value].name = row.name;
-  diagnosisList.value[rowIndex.value].definitionId = row.id;
-  diagnosisList.value[rowIndex.value].maindiseFlag = 0; // 默认设置为 0
-}
-/**获取焦点时 打开列表 */
-function handleFocus(row, index) {
-  rowIndex.value = index;
-  row.showPopover = true;
-}
-/**失去焦点时 关闭列表 */
-function handleBlur(row) {
-  row.showPopover = false;
-}
-
-function toCurrent() {
-  activeTab.value = 'current';
-  patientInfo.value = null;
-}
-
-function handleDetClick(e) {
-  console.log(e.props.label);
-  if (e.props.label == '病例') {
-  } else if (e.props.label == '诊断') {
-    getEncounterDiagnosis(patientInfo.value.encounterId).then((res) => {
-      if (res.code == 200) {
-        diagnosisList.value = res.data;
-      }
-    });
-  } else {
-  }
-}
-</script>
-<style lang="scss" scoped>
-// .el-tabs--card {
-//   height: calc(100vh - 100px);
-// }
-// .el-tab-pane {
-//   height: calc(100vh - 200px);
-//   overflow-y: auto;
-// }
-
-/* :deep( .el-tabs__item.is-top:last-child {
-  float: right;
-} */
-:deep( .el-tabs__new-tab) {
-  /* position: relative;
-  right: 10%; */
-  border: none;
-}
-
-.plain-button {
-  margin-right: 300px;
-  border: none;
-  background-color: transparent;
-  color: #909399;
-  font-size: 16px;
-  padding: 0;
-  cursor: pointer;
-}
-.el-popover.el-popper {
-  padding: 0px !important;
-}
-
-.custom-tree-node {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.tree-node-actions {
-  display: flex;
-  align-items: center;
-}
-
-.el-checkbox.is-bordered.el-checkbox--small {
-  background-color: #ffffff;
-}
-</style>
\ No newline at end of file
diff --git a/vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder copy.vue b/vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder copy.vue
deleted file mode 100644
index c8c71d7b..00000000
--- a/vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder copy.vue	
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <div class="folder-container" :style="{ marginLeft: `${level * 4}px` }">
-    <div class="folder-header" @click="toggleFolder">
-      <el-icon>
-        <component :is="isOpen ? 'Fold' : 'Expand'" />
-      </el-icon>
-      <span>{{ folder.name }}</span>
-    </div>
-
-    <div v-if="isOpen" class="folder-content">
-      <div v-for="(item, index) in props.folder.children" :key="index">
-        <div v-if="item.children && item.children.length" class="sub-folder">
-          <diagnose-folder :folder="item" :level="level + 1" />
-        </div>
-        <div v-else class="file-item">
-          {{ item.name }}
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup >
-import { ref, defineProps } from 'vue'
-import { ElIcon } from 'element-plus'
-
-interface FolderItem {
-  name: string
-  children?: FolderItem[]
-  type?: number // 0:文件夹 1:文件
-}
-
-interface Props {
-  folder: FolderItem
-  level: number
-}
-
-const props = defineProps<Props>()
-
-// 是否展开
-const isOpen = ref(false)
-
-const toggleFolder = () => {
-  isOpen.value = !isOpen.value
-}
-</script>
-
-<style lang="scss" scoped>
-.folder-container {
-  position: relative;
-
-  .folder-header {
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-    padding: 4px 4px 4px 0px;
-    border-radius: 4px;
-
-    &:hover {
-      background-color: #f5f7fa;
-    }
-
-    .el-icon {
-      margin-right: 8px;
-      font-size: 16px;
-    }
-  }
-
-  .folder-content {
-    margin-left: 8px;
-
-    .sub-folder {
-      margin-left: 10px;
-    }
-
-    .file-item {
-      padding: 4px;
-      margin-left: 4px;
-
-      &:hover {
-        background-color: #f5f7fa;
-      }
-    }
-  }
-}
-</style>
diff --git a/vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder.vue b/vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder.vue
deleted file mode 100644
index 83e03320..00000000
--- a/vue3/src/views/inpatientDoctor/home/components/diagnose/diagnoseFolder.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
- * @Author: sjjh
- * @Date: 2025-04-12 22:52:19
- * @Description:
--->
-<template>
-  <el-scrollbar height="100%" width="200px" class="folder-container">
-    <div :style="{ marginLeft: `${level * 4}px` }">
-      <template v-for="(folderItem, index) in props.folder" :key="index">
-        <div class="folder-header" @click="toggleFolder(folderItem)">
-          <el-icon v-if="folderItem.children && folderItem.children.length > 0">
-            <component :is="folderItem.isOpen ? 'Fold' : 'Expand'" />
-          </el-icon>
-          <el-tooltip
-            :content="folderItem.name"
-            placement="right"
-            v-if="folderItem.name.length >= 10"
-          >
-            <el-text truncated> {{ folderItem.name }}</el-text>
-          </el-tooltip>
-          <el-text v-else truncated> {{ folderItem.name }}</el-text>
-        </div>
-
-        <div v-if="folderItem.isOpen" class="folder-content">
-          <div v-if="folderItem.children && folderItem.children.length" class="sub-folder">
-            <diagnose-folder :folder="folderItem.children" :level="level + 1" />
-          </div>
-        </div>
-      </template>
-    </div>
-  </el-scrollbar>
-</template>
-
-<script setup >
-import { defineProps } from 'vue'
-import { ElIcon } from 'element-plus'
-
-interface FolderItem {
-  name: string
-  children?: FolderItem[]
-  type?: number // 0:文件夹 1:文件
-  isOpen?: boolean
-}
-
-interface Props {
-  folder: FolderItem[]
-  level: number
-}
-
-const props = defineProps<Props>()
-
-const toggleFolder = (folder: FolderItem) => {
-  folder.isOpen = !folder.isOpen
-}
-</script>
-
-<style lang="scss" scoped>
-.folder-container {
-  position: relative;
-
-  .folder-header {
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-    padding: 4px 4px 4px 0px;
-    border-radius: 4px;
-
-    &:hover {
-      background-color: #f5f7fa;
-    }
-
-    .el-icon {
-      margin-right: 8px;
-      font-size: 16px;
-    }
-  }
-
-  .folder-content {
-    margin-left: 8px;
-
-    .sub-folder {
-      margin-left: 10px;
-    }
-
-    .file-item {
-      padding: 4px;
-      margin-left: 4px;
-
-      &:hover {
-        background-color: #f5f7fa;
-      }
-    }
-  }
-}
-</style>
diff --git a/vue3/src/views/inpatientDoctor/home/index.js b/vue3/src/views/inpatientDoctor/home/index.js
deleted file mode 100644
index 2bdcf2f9..00000000
--- a/vue3/src/views/inpatientDoctor/home/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * @Author: sjjh
- * @Date: 2025-04-07 12:58:22
- * @Description:
- */
-import PatientList from './components/patientList.vue'
-import PatientCard from './components/patientCard/index.vue'
-import Advice from './components/order/index.vue'
-import Diagnose from './components/diagnose/index.vue'
-export { PatientList, PatientCard, Advice,Diagnose }
diff --git a/vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue b/vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
deleted file mode 100644
index 0d886d0c..00000000
--- a/vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- * @Author: sjjh
- * @Date: 2025-04-09 17:14:59
- * @Description:
--->
-<template>
-  <div class="bedAllocation-container">
-    <div class="bedAllocation-search">
-      <el-space>
-        <!-- <el-input v-model="input" style="width: 240px" placeholder="Please input" /> -->
-      </el-space>
-      <el-space>
-        <el-button @click="query">刷新</el-button>
-      </el-space>
-    </div>
-    <!-- 待入科列表 -->
-    <div class="bedAllocation-table">
-      <el-table
-        :data="allocationData"
-        border
-        row-key="id"
-        style="width: 100%; height: 100%"
-        highlight-current-row
-      >
-        <el-table-column prop="date" label="姓名" width="180" sortable />
-        <el-table-column prop="orderTypeName" label="住院号" width="180" />
-        <el-table-column prop="address" label="诊断" />
-        <el-table-column prop="address" label="性别" />
-        <el-table-column prop="address" label="年龄" />
-        <el-table-column prop="address" label="入院科室" />
-        <el-table-column prop="address" label="费别" width="180" />
-        <el-table-column prop="address" label="是否跨科收治" width="180" />
-        <!-- 新入院还是其他科室转入 -->
-        <el-table-column prop="address" label="入科来源" width="180" />
-
-        <el-table-column fixed="right" label="操作" width="140">
-          <template #default="props">
-            <el-button link type="primary" size="small" @click="addSigns(props.row)">
-              体征录入
-            </el-button>
-            <el-button link type="primary" size="small" @click="selectBed(props.row)"
-              >分床</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <TransferInDialog v-model:visible="transferInDialogVisible" />
-    <SignEntryDialog v-model:visible="signEntryDialogVisible" />
-  </div>
-</template>
-<script setup >
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue'
-import { TransferInDialog, SignEntryDialog } from './index'
-// const { proxy } = getCurrentInstance()
-// const emits = defineEmits([])
-// const props = defineProps({})
-
-const transferInDialogVisible = ref(false)
-const signEntryDialogVisible = ref(false)
-const state = reactive({})
-onBeforeMount(() => {})
-onMounted(() => {
-  query()
-})
-defineExpose({ state })
-const allocationData = ref([{}, {}])
-const query = () => {
-  // 查询列表
-}
-
-const addSigns = (row: any) => {
-  // TODO 新增入院体征
-  signEntryDialogVisible.value = true
-}
-
-const selectBed = (row: any) => {
-  // TODO 选床 入科
-  transferInDialogVisible.value = true
-}
-</script>
-<style lang="scss" scoped>
-.bedAllocation-container {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  .bedAllocation-search {
-    height: 44px;
-    display: flex;
-    align-items: center;
-    flex-direction: row-reverse;
-    text-align: right;
-    flex: none;
-    justify-content: space-between;
-  }
-  .bedAllocation-table {
-    height: 200px;
-    flex: auto;
-  }
-}
-</style>
diff --git a/vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue b/vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
deleted file mode 100644
index 339cd384..00000000
--- a/vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
+++ /dev/null
@@ -1,268 +0,0 @@
-<template>
-  <el-dialog
-    v-model="visible"
-    top="6vh"
-    :width="width"
-    title="入科选床"
-    @open="openAct"
-    @closed="closedAct"
-    :z-index="20"
-  >
-    <div class="transferIn-container">
-      <el-form :model="interventionForm" :rules="rules" ref="interventionFormRef">
-        <div class="admission-information">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="入院科室" label-width="100px">
-                <el-input
-                  class="w-p100"
-                  clearable
-                  disabled
-                  v-model="interventionForm.inDeptName"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="入院病区" label-width="100px">
-                <el-input
-                  class="w-p100"
-                  v-model="interventionForm.inNurseDeptName"
-                  disabled
-                  clearable
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="入住床位" label-width="100px">
-                <el-input
-                  class="w-p100"
-                  v-model="interventionForm.bedName"
-                  disabled
-                  clearable
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="24">
-              <el-scrollbar height="400px" class="beds">
-                <BedCards />
-              </el-scrollbar>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="住院医生" label-width="100px" prop="admittedDoctor">
-                <el-select
-                  v-model="interventionForm.admittedDoctor"
-                  placeholder="Select"
-                  style="width: 240px"
-                >
-                  <el-option key="1" label="医生甲" value="医生甲" />
-                  <el-option key="2" label="医生乙" value="医生乙" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="主治医生" label-width="100px">
-                <el-select
-                  v-model="interventionForm.masterDoctor"
-                  placeholder="Select"
-                  style="width: 240px"
-                >
-                  <el-option key="1" label="医生甲" value="医生甲" />
-                  <el-option key="2" label="医生乙" value="医生乙" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="主任医生" label-width="100px">
-                <el-select
-                  v-model="interventionForm.directorDoctor"
-                  placeholder="Select"
-                  style="width: 240px"
-                >
-                  <el-option key="1" label="医生甲" value="医生甲" />
-                  <el-option key="2" label="医生乙" value="医生乙" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="入科时间" label-width="100px">
-                <el-date-picker
-                  class="w-p100"
-                  v-model="interventionForm.inDeptDate"
-                  type="datetime"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请输入"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="责任护士" label-width="100px" prop="masterNurse">
-                <el-select
-                  v-model="interventionForm.masterNurse"
-                  placeholder="Select"
-                  style="width: 240px"
-                >
-                  <el-option key="1" label="护士甲" value="护士甲" />
-                  <el-option key="2" label="护士乙" value="护士乙" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="患者病情" label-width="100px">
-                <el-select
-                  v-model="interventionForm.bingqing"
-                  placeholder="Select"
-                  style="width: 240px"
-                >
-                  <el-option key="1" label="护士甲" value="护士甲" />
-                  <el-option key="2" label="护士乙" value="护士乙" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </el-form>
-    </div>
-    <template #footer>
-      <!-- <div class="transferInDialog-footer"> -->
-      <div class="isPrintWristband">
-        <el-checkbox v-model="printWristband">打印腕带</el-checkbox>
-      </div>
-      <el-button class="margin-left-auto" @click="cancelAct">取消 </el-button>
-      <el-button type="primary" @click="handleSubmit(interventionFormRef)">入科</el-button>
-      <!-- </div> -->
-    </template>
-  </el-dialog>
-</template>
-<script  setup>
-import { reactive, ref, onMounted, inject, type Ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
-import { dayjs, ElMessage } from 'element-plus'
-import type { IInPatient } from '@/model/IInPatient'
-
-import { BedCards } from './index'
-const currentInPatient = ref<Partial<IInPatient>>({})
-const initCurrentInPatient = () => {
-  currentInPatient.value = {
-    feeType: '08',
-    sexName: '男',
-    age: '0',
-  }
-}
-/* 初始化数据 */
-const init = () => {
-  initCurrentInPatient()
-}
-/* 入科 */
-const interventionForm = ref({
-  // id: undefined, // 标识
-  changeDeptOutId: '', // 住院患者转科出科标识
-  visitCode: '', // 	就诊流水号
-  patCode: '', // 主索引
-  inDept: '', // 入科科室
-  inDeptName: '', // 入科科室名称
-  inNurseDept: '', // 入科护理组
-  inNurseDeptName: '', // 入科护理组名称
-  bedId: '', // 床位服务信息标识
-  bedName: '', // 床号
-  admittedDoctor: '', // 住院医师
-  admittedDoctorName: '', // 住院医师名称
-  masterDoctor: '', // 主治医师
-  masterDoctorName: '', // 主治医师名称
-  directorDoctor: '', // 主任医师
-  directorDoctorName: '', // 主任医师名称
-  masterNurse: '', // 责任护士
-  masterNurseName: '', // 责任护士名称
-  height: 0, // 身高
-  weight: 0, // 体重
-  temperature: 0, // 体温
-  hertRate: 0, // 心率
-  pulse: 0, // 	脉搏
-  highBloodPressure: 0, // 收缩压
-  endBloodPressure: 0, // 舒张压
-  loginDeptCode: '', // 	当前登录科室
-  bingqing: '', //患者病情
-  inDeptDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), //入院时间
-  signsId: '',
-})
-const rules = reactive<FormRules>({
-  admittedDoctor: [{ required: true, message: '请选择住院医生', trigger: ['blur', 'change'] }],
-  masterNurse: [{ required: true, message: '请选择责任护士', trigger: ['blur', 'change'] }],
-})
-const printWristband = ref(false)
-const emits = defineEmits(['okAct'])
-const props = defineProps<{
-  bedInfo?: any
-}>()
-const visible = defineModel('visible')
-const width = '950px'
-/* 取消 */
-const cancelAct = () => {
-  visible.value = false
-}
-/* 入科 */
-const interventionFormRef = ref()
-const handleSubmit = async (formEl: FormInstance | undefined) => {
-  // TODO 登记入科
-  if (!formEl) return
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      try {
-        // 登记入科方法(interventionForm.value).then((res: any) => {
-        //   ElMessage({
-        //     message: '登记成功！',
-        //     type: 'success',
-        //     grouping: true,
-        //     showClose: true,
-        //   })
-        //   emits('okAct')
-        // })
-      } catch (error) {
-        console.log(error)
-      }
-    }
-  })
-}
-const openAct = () => {
-  init()
-}
-const closedAct = () => {
-  visible.value = false
-}
-onMounted(() => {})
-</script>
-<style lang="scss" scoped>
-.transferIn-container {
-  width: 100%;
-
-  .admission-information {
-    width: 896px;
-    .unit {
-      display: inline-block;
-      margin-left: 10px;
-      color: #bbb;
-      font-weight: 400;
-      font-size: 14px;
-      font-family: '思源黑体 CN';
-    }
-  }
-  .beds {
-    margin-bottom: 8px;
-  }
-}
-
-.isPrintWristband {
-  float: left;
-  display: inline-block;
-}
-.w-p100 {
-  width: 100%;
-}
-
-.w-80 {
-  width: 80px;
-}
-</style>
diff --git a/vue3/src/views/system/tenant/setOption.vue b/vue3/src/views/system/tenant/setOption.vue
deleted file mode 100644
index f2ae56d8..00000000
--- a/vue3/src/views/system/tenant/setOption.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
-         <el-form-item label="配置项" prop="optionCode">
-            <el-select v-model="queryParams.optionCode" placeholder="配置项" clearable style="width: 300px">
-               <el-option v-for="dict in optionCodeList" :key="dict.code" :label="dict.name + '（' + dict.code + '）'"
-                  :value="dict.code" />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
-
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="addOption">新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="delOptions">删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="optionList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="配置项编码" prop="optionCode" :show-overflow-tooltip="true" />
-         <el-table-column label="配置项名称" prop="optionName" :show-overflow-tooltip="true" />
-         <el-table-column label="配置项内容" prop="optionContent" :show-overflow-tooltip="true" />
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-tooltip content="修改" placement="top">
-                  <el-button link type="primary" icon="Edit" @click="editOption(scope.row)"></el-button>
-               </el-tooltip>
-               <el-tooltip content="删除" placement="top">
-                  <el-button link type="primary" icon="Delete" @click="handelDel(scope.row)"></el-button>
-               </el-tooltip>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize" @pagination="getList" />
-
-
-      <!-- 添加或修改配置项对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="optionRef" :model="form" :rules="rules" label-width="100px">
-            <el-form-item label="配置项" prop="optionCode">
-               <el-select v-model="form.optionCode" placeholder="配置项" :disabled="form.id" clearable
-                  style="width: 500px">
-                  <el-option v-for="dict in optionCodeList" :key="dict.code" :label="dict.name + '（' + dict.code + '）'"
-                     :value="dict.code" />
-               </el-select>
-            </el-form-item>
-            <el-form-item label="内容" prop="optionContent">
-               <el-input v-model="form.optionContent" type="textarea" style="width: 500px" placeholder="请输入内容" />
-            </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-
-   </div>
-</template>
-
-<script setup name="SetOption">
-import { getTenantOptionPage, getTenantOptionDetail, addTenantOption, editTenantOption, delTenantOption, getTenantOptionDropdown } from "@/api/system/tenant";
-
-const route = useRoute();
-const { proxy } = getCurrentInstance();
-
-const optionList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-const optionIds = ref([]);
-const optionCodeList = ref([]);
-
-const data = reactive({
-   form: {},
-   queryParams: {
-      pageNum: 1,
-      pageSize: 10,
-      tenantId: route.params.tenantId,
-      optionCode: undefined,
-   },
-   rules: {
-      optionCode: [
-         { required: true, message: "配置项不能为空", trigger: "blur" },
-      ],
-      optionContent: [
-         { required: true, message: "内容不能为空", trigger: "blur" },
-         { min: 1, max: 500, message: '长度需在1到500个字符之间', trigger: 'blur' }
-      ]
-   }
-})
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询授权用户列表 */
-function getList() {
-   loading.value = true;
-   getTenantOptionPage(queryParams.value).then(response => {
-      optionList.value = response.data.records;
-      total.value = response.data.total;
-      loading.value = false;
-   });
-}
-// 返回按钮
-function handleClose() {
-   const obj = { path: "/system/basicmanage/tenant" };
-   proxy.$tab.closeOpenPage(obj);
-}
-/** 搜索按钮操作 */
-function handleQuery() {
-   queryParams.pageNum = 1;
-   getList();
-}
-/** 重置按钮操作 */
-function resetQuery() {
-   proxy.resetForm("queryRef");
-   handleQuery();
-}
-// 多选框选中数据
-function handleSelectionChange(selection) {
-   optionIds.value = selection.map(item => item.id);
-   multiple.value = !selection.length;
-}
-/** 重置新增的表单以及其他数据  */
-function reset() {
-   form.value = {
-      id: undefined,
-      optionCode: undefined,
-      optionContent: undefined,
-   };
-   proxy.resetForm("optionRef");
-}
-/** 新增配置 */
-function addOption() {
-   reset();
-   open.value = true;
-   title.value = "新增配置项";
-}
-/** 批量删除配置 */
-function delOptions() {
-   proxy.$modal.confirm('确认要删除这些配置项吗？').then(function () {
-      return delTenantOption(optionIds.value);
-   }).then(() => {
-      getList();
-      proxy.$modal.msgSuccess("删除成功");
-   }).catch(() => { });
-}
-/** 编辑配置 */
-function editOption(row) {
-   reset();
-   getTenantOptionDetail(row.id).then(response => {
-      form.value = response.data
-      open.value = true;
-      title.value = "修改配置项";
-   }
-   )
-}
-/** 提交按钮 */
-function submitForm() {
-   form.value.tenantId = route.params.tenantId
-   proxy.$refs["optionRef"].validate(valid => {
-      if (valid) {
-         if (form.value.id != undefined) {
-            editTenantOption(form.value).then(response => {
-               proxy.$modal.msgSuccess("修改成功");
-               open.value = false;
-               getList();
-            });
-         } else {
-            addTenantOption(form.value).then(response => {
-               if (response.code != 0) {
-                  proxy.$modal.msgSuccess(response.msg);
-               } else {
-                  proxy.$modal.msgSuccess("新增成功");
-               }
-               open.value = false;
-               getList();
-            });
-         }
-      }
-   });
-}
-/** 删除配置 */
-function handelDel(row) {
-   proxy.$modal.confirm("确认要删除该配置项吗？").then(function () {
-      return delTenantOption([row.id]);
-   }).then(() => {
-      getList();
-      proxy.$modal.msgSuccess("删除成功");
-   }).catch(() => { });
-}
-/** 查询配置项下拉列表 */
-function getOptionCodeList() {
-   getTenantOptionDropdown().then(response => {
-      optionCodeList.value = response.data;
-   });
-}
-/** 取消按钮 */
-function cancel() {
-  open.value = false;
-  reset();
-}
-
-getList();
-getOptionCodeList();
-</script>
-- 
Gitee


From 3ef3c2fecf5c55bc0180339ed6079136e8154aee Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Wed, 3 Sep 2025 11:05:00 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openhis-server-new/openhis-ybapp/pom.xml      |  154 ---
 .../com/openhis/OpenHisYbApplication.java     |   50 -
 .../openhis/annotation/ElepHandlerInt.java    |   19 -
 .../com/openhis/annotation/HandlerInt.java    |   18 -
 .../component/ElepHandlerIntDispatcher.java   |   38 -
 .../component/HandlerIntDispatcher.java       |   34 -
 .../openhis/config/HospitalInfoConfig.java    |   36 -
 .../com/openhis/config/InterfaceConfig.java   |   43 -
 .../main/java/com/openhis/config/Tenant.java  |  227 ----
 .../openhis/constant/ClincStatusConst.java    |   11 -
 .../com/openhis/constant/CommonConstant.java  |  327 -----
 .../openhis/constant/InputDataTypeConst.java  |   23 -
 .../constant/InterFaceResultConst.java        |   14 -
 .../context/ElepHandlerServiceContext.java    |   38 -
 .../context/HandlerServiceContext.java        |   36 -
 .../com/openhis/controller/YbController.java  |  371 -----
 .../openhis/controller/YbElepController.java  |  110 --
 .../java/com/openhis/domain/BaseRequest.java  |   35 -
 .../java/com/openhis/domain/BaseResponse.java |   39 -
 .../com/openhis/domain/ClinicPreSettle.java   |   62 -
 .../java/com/openhis/domain/ClinicReg.java    |  109 --
 .../java/com/openhis/domain/ClinicSettle.java |  112 --
 .../java/com/openhis/domain/ClinicUnReg.java  |   47 -
 .../com/openhis/domain/ClinicUnSettle.java    |  111 --
 .../openhis/domain/DirectoryCheckRecord.java  |   42 -
 .../openhis/domain/ElepMedresultDetail.java   |   62 -
 .../com/openhis/domain/ElepMedresultInfo.java |   45 -
 .../openhis/domain/ElepMedresultInput.java    |   45 -
 .../openhis/domain/ElepQuerDiagnosisInfo.java |   69 -
 .../domain/ElepQuerPrescriptionDetail.java    |  140 --
 .../domain/ElepQuerPrescriptionInfo.java      |  118 --
 .../domain/ElepQuerPrescriptionInput.java     |   45 -
 .../com/openhis/domain/ElepQuerVisitInfo.java |  107 --
 .../com/openhis/domain/ElepRevokeInput.java   |   58 -
 .../com/openhis/domain/ElepRevokeOutput.java  |   36 -
 .../openhis/domain/ElepSignatureInput.java    |   48 -
 .../openhis/domain/ElepSignatureOutput.java   |   45 -
 .../com/openhis/domain/ElepUploadInput.java   |   98 --
 .../com/openhis/domain/ElepUploadOutput.java  |   36 -
 .../openhis/domain/ElepVeriDiagnosisInfo.java |   84 --
 .../domain/ElepVeriPrescriptionDetail.java    |  155 ---
 .../domain/ElepVeriPrescriptionInfo.java      |  124 --
 .../domain/ElepVeriPrescriptionOutput.java    |   35 -
 .../com/openhis/domain/ElepVeriVisitInfo.java |  180 ---
 .../main/java/com/openhis/domain/File.java    |   39 -
 .../openhis/domain/FinancialApplyRecord.java  |   69 -
 .../domain/FinancialReconcileRecord.java      |   99 --
 .../java/com/openhis/domain/InfoPerson.java   |   89 --
 .../openhis/domain/InformationInquiry.java    |   26 -
 .../openhis/domain/InventoryChangeRecord.java |   91 --
 .../openhis/domain/InventoryCheckRecord.java  |   81 --
 .../openhis/domain/InventoryDelRecord.java    |   42 -
 .../domain/InventoryPurchaseRecord.java       |  121 --
 .../domain/InventoryPurchaseReturnRecord.java |  109 --
 .../openhis/domain/InventorySaleRecord.java   |  190 ---
 .../domain/InventorySaleReturnRecord.java     |  129 --
 .../domain/MedicationResultInquiry.java       |   38 -
 .../openhis/domain/PreCheckPrescription.java  |  126 --
 .../com/openhis/domain/QueryPrescription.java |  118 --
 .../main/java/com/openhis/domain/Sign.java    |   76 --
 .../com/openhis/enums/ElepServiceAdrEnum.java |   47 -
 .../com/openhis/enums/ServiceAdrEnum.java     |  130 --
 .../listener/ElepHandlerServiceListener.java  |   35 -
 .../listener/HandlerServiceListener.java      |   31 -
 .../main/java/com/openhis/pojo/InputData.java |   79 --
 .../java/com/openhis/pojo/PDFInputDto.java    |  106 --
 .../java/com/openhis/pojo/RequestData.java    |   15 -
 .../java/com/openhis/pojo/ResultBody.java     |   40 -
 .../main/java/com/openhis/pojo/TransBody.java |   73 -
 .../java/com/openhis/service/FileService.java |  252 ----
 .../com/openhis/service/HandlerService.java   |   47 -
 .../openhis/service/IElepHandlerService.java  |   40 -
 .../com/openhis/service/IYbElepService.java   |   69 -
 .../java/com/openhis/service/YbService.java   |  348 -----
 .../service/impl/ElepHandlerServiceImpl.java  |  170 ---
 .../service/impl/HandlerServiceImpl.java      |  179 ---
 .../service/impl/YbElepServiceImpl.java       |  341 -----
 .../openhis/service/impl/YbServiceImpl.java   | 1196 -----------------
 .../clinc/ClinicDiagInfoUpServiceImpl.java    |   32 -
 .../clinc/ClinicFeeDetailDelServiceImpl.java  |   30 -
 .../clinc/ClinicFeeDetailUpServiceImpl.java   |   25 -
 .../impl/clinc/ClinicPreSetlServiceImpl.java  |   29 -
 .../impl/clinc/ClinicReRegServiceImpl.java    |   29 -
 .../impl/clinc/ClinicReSetlServiceImpl.java   |   29 -
 .../impl/clinc/ClinicRegServiceImpl.java      |   35 -
 .../impl/clinc/ClinicSetlServiceImpl.java     |   29 -
 .../impl/common/MedresultServiceImpl.java     |   32 -
 .../PreCheckPrescriptionServiceImpl.java      |   37 -
 .../common/QuerPrescriptionServiceImpl.java   |   32 -
 .../impl/common/RevokeServiceImpl.java        |   32 -
 .../impl/common/SignatureServiceImpl.java     |   32 -
 .../impl/common/UploadServiceImpl.java        |   33 -
 .../directory/DrugContrastUpServiceImpl.java  |   29 -
 .../RepealDrugContrastUpServiceImpl.java      |   29 -
 .../impl/down/DownloadServiceImpl.java        |   28 -
 .../drugstore/DrugPreSetlServiceImpl.java     |   29 -
 .../impl/drugstore/DrugReSetlServiceImpl.java |   29 -
 .../impl/drugstore/DrugSetlServiceImpl.java   |   29 -
 .../impl/filing/FixmedinsServiceImpl.java     |   29 -
 .../impl/filing/ReFixmedinsServiceImpl.java   |   29 -
 .../impl/filing/ReSlowdiseaseServiceImpl.java |   29 -
 .../impl/filing/SlowdiseServiceImpl.java      |   29 -
 .../impl/info/CatalogueInfoServiceImpl.java   |   31 -
 .../impl/info/GetMedicalInfoServiceImpl.java  |   29 -
 ...GetPatientSpecialConditionServiceImpl.java |   19 -
 .../impl/info/GetPersonInfoServiceImpl.java   |   30 -
 .../service/impl/info/SignInServiceImpl.java  |   29 -
 .../service/impl/info/SignOutServiceImpl.java |   29 -
 .../inhospital/ChHospitalizedServiceImpl.java |   29 -
 .../inhospital/DischargedServiceImpl.java     |   29 -
 .../impl/inhospital/FeeDetailServiceImpl.java |   29 -
 .../impl/inhospital/HaPreSetlServiceImpl.java |   29 -
 .../impl/inhospital/HaReSetlServiceImpl.java  |   29 -
 .../impl/inhospital/HaSetlServiceImpl.java    |   29 -
 .../inhospital/HospitalizedServiceImpl.java   |   29 -
 .../inhospital/ReDischargedServiceImpl.java   |   29 -
 .../inhospital/ReFeeDetailServiceImpl.java    |   29 -
 .../inhospital/ReHospitalizedServiceImpl.java |   29 -
 .../PhysicalInventoryChangeServiceImpl.java   |   27 -
 .../PhysicalInventoryServiceImpl.java         |   27 -
 .../impl/inventory/PurchasingServiceImpl.java |   27 -
 .../PurgeProductRecordsServiceImpl.java       |   27 -
 .../StockReplenishmentServiceImpl.java        |   27 -
 .../StockUnReplenishmentServiceImpl.java      |   27 -
 .../inventory/UnPurchasingServiceImpl.java    |   27 -
 .../DayReconciliationServiceImpl.java         |   27 -
 .../DetailReconciliationServiceImpl.java      |   27 -
 .../MonthSetlApplyAServiceImpl.java           |   29 -
 .../MonthSetlApplyServiceImpl.java            |   27 -
 .../MonthUnSetlApplyAServiceImpl.java         |   27 -
 .../MonthUnSetlApplyServiceImpl.java          |   28 -
 .../ReconciliationOrgServiceImpl.java         |   27 -
 .../ReconciliationServiceImpl.java            |   27 -
 .../ThreePartReconciliationServiceImpl.java   |   27 -
 .../TotalReconciliationServiceImpl.java       |   29 -
 .../main/java/com/openhis/utils/BCUtils.java  |   40 -
 .../java/com/openhis/utils/BusnessIdUtil.java |   53 -
 .../openhis/utils/CusAccessObjectUtil.java    |   34 -
 .../java/com/openhis/utils/EasyGmUtils.java   |  324 -----
 .../com/openhis/utils/HseEncAndDecUtil.java   |  279 ----
 .../com/openhis/utils/HttpClientUtil.java     |   92 --
 .../openhis/utils/PDFTemplateFillerUtil.java  |  279 ----
 .../java/com/openhis/utils/RedisUtil.java     |  611 ---------
 .../main/java/com/openhis/utils/SignUtil.java |  177 ---
 .../java/com/openhis/utils/StringUtil.java    |  428 ------
 .../main/java/com/openhis/vo/BaseInfo.java    |   93 --
 .../main/java/com/openhis/vo/BaseParam.java   |   13 -
 .../java/com/openhis/vo/CancelPaymentDto.java |   59 -
 .../com/openhis/vo/CancelRegPaymentDto.java   |   50 -
 .../com/openhis/vo/Catalogue1312Output.java   |  117 --
 .../openhis/vo/Catalogue1312QueryParam.java   |   48 -
 .../com/openhis/vo/ChargeItemDetailVO.java    |  143 --
 .../java/com/openhis/vo/ChargeItemDto.java    |  152 ---
 .../com/openhis/vo/Clearing3204AParam.java    |   29 -
 .../com/openhis/vo/Clearing3205AParma.java    |   33 -
 .../com/openhis/vo/Clearing3205AResult.java   |   91 --
 .../com/openhis/vo/Clearing3205AWebParma.java |   27 -
 .../com/openhis/vo/Clearing3206AParam.java    |   33 -
 .../com/openhis/vo/Clearing3206AResult.java   |   33 -
 .../openhis/vo/Clinic2203DiseInfoParam.java   |  107 --
 .../com/openhis/vo/Clinic2203Medical.java     |   80 --
 .../openhis/vo/Clinic2203MedicalParam.java    |   77 --
 .../openhis/vo/Clinic2204FeeDetailParam.java  |  239 ----
 .../openhis/vo/Clinic2204FeeDetailResult.java |   83 --
 .../com/openhis/vo/Clinic2204OrderParam.java  |   30 -
 .../com/openhis/vo/Clinic2204OrderResult.java |   26 -
 .../com/openhis/vo/Clinic2205OrderParam.java  |   35 -
 .../vo/Clinic2206FundPaymentResult.java       |   41 -
 .../com/openhis/vo/Clinic2206OrderOutput.java |  114 --
 .../com/openhis/vo/Clinic2206OrderParam.java  |  107 --
 .../com/openhis/vo/Clinic2206OrderResult.java |  161 ---
 .../openhis/vo/Clinic2206OrderResultDto.java  |   90 --
 .../openhis/vo/Clinic2206SetldetaiResult.java |   57 -
 .../com/openhis/vo/Clinic2207OrderResult.java |  158 ---
 .../openhis/vo/Clinic2207OrderResultDto.java  |   14 -
 .../vo/Clinic2207OrderResultInfoDto.java      |   74 -
 .../vo/Clinic2208UnSetlInfoOutput.java        |  106 --
 .../openhis/vo/Clinic2208UnSetlInfoParam.java |   34 -
 .../vo/Clinic2208UnSetlInfoResult.java        |  137 --
 .../main/java/com/openhis/vo/ClinicReg.java   |  113 --
 .../com/openhis/vo/ClinicReg2201Output.java   |   66 -
 .../openhis/vo/DispenseInventory3505Dto.java  |  103 --
 .../openhis/vo/EleInvoiceChargeDetailDto.java |   34 -
 .../openhis/vo/EleInvoiceListDetailDto.java   |   46 -
 .../openhis/vo/EleInvoicePatientInfoDto.java  |   75 --
 .../openhis/vo/EleInvoicePaymentInfoDto.java  |   60 -
 .../com/openhis/vo/EleInvoiceResultDto.java   |   73 -
 .../java/com/openhis/vo/File9101Param.java    |   14 -
 .../java/com/openhis/vo/FileDownload.java     |   26 -
 .../main/java/com/openhis/vo/FileResult.java  |   43 -
 .../com/openhis/vo/Financial13203Param.java   |   53 -
 .../com/openhis/vo/Financial13203Result.java  |   58 -
 .../openhis/vo/Financial13203WebParam.java    |   49 -
 .../com/openhis/vo/Financial3201Output.java   |   19 -
 .../com/openhis/vo/Financial3201Param.java    |   84 --
 .../openhis/vo/Financial3202FileParam.java    |   48 -
 .../openhis/vo/Financial3202FileResult.java   |   56 -
 .../com/openhis/vo/Financial3203AParam.java   |   67 -
 .../openhis/vo/Financial3203AWebParam.java    |   34 -
 .../com/openhis/vo/Financial3203Param.java    |   72 -
 .../java/com/openhis/vo/Financial3203VO.java  |   39 -
 .../com/openhis/vo/Financial3203WebParam.java |   42 -
 .../com/openhis/vo/Financial3204Param.java    |   32 -
 .../vo/FinancialSettlement3202Param.java      |   66 -
 .../vo/FinancialSettlement3202Result.java     |   36 -
 .../vo/FinancialSettlement3209AParam.java     |   40 -
 .../vo/FinancialSettlement3209AResult.java    |   28 -
 .../openhis/vo/FsiConsultation3101Param.java  |   45 -
 .../com/openhis/vo/FsiDiagnose3101Param.java  |   56 -
 .../com/openhis/vo/FsiEncounter3101Param.java |  167 ---
 .../openhis/vo/FsiFeedback3103DataParam.java  |   27 -
 .../openhis/vo/FsiFeedback3103WarnsParam.java |   29 -
 .../com/openhis/vo/FsiOperation3101Param.java |   68 -
 .../com/openhis/vo/FsiOrder3101Param.java     |  167 ---
 .../com/openhis/vo/FsiPatient3101Param.java   |   61 -
 .../openhis/vo/FsiViolation3101Result.java    |   73 -
 .../vo/FsiViolationDetail3101Result.java      |   44 -
 .../openhis/vo/HospAdm2401DiseInfoParam.java  |   68 -
 .../openhis/vo/HospAdm2401MdtInfoParam.java   |  191 ---
 .../openhis/vo/HospAdm2402DiseInfoParam.java  |   70 -
 .../openhis/vo/HospAdm2402DscgInfoParam.java  |  129 --
 .../openhis/vo/HospAdm2403AdmInfoParam.java   |  180 ---
 .../openhis/vo/HospAdm2403DiseInfoParam.java  |   74 -
 .../openhis/vo/HospAdm2404AdmCnlParam.java    |   32 -
 .../openhis/vo/HospAdm2406SmAttrUpParam.java  |   62 -
 .../vo/HospAdm2407SmAttrSelectParam.java      |   77 --
 .../vo/HospAdm2407SmAttrSelectResult.java     |   67 -
 .../com/openhis/vo/HospDept3401AParam.java    |   16 -
 .../com/openhis/vo/HospDept3401Param.java     |   89 --
 .../com/openhis/vo/HospDept3402Param.java     |   89 --
 .../com/openhis/vo/HospDept3403Param.java     |   28 -
 .../openhis/vo/HospTrf2501ARefmedinParam.java |  107 --
 .../openhis/vo/HospTrf2501RefmedinParam.java  |  107 --
 .../com/openhis/vo/HospTrfCxl2502Param.java   |   30 -
 .../java/com/openhis/vo/Info1101Output.java   |   68 -
 .../com/openhis/vo/Info1101PerinfoResult.java |   56 -
 .../com/openhis/vo/Info1101ReadcardParam.java |   43 -
 .../java/com/openhis/vo/Info5301Param.java    |   14 -
 .../vo/Info5301SpecialConditionResult.java    |   20 -
 .../com/openhis/vo/InvoiceBaseInfoDto.java    |  104 --
 .../main/java/com/openhis/vo/LoginUser.java   |   67 -
 .../com/openhis/vo/MatAllowReg25007Param.java |   56 -
 .../openhis/vo/MatAllowReg25007Result.java    |   82 --
 .../openhis/vo/MatAllowRegSel25008Param.java  |   82 --
 .../java/com/openhis/vo/Medical3503Param.java |  113 --
 .../java/com/openhis/vo/Medical3505Model.java |  176 ---
 .../java/com/openhis/vo/Medical3505Param.java |  179 ---
 .../com/openhis/vo/Medical3505Result.java     |   29 -
 .../java/com/openhis/vo/Medical3506Param.java |  118 --
 .../java/com/openhis/vo/Medical3507Param.java |   29 -
 .../java/com/openhis/vo/Medical3508Param.java |   99 --
 .../com/openhis/vo/Medical3508Result.java     |  104 --
 .../vo/MedicalDirectory3301ListParam.java     |   16 -
 .../openhis/vo/MedicalDirectory3301Param.java |   69 -
 .../openhis/vo/MedicalDirectory3302Param.java |   27 -
 .../vo/MedicalDirectory3302ParamDto.java      |   33 -
 .../openhis/vo/MedicalInventory3501Param.java |   72 -
 .../openhis/vo/MedicalInventory3502Param.java |   82 --
 .../openhis/vo/MedicalPurchase3504Param.java  |   95 --
 .../com/openhis/vo/MedicalTraceNoDto.java     |   26 -
 .../java/com/openhis/vo/PatientInfoDto.java   |   84 --
 .../java/com/openhis/vo/PaymentDetailDto.java |   37 -
 .../main/java/com/openhis/vo/PaymentDto.java  |   62 -
 .../java/com/openhis/vo/PaymentSettleDto.java |   19 -
 .../main/java/com/openhis/vo/PaymentVO.java   |   94 --
 .../vo/PersBirthApprovalCnl25004Param.java    |   27 -
 .../vo/PersBirthApprovalSel25005Param.java    |   64 -
 .../openhis/vo/PersBirthRecord25003Param.java |  124 --
 .../com/openhis/vo/PersChrDis2503Param.java   |   83 --
 .../openhis/vo/PersChrDisCxl2504Param.java    |   29 -
 .../com/openhis/vo/PersDesigPt2505Param.java  |   98 --
 .../openhis/vo/PersDesigPtCxl2506Param.java   |   29 -
 .../vo/PersMedApprovalCnl25006Param.java      |   25 -
 .../openhis/vo/PersMedRecord25001Param.java   |   84 --
 .../openhis/vo/PersMedSelect25002Param.java   |   37 -
 .../openhis/vo/PersMedSelect25002Result.java  |   89 --
 .../com/openhis/vo/PersUnintInj2507Param.java |  167 ---
 .../java/com/openhis/vo/PrePaymentDto.java    |   38 -
 .../src/main/java/com/openhis/vo/Result.java  |  132 --
 .../main/java/com/openhis/vo/ResultBody.java  |   39 -
 .../openhis/vo/Settlement3201DetailVO.java    |   22 -
 .../java/com/openhis/vo/Settlement3201VO.java |   28 -
 .../openhis/vo/Settlement3201WebParam.java    |   37 -
 .../java/com/openhis/vo/Settlement3202VO.java |   45 -
 .../openhis/vo/Settlement3202WebParam.java    |   46 -
 .../openhis/vo/Settlement3209AWebParam.java   |   35 -
 .../src/main/java/com/openhis/vo/Sign.java    |   58 -
 .../java/com/openhis/vo/Sign1101Param.java    |   19 -
 .../java/com/openhis/vo/Sign9001Result.java   |   24 -
 .../openhis/vo/SupplyItemDetail3503Dto.java   |  126 --
 .../vo/VeriPrescriptionDetailInfoDto.java     |  101 --
 .../openhis/vo/VeriPrescriptionInfoDto.java   |   53 -
 .../com/openhis/vo/VeriPrescriptionParam.java |   21 -
 .../src/main/java/com/openhis/vo/extData.java |   89 --
 .../src/main/resources/application-druid.yml  |   64 -
 .../src/main/resources/application-prod.yml   |   61 -
 .../src/main/resources/application.yml        |  159 ---
 .../src/main/resources/banner.txt             |   10 -
 .../src/main/resources/config.properties      |   10 -
 .../src/main/resources/config/flow.el.xml     |    6 -
 .../config/hospital-config.properties         |    0
 .../resources/config/sys-config.properties    |   21 -
 .../resources/config/tenant-config.properties |   12 -
 .../src/main/resources/logback.xml            |  133 --
 .../main/resources/mybatis/mybatis-config.xml |   21 -
 305 files changed, 22981 deletions(-)
 delete mode 100644 openhis-server-new/openhis-ybapp/pom.xml
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/application.yml
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/banner.txt
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config.properties
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/logback.xml
 delete mode 100644 openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml

diff --git a/openhis-server-new/openhis-ybapp/pom.xml b/openhis-server-new/openhis-ybapp/pom.xml
deleted file mode 100644
index 46203ce9..00000000
--- a/openhis-server-new/openhis-ybapp/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>openhis-server</artifactId>
-        <groupId>com.openhis</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>openhis-ybapp</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-
-        <!-- 领域-->
-<!--        <dependency>-->
-<!--            <groupId>com.openhis</groupId>-->
-<!--            <artifactId>openhis-domain</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>2.5.15</version> <!-- 确保版本与你的项目一致 -->
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>2.0.43</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <!-- 共通-->
-        <dependency>
-            <groupId>com.openhis</groupId>
-            <artifactId>openhis-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
-        <!-- liteflow-->
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>liteflow-spring-boot-starter</artifactId>
-            <version>2.12.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.3.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.69</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>2.0.43</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>kernel</artifactId>
-            <version>7.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5</version>
-        </dependency>
-
-        <!-- pdf依赖-->
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.12</version>
-        </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itext-asian</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>9</source>
-                    <target>9</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
deleted file mode 100644
index d1d20eab..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.openhis;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.Environment;
-
-import com.alibaba.fastjson.JSON;
-import com.openhis.pojo.ResultBody;
-import com.openhis.utils.EasyGmUtils;
-
-/**
- * 启动程序
- * 
- * @author system
- */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.openhis"})
-public class OpenHisYbApplication {
-    public static void main(String[] args) throws UnknownHostException {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
-        ConfigurableApplicationContext application = SpringApplication.run(OpenHisYbApplication.class, args);
-        Environment env = application.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = env.getProperty("server.servlet.context-path");
-        System.out.println("医保启动");
-
-        String msg = "{\"cainfo\":\"nz6uO/SDPvEnusDW091FTX+aUO50CUE1c3zSm9BLXMWUvbfxfLvDClwa2LR2sPESmti47a+c7CVec3OaZhte0A==\",\"err_msg\":\"成功\",\"inf_refmsgid\":\"220000202506231058383283681313\",\"infcode\":\"0\",\"output\":\"wYVUH0j0Lo9hUdRpaTd/9fNss5V0kDK/qwpDGA9bWrgED86hlNPordYmAs+bre/01Ik/gO+mzsX1K4yjzaAz8ze6AwQocY9JFBIjP/JV31P2eoq0+w1ZjXnu2BekEvqD+yfpd0IB1ENBS5fxv+wZde1D3h4wk12tdMGC0AY65TREGJXcGigTot6c3L8ZJsyG1uZbDQVur4t9p1Mv/1EJaXy3VWhZjoSDR/y615yvHA2Dmvuca60XU4gXdMluHnqxvs8TC6b/fFZqEl66bkP0Ic98CTzVPMSSZu37FX+9jdvZ28Ecq0KnN0v+scyX1RYe1SDRyWWSO+J7coAdYYnLYEQS7jGPOmNVjVP68LKAEPvLTxWh/sfMTYvcEZ0e3pDYTVLb9rODmF693Khns9qKJ5mEDCdKUksSgY63jaxpC8LgIszJnp0A4198MeVNRbMe51IuXJaYvdA58UgVr6smU8VY7NfdDJ/uuGAOv+rtHgykyWYKYmV0SV94oMSomCqCzhMN3g3+mv6mA6hdFixpQAzJLWmkM5wq92fSIwYfpZEFz/wxz7LI18myTO0Mw1Kygo2DIbfbFRIElo29Un7MlTFFQZC45XcEj1oIIvnh53h9sxREpuziJjj4wubMbCj1PM+ZM07zcYef2ZNxq8VoduTP7I8HTrQ+jGls7TmZ4npKvOrPV+v6LTiSnvHbOXfK0O1heRetpUURrAbkC3xsllV1rYSa1rR8gKLI8pHBRwpKK0krxlcM4Nyq1veI1+TfBHwjcLNeh3EK51Tij8cGoMDsub6G06uNhYEoCjz++uXX1ikzWDaAe+z3bjsPzdBMR4HjTy06F4W8OjcsslUABM6WF+DPZrIH0EbXB8ZCn92RKeTLCEJ5Ybczq7u9F48sVto6NTk4z54yZ31aFgu7n4Q6AVa4LHVJElgKHt3lHq4feWhhVwTDMIgOVC/a8esAoJcXySMDeLv6aqgs5rcH0Lh4UC/OYVa3eG10QSvbbh8JIhgspApZLlYOQw7TytxSEdtjw5UZMcaY8XXhEEiRr3hUAtJjzz7++N+N6Qdv8hLbJXIYeqPRnYf/PkxZjxOoITp86SGIjsYXd4DFIOQWRlmRPyzlws6Pj8TKN5st2FAve7vk5UNP/lk4X6noc0IgEAYnOPkO1ntztGTCm3XsJCyAHDnjDjPk1gimJy79yq8FpXkRA8o8PQfE6B8I8aKhli5X1wU18r3X8zrq8f8+/z6UstXcdR2p7hyfm+cjLwukVn1/kwvMFxa/4K7BMBAIAcB4Md1TduGioGBRT2JRbF7dO5VUN0YYUk2h2XUW2C1j5DAwTQuZTK5b0r9bY70IDCOYmAq4xd3lJMUfB1qq4TQve1Mm0hn25bNE7gvS4NrZcE5WI/4y6LYDd4TET7Mu1Y/6Rx92gGNzO9eLJ+xEkmB4M6LpBbTeMUl8KIzD8QNldA0pfZ5AhAKuuKtbOgujzQM8h7owsFgfPofTWg+jmIbI3nVJCzpfTp7R9hp69svbkN3p691VGuhc7weMwGRvmVl8HMe2quRDGt0Vfg4Bnak3QWzIHtlsYSf6v63SRre33JXC9KlrR8qa/XekbEgMh2Zur2ppszhwVs5hce5UCWfJzEO8G9bMecvz/C+tizI=\",\"refmsg_time\":\"20250623105838020\",\"respond_time\":\"20250623105838288\",\"signtype\":\"SM2\"}";
-        ResultBody response = JSON.parseObject(msg, ResultBody.class);
-        System.out.println(com.alibaba.fastjson2.JSON.toJSONString(response));
-        byte[] bytes = "8E8DF30BD2420D81".getBytes(StandardCharsets.UTF_8);
-        System.out.println(bytes.length);
-        byte[] result = EasyGmUtils.sm4Decrypt("8E8DF30BD2420D81".getBytes(StandardCharsets.UTF_8),
-            Base64.getDecoder().decode(response.getOutput()));
-        response.setOutput(new String(result));
-
-        System.out.println(JSON.toJSONString(response));
-
-        System.out.println("\n----------------------------------------------------------\n\t"
-            + "Application OpenHis-YB is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path
-            + "/\n\t" + "External: \thttp://" + ip + ":" + port + path + "/\n"
-            + "----------------------------------------------------------");
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java
deleted file mode 100644
index 505df87a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.openhis.annotation;
-
-import java.lang.annotation.*;
-
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.enums.ServiceAdrEnum;
-
-/**
- * 接口处理器注解
- */
-@Documented
-@Inherited
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ElepHandlerInt {
-
-	ElepServiceAdrEnum value();
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java
deleted file mode 100644
index 1c102b99..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.openhis.annotation;
-
-import com.openhis.enums.ServiceAdrEnum;
-
-import java.lang.annotation.*;
-
-/**
- * 接口处理器注解
- */
-@Documented
-@Inherited
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HandlerInt {
-
-	ServiceAdrEnum value();
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java
deleted file mode 100644
index f0c5d1a2..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.openhis.component;
-
-import com.openhis.context.ElepHandlerServiceContext;
-import com.openhis.domain.BaseResponse;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.IElepHandlerService;
-import com.openhis.vo.BaseParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.openhis.context.HandlerServiceContext;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.HandlerService;
-
-/**
- * handler分发
- */
-@Component
-public class ElepHandlerIntDispatcher {
-
-    /** 接口服务容器 */
-    @Autowired
-    private ElepHandlerServiceContext  elepHandlerServiceContext;
-
-    /**
-     * dispatcher 处理器
-     * @param intType
-     * @param requestData
-     * @return
-     */
-    public BaseResponse dispatcher(String intType, RequestData requestData, BaseParam baseParam) {
-        // 根据接口类型获取对应服务
-        IElepHandlerService elephandlerService = elepHandlerServiceContext.getElepHandlerService(intType);
-        // 调用对应服务接口
-        return elephandlerService.elepHandle(requestData,baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java
deleted file mode 100644
index 790956c8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.openhis.component;
-
-import com.openhis.vo.BaseParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.openhis.context.HandlerServiceContext;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.HandlerService;
-
-/**
- * handler分发
- */
-@Component
-public class HandlerIntDispatcher {
-
-    /** 接口服务容器 */
-    @Autowired
-    private HandlerServiceContext handlerServiceContext;
-
-    /**
-     * dispatcher 处理器
-     * @param intType
-     * @param inputData
-     * @return
-     */
-    public ResultBody dispatcher(String intType, InputData inputData, BaseParam baseParam) {
-        // 根据接口类型获取对应服务
-        HandlerService handlerService = handlerServiceContext.getHandlerService(intType);
-        // 调用对应服务接口
-        return handlerService.handle(inputData,baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java
deleted file mode 100644
index 0d3c9a01..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-/**
- * TODO:医疗机构的配置参数
- *
- * @author SunJQ
- * @date 2025-03-15
- */
-@Data
-@Component
-@PropertySource(value="classpath:/config/hospital-config.properties",encoding="UTF-8",ignoreResourceNotFound=true)
-@ConfigurationProperties(prefix = "pro")
-public class HospitalInfoConfig {
-    /**  同步工作流引擎1同步0不同步 */
-    private Integer activitiSync;
-    /**多租户id配置，编辑用户的时候设置*/
-    private String relTenantIds;
-    /**医保类型，1-市医保，2-省医保，3-省市医保*/
-    private String medicareType;
-    /** 定点医药机构编号 */
-    private String fixmedinsCode;
-    /** 定点医药机构名称 */
-    private String fixmedinsName;
-    /** 统筹区号 */
-    private String admvs;
-    /** 行政区划 */
-    private String district;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java
deleted file mode 100644
index 0c70a18c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.openhis.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-import lombok.Data;
-
-/**
- * 系统参数配置类
- */
-@Data
-@Component
-@PropertySource(value = "classpath:/config/sys-config.properties", encoding = "UTF-8", ignoreResourceNotFound = true)
-@ConfigurationProperties(prefix = "prod")
-// @ConfigurationProperties(prefix = "dev")
-public class InterfaceConfig {
-
-    /** 文件下载路径 */
-    private String filePath;
-
-    /** address */
-    private String address;
-
-    /** 缓存时间 */
-    private int time;
-
-    /** 是否加密 */
-    private Boolean isEncrypt;
-
-    /** 应用密钥 */
-    private String cliPubKey;
-
-    /** 秘钥 */
-    private String cliPrvKey;
-
-    /** appId */
-    private String clientId;
-
-    /** eleAddress */
-    private String eleAddress;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java
deleted file mode 100644
index 77fc1988..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.openhis.config;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 多租户信息表
- * @TableName sys_tenant
- */
-//@TableName(value ="sys_tenant")
-@Data
-@Component
-@PropertySource(value="classpath:/config/tenant-config.properties",encoding="UTF-8",ignoreResourceNotFound=true)
-@ConfigurationProperties(prefix = "pr")
-public class Tenant implements Serializable {
-    /**
-     * 租户编码
-     */
-    //@TableId
-    private String id;
-
-    /**
-     * 租户名称
-     */
-    private String name;
-
-    /**
-     * 开始时间
-     */
-    private Date beginDate;
-
-    /**
-     * 结束时间
-     */
-    private Date endDate;
-
-    /**
-     * 客戶端id
-     */
-    private String clientId;//医保用
-
-    /**
-     * 客戶端安全码
-     */
-    private String clientSecret;//医保用
-
-    /**
-     * 医保服务平台账号
-     */
-    private String username;//医保用
-
-    /**
-     * 医保服务平台密码
-     */
-    private String password;//医保用
-
-    /**
-     * 终端授权类型
-     */
-    private String grantType;//医保用
-
-    /**
-     * 终端授权范围
-     */
-    private String scope;//医保用
-
-    /**
-     * 公钥
-     */
-    private String cliPubKey;
-
-    /**
-     * 秘钥
-     */
-    private String cliPrvKey;//医保用
-
-    /**
-     * 服务端公钥
-     */
-    private String serverPubKey;
-
-    /**
-     * 定点医药机构编号
-     */
-    private String fixmedinsCode;//医保用
-
-    /**
-     * 定点医药机构名称
-     */
-    private String fixmedinsName;//医保用
-
-    /**
-     * 统筹区号
-     */
-    private String admvs;//医保用
-
-    /**
-     * 状态 1正常 0冻结
-     */
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建日期
-     */
-    private Date createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新日期
-     */
-    private Date updateTime;
-
-    // @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        Tenant other = (Tenant) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
-            && (this.getBeginDate() == null ? other.getBeginDate() == null : this.getBeginDate().equals(other.getBeginDate()))
-            && (this.getEndDate() == null ? other.getEndDate() == null : this.getEndDate().equals(other.getEndDate()))
-            && (this.getClientId() == null ? other.getClientId() == null : this.getClientId().equals(other.getClientId()))
-            && (this.getClientSecret() == null ? other.getClientSecret() == null : this.getClientSecret().equals(other.getClientSecret()))
-            && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
-            && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
-            && (this.getGrantType() == null ? other.getGrantType() == null : this.getGrantType().equals(other.getGrantType()))
-            && (this.getScope() == null ? other.getScope() == null : this.getScope().equals(other.getScope()))
-            && (this.getCliPubKey() == null ? other.getCliPubKey() == null : this.getCliPubKey().equals(other.getCliPubKey()))
-            && (this.getCliPrvKey() == null ? other.getCliPrvKey() == null : this.getCliPrvKey().equals(other.getCliPrvKey()))
-            && (this.getServerPubKey() == null ? other.getServerPubKey() == null : this.getServerPubKey().equals(other.getServerPubKey()))
-            && (this.getFixmedinsCode() == null ? other.getFixmedinsCode() == null : this.getFixmedinsCode().equals(other.getFixmedinsCode()))
-            && (this.getFixmedinsName() == null ? other.getFixmedinsName() == null : this.getFixmedinsName().equals(other.getFixmedinsName()))
-            && (this.getAdmvs() == null ? other.getAdmvs() == null : this.getAdmvs().equals(other.getAdmvs()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy()))
-            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
-        result = prime * result + ((getBeginDate() == null) ? 0 : getBeginDate().hashCode());
-        result = prime * result + ((getEndDate() == null) ? 0 : getEndDate().hashCode());
-        result = prime * result + ((getClientId() == null) ? 0 : getClientId().hashCode());
-        result = prime * result + ((getClientSecret() == null) ? 0 : getClientSecret().hashCode());
-        result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
-        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
-        result = prime * result + ((getGrantType() == null) ? 0 : getGrantType().hashCode());
-        result = prime * result + ((getScope() == null) ? 0 : getScope().hashCode());
-        result = prime * result + ((getCliPubKey() == null) ? 0 : getCliPubKey().hashCode());
-        result = prime * result + ((getCliPrvKey() == null) ? 0 : getCliPrvKey().hashCode());
-        result = prime * result + ((getServerPubKey() == null) ? 0 : getServerPubKey().hashCode());
-        result = prime * result + ((getFixmedinsCode() == null) ? 0 : getFixmedinsCode().hashCode());
-        result = prime * result + ((getFixmedinsName() == null) ? 0 : getFixmedinsName().hashCode());
-        result = prime * result + ((getAdmvs() == null) ? 0 : getAdmvs().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode());
-        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", name=").append(name);
-        sb.append(", beginDate=").append(beginDate);
-        sb.append(", endDate=").append(endDate);
-        sb.append(", clientId=").append(clientId);
-        sb.append(", clientSecret=").append(clientSecret);
-        sb.append(", username=").append(username);
-        sb.append(", password=").append(password);
-        sb.append(", grantType=").append(grantType);
-        sb.append(", scope=").append(scope);
-        sb.append(", cliPubKey=").append(cliPubKey);
-        sb.append(", cliPrvKey=").append(cliPrvKey);
-        sb.append(", serverPubKey=").append(serverPubKey);
-        sb.append(", fixmedinsCode=").append(fixmedinsCode);
-        sb.append(", fixmedinsName=").append(fixmedinsName);
-        sb.append(", admvs=").append(admvs);
-        sb.append(", status=").append(status);
-        sb.append(", createBy=").append(createBy);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateBy=").append(updateBy);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java
deleted file mode 100644
index ff695c2c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.constant;
-
-/**
- * 门诊状态常量
- */
-public interface ClincStatusConst {
-    String STATUS_0 = "0";
-    String STATUS_1 = "1";
-    String STATUS_2 = "2";
-    String CANCLE = "-1";
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java
deleted file mode 100644
index 4c3c8c19..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package com.openhis.constant;
-
-public interface CommonConstant {
-
-	/**
-	 * 正常状态
-	 */
-	public static final Integer STATUS_NORMAL = 0;
-
-	/**
-	 * 禁用状态
-	 */
-	public static final Integer STATUS_DISABLE = -1;
-
-	/**
-	 * 删除标志
-	 */
-	public static final Integer DEL_FLAG_1 = 1;
-
-	/**
-	 * 未删除
-	 */
-	public static final Integer DEL_FLAG_0 = 0;
-
-	/**
-	 * 系统日志类型： 登录
-	 */
-	public static final int LOG_TYPE_1 = 1;
-	
-	/**
-	 * 系统日志类型： 操作
-	 */
-	public static final int LOG_TYPE_2 = 2;
-
-	/**
-	 * 操作日志类型： 查询
-	 */
-	public static final int OPERATE_TYPE_1 = 1;
-	
-	/**
-	 * 操作日志类型： 添加
-	 */
-	public static final int OPERATE_TYPE_2 = 2;
-	
-	/**
-	 * 操作日志类型： 更新
-	 */
-	public static final int OPERATE_TYPE_3 = 3;
-	
-	/**
-	 * 操作日志类型： 删除
-	 */
-	public static final int OPERATE_TYPE_4 = 4;
-	
-	/**
-	 * 操作日志类型： 倒入
-	 */
-	public static final int OPERATE_TYPE_5 = 5;
-	
-	/**
-	 * 操作日志类型： 导出
-	 */
-	public static final int OPERATE_TYPE_6 = 6;
-	
-	
-	/** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
-    public static final Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
-    /** {@code 200 OK} (HTTP/1.0 - RFC 1945) */
-    public static final Integer SC_OK_200 = 200;
-    
-    /**访问权限认证未通过 510*/
-    public static final Integer SC_JEECG_NO_AUTHZ=510;
-
-    /** 登录用户Shiro权限缓存KEY前缀 */
-    public static String PREFIX_USER_SHIRO_CACHE  = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:";
-    /** 登录用户Token令牌缓存KEY前缀 */
-    public static final String PREFIX_USER_TOKEN  = "prefix_user_token_";
-    /** Token缓存时间：3600秒即一小时 */
-    public static final int  TOKEN_EXPIRE_TIME  = 3600;
-    
-
-    /**
-     *  0：一级菜单
-     */
-    public static final Integer MENU_TYPE_0  = 0;
-   /**
-    *  1：子菜单 
-    */
-    public static final Integer MENU_TYPE_1  = 1;
-    /**
-     *  2：按钮权限
-     */
-    public static final Integer MENU_TYPE_2  = 2;
-    
-    /**通告对象类型（USER:指定用户，ALL:全体用户）*/
-    public static final String MSG_TYPE_UESR  = "USER";
-    public static final String MSG_TYPE_ALL  = "ALL";
-    
-    /**发布状态（0未发布，1已发布，2已撤销）*/
-    public static final String NO_SEND  = "0";
-    public static final String HAS_SEND  = "1";
-    public static final String HAS_CANCLE  = "2";
-    
-    /**阅读状态（0未读，1已读）*/
-    public static final String HAS_READ_FLAG  = "1";
-    public static final String NO_READ_FLAG  = "0";
-    
-    /**优先级（L低，M中，H高）*/
-    public static final String PRIORITY_L  = "L";
-    public static final String PRIORITY_M  = "M";
-    public static final String PRIORITY_H  = "H";
-    
-    /**
-     * 短信模板方式  0 .登录模板、1.注册模板、2.忘记密码模板
-     */
-    public static final String SMS_TPL_TYPE_0  = "0";
-    public static final String SMS_TPL_TYPE_1  = "1";
-    public static final String SMS_TPL_TYPE_2  = "2";
-    
-    /**
-     * 状态(0无效1有效)
-     */
-    public static final String STATUS_0 = "0";
-    public static final String STATUS_1 = "1";
-    
-    /**
-     * 同步工作流引擎1同步0不同步
-     */
-    public static final Integer ACT_SYNC_1 = 1;
-    public static final Integer ACT_SYNC_0 = 0;
-
-    /**
-     * 消息类型1:通知公告2:系统消息
-     */
-    public static final String MSG_CATEGORY_1 = "1";
-    public static final String MSG_CATEGORY_2 = "2";
-    
-    /**
-     * 是否配置菜单的数据权限 1是0否
-     */
-    public static final Integer RULE_FLAG_0 = 0;
-    public static final Integer RULE_FLAG_1 = 1;
-
-    /**
-     * 是否用户已被冻结 1正常(解冻) 2冻结
-     */
-    public static final Integer USER_UNFREEZE = 1;
-    public static final Integer USER_FREEZE = 2;
-    
-    /**字典翻译文本后缀*/
-    public static final String DICT_TEXT_SUFFIX = "_dictText";
-
-    /**
-     * 表单设计器主表类型
-     */
-    public static final Integer DESIGN_FORM_TYPE_MAIN = 1;
-
-    /**
-     * 表单设计器子表表类型
-     */
-    public static final Integer DESIGN_FORM_TYPE_SUB = 2;
-
-    /**
-     * 表单设计器URL授权通过
-     */
-    public static final Integer DESIGN_FORM_URL_STATUS_PASSED = 1;
-
-    /**
-     * 表单设计器URL授权未通过
-     */
-    public static final Integer DESIGN_FORM_URL_STATUS_NOT_PASSED = 2;
-
-    /**
-     * 表单设计器新增 Flag
-     */
-    public static final String DESIGN_FORM_URL_TYPE_ADD = "add";
-    /**
-     * 表单设计器修改 Flag
-     */
-    public static final String DESIGN_FORM_URL_TYPE_EDIT = "edit";
-    /**
-     * 表单设计器详情 Flag
-     */
-    public static final String DESIGN_FORM_URL_TYPE_DETAIL = "detail";
-    /**
-     * 表单设计器复用数据 Flag
-     */
-    public static final String DESIGN_FORM_URL_TYPE_REUSE = "reuse";
-    /**
-     * 表单设计器编辑 Flag （已弃用）
-     */
-    public static final String DESIGN_FORM_URL_TYPE_VIEW = "view";
-
-    /**
-     * online参数值设置（是：Y, 否：N）
-     */
-    public static final String ONLINE_PARAM_VAL_IS_TURE = "Y";
-    public static final String ONLINE_PARAM_VAL_IS_FALSE = "N";
-
-    /**
-     * 文件上传类型（本地：local，Minio：minio，阿里云：alioss）
-     */
-    public static final String UPLOAD_TYPE_LOCAL = "local";
-    public static final String UPLOAD_TYPE_MINIO = "minio";
-    public static final String UPLOAD_TYPE_OSS = "alioss";
-
-    /**
-     * 文档上传自定义桶名称
-     */
-    public static final String UPLOAD_CUSTOM_BUCKET = "eoafile";
-    /**
-     * 文档上传自定义路径
-     */
-    public static final String UPLOAD_CUSTOM_PATH = "eoafile";
-    /**
-     * 文件外链接有效天数
-     */
-    public static final Integer UPLOAD_EFFECTIVE_DAYS = 1;
-
-    /**
-     * 员工身份 （1:普通员工  2:上级）
-     */
-    public static final Integer USER_IDENTITY_1 = 1;
-    public static final Integer USER_IDENTITY_2 = 2;
-
-    /** sys_user 表 username 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username";
-    /** sys_user 表 work_no 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no";
-    /** sys_user 表 phone 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone";
-    /** sys_user 表 email 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_SYS_USER_EMAIL = "uniq_sys_user_email";
-    /** sys_quartz_job 表 job_class_name 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_JOB_CLASS_NAME = "uniq_job_class_name";
-    /** sys_position 表 code 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_CODE = "uniq_code";
-    /** sys_role 表 code 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code";
-    /** sys_depart 表 code 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code";
-    /**
-     * 在线聊天 是否为默认分组
-     */
-    public static final String IM_DEFAULT_GROUP = "1";
-    /**
-     * 在线聊天 图片文件保存路径
-     */
-    public static final String IM_UPLOAD_CUSTOM_PATH = "imfile";
-    /**
-     * 在线聊天 用户状态
-     */
-    public static final String IM_STATUS_ONLINE = "online";
-
-    /**
-     * 在线聊天 SOCKET消息类型
-     */
-    public static final String IM_SOCKET_TYPE = "chatMessage";
-
-    /**
-     * 在线聊天 是否开启默认添加好友 1是 0否
-     */
-    public static final String IM_DEFAULT_ADD_FRIEND = "1";
-
-    /**
-     * 在线聊天 用户好友缓存前缀
-     */
-    public static final String IM_PREFIX_USER_FRIEND_CACHE = "sys:cache:im:im_prefix_user_friend_";
-
-    /**
-     * 考勤补卡业务状态 （1：同意  2：不同意）
-     */
-    public static final String SIGN_PATCH_BIZ_STATUS_1 = "1";
-    public static final String SIGN_PATCH_BIZ_STATUS_2 = "2";
-
-    /**
-     * 公文文档上传自定义路径
-     */
-    public static final String UPLOAD_CUSTOM_PATH_OFFICIAL = "officialdoc";
-     /**
-     * 公文文档下载自定义路径
-     */
-    public static final String DOWNLOAD_CUSTOM_PATH_OFFICIAL = "officaldown";
-
-    /**
-     * WPS存储值类别(1 code文号 2 text（WPS模板还是公文发文模板）)
-     */
-    public static final String WPS_TYPE_1="1";
-    public static final String WPS_TYPE_2="2";
-
-
-    public final static String X_ACCESS_TOKEN = "X-Access-Token";
-    public final static String X_SIGN = "X-Sign";
-    public final static String X_TIMESTAMP = "X-TIMESTAMP";
-
-    /**
-     * 多租户 请求头
-     */
-    public final static String TENANT_ID = "tenant-id";
-
-    /**
-     * 微服务读取配置文件属性 服务地址
-     */
-    public final static String CLOUD_SERVER_KEY = "spring.cloud.nacos.discovery.server-addr";
-
-    /**
-     * 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用
-     */
-    public final static String THIRD_LOGIN_CODE = "third_login_code";
-
-    /**
-     * 第三方APP同步方向：本地 --> 第三方APP
-     */
-    String THIRD_SYNC_TO_APP = "SYNC_TO_APP";
-    /**
-     * 第三方APP同步方向：第三方APP --> 本地
-     */
-    String THIRD_SYNC_TO_LOCAL = "SYNC_TO_LOCAL";
-
-    /** 系统通告消息状态：0=未发布 */
-    String ANNOUNCEMENT_SEND_STATUS_0 = "0";
-    /** 系统通告消息状态：1=已发布 */
-    String ANNOUNCEMENT_SEND_STATUS_1 = "1";
-    /** 系统通告消息状态：2=已撤销 */
-    String ANNOUNCEMENT_SEND_STATUS_2 = "2";
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
deleted file mode 100644
index a71d6a4f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.openhis.constant;
-
-/**
- * 入参类型常量
- */
-public interface InputDataTypeConst {
-
-    String DATA = "data";
-    String FEE_DETAIL = "feedetail";
-    String SIGN_IN = "signIn";
-    String SIGN_OUT = "signOut";
-    String MD_TRT_INFO = "mdtrtinfo";
-    String DI_SE_INFO = "diseinfo";
-    String DRUG_INFO = "druginfo";
-    String DRUG_DETAIL = "drugdetail";
-    String DSCG_INFO = "dscginfo";
-    String PURC_INFO = "purcinfo";
-    String INV_INFO = "invinfo";
-    String SEL_INFO = "selinfo";
-    String DRUG_TRAC_INFO = "drugtracinfo";
-    String ADM_INFO = "adminfo";
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java
deleted file mode 100644
index 6d995f1c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.openhis.constant;
-
-/**
- * 医保接口标识常量
- */
-public interface InterFaceResultConst {
-
-    /** 标识字段 */
-    String INFCODE = "infcode";
-    /** 成功 */
-    String SUCCESS = "0";
-    /** 失败 */
-    String FAILED = "-1";
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java
deleted file mode 100644
index 34779bad..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.openhis.context;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.openhis.service.IElepHandlerService;
-import org.springframework.stereotype.Component;
-
-import com.openhis.service.HandlerService;
-
-/**
- * 工厂模式
- */
-@Component
-public class ElepHandlerServiceContext {
-	
-	/** 接口处理器容器 */
-    private final Map<String, IElepHandlerService> elepHandlerMap = new HashMap<>();
-
-    /**
-     * 根据类型从容器中获取处理器
-     * @param type
-     * @return
-     */
-    public IElepHandlerService getElepHandlerService(String type) {
-        return elepHandlerMap.get(type);
-    }
-
-    /**
-     * 装载处理器
-     * @param type
-     * @param service
-     */
-    public void putElepHandlerService(String type, IElepHandlerService service) {
-        elepHandlerMap.put(type, service);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java
deleted file mode 100644
index bf924752..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.openhis.context;
-
-import com.openhis.service.HandlerService;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 工厂模式
- */
-@Component
-public class HandlerServiceContext {
-	
-	/** 接口处理器容器 */
-    private final Map<String, HandlerService> handlerMap = new HashMap<>();
-
-    /**
-     * 根据类型从容器中获取处理器
-     * @param type
-     * @return
-     */
-    public HandlerService getHandlerService(String type) {
-        return handlerMap.get(type);
-    }
-
-    /**
-     * 装载处理器
-     * @param type
-     * @param service
-     */
-    public void putHandlerService(String type, HandlerService service) {
-        handlerMap.put(type, service);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
deleted file mode 100644
index bb79d803..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.controller;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.alibaba.fastjson2.JSON;
-import com.core.common.annotation.Anonymous;
-import com.openhis.config.InterfaceConfig;
-import com.openhis.service.FileService;
-import com.openhis.service.YbService;
-import com.openhis.vo.*;
-
-import cn.hutool.crypto.asymmetric.Sign;
-
-/**
- * TODO:医保控制层
- *
- * @author SunJQ
- * @date 2025-03-18
- */
-@RestController
-@RequestMapping("/yb")
-public class YbController {
-
-    /** 中心接口配置 */
-    @Autowired
-    protected InterfaceConfig interfaceConfig;
-    // logger.debug("这是专用日志测试");
-    Logger logger = LoggerFactory.getLogger(YbController.class);
-    /** 医保服务 */
-    @Autowired
-    private YbService ybService;
-    /** 文件服务 */
-    @Autowired
-    private FileService fileService;
-
-    @PostMapping(value = "/signIn")
-    @Anonymous
-    public Result<?> signIn(@RequestBody BaseParam sign, HttpServletRequest request) {
-        return ybService.signIn(sign, request);
-    }
-
-    @PostMapping(value = "/signOut")
-    @Anonymous
-    public Result<?> signOut(BaseParam baseParam, Sign sign) {
-        return ybService.signOut(baseParam);
-    }
-
-    @PostMapping(value = "/getPatinfo")
-    @Anonymous
-    public Result<?> getPerInfo(@RequestBody BaseParam baseParam) {
-        return ybService.getPerInfo(baseParam);
-    }
-
-    @PostMapping(value = "/reg")
-    @Anonymous
-    public Result<?> reg(@RequestBody BaseParam baseParam) {
-        logger.info(JSON.toJSONString(baseParam));
-        return ybService.reg(baseParam);
-    }
-
-    @PostMapping(value = "/cancelReg")
-    @Anonymous
-    public Result<?> cancelReg(@RequestBody BaseParam baseParam) {
-        return ybService.cancelReg(baseParam);
-    }
-
-    @PostMapping(value = "/preSetl")
-    @Anonymous
-    public Result<?> preSetl(@RequestBody BaseParam baseParam) {
-        return ybService.preSetl(baseParam);
-    }
-
-    @PostMapping(value = "/unPreSettle")
-    @Anonymous
-    public Result<?> unPreSettle(@RequestBody BaseParam baseParam) {
-        return ybService.cancelFeeDetail(baseParam);
-    }
-
-    @PostMapping(value = "/upload2203-record")
-    @Anonymous
-    public Result<?> upload2203Record(@RequestBody BaseParam baseParam) {
-        return ybService.saveMedical(baseParam);
-    }
-
-    @PostMapping(value = "/upload2204-record")
-    @Anonymous
-    public Result<?> preSettle(@RequestBody BaseParam baseParam) {
-        return ybService.upFeeDetail(baseParam);
-    }
-
-    @PostMapping(value = "/cancel2205")
-    @Anonymous
-    public Result<?> cancelFeeDetail(@RequestBody BaseParam baseParam) {
-        return ybService.cancelFeeDetail(baseParam);
-    }
-
-    @PostMapping(value = "/setl")
-    @Anonymous
-    public Result<?> setl(@RequestBody BaseParam baseParam) {
-        return ybService.setl(baseParam);
-    }
-
-    @PostMapping(value = "/cancelSetl")
-    @Anonymous
-    public Result<?> cancelSetl(@RequestBody BaseParam baseParam) {
-        return ybService.cancelSetl(baseParam);
-    }
-
-    @PostMapping(value = "/download")
-    @Anonymous
-    public Result<?> download(BaseParam baseParam, FileDownload fileDownload) {
-        return ybService.download(baseParam, fileDownload);
-    }
-
-    @PostMapping(value = "/directoryCheck")
-    @Anonymous
-    public Result<?> directoryCheck(@RequestBody BaseParam baseParam) {
-        return ybService.directoryCheck(baseParam);
-    }
-
-    @PostMapping(value = "/directoryUnCheck")
-    @Anonymous
-    public Result<?> directoryUnCheck(@RequestBody BaseParam baseParam) {
-        return ybService.directoryUnCheck(baseParam);
-    }
-
-    @PostMapping(value = "/reconcile")
-    @Anonymous
-    public Result<?> reconcileGeneralLedger(@RequestBody BaseParam baseParam) {
-        return ybService.reconcileGeneralLedger(baseParam);
-    }
-
-    @PostMapping(value = "/reconcile-detail")
-    @Anonymous
-    public Result<?> reconcileGeneralLedgerDetail(BaseParam baseParam,
-        FinancialSettlement3202Param financial3202Param) {
-        return ybService.reconcileGeneralLedgerDetail(baseParam, financial3202Param);
-    }
-
-    @PostMapping(value = "/three-part-search-err")
-    @Anonymous
-    public Result<?> threePartSearch(BaseParam baseParam, FinancialSettlement3209AParam financialSettlement3209AParam) {
-        return ybService.threePartSearch(baseParam, financialSettlement3209AParam);
-    }
-
-    @PostMapping(value = "/apply-clearing")
-    @Anonymous
-    public Result<?> applyFinancialClearing(@RequestBody BaseParam baseParam, Financial3203AParam financial3203AParam) {
-        return ybService.applyFinancialClearing(baseParam);
-    }
-
-    @PostMapping(value = "/cancel-clearing")
-    @Anonymous
-    public Result<?> cancelFinancialClearing(@RequestBody BaseParam baseParam, Financial3204Param financial3204Param) {
-        return ybService.cancelFinancialClearing(baseParam, financial3204Param);
-    }
-
-    @PostMapping(value = "/get-clearing-status")
-    @Anonymous
-    public Result<?> getFinancialClearingStatus(@RequestBody BaseParam baseParam,
-        Clearing3205AParma clearing3205AParma) {
-        return ybService.getFinancialClearingStatus(baseParam, clearing3205AParma);
-    }
-
-    @PostMapping(value = "/upload-inventory-count")
-    @Anonymous
-    public Result<?> uploadInventoryCount(@RequestBody BaseParam baseParam) {
-        return ybService.uploadInventoryCount(baseParam);
-    }
-
-    @PostMapping(value = "/update-inventory")
-    @Anonymous
-    public Result<?> updateInventoryCount(@RequestBody BaseParam baseParam) {
-        return ybService.updateInventoryCount(baseParam);
-    }
-
-    @PostMapping(value = "/procurement")
-    @Anonymous
-    public Result<?> procurement(@RequestBody BaseParam baseParam) {
-        return ybService.procurement(baseParam);
-    }
-
-    @PostMapping(value = "/procurement-cancel")
-    @Anonymous
-    public Result<?> cancelProcurement(@RequestBody BaseParam baseParam) {
-        return ybService.cancelProcurement(baseParam);
-    }
-
-    @PostMapping(value = "/merchandise")
-    @Anonymous
-    public Result<?> merchandise(@RequestBody BaseParam baseParam) {
-        return ybService.merchandise(baseParam);
-    }
-
-    @PostMapping(value = "/cancel-merchandise")
-    @Anonymous
-    public Result<?> cancelMerchandise(@RequestBody BaseParam baseParam) {
-        return ybService.cancelMerchandise(baseParam);
-    }
-
-    @PostMapping(value = "/del-goods")
-    @Anonymous
-    public Result<?> deleteGoodsInfo(BaseParam baseParam, Medical3507Param medical3507Param) {
-        return ybService.deleteGoodsInfo(baseParam, medical3507Param);
-    }
-
-    @PostMapping(value = "/getclroptins")
-    @Anonymous
-    public Result<?> getClrOptins(@RequestBody BaseParam baseParam) {
-        return ybService.getClrOptins(baseParam);
-    }
-
-    @PostMapping(value = "/file-up1")
-    @Anonymous
-    public Result<?> uploadFile(@RequestParam("in") MultipartFile file, // 对应接口参数名"in"
-        @RequestParam("filename") String filename, @RequestParam("fixmedins_code") String fixmedinsCode) {
-
-        // 1. 基础校验
-        if (file.isEmpty()) {
-            return Result.error("文件不能为空");
-        }
-        if (!file.getOriginalFilename().endsWith(".zip")) {
-            return Result.error("仅支持ZIP格式文件");
-        }
-
-        // 2. 调用Service处理业务逻辑
-        try {
-            // FileResult fileResult =
-            fileService.uploadFile(file.getInputStream(), filename, fixmedinsCode);
-            return Result.ok("");
-        } catch (Exception e) {
-            return Result.error("处理失败: " + e.getMessage());
-        }
-    }
-
-    @PostMapping(value = "/file-up2")
-    @Anonymous
-    public Result<?> upload3202File(@RequestPart("file") MultipartFile file,
-        @RequestParam("fixmedinsCode") String fixmedinsCode, @RequestParam("userId") String userId,
-        @RequestParam("admvs") String admvs) {
-
-        // File9101Param file9101Param = JSON.parseObject(JSON.toJSONString(baseParam.getData()), File9101Param.class);
-
-        // MultipartFile file = file9101Param.getFile();
-        String filename = file.getOriginalFilename();
-        // String fixmedinsCode = file9101Param.getFixmedinsCode();
-
-        // 1. 基础校验
-        if (file.isEmpty()) {
-            return Result.error("文件不能为空");
-        }
-        // if (!file.getOriginalFilename().endsWith(".zip")) {
-        // return Result.error("仅支持ZIP格式文件");
-        // }
-
-        // 2. 调用Service处理业务逻辑
-        try {
-            // FileResult fileResult =
-            // fileService.uploadFile(file,filename, fixmedinsCode);
-            return fileService.uploadFile(file, filename, fixmedinsCode, admvs, userId);
-        } catch (Exception e) {
-            return Result.error("处理失败: " + e.getMessage());
-        }
-    }
-
-    @PostMapping(value = "/file-down")
-    @Anonymous
-    public Result<?> downloadFile(FileResult fileResult) {
-        return fileService.downloadFile(fileResult);
-    }
-
-    @PostMapping(value = "/queryYbCatalogue")
-    @Anonymous
-    public Result<?> queryYbCatalogue(@RequestBody BaseParam baseParam) {
-        return ybService.queryYbCatalogue(baseParam);
-    }
-
-    @PostMapping(value = "/upload-2301-fee-detail")
-    @Anonymous
-    public Result<?> uploadInpatientFeeDetail(@RequestBody BaseParam baseParam) {
-        return ybService.uploadInpatientFeeDetail(baseParam);
-    }
-
-    @PostMapping(value = "/cancel-2302-fee-detail")
-    @Anonymous
-    public Result<?> cancelInpatientFeeDetail(@RequestBody BaseParam baseParam) {
-        return ybService.cancelInpatientFeeDetail(baseParam);
-    }
-
-    @PostMapping(value = "/inpa-pre-setl")
-    @Anonymous
-    public Result<?> prePayInpatient(@RequestBody BaseParam baseParam) {
-        return ybService.prePayInpatient(baseParam);
-    }
-
-    @PostMapping(value = "/inpa-setl")
-    @Anonymous
-    public Result<?> payInpatient(@RequestBody BaseParam baseParam) {
-        return ybService.payInpatient(baseParam);
-    }
-
-    @PostMapping(value = "/inpa-un-setl")
-    @Anonymous
-    public Result<?> cancelInpatientPay(@RequestBody BaseParam baseParam) {
-        return ybService.cancelInpatientPay(baseParam);
-    }
-
-    @PostMapping(value = "/inpatient-reg")
-    @Anonymous
-    public Result<?> inpatientReg(@RequestBody BaseParam baseParam) {
-        return ybService.inpatientReg(baseParam);
-    }
-
-    @PostMapping(value = "/discharge-patient")
-    @Anonymous
-    public Result<?> dischargePatient(@RequestBody BaseParam baseParam) {
-        return ybService.dischargePatient(baseParam);
-    }
-
-    @PostMapping(value = "/change-inpatient-info")
-    @Anonymous
-    public Result<?> changeInpatientInfo(@RequestBody BaseParam baseParam) {
-        return ybService.changeInpatientInfo(baseParam);
-    }
-
-    @PostMapping(value = "/cancel-inpatient-reg")
-    @Anonymous
-    public Result<?> cancelInpatientReg(@RequestBody BaseParam baseParam) {
-        return ybService.cancelInpatientReg(baseParam);
-    }
-
-    @PostMapping(value = "/cancel-discharge-patient")
-    @Anonymous
-    public Result<?> cancelDischargePatient(@RequestBody BaseParam baseParam) {
-        return ybService.cancelDischargePatient(baseParam);
-    }
-
-    /**
-     * 【3101】明细审核事前事中分析服务
-     * 
-     * @param baseParam 基础参数
-     * @return 结果
-     */
-    @PostMapping(value = "/pre-mid-analysis")
-    @Anonymous
-    public Result<?> yb3101PreMidAnalysis(@RequestBody BaseParam baseParam) {
-        return ybService.yb3101PreMidAnalysis(baseParam);
-    }
-
-    /**
-     * 【3103】事前事中服务反馈服务
-     * 
-     * @param baseParam 基础参数
-     * @return 结果
-     */
-    @PostMapping(value = "/pre-mid-feedback")
-    @Anonymous
-    public Result<?> yb3103PreMidFeedback(@RequestBody BaseParam baseParam) {
-        return ybService.yb3103PreMidFeedback(baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java
deleted file mode 100644
index e01b2a1e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.controller;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.core.common.annotation.Anonymous;
-import com.openhis.service.IYbElepService;
-import com.openhis.vo.BaseParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.openhis.config.InterfaceConfig;
-import com.openhis.domain.*;
-import com.openhis.vo.Result;
-
-/**
- *
- * @author yuxj
- * @date 2025-04-17
- */
-@RestController
-@RequestMapping("/ybElep")
-public class YbElepController {
-
-    /** 医保服务 */
-    @Autowired
-    private IYbElepService ybElepService;
-
-    /**
-     * 电子处方上传预核验
-     *
-     * @param baseParam 处方信息
-     * @return
-     */
-    @PostMapping(value = "/preCheckPrescription")
-    @Anonymous
-    public Result<?> preCheckPrescription(@RequestBody BaseParam baseParam) {
-        return ybElepService.preCheckPrescription(baseParam);
-    }
-
-
-    /**
-     * 电子处方医保电子签名
-     *
-     * @param baseParam 电子签名信息
-     * @return
-     */
-    @PostMapping(value = "/signature")
-    @Anonymous
-    public Result<?> signature(@RequestBody BaseParam baseParam) {
-        return ybElepService.signature(baseParam);
-    }
-
-
-    /**
-     * 电子处方上传
-     *
-     * @param baseParam 上传信息
-     * @return
-     */
-    @PostMapping(value = "/upload")
-    @Anonymous
-    public Result<?> upload(@RequestBody BaseParam baseParam) {
-        return ybElepService.upload(baseParam);
-    }
-
-    /**
-     * 电子处方撤销
-     *
-     * @param baseParam 撤销信息
-     * @return
-     */
-    @PostMapping(value = "/revoke")
-    @Anonymous
-    public Result<?> revoke(@RequestBody BaseParam baseParam) {
-        return ybElepService.revoke(baseParam);
-    }
-
-    /**
-     * 电子处方信息查询
-     *
-     * @param baseParam 查询信息
-     * @return
-     */
-    @PostMapping(value = "/querPrescription")
-    @Anonymous
-    public Result<?> querPrescription(@RequestBody BaseParam baseParam) {
-        return ybElepService.querPrescription(baseParam);
-    }
-
-    /**
-     * 电子处方取药结果查询
-     *
-     * @param baseParam 撤销信息
-     * @return
-     */
-    @PostMapping(value = "/medresult")
-    @Anonymous
-    public Result<?> medresult(@RequestBody BaseParam baseParam) {
-        return ybElepService.medresult(baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java
deleted file mode 100644
index 130cc2b9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.openhis.domain;
-
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 基础请求模型
- * 包含所有接口共有的请求参数
- */
-@Data
-public class BaseRequest {
-    private String appId;         // 应用id
-    private String version;       // 版本号 1.0.0
-    private String timestamp;     // 当前时间
-    private String encType;       // 加密方式 SM4
-    private String encData;       // 加密数据
-    private String signType;      // 签名方式 SM2
-    private String signData;      // 签名串
-    private String data;          // 未签名数据
-    public Map<String, Object> toMap() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("appId", this.appId);
-        map.put("version", this.version);
-        map.put("timestamp", this.timestamp);
-        map.put("encType", this.encType);
-        map.put("encData", this.encData);
-        map.put("signType", this.signType);
-        map.put("signData", this.signData);
-        return map;
-    }
-}
-
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java
deleted file mode 100644
index a89d7a79..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.openhis.domain;
-
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 基础响应模型 包含所有接口共有的响应参数
- */
-@Data
-public class BaseResponse {
-    private int code; // 响应状态码
-    private String message; // 响应异常信息
-    private Boolean success; // 响应标识
-    private String type; // 类型
-    private String appId; // 应用id
-    private String timestamp; // 当前时间
-    private String encType; // 加密方式 SM4
-    private String signType; // 签名方式 SM2
-    private String signData; // 签名串
-    private String encData; // 加密数据
-
-    public Map<String, Object> toMap() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("code", this.code);
-        map.put("message", this.message);
-        map.put("success", this.success);
-        map.put("type", this.type);
-        map.put("appId", this.appId);
-        map.put("timestamp", this.timestamp);
-        map.put("encType", this.encType);
-        map.put("signType", this.signType);
-        map.put("signData", this.signData);
-        map.put("encData", this.encData);
-        return map;
-    }
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java
deleted file mode 100644
index b5ddce39..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 【2206】医保预结算实体
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@TableName("yb_clinc_pre_settle")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ClinicPreSettle extends HisBaseEntity implements Serializable {
-
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private Long id;
-
-    //就诊ID
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-
-    //内部就诊ID
-    @JSONField(serialize=false)
-    private String regId;
-
-    //人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-
-    //结算批次号
-    @JSONField(name="chrg_bchno")
-    private String chrgBchno;//对应payment的显示用流水
-
-    private String param2203;
-
-    private String result2203;
-
-    private String param2204;
-
-    private String result2204;
-
-    private String param2206;
-
-    private String result2206;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java
deleted file mode 100644
index a0474e84..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【2201】【2202】挂号 退号
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@TableName("yb_clinc_reg")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ClinicReg extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//主键
-	@TableId(type = IdType.ASSIGN_ID)
-	@JSONField(serialize=false)
-    private Long id;
-	//就诊ID
-	@JSONField(name="mdtrt_id")
-    private String mdtrtId;
-	//参保地医保区划
-	@JSONField(name="insuplc_admdvs")
-    private String insuplcAdmdvs;
-	//人员编号
-	@JSONField(name="psn_no")
-    private String psnNo;
-	//险种类型
-	@Dict(dictCode = "insutype")
-	@JSONField(name="insutype")
-    private String insutype;
-	//医疗类别
-	@Dict(dictCode = "med_type")
-	@JSONField(serialize=false)
-    private String medType;
-	//挂号时间
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@JSONField(name="begntime")
-    private Date begntime;
-	//就诊凭证类型
-	@JSONField(name="mdtrt_cert_type")
-    private String mdtrtCertType;
-	//就诊凭证编号
-	@JSONField(name="mdtrt_cert_no")
-    private String mdtrtCertNo;
-	//证件加密串
-	@JSONField(serialize=false)
-	@TableField(exist = false)
-	private String busiCardInfo;
-	//住院/门诊号
-	@JSONField(name="ipt_otp_no")
-    private String iptOtpNo;
-	//医师编码
-	@JSONField(name="atddr_no")
-    private String atddrNo;
-	//医师姓名
-	@JSONField(name="dr_name")
-    private String drName;
-	//科室编码
-	@JSONField(name="dept_code")
-    private String deptCode;
-	//科室名称
-	@JSONField(name="dept_name")
-    private String deptName;
-	//科别
-	@JSONField(name="caty")
-    private String caty;
-	//挂号费
-	@JSONField(serialize=false)
-    private Double regFee;
-	//检查费
-	@JSONField(serialize=false)
-    private Double checkFee;
-	//应收金额 
-	@JSONField(serialize=false)
-    private Double totalFee;
-	//状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算
-	@JSONField(serialize=false)
-    private String status;
-	@JSONField(name="psn_cert_type")
-	@TableField(exist = false)
-	private String psnCertType;
-	@JSONField(name="certno")
-	@TableField(exist = false)
-	private String certno;
-	@JSONField(name="psn_type")
-	@TableField(exist = false)
-	private String psnType;
-	@JSONField(name="psn_name")
-	@TableField(exist = false)
-	private String psnName;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java
deleted file mode 100644
index 1ddb8845..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【2207结算记录】
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@TableName("yb_clinc_settle")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ClinicSettle {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private Long id;
-
-    private String setlId;//结算id
-
-    private String mdtrtId; // 就诊ID
-
-    private String psnName; // 人员姓名
-
-    private String psnCertType; // 人员证件类型
-
-    private String certno; // 证件号码
-
-    private String insutype; // 险种类型
-
-    private String psnType; // 人员类别
-
-    private String cvlservFlag; // 公务员标志
-
-    private Date setlTime; // 结算时间
-
-    private String mdtrtCertType; // 就诊凭证类型
-
-    private String medType; // 医疗类别
-
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    private BigDecimal othPay; // 其他支出
-
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    private BigDecimal acctPay; // 个人账户支出
-
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    private BigDecimal balc; // 余额
-
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    private String medinsSetlId; // 医药机构结算ID
-
-    private String clrOptins; // 清算经办机构
-
-    private String clrWay; // 清算方式
-
-    private String clrType; // 清算类别
-
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    private String paymentNo;//结算业务流水号  Payment与ClinicSettle是1：N
-
-    private String param2207;
-
-    private String result2207;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java
deleted file mode 100644
index 54c5ce79..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 【2202】挂号撤销
- *
- * @author SunJQ
- * @date 2025-04-21
- */
-@Data
-@TableName("yb_clinc_un_reg")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ClinicUnReg {
-
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private Long id;
-
-    //就诊ID
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-
-    //人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-
-    //住院/门诊号
-    @JSONField(name="ipt_otp_no")
-    private String iptOtpNo;
-
-    //取消挂号时间
-    private Date unRegTime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java
deleted file mode 100644
index c5d5981e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【2208结算撤销】
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@TableName("yb_clinc_un_settle")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ClinicUnSettle extends HisBaseEntity {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private Long id;
-
-    private String mdtrtId; // 就诊ID
-
-    private String psnName; // 人员姓名
-
-    private String psnCertType; // 人员证件类型
-
-    private String certno; // 证件号码
-
-    private String insutype; // 险种类型
-
-    private String psnType; // 人员类别
-
-    private String cvlservFlag; // 公务员标志
-
-    private Date setlTime; // 结算时间
-
-    private String mdtrtCertType; // 就诊凭证类型
-
-    private String medType; // 医疗类别
-
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    private BigDecimal othPay; // 其他支出
-
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    private BigDecimal acctPay; // 个人账户支出
-
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    private BigDecimal balc; // 余额
-
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    private String medinsSetlId; // 医药机构结算ID
-
-    private String clrOptins; // 清算经办机构
-
-    private String clrWay; // 清算方式
-
-    private String clrType; // 清算类别
-
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    private String param2208;
-
-    private String result2208;
-
-    private String settleId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java
deleted file mode 100644
index d4bc630e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3301、3302】医保目录对照历史表
- *
- * @author SunJQ
- * @date 2025-04-27
- */
-@Data
-@TableName("yb_directory_check_record")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class DirectoryCheckRecord extends HisBaseEntity {
-
-    /** 主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 3301/3302 */
-    private Integer type;
-
-    /** 表名 */
-    private String tableName;
-
-    /** 业务表主键 */
-    private Long tableId;
-
-    /** 组织机构id */
-    private Long orgId;
-
-    /** 参数 */
-    private String param;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java
deleted file mode 100644
index 8b3f1c10..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【电子处方取药结果查询-输出（节点标识：seltdelts）】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_medresult_detail")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepMedresultDetail extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医疗目录编码 */
-    private String medListCodg;
-
-    /** 药品通用名 */
-    private String drugGenname;
-
-    /** 药品商品名 */
-    private String drugProdname;
-
-    /** 药品剂型 */
-    private String drugDosform;
-
-    /** 药品规格 */
-    private BigDecimal drugSpec;
-
-    /** 数量 */
-    private BigDecimal cnt;
-
-    /** 批准文号 */
-    private String aprvno;
-
-    /** 批次号 */
-    private String bchno;
-
-    /**  生产批号 */
-    private String manuLotnum;
-
-    /** 生产厂家 */
-    private String prdrName;
-
-    /** 取药标志位 */
-    private String takeDrugFlag;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java
deleted file mode 100644
index 1d2a7262..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方取药结果查询-输出】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_medresult_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepMedresultInfo extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医保结算时间(yyyy-MM-dd HH:mm:ss) */
-    private String setlTime;
-
-    /** 医保处方状态编码(参考rx_stas_codg) */
-    private String rxStasCodg;
-
-    /** 医保处方状态名称 */
-    private String rxStasName;
-
-    /** 处方使用状态编号(参考rx_used_stas_codg) */
-    private String rxUsedStasCodg;
-
-    /** 处方使用状态名称 */
-    private String rxUsedStasName;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java
deleted file mode 100644
index a82361be..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方取药结果查询-输入】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_medresult_input")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepMedresultInput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医保就诊ID(医保门诊挂号时返回) */
-    private String mdtrtId;
-
-    /** 人员名称 */
-    private String psnName;
-
-    /** 人员证件类型 */
-    private String psnCertType;
-
-    /** 证件号码 */
-    private String certno;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java
deleted file mode 100644
index fea9105d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方信息查询-输出-诊断信息（节点表示： rxDiseList) 】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_quer_diagnosis_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepQuerDiagnosisInfo extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 诊断类别 */
-    private String diagType;
-
-    /** 主诊断标志 */
-    private String maindiagFlag;
-
-    /** 诊断排序号 */
-    private String diagSrtNo;
-
-    /** 诊断代码 */
-    private String diagCode;
-
-    /** 诊断名称 */
-    private String diagName;
-
-    /** 诊断科室 */
-    private String diagDept;
-
-    /** 诊断科室代码 */
-    private String diagDeptCode;
-
-    /** 诊断医生编码 */
-    private String diagDrNo;
-
-    /** 诊断医生姓名 */
-    private String diagDrName;
-
-    /** 诊断时间(yyyy-MM-dd HH:mm:ss) */
-    private String diagTime;
-
-    /** 中医病名代码 */
-    private String tcmDiseCode;
-
-    /** 中医病名名称 */
-    private String tcmDiseName;
-
-    /** 中医症候代码 */
-    private String tcmsympCode;
-
-    /** 中医症候 */
-    private String tcmsymp;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java
deleted file mode 100644
index c65dcfe0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【电子处方信息查询-输出-处方明细信息（节点标识：rxDetlList） 】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_quer_prescription_detail")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepQuerPrescriptionDetail extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医疗目录编码(医保目录编码) */
-    private String medListCodg;
-
-    /** 定点医药机构目录编号(院内药品编码) */
-    private String fixmedinsHilistId;
-
-    /** 院内制剂标志(Y/N) */
-    private String hospPrepFlag;
-
-    /** 处方项目分类代码 */
-    private String rxItemTypeCode;
-
-    /** 处方项目分类名称 */
-    private String rxItemTypeName;
-
-    /** 中药类别名称 */
-    private String tcmdrugTypeName;
-
-    /** 中药类别代码 */
-    private String tcmdrugTypeCode;
-
-    /** 草药脚注 */
-    private String tcmherbFoote;
-
-    /** 药物类型代码 */
-    private String mednTypeCode;
-
-    /** 药物类型 */
-    private String mednTypeName;
-
-    /** 主要用药标志 */
-    private String mainMedcFlag;
-
-    /** 加急标志 */
-    private String urgtFlag;
-
-    /** 基本药物标志(Y/N) */
-    private String basMednFlag;
-
-    /** 基本药物标志(Y/N) */
-    private String impDrugFlag;
-
-    /** 药品商品名 */
-    private String drugProdname;
-
-    /** 药品通用名 */
-    private String drugGenname;
-
-    /** 药品剂型 */
-    private String drugDosform;
-
-    /** 药品规格 */
-    private String drugSpec;
-
-    /** 生产厂家 */
-    private String prdrName;
-
-    /** 用药途径代码 */
-    private String medcWayCodg;
-
-    /** 用药途径描述 */
-    private String medcWayDscr;
-
-    /** 用药开始时间(yyyy-MM-dd HH:mm:ss) */
-    private String medcBegntime;
-
-    /** 用药结束时间(yyyy-MM-dd HH:mm:ss) */
-    private String medcEndtime;
-
-    /** 用药天数 */
-    private BigDecimal medcDays;
-
-    /** 药品总用药量 */
-    private BigDecimal drugCnt;
-
-    /** 药品总用药量单位 */
-    private String drugDosunt;
-
-    /** 单次用量 */
-    private BigDecimal sinDoscnt;
-
-    /** 单次剂量单位 */
-    private String sinDosunt;
-
-    /** 使用频次编码 */
-    private String usedFrquCodg;
-
-    /** 使用频次名称 */
-    private String usedFrquName;
-
-    /** 医院审批标志(Y/N) */
-    private String hospApprFlag;
-
-    /** 取药标志位(Y/N) */
-    private String takeDrugFlag;
-
-    /** 是否OTC药品(0-处方药品、1-OTC药品) */
-    private String otcFlag;
-
-    /** 自费原因类型 */
-    private String selfPayRea;
-
-    /** 自费原因描述 */
-    private String realDscr;
-
-    /** 所需药品库存数量 */
-    private String drugTotlcnt;
-
-    /** 所需药品库存单位 */
-    private String drugTotlcntEmp;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java
deleted file mode 100644
index 3b227a52..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【电子处方信息查询-输出-处方信息 】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_quer_prescription_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepQuerPrescriptionInfo extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 定点医疗机构名称 */
-    private String fixmedinsName;
-
-    /** 医保处方状态编码 */
-    private String rxStasCodg;
-
-    /** 医保处方状态名称 */
-    private String rxStasName;
-
-    /** 医保处方使用状态编码 */
-    private String rxUsedStasCodg;
-
-    /** 医保处方使用状态名称 */
-    private String rxUsedStasName;
-
-    /** 开方时间 */
-    private String prscTime;
-
-    /** 药品总用量（剂数） */
-    private BigDecimal rxDrugCnt;
-
-    /** 处方整剂用法编码 */
-    private String rxUsedWayCodg;
-
-    /** 处方整剂用法名称 */
-    private String rxUsedWayName;
-
-    /** 处方整剂频次编号 */
-    private String rxFrquCodg;
-
-    /** 处方整剂频次名称 */
-    private String rxFrquName;
-
-    /** 处方整剂剂量单位 */
-    private String rxDosunt;
-
-    /** 处方整剂单次剂量数 */
-    private BigDecimal rxDoscnt;
-
-    /** 处方整剂医嘱说明 */
-    private String rxDrordDscr;
-
-    /** 处方有效天数 */
-    private BigDecimal valiDays;
-
-    /** 有效截止时间 */
-    private String valiEndTime;
-
-    /** 复用（多次）使用标志，0-否、1-是 */
-    private String reptFlag;
-
-    /** 最大复用次数 */
-    private BigDecimal maxReptCnt;
-
-    /** 已复用次数 */
-    private BigDecimal reptdCnt;
-
-    /** 使用最小间隔（天数） */
-    private BigDecimal minInrvDays;
-
-    /** 处方类别编码 */
-    private String rxTypeCode;
-
-    /** 处方类别名称 */
-    private String rxTypeName;
-
-    /** 长期处方标志，0-否、1-是 */
-    private String longRxFlag;
-
-    /** 业务类型代码 */
-    private String bizTypeCode;
-
-    /** 业务类型名称 */
-    private String bizTypeName;
-
-    /** 处方附加属性代码 */
-    private String rxExraAttrCode;
-
-    /** 处方附加属性名称 */
-    private String rxExraAttrName;
-
-    /** 处方循环限制标志 */
-    private String rxCircLimitFlag;
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java
deleted file mode 100644
index a38010ba..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方信息查询-输入】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_quer_prescription_input")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepQuerPrescriptionInput extends HisBaseEntity {
-
-    /** 定点医疗机构编号 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医保就诊 ID */
-    private String mdtrtId;
-
-    /** 人员名称 */
-    private String psnName;
-
-    /** 人员证件类型 */
-    private String psnCertType;
-
-    /** 证件号码 */
-    private String certno;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java
deleted file mode 100644
index 7065b5a3..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【电子处方信息查询-输出-就诊信息（节点标识：rxOtpinfo） 】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_quer_visit_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepQuerVisitInfo extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医疗类别(参考医疗类别med_type) */
-    private String medType;
-
-    /** 门诊/住院号 */
-    private String iptOtpNo;
-
-    /** 门诊住院标志(1-门诊，2-住院) */
-    private String otpIptFlag;
-
-    /** 患者姓名 */
-    private String patnName;
-
-    /** 年龄 */
-    private BigDecimal patnAge;
-
-    /** 患者身高(cm) */
-    private BigDecimal patnHgt;
-
-    /** 患者体重(kg) */
-    private BigDecimal patnWt;
-
-    /** 性别 */
-    private String gend;
-
-    /** 妊娠(孕周) */
-    private Integer gesoVal;
-
-    /** 新生儿标志(0-否、1-是) */
-    private String nwbFlag;
-
-    /** 新生儿日、月龄 */
-    private String nwbAge;
-
-    /** 哺乳期标志(0-否、1-是) */
-    private Integer suckPrdFlag;
-
-    /** 过敏史 */
-    private String algsHis;
-
-    /** 险种类型 */
-    private String insutype;
-
-    /** 开方科室名称 */
-    private String prscDeptName;
-
-    /** 开方医师姓名 */
-    private String prscDrName;
-
-    /** 药师姓名 */
-    private String pharName;
-
-    /** 医疗机构药师审方时间(yyyy-MM-dd HH:mm:ss) */
-    private String pharChkTime;
-
-    /** 就诊时间(yyyy-MM-dd HH:mm:ss) */
-    private String mdtrtTime;
-
-    /** 病种编码(按病种结算病种目录代码/门诊慢特病种目录代码) */
-    private String diseCodg;
-
-    /** 病种名称 */
-    private String diseName;
-
-    /** 是否特殊病种 */
-    private String spDiseFlag;
-
-    /** 主诊断代码 */
-    private String maindiagCode;
-
-    /** 主诊断名称 */
-    private String maindiagName;
-
-    /** 疾病病情描述 */
-    private String diseCondDscr;
-
-    /** 是否初诊(0-否、1-是) */
-    private String fstdiagFlag;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java
deleted file mode 100644
index 221c275e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【电子处方撤销-输入】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_revoke_input")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepRevokeInput extends HisBaseEntity {
-
-    /** 医保处方编号 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 撤销医师的医保医师代码 */
-    private String drCode;
-
-    /** 撤销医师姓名 */
-    private String undoDrName;
-
-    /** 撤销医师证件类型 */
-    private String undoDrCertType;
-
-    /** 撤销医师证件号码 */
-    private String undoDrCertno;
-
-    /** 撤销原因描述 */
-    private String undoRea;
-
-    /** 撤销时间，格式：yyyy-MM-dd HH:mm:ss */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date undoTime;
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java
deleted file mode 100644
index ce11b409..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方撤销-输出】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_revoke_output")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepRevokeOutput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医保处方状态编码 */
-    private String rxStasCodg;
-
-    /** 医保处方状态名称 */
-    private String rxStasName;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java
deleted file mode 100644
index deca06fb..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方医保电子签名 -输入】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_signature_input")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepSignatureInput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 定点机构代码，定点机构唯一标识，用于识别机构对应的医保数字证书 */
-    private String fixmedinsCode;
-
-    /** 原始待签名处方信息，JSONString序列化后的base64字符值 */
-    private String originalValue;
-
-    /** 原始待签名处方文件，文件base64的字符值 */
-    private String originalRxFile;
-
-    /** 扩展字段，JSON序列化成字符串后长度不能超过4000 */
-    private String extras;
-
-    /** 医保处方编号 */
-    @JSONField(serialize=false)
-    private String hiRxno;
-
-    /** 院内内部处方号 */
-    private String prescriptionNo;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java
deleted file mode 100644
index 75ca0ed1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方医保电子签名 -输出】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_signature_output")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepSignatureOutput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 处方文件，医保电子签名后处方文件originalRxFile的base64值 */
-    private String rxFile;
-
-    /** 签名摘要值，医保电子签名后处方信息originalValue的签名结果值 */
-    private String signDigest;
-
-    /** 签名机构证书SN */
-    private String signCertSn;
-
-    /** 签名机构证书DN */
-    private String signCertDn;
-
-    /** 医保处方编号 */
-    @JSONField(serialize=false)
-    private String hiRxno;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java
deleted file mode 100644
index 30146ab9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方上传-输入】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_upload_input")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepUploadInput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 处方追溯码 */
-    private String rxTraceCode;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医院就诊 ID */
-    private String mdtrtId;
-
-    /** 患者姓名 */
-    private String patnName;
-
-    /** 人员证件类型 */
-    private String psnCertType;
-
-    /** 证件号码 */
-    private String certno;
-
-    /** 定点医疗机构名称 */
-    private String fixmedinsName;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 开方医保医师代码 */
-    private String drCode;
-
-    /** 开方医师姓名 */
-    private String prscDrName;
-
-    /** 审方药师科室名称 */
-    private String pharDeptName;
-
-    /** 审方药师科室编号 */
-    private String pharDeptCode;
-
-    /** 审方药师职称编码 */
-    private String pharProfttlCodg;
-
-    /** 审方药师职称名称 */
-    private String pharProfttlName;
-
-    /** 审方医保药师代码 */
-    private String pharCode;
-
-    /** 审方药师证件类型 */
-    private String pharCertType;
-
-    /** 审方药师证件号码 */
-    private String pharCertno;
-
-    /** 审方药师姓名 */
-    private String pharName;
-
-    /** 审方药师执业资格证号 */
-    private String pharPracCertNo;
-
-    /** 医疗机构药师审方时间，格式：yyyy-MM-dd HH:mm:ss */
-    private String pharChkTime;
-
-    /** 处方原件，医保电子签名后的处方文件base64字符（PDF或OFD格式） */
-    private String rxFile;
-
-    /** 处方信息签名值 */
-    private String signDigest;
-
-    /** 扩展字段，JSON格式，长度不超过4000 */
-    private String extras;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java
deleted file mode 100644
index 792ba7ac..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方上传-输出】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_upload_output")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepUploadOutput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医保处方状态编码 */
-    private String rxStasCodg;
-
-    /** 医保处方状态名称 */
-    private String rxStasName;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java
deleted file mode 100644
index 39e471b8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【电子处方上传预核验-输入-诊断信息（节点表示：diseinfo)】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_veri_diagnosis_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepVeriDiagnosisInfo extends HisBaseEntity {
-
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 诊断类别，参考诊断类别(diag_type) */
-    private String diagType;
-
-    /** 主诊断标志，0-否、1-是 */
-    private String maindiagFlag;
-
-    /** 诊断排序号 */
-    private String diagSrtNo;
-
-    /** 诊断代码，医保疾病诊断代码 */
-    private String diagCode;
-
-    /** 诊断名称 */
-    private String diagName;
-
-    /** 诊断科室名称 */
-    private String diagDept;
-
-    /** 诊断科室代码，与科室信息上传中的hosp_dept_codg医院科室编码保持一致 */
-    private String diagDeptCode;
-
-    /** 诊断医生编码，国家医保医师代码 */
-    private String diagDrNo;
-
-    /** 诊断医生姓名 */
-    private String diagDrName;
-
-    /** 诊断时间，格式：yyyy-MM-dd HH:mm:ss */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date diagTime;
-
-    /** 中医病名代码，diag_type为中医诊断(值为2,3)时上传 */
-    private String tcmDiseCode;
-
-    /** 中医病名，diag_type为中医诊断(值为2,3)时上传 */
-    private String tcmDiseName;
-
-    /** 中医证候代码，diag_type为中医诊断(值为2,3)时上传 */
-    private String tcmsympCode;
-
-    /** 中医证候，diag_type为中医诊断(值为2,3)时上传 */
-    private String tcmsymp;
-
-    /** 院内内部处方号 */
-    @JSONField(serialize=false)
-    private String prescriptionNo;
-
-    /** 医保处方编号(电子处方信息查询返回时插入记录) */
-    @JSONField(serialize=false)
-    private String hiRxno;
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java
deleted file mode 100644
index bce7599e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【电子处方上传预核验-输入-处方明细信息（节点标识 rxdrugdetail） 】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_veri_prescription_detail")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepVeriPrescriptionDetail extends HisBaseEntity {
-
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-    /** 医疗目录编码(医保药品编码) */
-    private String medListCodg;
-
-    /** 定点医药机构目录编号(院内药品编码) */
-    private String fixmedinsHilistId;
-
-    /** 医疗机构制剂标志(0-否、1-是) */
-    private String hospPrepFlag;
-
-    /** 处方项目分类代码(11:西药,12:中成药,13:中药饮片) */
-    private String rxItemTypeCode;
-
-    /** 处方项目分类名称 */
-    private String rxItemTypeName;
-
-    /** 中药类别代码(中药饮片固定传3) */
-    private String tcmdrugTypeCode;
-
-    /** 中药类别名称 */
-    private String tcmdrugTypeName;
-
-    /** 草药脚注 */
-    private String tcmherbFoote;
-
-    /** 药物类型代码(参考medn_type_code) */
-    private String mednTypeCode;
-
-    /** 药物类型名称 */
-    private String mednTypeName;
-
-    /** 主要用药标志(0-否、1-是) */
-    private String mainMedcFlag;
-
-    /** 加急标志(0-否、1-是) */
-    private String urgtFlag;
-
-    /** 基本药物标志(0-否、1-是) */
-    private String basMednFlag;
-
-    /** 是否进口药品(0-否、1-是) */
-    private String impDrugFlag;
-
-    /** 是否OTC药品(0-处方药品、1-OTC药品) */
-    private String otcFlag;
-
-    /** 药品通用名 */
-    private String drugGenname;
-
-    /** 药品剂型 */
-    private String drugDosform;
-
-    /** 药品规格 */
-    private String drugSpec;
-
-    /** 药品商品名(非必填) */
-    private String drugProdname;
-
-    /** 生产厂家(非必填) */
-    private String prdrName;
-
-    /** 用药途径代码(西药/中成药必填) */
-    private String medcWayCodg;
-
-    /** 用药途径描述(西药/中成药必填) */
-    private String medcWayDscr;
-
-    /** 用药开始时间(yyyy-MM-dd HH:mm:ss) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date medcBegntime;
-
-    /** 用药结束时间(yyyy-MM-dd HH:mm:ss) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date medcEndtime;
-
-    /** 用药天数 */
-    private String medcDays;
-
-    /** 单次剂量单位(西药/中成药必填) */
-    private String sinDosunt;
-
-    /** 单次用量(西药/中成药必填) */
-    private String sinDoscnt;
-
-    /** 使用频次编码(西药/中成药必填) */
-    private String usedFrquCodg;
-
-    /** 使用频次名称(西药/中成药必填) */
-    private String usedFrquName;
-
-    /** 药品总用药量单位(发药计价单位) */
-    private String drugDosunt;
-
-    /** 药品总用药量(医保结算数量) */
-    private String drugCnt;
-
-    /** 药品单价(按drug_dosunt计价) */
-    private String drugPric;
-
-    /** 药品总金额(drug_cnt×drug_pric) */
-    private String drugSumamt;
-
-    /** 医院审批标志(1-纳入报销,2-自费) */
-    private String hospApprFlag;
-
-    /** 自费原因类型(hosp_appr_flag=2时必填) */
-    private String selfPayRea;
-
-    /** 自费原因描述(自费原因类型为6时必填) */
-    private String realDscr;
-
-    /** 扩展数据(地方业务扩展信息) */
-    private String extras;
-
-    /** 院内内部处方号 */
-    @JSONField(serialize=false)
-    private String prescriptionNo;
-
-    /** 医保处方编号(电子处方信息查询返回时插入记录) */
-    @JSONField(serialize=false)
-    private String hiRxno;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java
deleted file mode 100644
index adb6c6e2..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【电子处方上传预核验-输入-处方信息】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_veri_prescription_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepVeriPrescriptionInfo extends HisBaseEntity {
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 就诊凭证类型(01-电子凭证令牌、02-身份证号、03-社会保障卡号) */
-    private String mdtrtCertType;
-
-    /** 就诊凭证编号 */
-    private String mdtrtCertNo;
-
-    /** 卡识别码(就诊凭证类型为"03"时必填) */
-    private String cardSn;
-
-    /** 业务类型代码(01-定点医疗机构就诊，02-互联网医院问诊) */
-    private String bizTypeCode;
-
-    /** 处方附加属性代码(01-双通道处方，02-门诊统筹处方，99-其他) */
-    private String rxExraAttrCode;
-
-    /** 电子凭证令牌(使用医保电子凭证就诊时必填) */
-    private String ecToken;
-
-    /** 电子凭证线上身份核验流水号(线上场景互联网医院问诊时使用) */
-    private String authNo;
-
-    /** 参保地编号 */
-    private String insuPlcNo;
-
-    /** 就医地编号 */
-    private String mdtrtareaNo;
-
-    /** 定点医疗机构处方编号(院内内部处方号) */
-    private String hospRxno;
-
-    /** 续方的原处方编号 */
-    private String initRxno;
-
-    /** 处方类别代码(参考rx_type_code) */
-    private String rxTypeCode;
-
-    /** 开方时间(yyyy-MM-dd HH:mm:ss) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /** 药品类目数(剂数) */
-    private String rxDrugCnt;
-
-    /** 处方整剂用法编号 */
-    private String rxUsedWayCodg;
-
-    /** 处方整剂用法名称 */
-    private String rxUsedWayName;
-
-    /** 处方整剂频次编号(参考used_frequ) */
-    private String rxFrquCodg;
-
-    /** 处方整剂频次名称 */
-    private String rxFrquName;
-
-    /** 处方整剂剂量单位 */
-    private String rxDosunt;
-
-    /** 处方整剂单次剂量数 */
-    private String rxDoscnt;
-
-    /** 处方整剂医嘱说明 */
-    private String rxDrordDscr;
-
-    /** 处方有效天数 */
-    private String valiDays;
-
-    /** 有效截止时间(开方时间+处方有效天数) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date valiEndTime;
-
-    /** 复用(多次)使用标志(0-否、1-是) */
-    private String reptFlag;
-
-    /** 最大使用次数(预留字段) */
-    private String maxReptCnt;
-
-    /** 使用最小间隔(天数)(预留字段) */
-    private String minInvDays;
-
-    /** 续方标志(0-否、1-是) */
-    private String rxCotnFlag;
-
-    /** 长期处方标志(0-否、1-是) */
-    private String longRxFlag;
-
-    /** 医保处方编号(电子处方信息查询返回时插入记录) */
-    @JSONField(serialize=false)
-    private String hiRxno;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java
deleted file mode 100644
index a6d741b7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【电子处方上传预核验-输出】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_veri_prescription_output")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepVeriPrescriptionOutput extends HisBaseEntity {
-
-    /** 自增主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 处方追溯码 */
-    private String rxTraceCode;
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 药品请求的处方号 */
-    private String prescriptionNo;
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java
deleted file mode 100644
index 6157b08e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【电子处方上传预核验-输入-就诊信息（节点标识：mdtrtinfo） 】Entity实体
- *
- * @author system
- * @date 2025-04-17
- */
-@Data
-@TableName("yb_elep_veri_visit_info")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ElepVeriVisitInfo extends HisBaseEntity {
-    /** 自增主键 */
-    @JSONField(serialize=false)
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 定点医疗机构名称 */
-    private String fixmedinsName;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 医保就诊ID(医保门诊挂号时返回) */
-    private String mdtrtId;
-
-    /** 医疗类别(参考med_type) */
-    private String medType;
-
-    /** 门诊/住院号 */
-    private String iptOtpNo;
-
-    /** 门诊住院标识(1-门诊、2-住院) */
-    private String otpIptFlag;
-
-    /** 医保人员编号 */
-    private String psnNo;
-
-    /** 患者姓名 */
-    private String patnName;
-
-    /** 人员证件类型(参考psn_cert_type) */
-    private String psnCertType;
-
-    /** 证件号码 */
-    private String certno;
-
-    /** 年龄 */
-    private String patnAge;
-
-    /** 患者身高(cm) */
-    private String patnHgt;
-
-    /** 患者体重(kg) */
-    private String patnWt;
-
-    /** 性别(参考gend) */
-    private String gend;
-
-    /** 计划生育手术类别 */
-    private String birctrlType;
-
-    /** 计划生育手术或生育日期(yyyy-MM-dd) */
-    private String birctrlMatnDate;
-
-    /** 生育类别 */
-    private String matnType;
-
-    /** 妊娠(孕周) */
-    private String gesoVal;
-
-    /** 新生儿标志(0-否、1-是) */
-    private String nwbFlag;
-
-    /** 新生儿日、月龄 */
-    private String nwbAge;
-
-    /** 哺乳期标志(0-否、1-是) */
-    private String suckPrdFlag;
-
-    /** 过敏史 */
-    private String algsHis;
-
-    /** 开方科室名称 */
-    private String prscDeptName;
-
-    /** 开方科室编号(与医药机构服务的科室管理保持一致) */
-    private String prscDeptCode;
-
-    /** 开方医保医师代码(国家医保医师代码) */
-    private String drCode;
-
-    /** 开方医师姓名 */
-    private String prscDrName;
-
-    /** 开方医师证件类型(参考psn_cert_type) */
-    private String prscDrCertType;
-
-    /** 开方医师证件号码 */
-    private String prscDrCertno;
-
-    /** 医生职称编码(参考drord_dr_proftt1) */
-    private String drProfttlCodg;
-
-    /** 医生职称名称 */
-    private String drProfttlName;
-
-    /** 医生科室编码(与医院科室编码字段保持一致) */
-    private String drDeptCode;
-
-    /** 医生科室名称 */
-    private String drDeptName;
-
-    /** 科别(参考科室代码dept) */
-    private String caty;
-
-    /** 就诊时间(yyyy-MM-dd HH:mm:ss) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date mdtrtTime;
-
-    /** 病种编码 */
-    private String diseCodg;
-
-    /** 病种名称 */
-    private String diseName;
-
-    /** 特殊病种标志(0-否、1-是) */
-    private String spDiseFlag;
-
-    /** 主诊断代码(医保疾病诊断代码) */
-    private String maindiagCode;
-
-    /** 主诊断名称 */
-    private String maindiagName;
-
-    /** 疾病病情描述 */
-    private String diseCondDscr;
-
-    /** 医保费用结算类型(参考hi_feeset1_type) */
-    private String hiFeesetlType;
-
-    /** 医保费用类别名称 */
-    private String hiFeesetlName;
-
-    /** 挂号费 */
-    private String rgstFee;
-
-    /** 医疗费总额 */
-    private String medfeeSumamt;
-
-    /** 是否初诊(0-否、1-是) */
-    private String fstdiagFlag;
-
-    /** 扩展数据(地方业务扩展信息) */
-    private String extras;
-
-    /** 院内内部处方号 */
-    @JSONField(serialize=false)
-    private String prescriptionNo;
-
-    /** 医保处方编号(电子处方信息查询返回时插入记录) */
-    @JSONField(serialize=false)
-    private String hiRxno;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java
deleted file mode 100644
index 575572e0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 【9101】【9102】公用
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class File {
-
-    // 文件查询号
-    private String fileQuryNo;
-
-    // 文件名称
-    private String filename;
-
-    // 下载截止时间
-    private Date dldEndtime;
-
-    // 文件数据
-    private byte[] fileData;
-
-    // 医药机构编号
-    private String fixmedinsCode;
-
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java
deleted file mode 100644
index b087ffef..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 【3203】清算申请记录
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_financial_apply_record")
-@EqualsAndHashCode(callSuper = false)
-public class FinancialApplyRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //医院id
-    private Long orgId;
-
-    //开始时间
-    private Date begndate;
-
-    //医院id
-    private Date enddate;
-
-    //清算类别
-    private Date clrType;
-
-    //医疗费总额
-    private Date medfeeSumamt;
-
-    //医保认可费用总额
-    private Date medSumfee;
-
-    //基金申报总额
-    private Date fundAppySum;
-
-    //现金支付金额
-    private Date cashPayamt;
-
-    //个人账户支出
-    private Date acctPay;
-
-    //申请人
-    private Long praId;
-
-    //入参
-    private String param;
-
-    //
-    private String outResult;
-
-    //申请状态
-    private String status;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java
deleted file mode 100644
index 7b143b1d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.annotation.Excel;
-import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * [3201]对账记录
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_financial_reconcile_record")
-@EqualsAndHashCode(callSuper = false)
-public class FinancialReconcileRecord extends HisBaseEntity {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-    //定点医药机构编号
-    @Excel(name = "定点医药机构编号", width = 15)
-    @JSONField(serialize=false)
-    private String fixmedinsCode;
-    //定点医药机构名称
-    @Excel(name = "定点医药机构名称", width = 15)
-    @JSONField(serialize=false)
-    private String fixmedinsName;
-    //医保区划
-    @Excel(name = "医保区划", width = 15)
-    @JSONField(serialize=false)
-    private String admvs;
-    //险种
-    @Excel(name = "险种", width = 15, dictType = "insutype")
-    @Dict(dictCode = "insutype")
-    @JSONField(name="insutype")
-    private String insutype;
-    //清算类别
-    @Excel(name = "清算类别", width = 15, dictType = "clr_type")
-    @Dict(dictCode = "clr_type")
-    @JSONField(name="clr_type")
-    private String clrType;
-    //结算经办机构
-    @Excel(name = "结算经办机构", width = 15)
-    @JSONField(name="setl_optins")
-    private String setlOptins;
-    //对账开始日期
-    @Excel(name = "对账开始日期", width = 15, dateFormat = "yyyy-MM-dd")
-    @JSONField(name="stmt_begndate")
-    private String stmtBegndate;
-    //对账结束日期
-    @Excel(name = "对账结束日期", width = 15, dateFormat = "yyyy-MM-dd")
-    @JSONField(name="stmt_enddate")
-    private String stmtEnddate;
-    //医疗费总额
-    @Excel(name = "医疗费总额", width = 15)
-    @JSONField(name="medfee_sumamt")
-    private Double medfeeSumamt;
-    //基金支付总额
-    @Excel(name = "基金支付总额", width = 15)
-    @JSONField(name="fund_pay_sumamt")
-    private Double fundPaySumamt;
-    //个人账户支付金额
-    @Excel(name = "个人账户支付金额", width = 15)
-    @JSONField(name="acct_pay")
-    private Double acctPay;
-    //定点医药机构结算笔数
-    @Excel(name = "定点医药机构结算笔数", width = 15)
-    @JSONField(name="fixmedins_setl_cnt")
-    private Integer fixmedinsSetlCnt;
-    //对账结果
-    @Excel(name = "对账结果", width = 15, dictType = "stmt_rslt")
-    @Dict(dictCode = "stmt_rslt")
-    @JSONField(serialize=false)
-    private String stmtRslt;
-    //对账结果说明
-    @Excel(name = "对账结果说明", width = 15)
-    @JSONField(serialize=false)
-    private String stmtRsltDscr;
-
-    //医院id
-    private Long orgId;
-
-    //入参
-    private String param;
-
-    //clr_appy_evt_id 机构清算申请事件ID
-    private String result;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java
deleted file mode 100644
index e74de4c6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.vo.Info5301SpecialConditionResult;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- *【1101】获取身份信息
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@TableName("yb_pub_perinfo")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class InfoPerson extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private Long id;
-
-	//人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-	//人员证件类型
-    @JSONField(name="psn_cert_type")
-    private String psnCertType;
-	//证件号码
-    @JSONField(name="certno")
-    private String certno;
-	//人员姓名
-    @JSONField(name="psn_name")
-    private String psnName;
-	//性别
-    @JSONField(name="gend")
-    private String gend;
-	//民族
-    @JSONField(name="naty")
-    private String naty;
-	//出生日期
-    @JSONField(name="brdy")
-    private Date brdy;
-	//年龄
-    @JSONField(name="age")
-    private Double age;
-	//参保地医保区划
-    private String insuplcAdmdvs;
-    //险种类型
-    private String insutype;
-    //余额
-    private String balc;
-
-    private String param1101;
-
-    private String result1101;
-
-    //人员类别
-    private String psnType;
-
-    //人员参保状态
-    private String psnInsuStas;
-
-    //个人参保日期
-    private String psnInsuDate;
-
-    //公务员标志
-    private String cvlservFlag;
-
-    //单位名称
-    private String empName;
-
-    //特慢病
-    @TableField(exist = false)
-    private List<Info5301SpecialConditionResult> feedetail;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java
deleted file mode 100644
index b9c5e45d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.openhis.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class InformationInquiry {
-
-    // 处方信息
-    private ElepQuerPrescriptionInfo prescriptionInfo;
-
-    // 处方明细信息
-    private List<ElepQuerPrescriptionDetail> rxDetlList;
-
-    // 就诊信息
-    private List<ElepQuerVisitInfo> rxOtpinfo;
-
-    // 诊断信息
-    private List<ElepQuerDiagnosisInfo> rxDiseList;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java
deleted file mode 100644
index e8b615d9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3502】库存信息变更
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_change_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventoryChangeRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String result;
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 库存变更类型（字符型，6位，必填）
-    @JSONField(name = "inv_chg_type")
-    private String invChgType;
-
-    // 3. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 4. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 5. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 6. 单价（数值型，16位含6位小数，必填）
-    @JSONField(name = "pric")
-    private BigDecimal pric;
-
-    // 7. 数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "cnt")
-    private BigDecimal cnt;
-
-    // 8. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 9. 库存变更时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "inv_chg_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date invChgTime;
-
-    // 10. 库存变更经办人姓名（字符型，50位，非必填）
-    @JSONField(name = "inv_chg_opter_name")
-    private String invChgOpterName;
-
-    // 11. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 12. 拆零标志（字符型，2位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 13. 溯源码节点信息（字符型，长度未明确，暂定500位）
-    @JSONField(name = "drugtracinfo")
-    private String drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java
deleted file mode 100644
index 5bc176da..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3502】库存信息变更
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_check_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventoryCheckRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String result;
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 5. 盘存日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "invdate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date invdate;
-
-    // 6. 库存数量（数值型，16位含2位小数，必填）
-    @JSONField(name = "inv_cnt")
-    private BigDecimal invCnt;
-
-    // 7. 生产批号（字符型，30位，非必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 8. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 9. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 10. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java
deleted file mode 100644
index dc4326f6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3507】
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_del_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventoryDelRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String outResult;
-
-    // 定点医药机构批次流水号
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 进销存数据类型
-    @JSONField(name = "inv_data_type")
-    private String invDataType;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java
deleted file mode 100644
index 521122a7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3503】
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_purchase_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventoryPurchaseRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String outResult;
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 随货单号（字符型，50位，非必填）
-    @JSONField(name = "dynt_no")
-    private String dyntNo;
-
-    // 5. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 6. 供应商名称（字符型，200位，必填）
-    @JSONField(name = "spler_name")
-    private String splerName;
-
-    // 7. 供应商许可证号（字符型，50位，非必填）
-    @JSONField(name = "spler_pmtno")
-    private String splerPmtno;
-
-    // 8. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 9. 生产厂家名称（字符型，200位，必填）
-    @JSONField(name = "prodentp_name")
-    private String prodentpName;
-
-    // 10. 批准文号（字符型，100位，必填）
-    @JSONField(name = "aprvno")
-    private String aprvno;
-
-    // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 13. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 14. 采购/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "purc_retn_cnt")
-    private BigDecimal purcRetnCnt;
-
-    // 15. 采购发票编码（字符型，50位，非必填）
-    @JSONField(name = "purc_invo_codg")
-    private String purcInvoCodg;
-
-    // 16. 采购发票号（字符型，50位，非必填）
-    @JSONField(name = "purc_invo_no")
-    private String purcInvoNo;
-
-    // 17. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 18. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "purc_retn_stoin_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purcRetnStoinTime;
-
-    // 19. 采购/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "purc_retn_opter_name")
-    private String purcRetnOpterName;
-
-    // 20. 商品赠送标志（字符型，3位，必填）
-    @JSONField(name = "prod_geay_flag")
-    private String prodGeayFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java
deleted file mode 100644
index 418d567b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3504】
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_purchase_return_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventoryPurchaseReturnRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String outResult;
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 供应商名称（字符型，200位，必填）
-    @JSONField(name = "spler_name")
-    private String splerName;
-
-    // 6. 供应商许可证号（字符型，50位，非必填）
-    @JSONField(name = "spler_pmtno")
-    private String splerPmtno;
-
-    // 7. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 8. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 9. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 10. 采购/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "purc_retn_cnt")
-    private BigDecimal purcRetnCnt;
-
-    // 11. 采购发票编码（字符型，50位，非必填）
-    @JSONField(name = "purc_invo_codg")
-    private String purcInvoCodg;
-
-    // 12. 采购发票号（字符型，50位，必填）
-    @JSONField(name = "purc_invo_no")
-    private String purcInvoNo;
-
-    // 13. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 14. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "purc_retn_stoin_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purcRetnStoinTime;
-
-    // 15. 采购/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "purc_retn_opter_name")
-    private String purcRetnOpterName;
-
-    // 16. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 20. 商品采购流水号（字符型，50位，非必填）
-    @JSONField(name = "medins_prod_purc_no")
-    private String medinsProdPurcNo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java
deleted file mode 100644
index f9506319..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3505】
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_sale_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventorySaleRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String outResult;
-
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 开方医师证件类型（字符型，6位，非必填）
-    @JSONField(name = "prsc_dr_cert_type")
-    private String prscDrCertType;
-
-    // 6. 开方医师证件号码（字符型，50位，非必填）
-    @JSONField(name = "prsc_dr_certno")
-    private String prscDrCertno;
-
-    // 7. 开方医师姓名（字符型，50位，必填）
-    @JSONField(name = "prsc_dr_name")
-    private String prscDrName;
-
-    // 8. 药师证件类型（字符型，6位，非必填）
-    @JSONField(name = "phar_cert_type")
-    private String pharCertType;
-
-    // 9. 药师证件号码（字符型，50位，非必填）
-    @JSONField(name = "phar_certno")
-    private String pharCertno;
-
-    // 10. 药师姓名（字符型，50位，必填）
-    @JSONField(name = "phar_name")
-    private String pharName;
-
-    // 11. 药师执业资格证号（字符型，50位，必填）
-    @JSONField(name = "phar_prac_cert_no")
-    private String pharPracCertNo;
-
-    // 12. 医保费用结算类型（字符型，6位，必填）
-    @JSONField(name = "hi_feesetl_type")
-    private String hiFeesetlType;
-
-    // 13. 结算ID（字符型，30位，非必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 14. 就医流水号（字符型，30位，必填）
-    @JSONField(name = "mdtrt_sn")
-    private String mdtrtSn;
-
-    // 15. 人员编号（字符型，30位，非必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 16. 人员证件类型（字符型，6位，必填）
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 17. 证件号码（字符型，50位，非必填）
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 18. 人员姓名（字符型，50位，非必填）
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 19. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 20. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 21. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 22. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 23. 拆零标志（字符型，3位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 24. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 25. 处方号（字符型，40位，非必填）
-    @JSONField(name = "rxno")
-    private String rxno;
-
-    // 26. 外购处方标志（字符型，3位，必填）
-    @JSONField(name = "rx_circ_flag")
-    private String rxCircFlag;
-
-    // 27. 零售单据号（字符型，40位，必填）
-    @JSONField(name = "rtal_docno")
-    private String rtalDocno;
-
-    // 29. 销售出库单据号（字符型，40位，非必填）
-    @JSONField(name = "stoout_no")
-    private String stooutNo;
-
-    // 30. 批次号（字符型，30位，非必填）
-    @JSONField(name = "bchno")
-    private String bchno;
-
-    // 32. 药品条形码（字符型，30位，非必填）
-    @JSONField(name = "drug_prod_barc")
-    private String drugProdBarc;
-
-    // 33. 货架位（字符型，20位，非必填）
-    @JSONField(name = "shelf_posi")
-    private String shelfPosi;
-
-    // 34. 销售/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "sel_retn_cnt")
-    private BigDecimal selRetnCnt;
-
-    // 35. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "sel_retn_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date selRetnTime;
-
-    // 36. 销售/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "sel_retn_opter_name")
-    private String selRetnOpterName;
-
-    // 37. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 38. 就诊结算类型（字符型，6位，非必填）
-    @JSONField(name = "mdtrt_setl_type")
-    private String mdtrtSetlType;
-
-    // 39. 溯源码节点信息（字符型，长度未明确，暂定500位）
-    @JSONField(name = "drugtracinfo")
-    private String drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java
deleted file mode 100644
index 48bc2403..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3506】
- *
- * @author SunJQ
- * @date 2025-04-30
- */
-@Data
-@Accessors(chain = true)
-@TableName("yb_inventory_sale_return_record")
-@EqualsAndHashCode(callSuper = false)
-public class InventorySaleReturnRecord {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    //入参
-    private String param;
-
-    //出参
-    private String outResult;
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 结算ID（字符型，30位，非必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 6. 人员编号（字符型，30位，非必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 7. 人员证件类型（字符型，6位，必填）
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 8. 证件号码（字符型，50位，非必填）
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 9. 人员姓名（字符型，50位，非必填）
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 10. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 13. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 14. 拆零标志（字符型，3位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 15. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 16. 销售/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "sel_retn_cnt")
-    private BigDecimal selRetnCnt;
-
-    // 17. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "sel_retn_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date selRetnTime;
-
-    // 18. 销售/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "sel_retn_opter_name")
-    private String selRetnOpterName;
-
-    // 19. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 20. 商品销售流水号（字符型，50位，非必填）
-    @JSONField(name = "medins_prod_sel_no")
-    private String medinsProdSelNo;
-
-    // 21. 就医流水号（字符型，30位，必填）
-    @JSONField(name = "mdtrt_sn")
-    private String mdtrtSn;
-
-    // 22. 溯源码节点信息（字符型，长度未明确，暂定500位）
-    @JSONField(name = "drugtracinfo")
-    private String drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java
deleted file mode 100644
index cb271ece..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.openhis.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 电子处方取药结果查询
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicationResultInquiry {
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 医保结算时间(yyyy-MM-dd HH:mm:ss) */
-    private String setlTime;
-
-    /** 医保处方状态编码(参考rx_stas_codg) */
-    private String rxStasCodg;
-
-    /** 医保处方状态名称 */
-    private String rxStasName;
-
-    /** 处方使用状态编号(参考rx_used_stas_codg) */
-    private String rxUsedStasCodg;
-
-    /** 处方使用状态名称 */
-    private String rxUsedStasName;
-
-    // 输出明细信息
-    private List<ElepMedresultDetail> seltdelts;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java
deleted file mode 100644
index c48d8fa9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 电子处方上传预核验
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PreCheckPrescription {
-
-    // 处方信息
-
-    /** 就诊凭证类型(01-电子凭证令牌、02-身份证号、03-社会保障卡号) */
-    private String mdtrtCertType;
-
-    /** 就诊凭证编号 */
-    private String mdtrtCertNo;
-
-    /** 卡识别码(就诊凭证类型为"03"时必填) */
-    private String cardSn;
-
-    /** 业务类型代码(01-定点医疗机构就诊，02-互联网医院问诊) */
-    private String bizTypeCode;
-
-    /** 处方附加属性代码(01-双通道处方，02-门诊统筹处方，99-其他) */
-    private String rxExraAttrCode;
-
-    /** 电子凭证令牌(使用医保电子凭证就诊时必填) */
-    private String ecToken;
-
-    /** 电子凭证线上身份核验流水号(线上场景互联网医院问诊时使用) */
-    private String authNo;
-
-    /** 参保地编号 */
-    private String insuPlcNo;
-
-    /** 就医地编号 */
-    private String mdtrtareaNo;
-
-    /** 定点医疗机构处方编号(院内内部处方号) */
-    private String hospRxno;
-
-    /** 续方的原处方编号 */
-    private String initRxno;
-
-    /** 处方类别代码(参考rx_type_code) */
-    private String rxTypeCode;
-
-    /** 开方时间(yyyy-MM-dd HH:mm:ss) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /** 药品类目数(剂数) */
-    private String rxDrugCnt;
-
-    /** 处方整剂用法编号 */
-    private String rxUsedWayCodg;
-
-    /** 处方整剂用法名称 */
-    private String rxUsedWayName;
-
-    /** 处方整剂频次编号(参考used_frequ) */
-    private String rxFrquCodg;
-
-    /** 处方整剂频次名称 */
-    /** 处方整剂频次名称 */
-    private String rxFrquName;
-
-    /** 处方整剂剂量单位 */
-    private String rxDosunt;
-
-    /** 处方整剂单次剂量数 */
-    private String rxDoscnt;
-
-    /** 处方整剂医嘱说明 */
-    private String rxDrordDscr;
-
-    /** 处方有效天数 */
-    private String valiDays;
-
-    /** 有效截止时间(开方时间+处方有效天数) */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date valiEndTime;
-
-    /** 复用(多次)使用标志(0-否、1-是) */
-    private String reptFlag;
-
-    /** 最大使用次数(预留字段) */
-    private String maxReptCnt;
-
-    /** 使用最小间隔(天数)(预留字段) */
-    private String minInvDays;
-
-    /** 续方标志(0-否、1-是) */
-    private String rxCotnFlag;
-
-    /** 长期处方标志(0-否、1-是) */
-    private String longRxFlag;
-
-    /** 医保处方编号(电子处方信息查询返回时插入记录) */
-    @JSONField(serialize=false)
-    private String hiRxno;
-
-    // 处方明细信息
-    private List<ElepVeriPrescriptionDetail> rxdrugdetail;
-
-    // 就诊信息
-    private ElepVeriVisitInfo mdtrtinfo;
-
-    // 诊断信息
-    private ElepVeriDiagnosisInfo diseinfo;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java
deleted file mode 100644
index 52432ad1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.openhis.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-/**
- * 电子处方上传预核验
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class QueryPrescription {
-
-    /** 医保处方编号 */
-    private String hiRxno;
-
-    /** 定点医疗机构编号 */
-    private String fixmedinsCode;
-
-    /** 定点医疗机构名称 */
-    private String fixmedinsName;
-
-    /** 医保处方状态编码 */
-    private String rxStasCodg;
-
-    /** 医保处方状态名称 */
-    private String rxStasName;
-
-    /** 医保处方使用状态编码 */
-    private String rxUsedStasCodg;
-
-    /** 医保处方使用状态名称 */
-    private String rxUsedStasName;
-
-    /** 开方时间 */
-    private String prscTime;
-
-    /** 药品总用量（剂数） */
-    private BigDecimal rxDrugCnt;
-
-    /** 处方整剂用法编码 */
-    private String rxUsedWayCodg;
-
-    /** 处方整剂用法名称 */
-    private String rxUsedWayName;
-
-    /** 处方整剂频次编号 */
-    private String rxFrquCodg;
-
-    /** 处方整剂频次名称 */
-    private String rxFrquName;
-
-    /** 处方整剂剂量单位 */
-    private String rxDosunt;
-
-    /** 处方整剂单次剂量数 */
-    private BigDecimal rxDoscnt;
-
-    /** 处方整剂医嘱说明 */
-    private String rxDrordDscr;
-
-    /** 处方有效天数 */
-    private BigDecimal valiDays;
-
-    /** 有效截止时间 */
-    private String valiEndTime;
-
-    /** 复用（多次）使用标志，0-否、1-是 */
-    private String reptFlag;
-
-    /** 最大复用次数 */
-    private BigDecimal maxReptCnt;
-
-    /** 已复用次数 */
-    private BigDecimal reptdCnt;
-
-    /** 使用最小间隔（天数） */
-    private BigDecimal minInrvDays;
-
-    /** 处方类别编码 */
-    private String rxTypeCode;
-
-    /** 处方类别名称 */
-    private String rxTypeName;
-
-    /** 长期处方标志，0-否、1-是 */
-    private String longRxFlag;
-
-    /** 业务类型代码 */
-    private String bizTypeCode;
-
-    /** 业务类型名称 */
-    private String bizTypeName;
-
-    /** 处方附加属性代码 */
-    private String rxExraAttrCode;
-
-    /** 处方附加属性名称 */
-    private String rxExraAttrName;
-
-    /** 处方循环限制标志 */
-    private String rxCircLimitFlag;
-
-    // 处方明细信息
-    private List<ElepQuerPrescriptionDetail> rxDetlList;
-
-    // 就诊信息
-    private ElepQuerVisitInfo rxOtpinfo;
-
-    // 诊断信息
-    private List<ElepQuerDiagnosisInfo> rxDiseList;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java
deleted file mode 100644
index 3f3e888c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.openhis.domain;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-
-/**
- *【9001】【9002】签到 签退
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@TableName("yb_pub_sign")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Sign extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private Long id;
-	/**操作员编号*/
-    @JSONField(name="opter_no")
-    private String opterNo;
-	/**签到编号*/
-    @JSONField(name="sign_no")
-    private String signNo;
-	/**签到时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JSONField(serialize=false)
-    private java.util.Date signTime;
-	/**签退时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JSONField(serialize=false)
-    private java.util.Date signOutTime;
-	/**状态，0-新建，1-签到，2-签退*/
-    @JSONField(serialize=false)
-    private String status;
-    /** 签到MAC地址 */
-    @JSONField(name="mac")
-    @TableField(exist = false)
-    private String mac;
-    /** 签到IP地址 */
-    @JSONField(name="ip")
-    @TableField(exist = false)
-    private String ip;
-//	/**创建人*/
-//    private String createBy;
-//	/**创建日期*/
-//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    private java.util.Date createTime;
-//	/**更新人*/
-//    private String updateBy;
-//	/**更新日期*/
-//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    private java.util.Date updateTime;
-//	/**所属部门*/
-//    private String sysOrgCode;
-//	/**租户ID*/
-//    private String tenantId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java
deleted file mode 100644
index f265e388..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.openhis.enums;
-
-/**
- * 接口地址
- */
-public enum ElepServiceAdrEnum {
-
-    /** 电子处方上传预核验 */
-    A0001("A0001", "/fixmedins/uploadChk", "【A0001】电子处方上传预核验"),
-    /** 电子处方医保电子签名*/
-    A0002("A0002", "/fixmedins/rxFixmedinsSign", "【A0002】电子处方医保电子签名"),
-    /** 电子处方上传 */
-    A0003("A0003", "/fixmedins/rxFileUpld", "【A0003】电子处方上传"),
-    /** 电子处方撤销 */
-    A0004("A0004", "/fixmedins/rxUndo", "【A0004】电子处方撤销"),
-    /** 电子处方信息查询 */
-    A0005("A0005", "/fixmedins/hospRxDetlQuery", "【A0005】电子处方信息查询"),
-    /** 电子处方取药结果查询 */
-    A0006("A0006", "/fixmedins/rxSetlInfoQuery", "【A0006】电子处方取药结果查询");
-
-
-    /** 接口编号 */
-    private final String num;
-    /** 接口地址 */
-    private final String address;
-    /** 接口描述 */
-    private final String description;
-
-    ElepServiceAdrEnum(String num, String address, String description) {
-        this.num = num;
-        this.address = address;
-        this.description = description;
-    }
-
-    public String getNum() {
-        return num;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
deleted file mode 100644
index 94dad6f2..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.openhis.enums;
-
-/**
- * 接口地址
- */
-public enum ServiceAdrEnum {
-
-    /** 前置接口 */
-    TOKEN("token", "/auth/oauth/token", "获取token"),
-    P9001("9001", "/mbs/fmi/fsi/api/callFsiService/callService", "【9001】签到"),
-    P9002("9002", "/mbs/fmi/fsi/api/callFsiService/callService", "【9002】签退"),
-    P1101("1101", "/mbs/fmi/fsi/api/callFsiService/callService", "【1101】人员信息获取"),
-    P1201("1201", "/mbs/fmi/fsi/api/callFsiService/callService", "【1201】医药机构信息获取"),
-    P3301("3301", "/mbs/fmi/fsi/api/callFsiService/callService", "【3301】目录对照上传"),
-    P3302("3302", "/mbs/fmi/fsi/api/callFsiService/callService", "【3302】目录对照撤销"),
-    /** 目录下载接口 */
-    D1301("1301","/mbs/fmi/fsi/api/callFsiService/callService","【1301】西药中成药目录下载"),
-    D1302("1302","/mbs/fmi/fsi/api/callFsiService/callService","【1302】中药饮片目录下载"),
-    D1303("1303","/mbs/fmi/fsi/api/callFsiService/callService","【1303】医疗机构制剂目录下载"),
-    D1304("1304","/mbs/fmi/fsi/api/callFsiService/callService","【1304】民族药品目录查询"),
-    D1305("1305","/mbs/fmi/fsi/api/callFsiService/callService","【1305】医疗服务项目目录下载"),
-    D1306("1306","/mbs/fmi/fsi/api/callFsiService/callService","【1306】医用耗材目录下载"),
-    D1307("1307","/mbs/fmi/fsi/api/callFsiService/callService","【1307】疾病与诊断目录下载"),
-    D1308("1308","/mbs/fmi/fsi/api/callFsiService/callService","【1308】手术操作目录下载"),
-    D1309("1309","/mbs/fmi/fsi/api/callFsiService/callService","【1309】门诊慢特病种目录下载"),
-    D1310("1310","/mbs/fmi/fsi/api/callFsiService/callService","【1310】按病种付费病种目录下载"),
-    D1311("1311","/mbs/fmi/fsi/api/callFsiService/callService","【1311】日间手术治疗病种目录下载"),
-    D1312("1312","/mbs/fmi/fsi/api/callFsiService/callService","【1312】医保目录信息查询"),
-    D1313("1313","/mbs/fmi/fsi/api/callFsiService/callService","【1313】肿瘤形态学目录下载"),
-    D1314("1314","/mbs/fmi/fsi/api/callFsiService/callService","【1314】中医疾病目录下载"),
-    D1315("1315","/mbs/fmi/fsi/api/callFsiService/callService","【1315】中医证候目录下载"),
-    D1316("1316","/mbs/fmi/fsi/api/callFsiService/callService","【1316】医疗目录与医保目录匹配信息查询"),
-    D1317("1317","/mbs/fmi/fsi/api/callFsiService/callService","【1317】医药机构目录匹配信息查询"),
-    D1318("1318","/mbs/fmi/fsi/api/callFsiService/callService","【1318】医保目录限价信息查询"),
-    D1319("1319","/mbs/fmi/fsi/api/callFsiService/callService","【1319】医保目录先自付比例信息查询"),
-    D1320("1320","/mbs/fmi/fsi/api/callFsiService/callService","【1320】中药配方颗粒目录下载"),
-    D1321("1321","/mbs/fmi/fsi/api/callFsiService/callService","【1321】医疗服务项目（新）目录下载"),
-    /** 人员备案接口 */
-    F2501("2501", "/mbs/fmi/fsi/api/callFsiService/callService", "【2501】转院备案"),
-    F2502("2502", "/mbs/fmi/fsi/api/callFsiService/callService", "【2502】转院备案撤销"),
-    F2503("2503", "/mbs/fmi/fsi/api/callFsiService/callService", "【2503】人员慢特病备案"),
-    F2504("2504", "/mbs/fmi/fsi/api/callFsiService/callService", "【2504】人员慢特病备案撤销"),
-    F2505("2505", "/mbs/fmi/fsi/api/callFsiService/callService", "【2505】人员定点备案"),
-    F2506("2506", "/mbs/fmi/fsi/api/callFsiService/callService", "【2506】人员定点备案撤销"),
-    /** 药店接口 */
-    D2101("2101", "/mbs/fmi/fsi/api/callFsiService/callService", "【2101】药店预结算"),
-    D2102("2102", "/mbs/fmi/fsi/api/callFsiService/callService", "【2102】药店结算"),
-    D2103("2103", "/mbs/fmi/fsi/api/callFsiService/callService", "【2103】药店结算撤销"),
-    /** 门诊接口 */
-    C2201("2201", "/mbs/fmi/fsi/api/callFsiService/callService", "【2201】门诊挂号"),
-    C2202("2202", "/mbs/fmi/fsi/api/callFsiService/callService", "【2202】门诊挂号撤销"),
-    C2203("2203", "/mbs/fmi/fsi/api/callFsiService/callService", "【2203】门诊就诊信息上传"),
-    C2203A("2203A", "/mbs/fmi/fsi/api/callFsiService/callService", "【2203A】门诊就诊信息上传"),
-    C2204("2204", "/mbs/fmi/fsi/api/callFsiService/callService", "【2204】门诊费用明细上传"),
-    C2205("2205", "/mbs/fmi/fsi/api/callFsiService/callService", "【2205】门诊费用明细撤销"),
-    C2206("2206", "/mbs/fmi/fsi/api/callFsiService/callService", "【2206】门诊预结算"),
-    C2207("2207", "/mbs/fmi/fsi/api/callFsiService/callService", "【2207】门诊结算"),
-    C2208("2208", "/mbs/fmi/fsi/api/callFsiService/callService", "【2208】门诊费用撤销"),
-    /** 住院接口 */
-    H2401("2401", "/mbs/fmi/fsi/api/callFsiService/callService", "【2401】入院办理"),
-    H2402("2402", "/mbs/fmi/fsi/api/callFsiService/callService", "【2402】出院办理"),
-    H2403("2403", "/mbs/fmi/fsi/api/callFsiService/callService", "【2403】住院信息变更"),
-    H2405("2405", "/mbs/fmi/fsi/api/callFsiService/callService", "【2405】出院撤销"),
-    H2301("2301", "/mbs/fmi/fsi/api/callFsiService/callService", "【2301】住院费用明细上传"),
-    H2302("2302", "/mbs/fmi/fsi/api/callFsiService/callService", "【2302】住院费用明细撤销"),
-    H2303("2303", "/mbs/fmi/fsi/api/callFsiService/callService", "【2303】住院预结算"),
-    H2304("2304", "/mbs/fmi/fsi/api/callFsiService/callService", "【2304】住院结算"),
-    H2305("2305", "/mbs/fmi/fsi/api/callFsiService/callService", "【2305】住院结算撤销"),
-    H2404("2404", "/mbs/fmi/fsi/api/callFsiService/callService", "【2404】入院撤销"),
-    /** 智能审核事前提醒 */
-    A3101("3101", "/mbs/fmi/fsi/api/callFsiService/callService", "【3101】明细审核事前事中分析服务"),
-    A3103("3103", "/mbs/fmi/fsi/api/callFsiService/callService", "【3103】事前事中服务反馈服务"),
-    /** 医药机构费用结算业务 */
-    R3201("3201", "/mbs/fmi/fsi/api/callFsiService/callService", "【3201】医药机构费用结算对总账"),
-    R3202("3202", "/mbs/fmi/fsi/api/callFsiService/callService", "【3202】医药机构费用结算对明细账"),
-    R3203("3203", "/mbs/fmi/fsi/api/callFsiService/callService", "【3203】清算申请"),
-    R3203A("3203A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3203A】清算申请(吉林省)"),
-    R3204("3204", "/mbs/fmi/fsi/api/callFsiService/callService", "【3204】清算申请撤销"),
-    R3204A("3204A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3204A】清算申请撤销(吉林省)"),
-    R3205A("3205A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3205A】清算申请状态查询（吉林省）"),
-    R3206A("3206A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3206A】清算机构查询(吉林省)"),
-    R3209A("3206A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3209A】查询跨省三方对账未成功数据(吉林省)"),
-    R13203("13203", "/mbs/fmi/fsi/api/callFsiService/callService", "【13203】医药机构费用结算日对账结果查询"),
-    /** 进销存业务 */
-    I3501("3501", "/mbs/fmi/fsi/api/callFsiService/callService", "【3501】商品盘存上传"),
-    I3502("3502", "/mbs/fmi/fsi/api/callFsiService/callService", "【3502】商品库存变更"),
-    I3503("3503", "/mbs/fmi/fsi/api/callFsiService/callService", "【3503】商品采购"),
-    I3504("3504", "/mbs/fmi/fsi/api/callFsiService/callService", "【3504】商品采购退货"),
-    I3505("3505", "/mbs/fmi/fsi/api/callFsiService/callService", "【3505】商品销售"),
-    I3506("3506", "/mbs/fmi/fsi/api/callFsiService/callService", "【3506】商品销售退货"),
-    I3507("3507", "/mbs/fmi/fsi/api/callFsiService/callService", "【3507】商品信息删除"),
-    /** 医保服务查询业务 */
-    G5301("5301", "/mbs/fmi/fsi/api/callFsiService/callService", "【5301】人员慢特病备案查询"),
-    /** 文件上传下载 */
-    U9101("9101", "/mbs/fmi/fsi/api/callFsiService/callService", "【9101】文件上传"),
-    U9102("9102", "/mbs/fmi/fsi/api/callFsiService/callService", "【9102】文件下载");
-    /** 接口编号 */
-    private final String num;
-    /** 接口地址 */
-    private final String address;
-    /** 接口描述 */
-    private final String description;
-
-    ServiceAdrEnum(String num, String address, String description) {
-        this.num = num;
-        this.address = address;
-        this.description = description;
-    }
-
-    public String getNum() {
-        return num;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public static ServiceAdrEnum getEnum(String num){
-        for (ServiceAdrEnum serviceAdrEnum : ServiceAdrEnum.values()) {
-            if (serviceAdrEnum.getNum().equals(num)){
-                return serviceAdrEnum;
-            }
-        }
-        return null;
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java
deleted file mode 100644
index b9d05849..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.openhis.listener;
-
-import java.util.Map;
-
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.context.ElepHandlerServiceContext;
-import com.openhis.service.IElepHandlerService;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.context.HandlerServiceContext;
-import com.openhis.service.HandlerService;
-
-/**
- * 监听@ElepHandlerInt注解下的类
- */
-@Component
-public class ElepHandlerServiceListener implements ApplicationListener<ContextRefreshedEvent> {
-
-	/**
-	 * 将实例放到容器
-	 * @param event
-	 */
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-		Map<String, Object> beans = event.getApplicationContext().getBeansWithAnnotation(ElepHandlerInt.class);
-		ElepHandlerServiceContext handlerServiceContext = event.getApplicationContext().getBean(ElepHandlerServiceContext.class);
-		beans.forEach((name, bean) -> {
-			ElepHandlerInt typeHandler = bean.getClass().getAnnotation(ElepHandlerInt.class);
-			handlerServiceContext.putElepHandlerService(typeHandler.value().toString(), (IElepHandlerService) bean);
-		});
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java
deleted file mode 100644
index 4f8f0dac..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.openhis.listener;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.context.HandlerServiceContext;
-import com.openhis.service.HandlerService;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * 监听@HandlerInt注解下的类
- */
-@Component
-public class HandlerServiceListener implements ApplicationListener<ContextRefreshedEvent> {
-
-	/**
-	 * 将实例放到容器
-	 * @param event
-	 */
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-		Map<String, Object> beans = event.getApplicationContext().getBeansWithAnnotation(HandlerInt.class);
-		HandlerServiceContext handlerServiceContext = event.getApplicationContext().getBean(HandlerServiceContext.class);
-		beans.forEach((name, bean) -> {
-			HandlerInt typeHandler = bean.getClass().getAnnotation(HandlerInt.class);
-			handlerServiceContext.putHandlerService(typeHandler.value().toString(), (HandlerService) bean);
-		});
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
deleted file mode 100644
index db3fef33..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.openhis.pojo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.openhis.constant.InputDataTypeConst;
-
-import lombok.Data;
-
-/**
- * 医保入参
- */
-@Data
-public class InputData<T, H> {
-
-    @JSONField(serialize = false)
-    private String insuplcAdmdvs;
-    @JSONField(name = InputDataTypeConst.DATA)
-    private T data;
-    @JSONField(name = InputDataTypeConst.FEE_DETAIL)
-    private T feeDetail;
-    @JSONField(name = InputDataTypeConst.SIGN_IN)
-    private T signIn;
-    @JSONField(name = InputDataTypeConst.SIGN_OUT)
-    private T signOut;
-    @JSONField(name = InputDataTypeConst.MD_TRT_INFO)
-    private T mdTrtInfo;
-    @JSONField(name = InputDataTypeConst.DI_SE_INFO)
-    private H diSeInfo;
-    @JSONField(name = InputDataTypeConst.DRUG_INFO)
-    private T druginfo;
-    @JSONField(name = InputDataTypeConst.DRUG_DETAIL)
-    private H drugdetail;
-    @JSONField(name = InputDataTypeConst.DSCG_INFO)
-    private T dscginfo;
-    @JSONField(name = InputDataTypeConst.PURC_INFO)
-    private T purcinfo;
-    @JSONField(name = InputDataTypeConst.INV_INFO)
-    private T invinfo;
-    @JSONField(name = InputDataTypeConst.SEL_INFO)
-    private T selinfo;
-    @JSONField(name = InputDataTypeConst.ADM_INFO)
-    private T adminfo;
-
-    public InputData(T param, String insuplcAdmdvs, String flag) {
-        this.insuplcAdmdvs = insuplcAdmdvs == null ? "" : insuplcAdmdvs;
-        if (InputDataTypeConst.DATA.equals(flag)) {
-            this.data = param;
-        } else if (InputDataTypeConst.FEE_DETAIL.equals(flag)) {
-            this.feeDetail = param;
-        } else if (InputDataTypeConst.SIGN_IN.equals(flag)) {
-            this.signIn = param;
-        } else if (InputDataTypeConst.SIGN_OUT.equals(flag)) {
-            this.signOut = param;
-        } else if (InputDataTypeConst.PURC_INFO.equals(flag)) {
-            this.purcinfo = param;
-        } else if (InputDataTypeConst.INV_INFO.equals(flag)) {
-            this.invinfo = param;
-        } else if (InputDataTypeConst.SEL_INFO.equals(flag)) {
-            this.selinfo = param;
-        }
-    }
-
-    public InputData(T param1, H param2, String insuplcAdmdvs, String flag) {
-        this.insuplcAdmdvs = insuplcAdmdvs == null ? "" : insuplcAdmdvs;
-        if (InputDataTypeConst.MD_TRT_INFO.equals(flag)) {
-            this.mdTrtInfo = param1;
-            this.diSeInfo = param2;
-        } else if (InputDataTypeConst.DRUG_INFO.equals(flag)) {
-            this.druginfo = param1;
-            this.drugdetail = param2;
-        } else if (InputDataTypeConst.DSCG_INFO.equals(flag)) {
-            this.dscginfo = param1;
-            this.diSeInfo = param2;
-        } else if (InputDataTypeConst.ADM_INFO.equals(flag)) {
-            this.adminfo = param1;
-            this.diSeInfo = param2;
-        }
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
deleted file mode 100644
index a9bc4f50..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-/**
- * PDF模板替换内容实体类
- *
- * @author liuhr
- * @date 2025/4/30
- */
-@Data
-@Accessors(chain = true)
-public class PDFInputDto {
-
-    /** 医保电子处方追溯码 */
-    private String rxTraceCode;
-
-    /** 机构名 */
-    private String orgName;
-
-    /** 门诊/住院病历号 */
-    private String iptOtpNo;
-
-    /** 院内处方编号 */
-    private String prescriptionNo;
-
-    /** 科别/病区和床位 */
-    private String locationName;
-
-    /** 姓名 */
-    private String patnName;
-
-    /** 性别 */
-    private String gender;
-
-    /** 年龄 */
-    private BigDecimal patnAge;
-
-    /** 费别 */
-    private String hiFeesetlType;
-
-    /** 开具日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /** 临床诊断 */
-    private String diagName;
-
-    /** 处方有效天数 */
-    private BigDecimal valiDays;
-
-    /** 开方医师 */
-    private String prscDrName;
-
-    /** 审核药师 */
-    private String pharName;
-
-    /** 调配、复核药师 */
-    private String disRevPharName;
-
-    /** 核对、发药药师 */
-    private String checkPharName;
-
-    /** 延长处方用量原因 */
-    private String reason;
-
-    /** 药品信息列表 */
-    private List<MedDetail> medDetailList;
-
-    /**
-     * 药品明细信息
-     */
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor  // 关键注解
-    public static class MedDetail {
-
-        /** 药品名字 */
-        private String medName;
-
-        /** 药品规格 */
-        private String drugSpec;
-
-        /** 单次用量 */
-        private String sinDoscnt;
-
-        /** 单次剂量单位 */
-        private String sinDosunt;
-
-        /** 使用频次编码 */
-        private String usedFrquCodg;
-
-        /** 用药途径 */
-        private String medWay;
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java
deleted file mode 100644
index 5c33e7de..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.openhis.pojo;
-
-import lombok.Data;
-
-/**
- * 医保入参
- */
-@Data
-public class RequestData<T> {
-
-    private T data;
-    public RequestData(T param) {
-            this.data = param;
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java
deleted file mode 100644
index 237b1ec9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.openhis.pojo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import lombok.Data;
-
-/**
- * 医保结果
- */
-@Data
-public class ResultBody {
-
-    /** 交易状态码 */
-    @JSONField(name="infcode")
-    private String infcode;
-    /** 发送方报文ID */
-    @JSONField(name="warnMsg")
-    private String warn_msg;
-    /** 数字签名信息 */
-    @JSONField(name="cainfo")
-    private String cainfo;
-    /** 错误信息 */
-    @JSONField(name="err_msg")
-    private String errMsg;
-    /** 接收报文时间 */
-    @JSONField(name="refmsg_time")
-    private String refmsgTime;
-    /** 签名类型 */
-    @JSONField(name="signtype")
-    private String signtype;
-    /** 响应报文时间 */
-    @JSONField(name="respond_time")
-    private String respondTime;
-    /** 接收方报文ID */
-    @JSONField(name="inf_refmsgid")
-    private String infRefmsgid;
-    /** 交易输出 */
-    @JSONField(name="output")
-    private String output;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java
deleted file mode 100644
index 6cc24e1c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.openhis.pojo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * 接口交易报文实体
- * @param <T>
- */
-@Data
-@Builder
-public class TransBody<T> {
-
-    /** 交易编号 */
-    @JSONField(name="infno")
-    private String infno;
-    /** 发送方报文ID */
-    @JSONField(name="msgid")
-    private String msgid;
-    /** 就医地医保区划 */
-    @JSONField(name="mdtrtarea_admvs")
-    private String mdtrtareaAdmvs;
-    /** 参保地医保区划 */
-    @JSONField(name="insuplc_admdvs")
-    private String insuplcAdmdvs;
-    /** 接收方系统代码 */
-    @JSONField(name="recer_sys_code")
-    private String recerSysCode;
-    /** 设备编号 */
-    @JSONField(name="dev_no")
-    private String devNo;
-    /** 设备安全信息 */
-    @JSONField(name="dev_safe_info")
-    private String devSafeInfo;
-    /** 数字签名信息 */
-    @JSONField(name="cainfo")
-    private String cainfo;
-    /** 签名类型 */
-    @JSONField(name="signtype")
-    private String signtype;
-    /** 接口版本号 */
-    @JSONField(name="infver")
-    private String infver;
-    /** 经办人类别 */
-    @JSONField(name="opter_type")
-    private String opterType;
-    /** 经办人 */
-    @JSONField(name="opter")
-    private String opter;
-    /** 经办人姓名 */
-    @JSONField(name="opter_name")
-    private String opterName;
-    /** 交易时间 */
-    @JSONField(name="inf_time")
-    private String infTime;
-    /** 定点医药机构编号 */
-    @JSONField(name="fixmedins_code")
-    private String fixmedinsCode;
-    /** 定点医药机构名称 */
-    @JSONField(name="fixmedins_name")
-    private String fixmedinsName;
-    /** 交易签到流水号 */
-    @JSONField(name="sign_no")
-    private String signNo;
-    @JSONField(name="enc_type")
-    private String encType;
-    /** 交易输入 */
-    @JSONField(name="input")
-    private T input;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
deleted file mode 100644
index 768533a3..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.config.InterfaceConfig;
-import com.openhis.utils.RedisUtil;
-import com.openhis.vo.FileDownload;
-import com.openhis.vo.FileResult;
-import com.openhis.vo.Result;
-import org.apache.commons.compress.utils.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-/**
- * 文件服务
- *
- * @author SunJQ
- * @date 2025-05-04
- */
-@Service
-public class FileService {
-
-    @Autowired
-    private InterfaceConfig interfaceConfig;
-    @Autowired
-    private RedisUtil redisUtil;
-
-
-    private static final String url = "http://ddjk.jlhs.gov.cn:20215/mbs/fsi/api/fileupload";
-
-    /**
-     * 调用普通交易及文件下载交易
-     */
-    public Result<?> downloadFile(FileResult fileResult) {
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpPost httppost = new HttpPost(url);
-        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).build();
-        httppost.setConfig(requestConfig);
-        FileDownload fileDownload = new FileDownload();
-        fileDownload.setFilename(fileResult.getFilename()).setFileQuryNo(fileResult.getFileQuryNo()).setFixmedinsCode(fileResult.getFixmedinsCode());
-        ByteArrayEntity entity = new ByteArrayEntity(JSON.toJSONString(fileDownload).getBytes(StandardCharsets.UTF_8));
-        entity.setContentType("text/plain");
-        httppost.setEntity(entity);
-        CloseableHttpResponse response = null;
-        try {
-            response = httpclient.execute(httppost);
-            int statusCode = response.getStatusLine().getStatusCode();
-            if (statusCode != HttpStatus.SC_OK) {
-                httppost.abort();
-                throw new RuntimeException("HttpClient,error status code :" + statusCode);
-            }
-            HttpEntity responseEntity = response.getEntity();
-            String result;
-            if (responseEntity != null) {
-                if (responseEntity.getContentType().getValue().contains("application/octet-stream")) {
-                    //拼接文件路径
-                    String filePath = interfaceConfig.getFilePath();
-                    long time = new Date().getTime();
-
-                    InputStream content = responseEntity.getContent();
-                    //返回文件流
-                    File file = new File(filePath+"\\\\"+time+".txt");
-                    FileOutputStream fileOutputStream = new FileOutputStream(file);
-                    int temp;
-                    while ((temp = content.read()) != -1) {
-                        fileOutputStream.write(temp);
-                    }
-                    fileOutputStream.close();
-                    return Result.okMsg("文件下载成功"+filePath+"\\\\"+time+".txt");
-                } else {
-                    //返回字符串
-                    result = EntityUtils.toString(responseEntity, "UTF-8");
-                    System.out.println(result);
-                }
-            }
-            EntityUtils.consume(entity);
-        } catch (ClientProtocolException e) {
-            throw new RuntimeException("提交给服务器的请求，不符合HTTP协议", e);
-        } catch (IOException e) {
-            throw new RuntimeException("向服务器承保接口发起http请求,执行post请求异常", e);
-        } finally {
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (httpclient != null) {
-                try {
-                    httpclient.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.error("下载失败");
-    }
-
-
-    /**
-     * 调用文件上传交易
-     */
-    public Result uploadFile(MultipartFile file, String text, String fixmedinsCode, String admvs, String userId) {
-        HttpEntity responseEntity = null;
-        try {
-            CloseableHttpClient httpclient = HttpClients.createDefault();
-            HttpPost httppost = new HttpPost(url);
-            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(10000)
-                    .setSocketTimeout(10000)
-                    .build();
-            httppost.setConfig(requestConfig);
-
-            // 设置认证头
-            httppost.setHeader("Authorization", String.valueOf(
-                    redisUtil.get("USER_TOKEN:USER_TOKEN_" + admvs + ":" + userId)
-            ));
-
-            // 创建JSON请求体 - 这是关键改变！
-            JSONObject requestBody = new JSONObject();
-            requestBody.put("fixmedins_code", fixmedinsCode);
-            requestBody.put("filename", file.getOriginalFilename());
-            requestBody.put("file", Base64.getEncoder().encodeToString(file.getBytes()));
-
-            // 设置JSON请求体
-            StringEntity entity = new StringEntity(
-                    requestBody.toJSONString(),
-                    ContentType.APPLICATION_JSON
-            );
-            httppost.setEntity(entity);
-
-            System.out.println("Sending JSON: " + requestBody.toJSONString());
-
-            try (CloseableHttpResponse response = httpclient.execute(httppost)) {
-                int statusCode = response.getStatusLine().getStatusCode();
-                if (statusCode != HttpStatus.SC_OK) {
-                    throw new RuntimeException("HTTP error, status code: " + statusCode);
-                }
-
-                responseEntity = response.getEntity();
-                if (responseEntity != null) {
-                    String result = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8);
-                    System.out.println("Response: " + result);
-                    return Result.ok(result);
-                    // 处理返回结果...
-                }
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Request failed: " + e.getMessage(), e);
-        }
-        return Result.ok(responseEntity);
-    }
-
-    public FileResult uploadFile(InputStream fileStream,
-                                 String filename,
-                                 String fixmedinsCode) throws IOException{
-//        // 1. 预处理校验（与之前方案一致）
-//        validateZipFile(fileData);
-//        List<String> txtLines = extractTxtContent(fileData);
-//        validateTxtFormat(txtLines);
-
-        // 2. 构建请求（关键修改点）
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(url);
-
-        // 构建multipart请求体（参考医保局示例）
-        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-        builder.setCharset(StandardCharsets.UTF_8);
-
-        // 添加JSON参数（根据实际接口要求调整）
-        builder.addTextBody("jsonStr", buildJsonRequest(filename, fixmedinsCode));
-
-        // 添加文件参数（注意参数名需与接口文档一致）
-        builder.addBinaryBody(
-                "in",  // 对应接口参数代码"in"
-                IOUtils.toByteArray(fileStream),
-                ContentType.APPLICATION_OCTET_STREAM,
-                filename
-        );
-
-        HttpEntity entity = builder.build();
-        httpPost.setEntity(entity);
-
-        // 3. 执行请求（关键修改点）
-        try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
-            int statusCode = response.getStatusLine().getStatusCode();
-            if (statusCode != HttpStatus.SC_OK) {
-                throw new RuntimeException("医保接口调用失败，状态码：" + statusCode);
-            }
-
-            // 解析响应（参考医保局示例）
-            HttpEntity responseEntity = response.getEntity();
-            String responseBody = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8);
-            return parseMedicareResponse(responseBody);
-        }
-    }
-
-    private String buildJsonRequest(String filename, String fixmedinsCode) {
-        // 根据实际接口要求构建JSON请求体
-        return String.format(
-                "{" +
-                        "\"filename\":\"%s\"," +
-                        "\"fixmedins_code\":\"%s\"" +
-                        "}",
-                filename,
-                fixmedinsCode
-        );
-    }
-
-    private FileResult parseMedicareResponse(String jsonResponse) {
-        // 解析医保局返回的JSON响应（根据实际响应结构调整）
-        // 示例解析逻辑，需替换为实际解析代码
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            return mapper.readValue(jsonResponse, FileResult.class);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException("响应解析失败", e);
-        }
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java
deleted file mode 100644
index 8296da02..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.openhis.service;
-
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.vo.BaseParam;
-
-import java.util.Map;
-/**
- *
- */
-public interface HandlerService {
-
-	/**
-	 * 发送数据
-	 * @param inputData
-	 * @return
-	 */
-	ResultBody handle(InputData inputData, BaseParam baseParam);
-
-	/**
-	 * 初始化接口报文
-	 * @param intNum
-	 * @param inputData
-	 * @return
-	 */
-	String initTransBody(String intNum,InputData inputData,BaseParam baseParam);
-
-	/**
-	 * 发送数据
-	 * @return
-	 */
-	Map<String,String> getHeader(BaseParam baseParam);
-
-	/**
-	 * 发送数据
-	 * @param url
-	 * @param transBody
-	 * @return
-	 */
-	ResultBody sendDatas(String url, String transBody,BaseParam baseParam);
-
-	/**
-	 * 获取token
-	 * @return
-	 */
-	String getToken(BaseParam baseParam);
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java
deleted file mode 100644
index afd96ca3..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.openhis.service;
-
-import java.util.Map;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.openhis.domain.BaseResponse;
-import com.openhis.pojo.RequestData;
-import com.openhis.vo.BaseParam;
-
-/**
- *
- */
-public interface IElepHandlerService {
-
-	/**
-	 * 发送数据
-	 * @param requestData 请求数据
-	 * @return 请求数据
-	 */
-	BaseResponse elepHandle(RequestData requestData, BaseParam baseParam);
-
-	/**
-	 * 初始化接口报文
-	 * @param intNum 类型
-	 * @param requestData 请求数据
-	 * @return
-	 */
-	JSONObject initTransBody(String intNum, RequestData requestData, BaseParam baseParam);
-
-
-	/**
-	 * 发送数据
-	 * @param url url
-	 * @param request 请求数据
-	 * @return
-	 */
-	BaseResponse sendDatas(String url, JSONObject request,BaseParam baseParam);
-
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java
deleted file mode 100644
index 8a0aa3b7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.openhis.domain.*;
-import com.openhis.vo.BaseParam;
-import com.openhis.vo.Result;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- *
- * @author yuxj
- * @date 2025-04-17
- */
-public interface IYbElepService {
-
-    /**
-     * 电子处方上传预核验
-     *
-     * @param baseParam 处方信息
-     * @return
-     */
-    Result<?> preCheckPrescription(BaseParam baseParam);
-
-    /**
-     * 电子处方医保电子签名
-     *
-     * @param baseParam 电子签名信息
-     * @return
-     */
-    Result<?> signature(BaseParam baseParam);
-
-    /**
-     * 电子处方上传
-     *
-     * @param baseParam 上传信息
-     * @return
-     */
-    Result<?> upload(BaseParam baseParam);
-
-    /**
-     * 电子处方撤销
-     *
-     * @param baseParam 撤销信息
-     * @return
-     */
-    Result<?> revoke(BaseParam baseParam);
-
-    /**
-     * 电子处方信息查询
-     *
-     * @param baseParam 查询信息
-     * @return
-     */
-    Result<?> querPrescription(BaseParam baseParam);
-
-    /**
-     * 电子处方取药结果查询
-     *
-     * @param baseParam 撤销信息
-     * @return
-     */
-    Result<?> medresult(BaseParam baseParam);
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
deleted file mode 100644
index 168e47c8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.openhis.vo.*;
-
-/**
- * TODO:医保同一服务层
- *
- * @author SunJQ
- * @date 2025-03-19
- */
-public interface YbService {
-
-    /**
-     * 签到
-     *
-     * @param sign
-     * @param request
-     * @return
-     */
-    Result<?> signIn(BaseParam sign, HttpServletRequest request);
-
-    /**
-     * 签到
-     *
-     * @param sign
-     * @return
-     */
-    Result<?> signOut(BaseParam sign);
-
-    /**
-     * 读卡获取身份信息
-     *
-     * @param baseParam
-     * @return
-     */
-    Result<?> getPerInfo(BaseParam baseParam);
-
-    /**
-     * 挂号
-     *
-     * @param baseParam
-     * @return
-     */
-    Result<?> reg(BaseParam baseParam);
-
-    /**
-     * 退号
-     *
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelReg(BaseParam baseParam);
-
-    /**
-     * 门诊就诊信息上传
-     *
-     * @param
-     * @return
-     */
-    Result<?> saveMedical(BaseParam baseParam);
-
-    /**
-     * 门诊费用明细上传
-     *
-     * @param baseParam
-     * @return
-     */
-    Result<?> upFeeDetail(BaseParam baseParam);
-
-    /**
-     * 门诊费预结算
-     *
-     * @param baseParam
-     * @return
-     */
-    Result<?> preSetl(BaseParam baseParam);
-
-    /**
-     * 门诊费用明细撤销
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelFeeDetail(BaseParam baseParam);
-
-    /**
-     * 门诊费用结算
-     *
-     * @param
-     * @return
-     */
-    Result<?> setl(BaseParam baseParam);
-
-    /**
-     * 门诊费用撤销
-     *
-     * @param
-     * @return
-     */
-    Result<?> cancelSetl(BaseParam baseParam);
-
-    /**
-     * 目录下载
-     * 
-     * @param fileDownload
-     * @return
-     */
-    Result<?> download(BaseParam baseParam, FileDownload fileDownload);
-
-    /**
-     * 预结算
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> preSettle(BaseParam baseParam);
-
-    /**
-     * 目录对照
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> directoryCheck(BaseParam baseParam);
-
-    /**
-     * 目录对照撤销
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> directoryUnCheck(BaseParam baseParam);
-
-    /**
-     * 对总账
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> reconcileGeneralLedger(BaseParam baseParam);
-
-    /**
-     * 明细对账
-     * 
-     * @param financial3202Param
-     * @return
-     */
-    Result<?> reconcileGeneralLedgerDetail(BaseParam baseParam, FinancialSettlement3202Param financial3202Param);
-
-    /**
-     * 第三方异常数据结算
-     * 
-     * @param financialSettlement3209AParam
-     * @return
-     */
-    Result<?> threePartSearch(BaseParam baseParam, FinancialSettlement3209AParam financialSettlement3209AParam);
-
-    /**
-     * 清算申请
-     * 
-     * @param
-     * @return
-     */
-    Result<?> applyFinancialClearing(BaseParam baseParam);
-
-    /**
-     * 清算申请状态查询
-     * 
-     * @param clearing3205AParma
-     * @return
-     */
-    Result<?> getFinancialClearingStatus(BaseParam baseParam, Clearing3205AParma clearing3205AParma);
-
-    /**
-     * 撤销清算申请
-     * 
-     * @param financial3204Param
-     * @return
-     */
-    Result<?> cancelFinancialClearing(BaseParam baseParam, Financial3204Param financial3204Param);
-
-    /**
-     * 库存盘点上传
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> uploadInventoryCount(BaseParam baseParam);
-
-    /**
-     * 库存信息变更
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> updateInventoryCount(BaseParam baseParam);
-
-    /**
-     * 商品采购
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> procurement(BaseParam baseParam);
-
-    /**
-     * 商品采购撤销
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelProcurement(BaseParam baseParam);
-
-    /**
-     * 商品销售
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> merchandise(BaseParam baseParam);
-
-    /**
-     * 商品销售退货
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelMerchandise(BaseParam baseParam);
-
-    Result<?> deleteGoodsInfo(BaseParam baseParam, Medical3507Param medical3507Param);
-
-    /**
-     * 医保目录信息查询
-     *
-     * @param baseParam
-     * @return
-     */
-    Result<?> queryYbCatalogue(BaseParam baseParam);
-
-    /**
-     * 3206A
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> getClrOptins(BaseParam baseParam);
-
-    /**
-     * 【2301】上传住院费用明细
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> uploadInpatientFeeDetail(BaseParam baseParam);
-
-    /**
-     * 【2302】住院费用明细撤销
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelInpatientFeeDetail(BaseParam baseParam);
-
-    /**
-     * 【2303】住院预结算
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> prePayInpatient(BaseParam baseParam);
-
-    /**
-     * 【2304】住院结算
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> payInpatient(BaseParam baseParam);
-
-    /**
-     * 【2305】取消住院结算
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelInpatientPay(BaseParam baseParam);
-
-    /**
-     * 【2401】 办理入院
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> inpatientReg(BaseParam baseParam);
-
-    /**
-     * 【2402】 办理出院
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> dischargePatient(BaseParam baseParam);
-
-    /**
-     * 【2403】 住院信息变更
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> changeInpatientInfo(BaseParam baseParam);
-
-    /**
-     * 【2404】 撤销入院
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelInpatientReg(BaseParam baseParam);
-
-    /**
-     * 【2405】 撤销出院
-     * 
-     * @param baseParam
-     * @return
-     */
-    Result<?> cancelDischargePatient(BaseParam baseParam);
-
-    /**
-     * 【3101】明细审核事前事中分析服务
-     *
-     * @param baseParam 基础参数
-     * @return 结果
-     */
-    Result<?> yb3101PreMidAnalysis(BaseParam baseParam);
-
-    /**
-     * 【3103】事前事中服务反馈服务
-     *
-     * @param baseParam 基础参数
-     * @return 结果
-     */
-    Result<?> yb3103PreMidFeedback(BaseParam baseParam);
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
deleted file mode 100644
index 1e375275..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.openhis.service.impl;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.core.common.exception.ServiceException;
-import com.openhis.domain.BaseResponse;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.IElepHandlerService;
-import com.openhis.utils.HseEncAndDecUtil;
-import com.openhis.utils.RedisUtil;
-import com.openhis.utils.SignUtil;
-import com.openhis.vo.BaseParam;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-/**
- * 医保交易
- */
-@Component
-@Slf4j
-public abstract class ElepHandlerServiceImpl implements IElepHandlerService {
-    Logger logger = LoggerFactory.getLogger(ElepHandlerServiceImpl.class);
-    /**********************************************************************
-     *
-     * @method handle
-     * @author TianYi
-     * @Date 2021-08-13
-     * @param        requestData
-     * @return
-     * @description 发送数据
-     **********************************************************************/
-    @Override
-    public abstract BaseResponse elepHandle(RequestData requestData, BaseParam baseParam);
-
-
-    /**********************************************************************
-     *
-     * @method sendDatas
-     * @author TianYi
-     * @Date 2021-08-13
-     * @param        intNum
-     * @param        requestData
-     * @return
-     * @description 初始化数据体
-     **********************************************************************/
-    @Override
-    public JSONObject initTransBody(String intNum, RequestData requestData, BaseParam baseParam) {
-        String prePrvKey = baseParam.getBaseInfo().getPrePrvKey();
-        String appId = baseParam.getBaseInfo().getPreAppId();
-        String appSecret = baseParam.getBaseInfo().getPreAppSecret();
-
-        String sortedData = SignUtil.getValue(JSONObject.toJSONString(requestData.getData()));
-        logger.info("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(sortedData));
-        System.out.println("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(sortedData));
-
-        // 加密数据
-        try {
-            JSONObject jsonObject = JSON.parseObject(sortedData);
-            JSONObject inputObject = HseEncAndDecUtil.encryptMsg(appId, appSecret, prePrvKey, "", jsonObject);
-
-            logger.info("【" + intNum + "】 加密后的整体入参：====" + JSONObject.toJSONString(inputObject));
-            System.out.println("【" + intNum + "】 加密后的整体入参：====" + JSONObject.toJSONString(inputObject));
-            return inputObject;
-        } catch (Exception e) {
-            throw new ServiceException("加密数据异常");
-        }
-
-    }
-
-
-    /**********************************************************************
-     *
-     * @method sendDatas
-     * @author TianYi
-     * @Date 2021-08-13
-     * @param        url
-     * @param        request
-     * @return
-     * @description 发送数据
-     **********************************************************************/
-    @Override
-    public BaseResponse sendDatas(String url, JSONObject request, BaseParam baseParam) {
-        String appId = baseParam.getBaseInfo().getPreAppId();
-        String appSecret = baseParam.getBaseInfo().getPreAppSecret();
-
-        logger.info("响应URL：====" + url);
-        System.out.println("响应URL：====" + url);
-
-        CloseableHttpClient client = HttpClients.createDefault();
-        String encData = request.getString("encData");
-        String signData = request.getString("signData");
-        request.remove("encData");
-        request.remove("signData");
-        String sortjson = SignUtil.getValue(request);
-        sortjson = sortjson.substring(0, sortjson.length() - 1) + ",\"encData\":\"" + encData + "\"" + ",\"signData\":\"" + signData + "\"}";
-
-        BaseResponse response = null;
-        HttpPost httpPost = new HttpPost(url);
-        StringEntity entity;
-        try {
-            entity = new StringEntity(sortjson);//解决中文乱码问题
-        } catch (UnsupportedEncodingException e) {
-            throw new ServiceException("解决中文乱码问题失败");
-        }
-
-        httpPost.addHeader("Content-Type", "application/json; charset=utf-8");
-        httpPost.setEntity(entity);
-        try {
-            HttpResponse resp = client.execute(httpPost);//执行时机
-
-            String respResult = "";
-            StatusLine statusLine = resp.getStatusLine();//获取请求对象中的响应行对象
-            int responseCode = statusLine.getStatusCode();//从状态行中获取状态码
-            if (responseCode == 200) {
-                HttpEntity entity2 = resp.getEntity();
-                if (entity2 != null) {
-                    System.out.println("响应内容：");
-                    System.out.println(JSON.toJSONString(response));
-                    //根据httpclient的官方说明中，EntityUtils.toString(httpEntity) 这个被调用一次后就会自动销毁
-                    BufferedReader in = new BufferedReader(new InputStreamReader(resp.getEntity().getContent(), "UTF-8"));
-                    StringBuffer sb = new StringBuffer("");
-                    String line = "";
-                    String NL = System.getProperty("line.separator");
-                    while ((line = in.readLine()) != null) {
-                        sb.append(line + NL);
-                    }
-                    in.close();
-                    String content = sb.toString();
-                    response = JSONObject.parseObject(content, BaseResponse.class);
-                    System.out.println("响应之后出参：====" + response);
-                    logger.info("出参数据：====" + response);
-                    //数据解密
-                    String testdecData = null;
-                    if (response.getCode() == 0){
-                        try {
-                            testdecData = HseEncAndDecUtil.sm4Decrypt(appId, appSecret, response.getEncData());
-                            System.out.println("解密后的数据" + testdecData);
-                            logger.info("解密后的出参数据：====" + testdecData);
-                            response.setEncData(testdecData);
-                        } catch (Exception e) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                    return response;
-                }
-            } else {
-                throw new ServiceException("电子处方网络请求失败");
-            }
-            client.close();
-        } catch (IOException e) {
-            throw new ServiceException("电子处方网络请求失败");
-        }
-        return response;
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
deleted file mode 100644
index d10826f6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.openhis.service.impl;
-
-import static com.alibaba.fastjson.JSON.parseObject;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.openhis.vo.BaseParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.openhis.config.InterfaceConfig;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.pojo.TransBody;
-import com.openhis.service.HandlerService;
-import com.openhis.utils.BusnessIdUtil;
-import com.openhis.utils.EasyGmUtils;
-import com.openhis.utils.HttpClientUtil;
-import com.openhis.utils.RedisUtil;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.http.HttpRequest;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 医保交易
- */
-@Component
-@Slf4j
-public abstract class HandlerServiceImpl implements HandlerService {
-
-    /**
-     * 中心接口配置
-     */
-    @Autowired
-    protected InterfaceConfig interfaceConfig;
-    /**
-     * redis工具
-     */
-    @Autowired
-    private RedisUtil redisUtil;
-    /**
-     * 多租户服务
-     */
-    @Autowired
-    private BusnessIdUtil busnessIdUtil;
-
-    Logger logger = LoggerFactory.getLogger(HandlerServiceImpl.class);
-
-    @Override
-    public abstract ResultBody handle(InputData inputData, BaseParam baseParam);
-
-
-    @Override
-    public String initTransBody(String intNum, InputData inputData, BaseParam baseParam) {
-        // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        // com.openhis.vo.LoginUser sysUser = loginUserUtil.getLoginUser();
-        // 从缓存中获取签到编号
-        String signNo = "";
-        if (redisUtil.hasKey("USER_SIGNNO:"+ baseParam.getBaseInfo().getAdmvs()+ ":" + baseParam.getBaseInfo().getUserId())) {
-            signNo = redisUtil.get("USER_SIGNNO:"+ baseParam.getBaseInfo().getAdmvs()+ ":" + baseParam.getBaseInfo().getUserId()).toString();
-        }
-        if("9001".equals(intNum)){
-            signNo = "";
-        }
-        logger.info("【" + intNum + "】加密前的input：====" + JSONObject.toJSONString(inputData));
-        System.out.println("【" + intNum + "】加密前的input：====" + JSONObject.toJSONString(inputData));
-
-        TransBody transBody = TransBody.builder().infno(intNum)
-            .msgid(busnessIdUtil.getMsgid(baseParam.getBaseInfo().getFixmedinsCode()))
-            .mdtrtareaAdmvs(baseParam.getBaseInfo().getAdmvs())
-            .insuplcAdmdvs(intNum.equals("9001") || intNum.equals("1101") || intNum.equals("3206A") || intNum.equals("3301") || intNum.equals("3302")|| intNum.equals("3203A")  ? baseParam.getBaseInfo().getAdmvs()
-                : baseParam.getBaseInfo().getInsuplcAdmdvs())
-            .recerSysCode("sys01").devNo("").devSafeInfo("")
-            .cainfo(interfaceConfig.getIsEncrypt() ? sign(JSONObject.toJSONString(inputData),baseParam) : "")
-            .signtype(interfaceConfig.getIsEncrypt() ? "SM2" : "").infver("V1.0").opterType("1").encType("SM4")
-            .opter(baseParam.getBaseInfo().getUserId().toString()).opterName(baseParam.getBaseInfo().getRealname())
-            .infTime(DateUtil.now()).fixmedinsCode(baseParam.getBaseInfo().getFixmedinsCode())
-            .fixmedinsName(baseParam.getBaseInfo().getFixmedinsName()).signNo(signNo)
-            // .fixmedinsName(baseParam.getBaseInfo().getFixmedinsName()).signNo("220000202505210958500117447359")
-            .input(interfaceConfig.getIsEncrypt() ? encrypt(JSONObject.toJSONString(inputData),baseParam) : inputData).build();
-        System.out.println("【" + intNum + "】" + " 整体入参：====" + JSONObject.toJSONString(transBody));
-        logger.info("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(transBody));
-        return JSONObject.toJSONString(transBody);
-    }
-
-
-    @Override
-    public Map<String, String> getHeader(BaseParam baseParam) {
-        Map<String, String> header = new HashMap();
-        header.put("Authorization", "Bearer " + this.getToken(baseParam));
-        header.put(HttpHeaders.CONTENT_TYPE, "application/json");
-        return header;
-    }
-
-
-    @Override
-    public ResultBody sendDatas(String url, String transBody, BaseParam baseParam) {
-        String result =
-            HttpRequest.post(url).addHeaders(getHeader(baseParam)).body(transBody).timeout(20000).execute().body();
-        System.out.println("解密之前医保返回出参：====" + result);
-        logger.info("解密之前医保返回出参：====" + result);
-        ResultBody resultBody = JSONObject.parseObject(result, ResultBody.class);
-        // 判断返回值是否需要解密
-        String decryptFlag = baseParam.getBaseInfo().getDecryptFlag();
-        if (interfaceConfig.getIsEncrypt()&&"1".equals(decryptFlag)) {
-            decrypt(resultBody,baseParam);
-        }
-        System.out.println("解密之后出参：====" + resultBody);
-        logger.info("解密之后出参：====" + resultBody);
-        return resultBody;
-    }
-
-
-    @Override
-    public String getToken(BaseParam baseParam) {
-        String accessToken = "";
-        Long userId = baseParam.getBaseInfo().getUserId();
-        if (redisUtil.hasKey("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId)) {
-            // 获取缓存
-            accessToken = String.valueOf(redisUtil.get("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId));
-        } else {
-            Map parmap = new HashMap<String, String>();
-            parmap.put("username", baseParam.getBaseInfo().getYbUsername());
-            parmap.put("password", baseParam.getBaseInfo().getYbPassword());
-            parmap.put("scope", baseParam.getBaseInfo().getYbScope());
-            parmap.put("grant_type", baseParam.getBaseInfo().getYbGrantType());
-            System.out.println(parmap);
-            Map headermap = new HashMap<String, String>();
-            headermap.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(
-                    (baseParam.getBaseInfo().getYbClientId() + ":" + baseParam.getBaseInfo().getYbClientSecret()).getBytes(StandardCharsets.UTF_8)));
-            headermap.put(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded");
-            System.out.println(interfaceConfig.getAddress() + ServiceAdrEnum.TOKEN.getAddress());
-            String result = HttpClientUtil.sendIOPost(interfaceConfig.getAddress() + ServiceAdrEnum.TOKEN.getAddress(),
-                parmap, headermap, "utf8", null);
-            System.out.println(result);
-            accessToken = JSON.parseObject(result).getString("access_token");
-            // 数据插入缓存（set中的参数含义：key值，user对象，缓存存在时间10（long类型），时间单位）
-            System.out.println("token:"+accessToken);
-            redisUtil.set("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId, accessToken, interfaceConfig.getTime());
-            log.info("数据插入缓存" + accessToken);
-        }
-        return accessToken;
-    }
-
-
-    private String sign(String signBody,BaseParam baseParam) {
-        byte[] prvKey = Base64.getDecoder().decode(baseParam.getBaseInfo().getYbCliPrvKey());
-        byte[] asig = EasyGmUtils.signSm3WithSm2(signBody.getBytes(StandardCharsets.UTF_8),
-                baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), prvKey);
-        String signStr = new String(Base64.getEncoder().encode(asig));
-        return signStr;
-    }
-
-
-    private String encrypt(String param,BaseParam baseParam) {
-        byte[] encrypt = param.getBytes();
-        byte[] bs = EasyGmUtils.sm4Encrypt(baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), encrypt);
-        String result = new String(Base64.getEncoder().encode(bs));
-        return result;
-    }
-
-
-    private void decrypt(ResultBody resultBody, BaseParam baseParam) {
-        System.out.println(JSON.toJSONString(resultBody));
-        byte[] result = EasyGmUtils.sm4Decrypt(baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8),
-            Base64.getDecoder().decode(resultBody.getOutput()));
-        resultBody.setOutput(new String(result));
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
deleted file mode 100644
index 2b4c807a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl;
-
-import static com.alibaba.fastjson.JSON.parseObject;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.core.common.utils.SecurityUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.itextpdf.text.DocumentException;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ybenums.YbDrugMedWay;
-import com.openhis.common.enums.ybenums.YbGender;
-import com.openhis.common.enums.ybenums.YbUsedFrqu;
-import com.openhis.component.ElepHandlerIntDispatcher;
-import com.openhis.config.InterfaceConfig;
-import com.openhis.config.Tenant;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.utils.PDFTemplateFillerUtil;
-import com.openhis.utils.RedisUtil;
-import com.openhis.vo.BaseInfo;
-import com.openhis.vo.BaseParam;
-import com.openhis.web.ybmanage.dto.PDFInputDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.openhis.domain.*;
-import com.openhis.service.*;
-import com.openhis.vo.Result;
-
-/**
- * @author yuxj
- * @date 2025-04-17
- */
-@Service
-public class YbElepServiceImpl implements IYbElepService {
-
-    /**
-     * 接口分发器
-     */
-    @Autowired
-    private ElepHandlerIntDispatcher elepHandlerIntDispatcher;
-
-    /**
-     * redis工具
-     */
-    @Autowired
-    private RedisUtil redisUtil;
-    /**
-     * 中心接口配置
-     */
-    @Autowired
-    protected InterfaceConfig interfaceConfig;
-
-    @Autowired
-    private Tenant tenant;
-
-    /**
-     * 电子处方上传预核验
-     *
-     * @param baseParam 处方信息
-     * @return 返回值
-     */
-    public Result<?> preCheckPrescription(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName());
-        PreCheckPrescription prescriptioninfo =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), PreCheckPrescription.class);
-        // 调用分发器处理预核验业务
-        BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0001.toString(),
-                new RequestData(prescriptioninfo), baseParam);
-        // 检查服务调用是否成功
-        if (result.getCode() == 0) {
-            // 解析返回结果中的数据
-            ElepVeriPrescriptionOutput output = null;
-            try {
-                ObjectMapper objectMapper = new ObjectMapper();
-                output = objectMapper.readValue(result.getEncData(), ElepVeriPrescriptionOutput.class);
-            } catch (Exception e) {
-                Result.error("返回参数转换错误");
-            }
-            // 做成PDF
-            List<PDFInputDto.MedDetail> medDetailList = new ArrayList<>();
-            PDFInputDto.MedDetail medDetail;
-            String pattern = "\\s*\\([^)]*\\)$";
-            for (ElepVeriPrescriptionDetail item : prescriptioninfo.getRxdrugdetail()) {
-                medDetail = new PDFInputDto.MedDetail();
-                // 药品名字
-                medDetail.setMedName(item.getDrugGenname());
-                // 药品规格
-                medDetail.setDrugSpec(item.getDrugSpec() + "  *  " + item.getDrugCnt() + item.getDrugDosunt());
-                // 单次用量
-                medDetail.setSinDoscnt("每次" + item.getSinDoscnt());
-                // 单次剂量单
-                medDetail.setSinDosunt(item.getSinDosunt());
-                // 使用频次编码
-                medDetail.setUsedFrquCodg(YbUsedFrqu.getByValue(item.getUsedFrquCodg()).getDescription().replaceAll(pattern, ""));
-                // 用药途径
-                medDetail.setMedWay(YbDrugMedWay.getByValue(item.getMedcWayCodg()).getDescription());
-                medDetailList.add(medDetail);
-            }
-            // 主诊断名称
-            String diagName = prescriptioninfo.getDiseinfo().getDiagName();
-
-            // 做成原始PDF文件
-            PDFInputDto pdfInputDto = new PDFInputDto()
-                    // 医保电子处方追溯码
-                    .setRxTraceCode(output.getRxTraceCode())
-                    // 机构名
-                    .setOrgName(prescriptioninfo.getMdtrtinfo().getFixmedinsName())
-                    // 门诊/住院病历号
-                    .setIptOtpNo(prescriptioninfo.getMdtrtinfo().getIptOtpNo())
-                    // 院内处方编号
-                    .setPrescriptionNo(prescriptioninfo.getHospRxno())
-                    // 科别/病区和床位
-                    .setLocationName(prescriptioninfo.getMdtrtinfo().getPrscDeptName())
-                    // 姓名
-                    .setPatnName(prescriptioninfo.getMdtrtinfo().getPatnName())
-                    // 性别
-                    .setGender(YbGender.getByValue(prescriptioninfo.getMdtrtinfo().getGend()).getDescription())
-                    // 年龄
-                    .setPatnAge(new BigDecimal(prescriptioninfo.getMdtrtinfo().getPatnAge()))
-                    // 费别
-                    .setHiFeesetlType(baseInfo.getMedType())
-                    // 开具日期
-                    .setPrscTime(prescriptioninfo.getPrscTime())
-                    // 临床诊断
-                    .setDiagName(diagName)
-                    // 处方有效天数
-                    .setValiDays(new BigDecimal(prescriptioninfo.getValiDays()))
-                    // 开方医师
-                    .setPrscDrName(prescriptioninfo.getMdtrtinfo().getPrscDrName())
-                    // 审核药师
-                    .setPharName(baseInfo.getDutyDoctorName())
-                    // 调配、复核药师
-                    .setDisRevPharName(null)
-                    // 核对、发药药师
-                    .setCheckPharName(null)
-                    // 延长处方用量原因
-                    .setReason(null)
-                    // 药品明细信息
-                    .setMedDetailList(medDetailList);
-
-            // 获取当前日期
-            LocalDate currentDate = LocalDate.now();
-            // 定义格式（yyyyMMdd）
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-            // 格式化日期
-            String formattedDate = currentDate.format(formatter);
-            //创建日期文件夹
-            Boolean pathFlg = PDFTemplateFillerUtil.makePath(baseInfo.getOutputPath(), formattedDate);
-            if (!pathFlg) {
-                return Result.error("创建文件夹时发生错误");
-            }
-            //pdf模板文件全路径
-            String templatePath = baseInfo.getTemplatePath();
-            //生成的pdf模板文件全路径
-            String outputPath = baseInfo.getOutputPath() + formattedDate + "\\" + prescriptioninfo.getHospRxno() + ".pdf";
-            //盖章全路径
-            String hospitalSealPath = baseInfo.getHospitalSealPath();
-            try {
-                PDFTemplateFillerUtil.fillPdfTemplate(templatePath, outputPath, hospitalSealPath, pdfInputDto);
-                System.out.println("PDF 填充完成，文件已保存到：" + outputPath);
-            } catch (IOException | DocumentException e) {
-                e.printStackTrace();
-                System.err.println("填充 PDF 时发生错误：" + e.getMessage());
-                return Result.error("填充 PDF 时发生错误：" + e.getMessage());
-            }
-            // 将pdf的名字保存
-            redisUtil.set("RxFileName", outputPath);
-
-            // 返回成功响应
-            return Result.ok("电子处方上传预核验成功！", output);
-        }
-
-        return Result.error(result.getMessage());
-    }
-
-    /**
-     * 电子处方医保电子签名
-     *
-     * @param baseParam 电子签名信息
-     * @return 返回值
-     */
-    public Result<?> signature(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName());
-        ElepSignatureInput signatureInput =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepSignatureInput.class);
-        String prescriptionNo = signatureInput.getPrescriptionNo();
-        signatureInput.setPrescriptionNo(null);
-
-        // 调用分发器处理电子签名业务
-        BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0002.toString(),
-                new RequestData(signatureInput), baseParam);
-        // 检查服务调用是否成功
-        if (result.getCode() == 0) {
-            // 解析返回结果中的数据
-            ElepSignatureOutput output =
-                    parseObject(parseObject(result.getEncData()).toString(), ElepSignatureOutput.class);
-
-            LocalDate currentDate = LocalDate.now();
-            // 定义格式（yyyyMMdd）
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-            // 格式化日期
-            String formattedDate = currentDate.format(formatter);
-            String folderPath = baseInfo.getOutputPath() + formattedDate + "\\"; // Windows 绝对路径，注意末尾的反斜杠
-            String fileName = prescriptionNo + ".pdf"; // 文件名由处方号拼接而成
-            // 拼接完整的文件路径
-            String filePath = folderPath + fileName;
-            // 做成PDF文件
-            boolean rxFileBool = PDFTemplateFillerUtil.makePDF(output.getRxFile(), filePath);
-            if (!rxFileBool) {
-                return Result.error("PDF文件做成失败！");
-            }
-
-            // 返回成功响应
-            return Result.ok("电子处方医保电子签名成功！", output);
-        }
-
-        return Result.error(result.getMessage());
-    }
-
-    /**
-     * 电子处方上传
-     *
-     * @param baseParam 上传信息
-     * @return 返回值
-     */
-    public Result<?> upload(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName());
-
-        ElepUploadInput uploadInput =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepUploadInput.class);
-
-        // 调用分发器处理上传业务
-        BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0003.toString(),
-                new RequestData(uploadInput), baseParam);
-        // 检查服务调用是否成功
-        if (result.getCode() == 0) {
-            // 解析返回结果中的数据
-            ElepUploadOutput output = parseObject(parseObject(result.getEncData()).toString(), ElepUploadOutput.class);
-            // 返回成功响应
-            return Result.ok("电子处方上传成功！", output);
-        }
-
-        return Result.error(result.getMessage());
-    }
-
-    /**
-     * 电子处方撤销
-     *
-     * @param baseParam 撤销信息
-     * @return 返回值
-     */
-    public Result<?> revoke(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName());
-
-        ElepRevokeInput revokeInput =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepRevokeInput.class);
-        // 调用分发器处理上传业务
-        BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0004.toString(),
-                new RequestData(revokeInput), baseParam);
-        // 检查服务调用是否成功
-        if (result.getCode() == 0) {
-            // 解析返回结果中的数据
-            ElepRevokeOutput output = parseObject(parseObject(result.getEncData()).toString(), ElepRevokeOutput.class);
-            // 返回成功响应
-            return Result.ok("电子处方撤销成功！", output);
-        }
-        return Result.error(result.getMessage());
-    }
-
-    /**
-     * 电子处方信息查询
-     *
-     * @param baseParam 查询信息
-     * @return 返回值
-     */
-    public Result<?> querPrescription(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName());
-
-        ElepQuerPrescriptionInput querPrescriptionInput =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepQuerPrescriptionInput.class);
-//        (ElepQuerPrescriptionInput)baseParam.getData();
-        // 调用分发器处理信息查询业务
-        BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0005.toString(),
-                new RequestData(querPrescriptionInput), baseParam);
-        // 检查服务调用是否成功
-        if (result.getCode() == 0) {
-            // 解析返回结果中的数据
-            QueryPrescription output =
-                    parseObject(parseObject(result.getEncData()).toString(), QueryPrescription.class);
-            // 返回成功响应
-            return Result.ok("电子处方信息查询成功！", output);
-        }
-        return Result.error(result.getMessage());
-    }
-
-    /**
-     * 电子处方取药结果查询
-     *
-     * @param baseParam 撤销信息
-     * @return 返回值
-     */
-    public Result<?> medresult(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName());
-
-        ElepMedresultInput medresultInput =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepMedresultInput.class);
-
-        // 调用分发器处理结果查询业务
-        BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0006.toString(),
-                new RequestData(medresultInput), baseParam);
-        // 检查服务调用是否成功
-        if (result.getCode() == 0) {
-            // 解析返回结果中的数据
-            MedicationResultInquiry output =
-                    parseObject(parseObject(result.getEncData()).toString(), MedicationResultInquiry.class);
-            // 返回成功响应
-            return Result.ok("电子处方取药结果查询成功！", output);
-        }
-
-        return Result.error(result.getMessage());
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
deleted file mode 100644
index 55aa6c77..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl;
-
-import static com.alibaba.fastjson.JSON.parseObject;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.StringUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.component.HandlerIntDispatcher;
-import com.openhis.config.InterfaceConfig;
-import com.openhis.config.Tenant;
-import com.openhis.constant.ClincStatusConst;
-import com.openhis.constant.InputDataTypeConst;
-import com.openhis.constant.InterFaceResultConst;
-import com.openhis.domain.InfoPerson;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.YbService;
-import com.openhis.utils.RedisUtil;
-import com.openhis.vo.*;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
-
-/**
- * TODO:医保同一服务层
- *
- * @author SunJQ
- * @date 2025-03-19
- */
-@Service
-public class YbServiceImpl implements YbService {
-    /**********************************************************************/
-    /**
-     * 接口分发器
-     */
-    @Autowired
-    private HandlerIntDispatcher handlerIntDispatcher;
-    /**
-     * redis工具
-     */
-    @Autowired
-    private RedisUtil redisUtil;
-    /**
-     * 中心接口配置
-     */
-    @Autowired
-    protected InterfaceConfig interfaceConfig;
-    @Autowired
-    private Tenant tenant;
-
-    /**********************************************************************/
-
-    /**********************************************************************/
-    /**
-     * 签到
-     *
-     * @param baseParam
-     * @param request
-     * @return
-     */
-    public Result<?> signIn(BaseParam baseParam, HttpServletRequest request) {
-        // BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Sign1101Param sign = parseObject(JSON.toJSONString(baseParam.getData()), Sign1101Param.class);
-
-        Console.error("AAA:" + sign.getMac() + "|" + sign.getIp() + "|" + sign.getOpterNo());
-        // Sign1101Param sign = (Sign1101Param)baseParam.getData();
-        // sign.setIp(request.getRemoteAddr());
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P9001.toString(),
-            new InputData(sign, null, InputDataTypeConst.SIGN_IN), baseParam);
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            Sign param = parseObject(parseObject(result.getOutput()).getString("signinoutb"), Sign.class);
-            param.setOpterNo(sign.getOpterNo());
-            param.setStatus("1");
-            redisUtil.set(
-                "USER_SIGNNO:" + baseParam.getBaseInfo().getAdmvs() + ":" + baseParam.getBaseInfo().getUserId(),
-                param.getSignNo(), 24 * 3600);
-            return Result.ok("签到成功！", param);
-        }
-        return Result.error(result.getErrMsg());
-    }
-
-    /**
-     * 签退
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> signOut(BaseParam baseParam) {
-        // Sign signInfo = getById(sign.getId());
-        // LoginUser sysUser = loginUserUtil.getLoginUser();
-        Long userId = baseParam.getBaseInfo().getUserId();
-        Sign signInfo = parseObject(String.valueOf(redisUtil.get("USER_SIGNNO:USER_SIGNNO_" + userId)), Sign.class);
-        Sign inputData = new Sign();
-        inputData.setOpterNo(signInfo.getOpterNo());
-        inputData.setSignNo(signInfo.getSignNo());
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P9002.toString(),
-            new InputData(inputData, null, InputDataTypeConst.SIGN_OUT), baseParam);
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            Sign param = parseObject(parseObject(result.getOutput()).getString("signoutoutb"), Sign.class);
-            signInfo.setSignOutTime(param.getSignTime());
-            signInfo.setStatus("2");
-            // updateById(signInfo);
-            // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            redisUtil.del("USER_SIGNNO:USER_SIGNNO_" + userId);
-            return Result.ok("签退成功！", signInfo);
-        }
-        return Result.error(result.getErrMsg());
-    }
-
-    /**
-     * 读卡获取身份信息
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> getPerInfo(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P1101.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            InfoPerson perinfo = parseObject(resultObj.getString("baseinfo"), InfoPerson.class);
-            JSONArray insuinfo = resultObj.getJSONArray("insuinfo");
-            // if (insuinfo.size() == 1) {
-            // JSONObject obj = insuinfo.getJSONObject(0);
-            // perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
-            // perinfo.setInsutype(obj.getString("insutype"));
-            // perinfo.setBalc(obj.getString("balc"));
-            // return Result.OK("获取成功", perinfo);
-            // }
-            for (int i = 0, size = insuinfo.size(); i < size; i++) {
-                JSONObject obj = insuinfo.getJSONObject(i);
-                String insuplc_admdvs = obj.getString("insuplc_admdvs");// 获取参保地
-                if (StringUtils.isEmpty(insuplc_admdvs)) {
-                    throw new ServiceException("查询不到参保地信息");
-                }
-                if (insuplc_admdvs.equals(baseInfo.getAdmvs())) {
-                    // 职工
-                    if ("310".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) {
-                        perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
-                        perinfo.setInsutype(obj.getString("insutype"));
-                        perinfo.setBalc(obj.getString("balc"));
-                        perinfo.setCvlservFlag(obj.getString("cvlserv_flag"));
-                        perinfo.setPsnType(obj.getString("psn_type"));
-                        perinfo.setPsnInsuDate(obj.getString("psn_insu_date"));
-                        perinfo.setEmpName(obj.getString("emp_name"));
-                    }
-                    // 居民
-                    if ("390".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) {
-                        perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
-                        perinfo.setInsutype(obj.getString("insutype"));
-                        perinfo.setBalc(obj.getString("balc"));
-                        perinfo.setCvlservFlag(obj.getString("cvlserv_flag"));
-                        perinfo.setPsnType(obj.getString("psn_type"));
-                        perinfo.setPsnInsuDate(obj.getString("psn_insu_date"));
-                        perinfo.setEmpName(obj.getString("emp_name"));
-                    }
-                } else {
-                    // 2025.06.25 同关确认异地默认是参保状态
-                    perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs"));
-                    perinfo.setInsutype(obj.getString("insutype"));
-                    perinfo.setBalc(obj.getString("balc"));
-                    perinfo.setCvlservFlag(obj.getString("cvlserv_flag"));
-                    perinfo.setPsnType(obj.getString("psn_type"));
-                    perinfo.setPsnInsuDate(obj.getString("psn_insu_date"));
-                    perinfo.setEmpName(obj.getString("emp_name"));
-                }
-            }
-
-            // 查询慢特病信息
-            baseParam.getBaseInfo().setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs());
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.G5301.toString(),
-                new InputData(new Info5301Param().setPsnNo(perinfo.getPsnNo()), null, InputDataTypeConst.DATA),
-                baseParam);
-            if ("0".equals(resultBody.getInfcode())) {
-                resultObj = parseObject(resultBody.getOutput());
-                JSONArray feedetail = resultObj.getJSONArray("feedetail");
-
-                List<Info5301SpecialConditionResult> list = new ArrayList<>();
-                Info5301SpecialConditionResult info5301SpecialConditionResult;
-                // 慢性病赋值
-                for (int i = 0; i < feedetail.size(); i++) {
-                    JSONObject obj = feedetail.getJSONObject(i);
-                    info5301SpecialConditionResult = new Info5301SpecialConditionResult();
-                    info5301SpecialConditionResult.setOpspDiseName(obj.getString("opsp_dise_name"))
-                        .setOpspDiseCode(obj.getString("opsp_dise_code")).setBegndate(obj.getString("begndate"))
-                        .setEnddate(obj.getString("enddate"));
-
-                    list.add(info5301SpecialConditionResult);
-                }
-                perinfo.setFeedetail(list);
-            }
-            // redisUtil.set(String.format("%s:%s:%s", "PERSON-INFO", readcard.getMdtrtCertType(),
-            // readcard.getMdtrtCertNo()), perinfo, 72000);
-            System.out.println(JSON.toJSONString(perinfo));
-            return Result.ok("获取成功", perinfo);
-        }
-        return Result.error(result.getErrMsg());
-    }
-
-    /**
-     * 挂号
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> reg(BaseParam baseParam) {
-        Result result;
-        try {
-            BaseInfo baseInfo = baseParam.getBaseInfo();
-            // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-            // .setFixmedinsName(tenant.getFixmedinsName());
-            ClinicReg reg = parseObject(JSON.toJSONString(baseParam.getData()), ClinicReg.class);
-            String mdtrtCertNo = reg.getMdtrtCertNo();
-            reg.setMdtrtCertNo(reg.getMdtrtCertNo());
-            reg.setBegntime(DateUtil.date());
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2201.toString(),
-                new InputData(reg, null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = parseObject(resultBody.getOutput());
-                reg.setStatus(ClincStatusConst.STATUS_0);
-                reg.setMdtrtCertNo(mdtrtCertNo);
-                reg.setMdtrtId(resultObj.getJSONObject("data").getString("mdtrt_id"));
-                result = Result.ok(reg);
-            } else {
-                result = Result.error(resultBody.getErrMsg(), reg);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Result<?> cancelReg(BaseParam baseParam) {
-        Result result;
-        try {
-            BaseInfo baseInfo = baseParam.getBaseInfo();
-            // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-            // .setFixmedinsName(tenant.getFixmedinsName());
-            ClinicReg reg = parseObject(JSON.toJSONString(baseParam.getData()), ClinicReg.class);
-            ClinicReg transReg = new ClinicReg();
-            transReg.setPsnNo(reg.getPsnNo());
-            transReg.setMdtrtId(reg.getMdtrtId());
-            transReg.setIptOtpNo(reg.getIptOtpNo());
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2202.toString(),
-                new InputData(transReg, null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                reg.setStatus(ClincStatusConst.CANCLE);
-                // regService.updateById(reg);
-                result = Result.ok(transReg);
-            } else {
-                result = Result.error(resultBody.getErrMsg(), reg);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 门诊就诊信息上传
-     *
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> saveMedical(BaseParam baseParam) {
-        Result result;
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Clinic2203MedicalParam medical =
-            parseObject(JSON.toJSONString(baseParam.getData()), Clinic2203MedicalParam.class);
-        try {
-            List<Clinic2203DiseInfoParam> diseinfoList = medical.getDiseinfoList();
-            medical.setBegntime(DateUtil.date());
-            if (diseinfoList != null) {
-                diseinfoList.stream().forEach(diseInfo -> diseInfo.setDiagTime(DateUtil.date()));
-            } else {
-                // throw new ServiceException("诊断节点列表不能为空");
-                result = Result.error("诊断节点列表不能为空");
-            }
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2203.toString(),
-                new InputData(medical, diseinfoList, medical.getInsuplcAdmdvs(), InputDataTypeConst.MD_TRT_INFO),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 门诊费用明细上传
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> upFeeDetail(BaseParam baseParam) {
-        Result result;
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Clinic2204OrderParam clinic2204OrderParam =
-            parseObject(JSON.toJSONString(baseParam.getData()), Clinic2204OrderParam.class);
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2204.toString(),
-                new InputData(clinic2204OrderParam.getFeedetail(), clinic2204OrderParam.getInsuplcAdmdvs(),
-                    InputDataTypeConst.FEE_DETAIL),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // 将返回结果解析成JSON
-                JSONObject resultObj = parseObject(resultBody.getOutput());
-                List<Clinic2204FeeDetailResult> feedetails =
-                    JSONObject.parseArray(resultObj.getString("result"), Clinic2204FeeDetailResult.class);
-                result = Result.ok(new Clinic2204OrderResult().setResult(feedetails));
-            } else {
-                result = Result.error(resultBody.getErrMsg(), new Clinic2204OrderResult());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 门诊费用明细上传
-     *
-     * @return
-     */
-    public Result<?> cancelFeeDetail(BaseParam baseParam) {
-        Result result;
-        try {
-            // 调用接口
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2205.toString(),
-                new InputData(baseParam.getData(), baseParam.getBaseInfo().getInsuplcAdmdvs(), InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 预结算
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> preSetl(BaseParam baseParam) {
-        Result result;
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Clinic2206OrderParam clinic2206OrderParam =
-            parseObject(JSON.toJSONString(baseParam.getData()), Clinic2206OrderParam.class);
-        Clinic2206OrderResult clinic2206OrderResult = new Clinic2206OrderResult();
-        try {
-            String mdtrtCertNo = clinic2206OrderParam.getMdtrtCertNo();
-            clinic2206OrderResult.setMdtrtCertNo(clinic2206OrderParam.getMdtrtCertNoEncrypt());
-            // 调用接口
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2206.toString(),
-                new InputData(clinic2206OrderParam, clinic2206OrderParam.getInsuplcAdmdvs(), InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // 将返回结果解析成JSON
-                JSONObject resultObj = parseObject(resultBody.getOutput());
-                // 解析结算信息
-                clinic2206OrderResult = parseObject(resultObj.getString("setlinfo"), Clinic2206OrderResult.class);
-                // 结算基金分项信息
-                List<Clinic2206FundPaymentResult> clincSetldetailList =
-                    JSONObject.parseArray(resultObj.getString("setldetail"), Clinic2206FundPaymentResult.class);
-
-                clinic2206OrderResult.setMdtrtCertNo(mdtrtCertNo);
-
-                clinic2206OrderResult.setSetldetail(clincSetldetailList);
-
-                result = Result.ok(clinic2206OrderResult);
-            } else {
-                result = Result.error(resultBody.getErrMsg(), clinic2206OrderResult);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 门诊费用结算
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> setl(BaseParam baseParam) {
-        Result result;
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Clinic2206OrderParam clincOrder =
-            parseObject(JSON.toJSONString(baseParam.getData()), Clinic2206OrderParam.class);
-
-        try {
-            // 调用接口
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2207.toString(),
-                new InputData(clincOrder, clincOrder.getInsuplcAdmdvs(), InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // 将返回结果解析成JSON
-                JSONObject resultObj = parseObject(resultBody.getOutput());
-                // 解析结算信息
-                Clinic2207OrderResult clincSetlinfo =
-                    parseObject(resultObj.getString("setlinfo"), Clinic2207OrderResult.class);
-                // 结算基金分项信息
-                List<Clinic2206FundPaymentResult> clincSetldetailList =
-                    JSONObject.parseArray(resultObj.getString("setldetail"), Clinic2206FundPaymentResult.class);
-                clincSetlinfo.setSetldetail(clincSetldetailList);
-
-                result = Result.ok(clincSetlinfo);
-            } else {
-                result = Result.error(resultBody.getErrMsg(), new Clinic2206OrderResult());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 门诊费用撤销
-     *
-     * @param baseParam
-     * @return
-     */
-    public Result<?> cancelSetl(BaseParam baseParam) {
-        Result result;
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Clinic2208UnSetlInfoParam setlinfo =
-            parseObject(JSON.toJSONString(baseParam.getData()), Clinic2208UnSetlInfoParam.class);
-
-        try {
-            // 调用接口
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2208.toString(),
-                new InputData(setlinfo, baseInfo.getInsuplcAdmdvs(), InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-
-                // 将返回结果解析成JSON
-                JSONObject resultObj = parseObject(resultBody.getOutput());
-                // 解析结算信息
-                Clinic2208UnSetlInfoResult clincSetlinfo =
-                    parseObject(resultObj.getString("setlinfo"), Clinic2208UnSetlInfoResult.class);
-                // 结算基金分项信息
-                List<Clinic2206FundPaymentResult> clincSetldetailList =
-                    JSONObject.parseArray(resultObj.getString("setldetail"), Clinic2206FundPaymentResult.class);
-                // 保存结算信息和结算基金分项信息
-                clincSetlinfo.setSetldetail(clincSetldetailList);
-
-                result = Result.ok(clincSetlinfo);
-            } else {
-                result = Result.error(resultBody.getErrMsg(), new Clinic2208UnSetlInfoResult());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 下载目录
-     * 
-     * @param fileDownload
-     * @return
-     */
-    @Override
-    public Result<?> download(BaseParam baseParam, FileDownload fileDownload) {
-        Result result;
-        try {
-            ServiceAdrEnum anEnum = ServiceAdrEnum.getEnum(fileDownload.getCode());
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(anEnum.toString(),
-                new InputData(fileDownload.getVersion(), null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                result = Result.ok("下载成功");
-            }
-            result = Result.error("下载失败");
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 诊断及费用明细上传
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> preSettle(BaseParam baseParam) {
-        Result result;
-        HashMap hashMap = new HashMap();
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            hashMap = objectMapper.readValue(String.valueOf(baseParam.getData()), HashMap.class);
-            // 处理obj
-        } catch (IOException e) {
-            System.err.println("JSON解析错误: " + e.getMessage());
-            e.printStackTrace();
-        }
-
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        Clinic2203MedicalParam p2203 =
-            parseObject(JSON.toJSONString(String.valueOf(hashMap.get("P2203"))), Clinic2203MedicalParam.class);
-        Clinic2204OrderParam p2204 =
-            parseObject(JSON.toJSONString(String.valueOf(hashMap.get("P2204"))), Clinic2204OrderParam.class);
-        try {
-            List<Clinic2203DiseInfoParam> diseinfoList = p2203.getDiseinfoList();
-            diseinfoList.stream().forEach(diseInfo -> diseInfo.setDiagTime(DateUtil.date()));
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2203.toString(),
-                new InputData(p2203, diseinfoList, p2203.getInsuplcAdmdvs(), InputDataTypeConst.MD_TRT_INFO),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                ResultBody result2204 = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2204.toString(),
-                    new InputData(p2204, p2204.getInsuplcAdmdvs(), InputDataTypeConst.FEE_DETAIL), baseParam);
-                if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                    // 将返回结果解析成JSON
-                    JSONObject resultObj = parseObject(result2204.getOutput());
-                    // 解析结算信息
-                    Clinic2204OrderResult clinic2204OrderResult =
-                        parseObject(resultObj.getString("result"), Clinic2204OrderResult.class);
-                    result = Result.ok(clinic2204OrderResult);
-                } else {
-                    result = Result.error("诊断信息上传失败");
-                }
-            } else {
-                result = Result.error("就诊信息上传失败");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 目录对照
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> directoryCheck(BaseParam baseParam) {
-        Result result;
-        try {
-            BaseInfo baseInfo = baseParam.getBaseInfo();
-            // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-            // .setFixmedinsName(tenant.getFixmedinsName());
-
-            MedicalDirectory3301ListParam medicalDirectory3301ListParam =
-                JSON.parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3301ListParam.class);
-            // MedicalDirectory3301Param medicalDirectory3301Param =
-            // parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3301Param.class);
-            ResultBody resultInfo = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P3301.toString(),
-                new InputData(medicalDirectory3301ListParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultInfo.getInfcode())) {
-                result = Result.ok(resultInfo);
-            } else {
-                result = Result.error(resultInfo.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 目录对照
-     *
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> directoryUnCheck(BaseParam baseParam) {
-        Result result;
-        try {
-            BaseInfo baseInfo = baseParam.getBaseInfo();
-            // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-            // .setFixmedinsName(tenant.getFixmedinsName());
-            MedicalDirectory3302ParamDto medicalDirectory3302ParamDto =
-                parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3302ParamDto.class);
-            MedicalDirectory3302Param medicalDirectory3302Param = new MedicalDirectory3302Param();
-            medicalDirectory3302Param.setFixmedinsCode(medicalDirectory3302ParamDto.getFixmedinsCode())
-                .setFixmedinsHilistId(medicalDirectory3302ParamDto.getFixmedinsHilistId())
-                .setListType(medicalDirectory3302ParamDto.getListType())
-                .setMedListCodg(medicalDirectory3302ParamDto.getMedListCodg());
-            ResultBody resultInfo = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P3302.toString(),
-                new InputData(medicalDirectory3302ParamDto, null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultInfo.getInfcode())) {
-                result = Result.ok(resultInfo);
-            } else {
-                result = Result.error(resultInfo.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    /**
-     * 结算对总账
-     *
-     * @param baseParam
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Result<?> reconcileGeneralLedger(BaseParam baseParam) {
-        Result result;
-        Financial3201Output financial3201Output = new Financial3201Output();
-        try {
-            // com.core.common.core.domain.model.LoginUser loginUser = SecurityUtils.getLoginUser();
-            // LoginUser sysUser = loginUserUtil.getLoginUser();
-            // reconciliation.setFixmedinsCode(sysUser.getFixmedinsCode());
-            // reconciliation.setFixmedinsName(sysUser.getFixmedinsName());
-            // reconciliation.setAdmvs(sysUser.getAdmvs());
-            // reconciliation.setSetlOptins(sysUser.getAdmvs());
-            Financial3201Param financial3201Param =
-                parseObject(JSON.toJSONString(baseParam.getData()), Financial3201Param.class);
-            // 调用接口
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3201.toString(),
-                new InputData(financial3201Param, financial3201Param.getAdmvs(), InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                // reconciliation.setCreateTime(new Date());
-                financial3201Output.setSetlOptins(financial3201Param.getSetlOptins());
-                financial3201Output.setStmtRslt(resultObj.getJSONObject("stmtinfo").getString("stmt_rslt"));
-                financial3201Output.setStmtRsltDscr(resultObj.getJSONObject("stmtinfo").getString("stmt_rslt_dscr"));
-                result = Result.ok(financial3201Output);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> reconcileGeneralLedgerDetail(BaseParam baseParam,
-        FinancialSettlement3202Param financial3202Param) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3202.toString(),
-                new InputData(financial3202Param, financial3202Param.getSetlOptins(), InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                FinancialSettlement3202Result financialSettlement3202Result = new FinancialSettlement3202Result();
-                financialSettlement3202Result.setFilename(resultObj.getJSONObject("fileinfo").getString("filename"));
-                financialSettlement3202Result
-                    .setFileQuryNo(resultObj.getJSONObject("fileinfo").getString("file_qury_no"));
-                financialSettlement3202Result.setDldEndtime(DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",
-                    resultObj.getJSONObject("fileinfo").getString("dld_endtime")));
-
-                result = Result.ok(financialSettlement3202Result);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> threePartSearch(BaseParam baseParam, FinancialSettlement3209AParam financialSettlement3209AParam) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3202.toString(),
-                new InputData(financialSettlement3209AParam, financialSettlement3209AParam.getClrOptins(),
-                    InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultObj.getJSONObject("selt_list"));
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> applyFinancialClearing(BaseParam baseParam) {
-        Result result;
-        Financial3203AParam financial3203AParam =
-            parseObject(JSON.toJSONString(baseParam.getData()), Financial3203AParam.class);
-
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3203A.toString(),
-                new InputData(baseParam.getData(), financial3203AParam.getClrOptins(), InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultObj.getJSONObject("clr_appy_evt_id"));
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> cancelFinancialClearing(BaseParam baseParam, Financial3204Param financial3204Param) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3204A.toString(),
-                new InputData(financial3204Param, financial3204Param.getClrOptins(), InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> getFinancialClearingStatus(BaseParam baseParam, Clearing3205AParma clearing3205AParma) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3205A.toString(),
-                new InputData(clearing3205AParma, clearing3205AParma.getClrOptins(), InputDataTypeConst.DATA),
-                baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultObj.getJSONObject("clr_appys"));
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> uploadInventoryCount(BaseParam baseParam) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3501.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.INV_INFO), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> updateInventoryCount(BaseParam baseParam) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3502.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.INV_INFO), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> procurement(BaseParam baseParam) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3503.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.PURC_INFO), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> cancelProcurement(BaseParam baseParam) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3504.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.PURC_INFO), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> merchandise(BaseParam baseParam) {
-        Result result = null;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3505.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.SEL_INFO), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                Medical3505Result medical3505Result = new Medical3505Result();
-                if (resultObj.get("msgRslt") != null && resultObj.get("retRslt") != null) {
-                    medical3505Result.setMsgRslt(resultObj.get("msgRslt").toString());
-                    medical3505Result.setRetRslt(resultObj.get("retRslt").toString());
-                } else {
-                    medical3505Result.setMsgRslt("成功");
-                    medical3505Result.setRetRslt("1");
-                }
-                result = Result.ok(medical3505Result);
-            } else if (InterFaceResultConst.FAILED.equals(resultBody.getInfcode())) {
-                Medical3505Result medical3505Result = new Medical3505Result();
-                medical3505Result.setRetRslt("-1");
-                medical3505Result.setMsgRslt(resultBody.getErrMsg());
-                result = Result.ok(medical3505Result);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> cancelMerchandise(BaseParam baseParam) {
-        Result result = null;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3506.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.SEL_INFO), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput());
-                Medical3505Result medical3505Result = new Medical3505Result();
-                if (resultObj.get("msgRslt") != null && resultObj.get("retRslt") != null) {
-                    medical3505Result.setMsgRslt(resultObj.get("msgRslt").toString());
-                    medical3505Result.setRetRslt(resultObj.get("retRslt").toString());
-                } else {
-                    medical3505Result.setMsgRslt("成功");
-                    medical3505Result.setRetRslt("1");
-                }
-                result = Result.ok(medical3505Result);
-            } else if (InterFaceResultConst.FAILED.equals(resultBody.getInfcode())) {
-                Medical3505Result medical3505Result = new Medical3505Result();
-                medical3505Result.setRetRslt("-1");
-                medical3505Result.setMsgRslt(resultBody.getErrMsg());
-                result = Result.ok(medical3505Result);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> deleteGoodsInfo(BaseParam baseParam, Medical3507Param medical3507Param) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3507.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> getClrOptins(BaseParam baseParam) {
-        Result result;
-        try {
-            ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3206A.toString(),
-                new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-            if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) {
-                result = Result.ok(resultBody);
-            } else {
-                result = Result.error(resultBody.getErrMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = Result.error("网络异常");
-        }
-        return result;
-    }
-
-    @Override
-    public Result<?> queryYbCatalogue(BaseParam baseParam) {
-        BaseInfo baseInfo = baseParam.getBaseInfo();
-        // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode())
-        // .setFixmedinsName(tenant.getFixmedinsName());
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.D1312.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        // System.out.println("---------1312result---------------" + result);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            data = resultObj.getString("data");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    /**
-     * 2301 住院费用明细上传
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> uploadInpatientFeeDetail(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2301.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            data = resultObj.getString("result");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    /**
-     * 2302 住院费用明细撤销
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> cancelInpatientFeeDetail(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2302.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            data = resultObj.getString("result");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    /**
-     * 2303 住院预结算
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> prePayInpatient(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2303.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            data = resultObj.getString("result");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    /**
-     * 2304 住院结算
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> payInpatient(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2304.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            data = resultObj.getString("result");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    /**
-     * 2305 住院结算撤销
-     * 
-     * @param baseParam
-     * @return
-     */
-    @Override
-    public Result<?> cancelInpatientPay(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2305.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            data = resultObj.getString("result");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    @Override
-    public Result<?> inpatientReg(BaseParam baseParam) {
-        JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2401.toString(),
-            new InputData(resultObj.getString("mdtrtinfo"), resultObj.getString("diseinfo"), null,
-                InputDataTypeConst.MD_TRT_INFO),
-            baseParam);
-        String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObject = parseObject(result.getOutput());
-            data = resultObject.getString("result");
-        }
-        return Result.ok("获取成功", data);
-    }
-
-    @Override
-    public Result<?> dischargePatient(BaseParam baseParam) {
-        JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2402.toString(),
-            new InputData(resultObj.getString("dscginfo"), resultObj.getString("diseinfo"), null,
-                InputDataTypeConst.DSCG_INFO),
-            baseParam);
-        // String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObject = parseObject(result.getOutput());
-            // data = resultObject.getString("result");
-            return Result.ok("获取成功");
-        }
-        return Result.error("上传失败");
-    }
-
-    @Override
-    public Result<?> changeInpatientInfo(BaseParam baseParam) {
-        JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2403.toString(),
-            new InputData(resultObj.getString("adminfo"), resultObj.getString("diseinfo"), null,
-                InputDataTypeConst.ADM_INFO),
-            baseParam);
-        // String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObject = parseObject(result.getOutput());
-            // data = resultObject.getString("result");
-            return Result.ok("获取成功");
-        }
-        return Result.error("上传失败");
-    }
-
-    @Override
-    public Result<?> cancelInpatientReg(BaseParam baseParam) {
-        // JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2404.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        // String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObject = parseObject(result.getOutput());
-            // data = resultObject.getString("result");
-            return Result.ok("获取成功");
-        }
-        return Result.error("上传失败");
-    }
-
-    @Override
-    public Result<?> cancelDischargePatient(BaseParam baseParam) {
-        // JSONObject resultObj = parseObject(String.valueOf(baseParam.getData()));
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2405.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        // String data = "";
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObject = parseObject(result.getOutput());
-            // data = resultObject.getString("result");
-            return Result.ok("获取成功");
-        }
-        return Result.error("上传失败");
-    }
-
-    /**
-     * 【3101】明细审核事前事中分析服务
-     *
-     * @param baseParam 基础参数
-     * @return 结果
-     */
-    @Override
-    public Result<?> yb3101PreMidAnalysis(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.A3101.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            String data = resultObj.getString("result");
-            return Result.ok("获取成功", data);
-        } else {
-            return Result.error("获取失败");
-        }
-    }
-
-    /**
-     * 【3103】事前事中服务反馈服务
-     *
-     * @param baseParam 基础参数
-     * @return 结果
-     */
-    @Override
-    public Result<?> yb3103PreMidFeedback(BaseParam baseParam) {
-        ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.A3103.toString(),
-            new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam);
-        if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) {
-            JSONObject resultObj = parseObject(result.getOutput());
-            String data = resultObj.getString("result");
-            return Result.ok("获取成功", data);
-        } else {
-            return Result.error("获取失败");
-        }
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java
deleted file mode 100644
index b8b46629..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 门诊就诊信息上传
- *
- * @author SunJQ
- * @date 2025-05-07
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2203)
-public class ClinicDiagInfoUpServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2203.getAddress(),initTransBody(ServiceAdrEnum.C2203.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java
deleted file mode 100644
index 4e553103..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.clinc;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 费用明细撤销
- *
- * @author SunJQ
- * @date 2025-05-07
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2205)
-public class ClinicFeeDetailDelServiceImpl extends HandlerServiceImpl {
-
-
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.C2205.getAddress(),initTransBody(ServiceAdrEnum.C2205.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java
deleted file mode 100644
index 629ba17a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-
-/**
- * 费用明细上传
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2204)
-public class ClinicFeeDetailUpServiceImpl extends HandlerServiceImpl {
-
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2204.getAddress(),initTransBody(ServiceAdrEnum.C2204.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java
deleted file mode 100644
index 41760833..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 门诊预结算
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2206)
-public class ClinicPreSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2206.getAddress(),initTransBody(ServiceAdrEnum.C2206.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java
deleted file mode 100644
index 84db828a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 撤销挂号接口
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2202)
-public class ClinicReRegServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2202.getAddress(),initTransBody(ServiceAdrEnum.C2202.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java
deleted file mode 100644
index 31cb1b7b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 门诊反结
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2208)
-public class ClinicReSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2208.getAddress(),initTransBody(ServiceAdrEnum.C2208.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java
deleted file mode 100644
index 3c162bcc..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.alibaba.fastjson2.JSON;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 挂号接口
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2201)
-public class ClinicRegServiceImpl extends HandlerServiceImpl {
-
-    Logger logger = LoggerFactory.getLogger(ClinicRegServiceImpl.class);
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        logger.info(ServiceAdrEnum.C2201.getDescription()+" : "+ JSON.toJSONString(inputData));
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2201.getAddress(),initTransBody(ServiceAdrEnum.C2201.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java
deleted file mode 100644
index 02f1cca7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.clinc;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 门诊结算
- */
-@Service
-@HandlerInt(ServiceAdrEnum.C2207)
-public class ClinicSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param  		inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2207.getAddress(),initTransBody(ServiceAdrEnum.C2207.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java
deleted file mode 100644
index a67edcf7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.openhis.service.impl.common;
-
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.domain.BaseResponse;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.impl.ElepHandlerServiceImpl;
-
-/**
- * 电子处方取药结果查询
- */
-@ElepHandlerInt(ElepServiceAdrEnum.A0006)
-@Service
-public class MedresultServiceImpl extends ElepHandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param requestData 请求信息
-     * @return
-     */
-    @Override
-    public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){
-        String eleAddress = baseParam.getBaseInfo().getEleAddress();
-        return sendDatas(eleAddress+ ElepServiceAdrEnum.A0006.getAddress(),initTransBody(ElepServiceAdrEnum.A0006.getNum(),requestData,baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java
deleted file mode 100644
index 3c35d293..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.openhis.service.impl.common;
-
-import com.core.common.utils.SecurityUtils;
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.domain.BaseResponse;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.impl.ElepHandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-
-/**
- * 电子处方上传预核验接口
- */
-@ElepHandlerInt(ElepServiceAdrEnum.A0001)
-@Service
-public class PreCheckPrescriptionServiceImpl extends ElepHandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param requestData 请求信息
-     * @return
-     */
-    @Override
-    public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){
-        String eleAddress = baseParam.getBaseInfo().getEleAddress();
-        return sendDatas(eleAddress+ ElepServiceAdrEnum.A0001.getAddress(),initTransBody(ElepServiceAdrEnum.A0001.getNum(),requestData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java
deleted file mode 100644
index 66a6fecb..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.openhis.service.impl.common;
-
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.domain.BaseResponse;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.impl.ElepHandlerServiceImpl;
-
-/**
- * 电子处方信息查询
- */
-@ElepHandlerInt(ElepServiceAdrEnum.A0005)
-@Service
-public class QuerPrescriptionServiceImpl extends ElepHandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param requestData 请求信息
-     * @return
-     */
-    @Override
-    public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){
-        String eleAddress = baseParam.getBaseInfo().getEleAddress();
-        return sendDatas(eleAddress+ ElepServiceAdrEnum.A0005.getAddress(),initTransBody(ElepServiceAdrEnum.A0005.getNum(),requestData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java
deleted file mode 100644
index 87b8f0dd..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.openhis.service.impl.common;
-
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.domain.BaseResponse;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.impl.ElepHandlerServiceImpl;
-
-/**
- * 电子处方撤销
- */
-@ElepHandlerInt(ElepServiceAdrEnum.A0004)
-@Service
-public class RevokeServiceImpl extends ElepHandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param requestData 请求信息
-     * @return
-     */
-    @Override
-    public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){
-        String eleAddress = baseParam.getBaseInfo().getEleAddress();
-        return sendDatas(eleAddress+ElepServiceAdrEnum.A0004.getAddress(),initTransBody(ElepServiceAdrEnum.A0004.getNum(),requestData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java
deleted file mode 100644
index 8c7bea3a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.openhis.service.impl.common;
-
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.domain.BaseResponse;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.impl.ElepHandlerServiceImpl;
-
-/**
- * 电子处方医保电子签名
- */
-@ElepHandlerInt(ElepServiceAdrEnum.A0002)
-@Service
-public class SignatureServiceImpl extends ElepHandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param requestData 请求信息
-     * @return
-     */
-    @Override
-    public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){
-        String eleAddress = baseParam.getBaseInfo().getEleAddress();
-        return sendDatas(eleAddress+ElepServiceAdrEnum.A0002.getAddress(),initTransBody(ElepServiceAdrEnum.A0002.getNum(),requestData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java
deleted file mode 100644
index d4496f88..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.openhis.service.impl.common;
-
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.ElepHandlerInt;
-import com.openhis.domain.BaseResponse;
-import com.openhis.enums.ElepServiceAdrEnum;
-import com.openhis.pojo.RequestData;
-import com.openhis.service.impl.ElepHandlerServiceImpl;
-
-/**
- * 电子处方上传
- */
-@ElepHandlerInt(ElepServiceAdrEnum.A0003)
-@Service
-public class UploadServiceImpl extends ElepHandlerServiceImpl {
-
-    /**
-     * 处理交易
-     *
-     * @param requestData 请求信息
-     * @return
-     */
-    @Override
-    public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam) {
-        String eleAddress = baseParam.getBaseInfo().getEleAddress();
-        return sendDatas(eleAddress + ElepServiceAdrEnum.A0003.getAddress(), initTransBody(ElepServiceAdrEnum.A0003.getNum(), requestData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java
deleted file mode 100644
index 812292d1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.directory;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 药品目录对照上传
- */
-@HandlerInt(ServiceAdrEnum.P3301)
-@Service
-public class DrugContrastUpServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P3301.getAddress(),initTransBody(ServiceAdrEnum.P3301.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java
deleted file mode 100644
index 3c3c12e7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.directory;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 目录对照撤销
- */
-@HandlerInt(ServiceAdrEnum.P3302)
-@Service
-public class RepealDrugContrastUpServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P3302.getAddress(),initTransBody(ServiceAdrEnum.P3302.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java
deleted file mode 100644
index 55574ce3..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.down;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * TODO:目录下载服务
- *
- * @author SunJQ
- * @date 2025-03-25
- */
-@Service
-@HandlerInt(ServiceAdrEnum.D1301)
-public class DownloadServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        ServiceAdrEnum anEnum = ServiceAdrEnum.getEnum(inputData.getData().toString());
-        return sendDatas(interfaceConfig.getAddress()+anEnum.getAddress(),initTransBody(anEnum.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java
deleted file mode 100644
index 1f6ca382..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.drugstore;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 药店预结算
- */
-@Service
-@HandlerInt(ServiceAdrEnum.D2101)
-public class DrugPreSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.D2101.getAddress(),initTransBody(ServiceAdrEnum.D2101.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java
deleted file mode 100644
index d42c58e9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.drugstore;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 药店结算撤销
- */
-@Service
-@HandlerInt(ServiceAdrEnum.D2103)
-public class DrugReSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.D2103.getAddress(),initTransBody(ServiceAdrEnum.D2103.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java
deleted file mode 100644
index 7588685b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.drugstore;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 药店结算
- */
-@Service
-@HandlerInt(ServiceAdrEnum.D2102)
-public class DrugSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.D2102.getAddress(),initTransBody(ServiceAdrEnum.D2102.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java
deleted file mode 100644
index 714e848e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.filing;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 人员定点备案撤销
- */
-@Service
-@HandlerInt(ServiceAdrEnum.F2505)
-public class FixmedinsServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2505.getAddress(),initTransBody(ServiceAdrEnum.F2505.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java
deleted file mode 100644
index eaf93e4b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.filing;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 人员定点备案撤销
- */
-@Service
-@HandlerInt(ServiceAdrEnum.F2506)
-public class ReFixmedinsServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2506.getAddress(),initTransBody(ServiceAdrEnum.F2506.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java
deleted file mode 100644
index 1b65250f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.filing;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 人员慢特病备案撤销
- */
-@Service
-@HandlerInt(ServiceAdrEnum.F2504)
-public class ReSlowdiseaseServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2504.getAddress(),initTransBody(ServiceAdrEnum.F2504.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java
deleted file mode 100644
index d5a953cf..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.filing;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 人员慢特病备案
- */
-@Service
-@HandlerInt(ServiceAdrEnum.F2503)
-public class SlowdiseServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2503.getAddress(),initTransBody(ServiceAdrEnum.F2503.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java
deleted file mode 100644
index c08d7827..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.openhis.service.impl.info;
-
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-
-/**
- * 医保目录信息查询接口
- */
-@Service
-@HandlerInt(ServiceAdrEnum.D1312)
-public class CatalogueInfoServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * 
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress() + ServiceAdrEnum.D1312.getAddress(),
-            initTransBody(ServiceAdrEnum.D1312.getNum(), inputData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java
deleted file mode 100644
index d5c6da07..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.info;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 医药机构信息获取
- */
-@Service
-@HandlerInt(ServiceAdrEnum.P1201)
-public class GetMedicalInfoServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P1201.getAddress(),initTransBody(ServiceAdrEnum.P1201.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java
deleted file mode 100644
index 1dd45453..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.openhis.service.impl.info;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-@Service
-@HandlerInt(ServiceAdrEnum.G5301)
-public class GetPatientSpecialConditionServiceImpl extends HandlerServiceImpl {
-
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.G5301.getAddress(),initTransBody(ServiceAdrEnum.G5301.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java
deleted file mode 100644
index 0e744852..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.openhis.service.impl.info;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-
-/**
- * 人员信息获取接口
- */
-@Service
-@HandlerInt(ServiceAdrEnum.P1101)
-public class GetPersonInfoServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P1101.getAddress(),initTransBody(ServiceAdrEnum.P1101.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java
deleted file mode 100644
index 2776da9a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.info;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 签到接口
- */
-@HandlerInt(ServiceAdrEnum.P9001)
-@Service
-public class SignInServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P9001.getAddress(),initTransBody(ServiceAdrEnum.P9001.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java
deleted file mode 100644
index 96f05857..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.info;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 签退接口
- */
-@HandlerInt(ServiceAdrEnum.P9002)
-@Service
-public class SignOutServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P9002.getAddress(),initTransBody(ServiceAdrEnum.P9002.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java
deleted file mode 100644
index 3cc5cdfa..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-
-/**
- * 住院信息变更
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2403)
-public class ChHospitalizedServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2403.getAddress(),initTransBody(ServiceAdrEnum.H2403.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java
deleted file mode 100644
index 2fb5139a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 办理出院
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2402)
-public class DischargedServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2402.getAddress(),initTransBody(ServiceAdrEnum.H2402.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java
deleted file mode 100644
index efe42be3..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 住院费用明细上传
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2301)
-public class FeeDetailServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2301.getAddress(),initTransBody(ServiceAdrEnum.H2301.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java
deleted file mode 100644
index 4cba9d80..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 住院预结算
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2303)
-public class HaPreSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2303.getAddress(),initTransBody(ServiceAdrEnum.H2303.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java
deleted file mode 100644
index 88b22525..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 住院结算撤销
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2305)
-public class HaReSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param  		inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2305.getAddress(),initTransBody(ServiceAdrEnum.H2305.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java
deleted file mode 100644
index 4270c327..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 住院结算
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2304)
-public class HaSetlServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param  		inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2304.getAddress(),initTransBody(ServiceAdrEnum.H2304.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java
deleted file mode 100644
index 0051ca2a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 办理住院
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2401)
-public class HospitalizedServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2401.getAddress(),initTransBody(ServiceAdrEnum.H2401.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java
deleted file mode 100644
index 16a40d16..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 办理出院
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2405)
-public class ReDischargedServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2405.getAddress(),initTransBody(ServiceAdrEnum.H2405.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java
deleted file mode 100644
index c4eacff0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 住院费用明细撤销
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2302)
-public class ReFeeDetailServiceImpl extends HandlerServiceImpl {
-
-    /**
-     *
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2302.getAddress(),initTransBody(ServiceAdrEnum.H2302.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java
deleted file mode 100644
index 8b45c32a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.inhospital;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 撤销住院
- */
-@Service
-@HandlerInt(ServiceAdrEnum.H2404)
-public class ReHospitalizedServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2404.getAddress(),initTransBody(ServiceAdrEnum.H2404.getNum(),inputData, baseParam),baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java
deleted file mode 100644
index 8ade967c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品盘点变更
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3502)
-public class PhysicalInventoryChangeServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3502.getAddress(),initTransBody(ServiceAdrEnum.I3502.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java
deleted file mode 100644
index 3ee98bdb..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品盘点上传
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3501)
-public class PhysicalInventoryServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3501.getAddress(),initTransBody(ServiceAdrEnum.I3501.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java
deleted file mode 100644
index cf8e1d97..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品销售
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3505)
-public class PurchasingServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3505.getAddress(),initTransBody(ServiceAdrEnum.I3505.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java
deleted file mode 100644
index d717fdb8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品信息删除
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3507)
-public class PurgeProductRecordsServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3507.getAddress(),initTransBody(ServiceAdrEnum.I3507.getNum(),inputData,baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java
deleted file mode 100644
index fe677572..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品采购
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3503)
-public class StockReplenishmentServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3503.getAddress(),initTransBody(ServiceAdrEnum.I3503.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java
deleted file mode 100644
index 57d686a5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品采购退货
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3504)
-public class StockUnReplenishmentServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3504.getAddress(),initTransBody(ServiceAdrEnum.I3504.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java
deleted file mode 100644
index a72a7d36..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.inventory;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 商品销售退货
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.I3506)
-public class UnPurchasingServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3506.getAddress(),initTransBody(ServiceAdrEnum.I3506.getNum(),inputData, baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java
deleted file mode 100644
index 09e37e7d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 日对账
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R13203)
-public class DayReconciliationServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R13203.getAddress(),initTransBody(ServiceAdrEnum.R13203.getNum(),inputData,baseParam),baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java
deleted file mode 100644
index baf348e5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 对明细账
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3202)
-public class DetailReconciliationServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R3202.getAddress(),initTransBody(ServiceAdrEnum.R3202.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java
deleted file mode 100644
index 0e97d652..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 清算申请
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3203A)
-public class MonthSetlApplyAServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3203A.getAddress(),initTransBody(ServiceAdrEnum.R3203A.getNum(),inputData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java
deleted file mode 100644
index 906d7c17..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 清算申请
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3203)
-public class MonthSetlApplyServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3203.getAddress(),initTransBody(ServiceAdrEnum.R3203.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java
deleted file mode 100644
index 97631d23..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 清算申请撤销
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3204A)
-public class MonthUnSetlApplyAServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3204A.getAddress(),initTransBody(ServiceAdrEnum.R3204A.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java
deleted file mode 100644
index b9a8ce05..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 清算申请撤销(吉林省)
- *
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3204)
-public class MonthUnSetlApplyServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3204.getAddress(),initTransBody(ServiceAdrEnum.R3204.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java
deleted file mode 100644
index e81d82dc..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 清算申请状态查询（吉林省）
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3206A)
-public class ReconciliationOrgServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3206A.getAddress(),initTransBody(ServiceAdrEnum.R3206A.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java
deleted file mode 100644
index 98e65af6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 清算申请状态查询（吉林省）
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3205A)
-public class ReconciliationServiceImpl extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3205A.getAddress(),initTransBody(ServiceAdrEnum.R3205A.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java
deleted file mode 100644
index 4a1b73d5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * 查询跨省三方对账未成功数据(吉林省)
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3209A)
-public class ThreePartReconciliationServiceImpl  extends HandlerServiceImpl {
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam) {
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R3209A.getAddress(),initTransBody(ServiceAdrEnum.R3209A.getNum(),inputData, baseParam), baseParam);
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java
deleted file mode 100644
index ffb976ec..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.service.impl.reconciliation;
-
-import com.openhis.service.impl.HandlerServiceImpl;
-import com.openhis.vo.BaseParam;
-import org.springframework.stereotype.Service;
-
-import com.openhis.annotation.HandlerInt;
-import com.openhis.enums.ServiceAdrEnum;
-import com.openhis.pojo.InputData;
-import com.openhis.pojo.ResultBody;
-
-/**
- * 对总账
- */
-@Service
-@HandlerInt(ServiceAdrEnum.R3201)
-public class TotalReconciliationServiceImpl extends HandlerServiceImpl {
-
-    /**
-     * 处理交易
-     * @param inputData
-     * @return
-     */
-    @Override
-    public ResultBody handle(InputData inputData, BaseParam baseParam){
-        return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R3201.getAddress(),initTransBody(ServiceAdrEnum.R3201.getNum(),inputData, baseParam), baseParam);
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java
deleted file mode 100644
index a10dfe69..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.openhis.utils;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
-import java.security.*;
-
-public class BCUtils {
-
-    static {
-        if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    public static Cipher getCipher(final String algorithm) {
-        try {
-            return Cipher.getInstance(algorithm, BouncyCastleProvider.PROVIDER_NAME);
-        } catch (final NoSuchAlgorithmException | NoSuchPaddingException | NoSuchProviderException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    public static MessageDigest getMessageDigest(final String algorithm) {
-        try {
-            return MessageDigest.getInstance(algorithm, BouncyCastleProvider.PROVIDER_NAME);
-        } catch (final NoSuchAlgorithmException | NoSuchProviderException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    public static Signature getSignature(final String algorithm) {
-        try {
-            return Signature.getInstance(algorithm, BouncyCastleProvider.PROVIDER_NAME);
-        } catch (final NoSuchAlgorithmException | NoSuchProviderException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java
deleted file mode 100644
index fe4c28b0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.openhis.utils;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.RandomUtil;
-import org.springframework.stereotype.Component;
-
-/**
- * 生成msg交易id
- */
-@Component
-public class BusnessIdUtil {
-
-    /**
-     * 生成msg_id
-     * @return
-     */
-    public String getMsgid(String fixmedinsCode){
-        return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomInt(1000, 9999);
-    }
-
-    /**
-     * 生成发票号
-     * @return
-     */
-    public static String gettInvoiceNo(String fixmedinsCode){
-        return DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(6);
-    }
-
-    /**
-     * 生成费用明细流水号
-     * @return
-     */
-    public String gettFeedetlSn(String fixmedinsCode){
-        return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(4);
-    }
-
-    /**
-     * 生成id
-     * @return
-     */
-    public String getId(String fixmedinsCode){
-        return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(10);
-    }
-
-    /**
-     * 生成医院科室编码
-     * @return
-     */
-    public String getCodg(String fixmedinsCode){
-        return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(4);
-    }
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java
deleted file mode 100644
index db09592b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.openhis.utils;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 获取用户真实ip工具类
- */
-public class CusAccessObjectUtil {
-
-    /**
-     * 获取用户真实IP地址
-     * @param request
-     * @return
-     */
-    public static String getIpAddress(HttpServletRequest request) {
-        String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_CLIENT_IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getRemoteAddr();
-        }
-        return ip;
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java
deleted file mode 100644
index 059029f5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package com.openhis.utils;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.gm.GMNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.SM2Engine;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
-import org.bouncycastle.jcajce.spec.SM2ParameterSpec;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.*;
-import java.util.Arrays;
-
-/**
- * 注意事项：
- * 这个版本的BC对SM3withSM2的结果为asn1格式的r和s，如果需要直接拼接的r||s需要自己转换。下面rsAsn1ToPlainByteArray、rsPlainByteArrayToAsn1就在干这事。
- * 这个版本的BC对SM2的结果为C1||C2||C3，据说为旧标准，新标准为C1||C3||C2，用新标准的需要自己转换。下面changeC1C2C3ToC1C3C2、changeC1C3C2ToC1C2C3就在干这事。
- */
-public class EasyGmUtils {
-
-    private static X9ECParameters x9ECParameters = GMNamedCurves.getByName("sm2p256v1");
-    private static ECDomainParameters ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-    private static ECParameterSpec ecParameterSpec = new ECParameterSpec(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-
-    public static byte[] signSm3WithSm2(byte[] msg, byte[] userId, byte[] privateKeyBytes) {
-        BCECPrivateKey bcecPrivateKey = getPrivatekeyFromD(BigIntegers.fromUnsignedByteArray(privateKeyBytes));
-        return signSm3WithSm2(msg, userId, bcecPrivateKey);
-
-    }
-
-    /**
-     * @param msg
-     * @param userId
-     * @param privateKey
-     * @return r||s，直接拼接byte数组的rs
-     */
-    public static byte[] signSm3WithSm2(byte[] msg, byte[] userId, PrivateKey privateKey) {
-        return rsAsn1ToPlainByteArray(signSm3WithSm2Asn1Rs(msg, userId, privateKey));
-    }
-
-
-    /**
-     * @param msg
-     * @param userId
-     * @param privateKey
-     * @return rs in <b>asn1 format</b>
-     */
-    public static byte[] signSm3WithSm2Asn1Rs(byte[] msg, byte[] userId, PrivateKey privateKey) {
-        try {
-            SM2ParameterSpec parameterSpec = new SM2ParameterSpec(userId);
-            Signature signer = BCUtils.getSignature("SM3withSM2");
-//            signer.setParameter(parameterSpec);
-            signer.initSign(privateKey, new SecureRandom());
-            signer.update(msg, 0, msg.length);
-            byte[] sig = signer.sign();
-            return sig;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static boolean verifySm3WithSm2(byte[] msg, byte[] userId, byte[] rs, byte[] publicKeyBytes) {
-        if (publicKeyBytes.length != 64 && publicKeyBytes.length != 65) {
-            throw new RuntimeException("err key length");
-        }
-
-        BigInteger x, y;
-        if (publicKeyBytes.length > 64) {
-            x = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 1, 32);
-            y = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 33, 32);
-        } else {
-            x = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 0, 32);
-            y = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 32, 32);
-        }
-        BCECPublicKey bcecPublicKey = getPublickeyFromXY(x, y);
-
-        return verifySm3WithSm2(msg, userId, rs, bcecPublicKey);
-    }
-
-    /**
-     * @param msg
-     * @param userId
-     * @param rs        r||s，直接拼接byte数组的rs
-     * @param publicKey
-     * @return
-     */
-    public static boolean verifySm3WithSm2(byte[] msg, byte[] userId, byte[] rs, PublicKey publicKey) {
-        return verifySm3WithSm2Asn1Rs(msg, userId, rsPlainByteArrayToAsn1(rs), publicKey);
-    }
-
-    /**
-     * @param msg
-     * @param userId
-     * @param rs        in <b>asn1 format</b>
-     * @param publicKey
-     * @return
-     */
-    public static boolean verifySm3WithSm2Asn1Rs(byte[] msg, byte[] userId, byte[] rs, PublicKey publicKey) {
-        try {
-
-            Signature verifier = BCUtils.getSignature("SM3withSM2");
-//            verifier.setParameter(parameterSpec);
-            verifier.initVerify(publicKey);
-            verifier.update(msg, 0, msg.length);
-            return verifier.verify(rs);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * bc加解密使用旧标c1||c2||c3，此方法在加密后调用，将结果转化为c1||c3||c2
-     *
-     * @param c1c2c3
-     * @return
-     */
-    private static byte[] changeC1C2C3ToC1C3C2(byte[] c1c2c3) {
-        final int c1Len = (x9ECParameters.getCurve().getFieldSize() + 7) / 8 * 2 + 1; //sm2p256v1的这个固定65。可看GMNamedCurves、ECCurve代码。
-        final int c3Len = 32; //new SM3Digest().getDigestSize();
-        byte[] result = new byte[c1c2c3.length];
-        System.arraycopy(c1c2c3, 0, result, 0, c1Len); //c1
-        System.arraycopy(c1c2c3, c1c2c3.length - c3Len, result, c1Len, c3Len); //c3
-        System.arraycopy(c1c2c3, c1Len, result, c1Len + c3Len, c1c2c3.length - c1Len - c3Len); //c2
-        return result;
-    }
-
-
-    /**
-     * bc加解密使用旧标c1||c3||c2，此方法在解密前调用，将密文转化为c1||c2||c3再去解密
-     *
-     * @param c1c3c2
-     * @return
-     */
-    private static byte[] changeC1C3C2ToC1C2C3(byte[] c1c3c2) {
-        final int c1Len = (x9ECParameters.getCurve().getFieldSize() + 7) / 8 * 2 + 1; //sm2p256v1的这个固定65。可看GMNamedCurves、ECCurve代码。
-        final int c3Len = 32; //new SM3Digest().getDigestSize();
-        byte[] result = new byte[c1c3c2.length];
-        System.arraycopy(c1c3c2, 0, result, 0, c1Len); //c1: 0->65
-        System.arraycopy(c1c3c2, c1Len + c3Len, result, c1Len, c1c3c2.length - c1Len - c3Len); //c2
-        System.arraycopy(c1c3c2, c1Len, result, c1c3c2.length - c3Len, c3Len); //c3
-        return result;
-    }
-
-    private final static int RS_LEN = 32;
-
-    private static byte[] bigIntToFixexLengthBytes(BigInteger rOrS) {
-        // for sm2p256v1, n is 00fffffffeffffffffffffffffffffffff7203df6b21c6052b53bbf40939d54123,
-        // r and s are the result of mod n, so they should be less than n and have length<=32
-        byte[] rs = rOrS.toByteArray();
-        if (rs.length == RS_LEN) {
-            return rs;
-        } else if (rs.length == RS_LEN + 1 && rs[0] == 0) {
-            return Arrays.copyOfRange(rs, 1, RS_LEN + 1);
-        } else if (rs.length < RS_LEN) {
-            byte[] result = new byte[RS_LEN];
-            Arrays.fill(result, (byte) 0);
-            System.arraycopy(rs, 0, result, RS_LEN - rs.length, rs.length);
-            return result;
-        } else {
-            throw new RuntimeException("err rs: " + Hex.toHexString(rs));
-        }
-    }
-
-    /**
-     * BC的SM3withSM2签名得到的结果的rs是asn1格式的，这个方法转化成直接拼接r||s
-     *
-     * @param rsDer rs in asn1 format
-     * @return sign result in plain byte array
-     */
-    private static byte[] rsAsn1ToPlainByteArray(byte[] rsDer) {
-        ASN1Sequence seq = ASN1Sequence.getInstance(rsDer);
-        byte[] r = bigIntToFixexLengthBytes(ASN1Integer.getInstance(seq.getObjectAt(0)).getValue());
-        byte[] s = bigIntToFixexLengthBytes(ASN1Integer.getInstance(seq.getObjectAt(1)).getValue());
-        byte[] result = new byte[RS_LEN * 2];
-        System.arraycopy(r, 0, result, 0, r.length);
-        System.arraycopy(s, 0, result, RS_LEN, s.length);
-        return result;
-    }
-
-    /**
-     * BC的SM3withSM2验签需要的rs是asn1格式的，这个方法将直接拼接r||s的字节数组转化成asn1格式
-     *
-     * @param sign in plain byte array
-     * @return rs result in asn1 format
-     */
-    private static byte[] rsPlainByteArrayToAsn1(byte[] sign) {
-        if (sign.length != RS_LEN * 2) {
-            throw new RuntimeException("err rs. ");
-        }
-        BigInteger r = new BigInteger(1, Arrays.copyOfRange(sign, 0, RS_LEN));
-        BigInteger s = new BigInteger(1, Arrays.copyOfRange(sign, RS_LEN, RS_LEN * 2));
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(new ASN1Integer(r));
-        v.add(new ASN1Integer(s));
-        try {
-            return new DERSequence(v).getEncoded("DER");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static BCECPrivateKey getPrivatekeyFromD(BigInteger d) {
-        ECPrivateKeySpec ecPrivateKeySpec = new ECPrivateKeySpec(d, ecParameterSpec);
-        return new BCECPrivateKey("EC", ecPrivateKeySpec, BouncyCastleProvider.CONFIGURATION);
-    }
-
-    public static BCECPublicKey getPublickeyFromXY(BigInteger x, BigInteger y) {
-        ECPublicKeySpec ecPublicKeySpec = new ECPublicKeySpec(x9ECParameters.getCurve().createPoint(x, y), ecParameterSpec);
-        return new BCECPublicKey("EC", ecPublicKeySpec, BouncyCastleProvider.CONFIGURATION);
-    }
-
-    /**
-     * c1||c3||c2
-     *
-     * @param data
-     * @param key
-     * @return
-     */
-    public static byte[] sm2Decrypt(byte[] data, PrivateKey key) {
-        return sm2DecryptOld(changeC1C3C2ToC1C2C3(data), key);
-    }
-
-    /**
-     * c1||c3||c2
-     *
-     * @param data
-     * @param key
-     * @return
-     */
-
-    public static byte[] sm2Encrypt(byte[] data, PublicKey key) {
-        return changeC1C2C3ToC1C3C2(sm2EncryptOld(data, key));
-    }
-
-    /**
-     * c1||c2||c3
-     *
-     * @param data
-     * @param key
-     * @return
-     */
-    public static byte[] sm2EncryptOld(byte[] data, PublicKey key) {
-        BCECPublicKey localECPublicKey = (BCECPublicKey) key;
-        ECPublicKeyParameters ecPublicKeyParameters = new ECPublicKeyParameters(localECPublicKey.getQ(), ecDomainParameters);
-        SM2Engine sm2Engine = new SM2Engine();
-        sm2Engine.init(true, new ParametersWithRandom(ecPublicKeyParameters, new SecureRandom()));
-        try {
-            return sm2Engine.processBlock(data, 0, data.length);
-        } catch (InvalidCipherTextException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * c1||c2||c3
-     *
-     * @param data
-     * @param key
-     * @return
-     */
-    public static byte[] sm2DecryptOld(byte[] data, PrivateKey key) {
-        BCECPrivateKey localECPrivateKey = (BCECPrivateKey) key;
-        ECPrivateKeyParameters ecPrivateKeyParameters = new ECPrivateKeyParameters(localECPrivateKey.getD(), ecDomainParameters);
-        SM2Engine sm2Engine = new SM2Engine();
-        sm2Engine.init(false, ecPrivateKeyParameters);
-        try {
-            return sm2Engine.processBlock(data, 0, data.length);
-        } catch (InvalidCipherTextException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static byte[] sm4Encrypt(byte[] keyBytes, byte[] plain) {
-        if (keyBytes.length != 16) {
-            throw new RuntimeException("err key length");
-        }
-
-        try {
-            Key key = new SecretKeySpec(keyBytes, "SM4");
-
-            Cipher out = BCUtils.getCipher("SM4/ECB/PKCS7Padding");
-            out.init(Cipher.ENCRYPT_MODE, key);
-            return out.doFinal(plain);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static byte[] sm4Decrypt(byte[] keyBytes, byte[] cipher) {
-//        if (keyBytes.length != 16) throw new RuntimeException("err key length");
-        if (cipher.length % 16 != 0) {
-            throw new RuntimeException("err data length");
-        }
-
-        try {
-            Key key = new SecretKeySpec(keyBytes, "SM4");
-            Cipher in = BCUtils.getCipher("SM4/ECB/PKCS7Padding");
-            in.init(Cipher.DECRYPT_MODE, key);
-            return in.doFinal(cipher);
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java
deleted file mode 100644
index e1a4830b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.openhis.utils;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import org.bouncycastle.util.encoders.Hex;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Iterator;
-import java.util.Map;
-
-import static java.util.Base64.getEncoder;
-
-
-/**
- * 电子凭证加解密和.
- */
-public class HseEncAndDecUtil {
-
-
-    /**
-     * sm2签名
-     * @param message 未加密报文
-     * @param sm4key 渠道sm4密钥
-     * @param prvKey 渠道私钥
-     * @return 签名串 String
-     * @throws Exception
-     */
-    public static String signature(String message,String sm4key,String prvKey,String appId){
-        byte[] messageByte;
-        try {
-            JSONObject jsonObject = JSON.parseObject(message);
-            removeEmpty(jsonObject);
-            messageByte = SignUtil.getSignText(jsonObject, sm4key).getBytes("UTF-8");
-        }catch (Exception e){
-            messageByte = message.getBytes();
-        }
-        System.out.println("待签名的参数："+ messageByte);
-        //byte[] prvKeyBite = Base64.getDecoder().decode(prvKey);
-        //byte[] asig = EasyGmUtils.signSm3WithSm2(message.getBytes(StandardCharsets.UTF_8),
-                //appId.getBytes(StandardCharsets.UTF_8), prvKeyBite);
-        //String signStr = new String(Base64.getEncoder().encode(secKey));
-        //return signStr;
-        byte[] chnlSecretByte = sm4key.getBytes();
-        byte[] prvkey = Base64.getDecoder().decode(prvKey);
-        return Base64.getEncoder().encodeToString(EasyGmUtils.signSm3WithSm2(messageByte, chnlSecretByte, prvkey));
-    }
-
-    /**
-     * sm2验签
-     * @param msg sm4解密后报文
-     * @param source 原始响应报文
-     * @param signData 签名串
-     * @param sm4key 渠道密钥
-     * @param pubKey 平台公钥
-     * @return 验证是否通过 boolean
-     * @throws Exception
-     */
-    public static boolean verify(String msg,String source, String signData,String sm4key,String pubKey){
-        byte[] msgByte;
-        try {
-            JSONObject jsonObject = JSON.parseObject(msg);
-            JSONObject jsonObjects = JSON.parseObject(source);
-            jsonObjects.remove("signData");
-            jsonObjects.remove("encData");
-            jsonObjects.put("data",jsonObject);
-            removeEmpty(jsonObject);
-            String str = SignUtil.getSignText(jsonObjects, sm4key);
-            msgByte = str.getBytes("UTF-8");
-        }catch (Exception e){
-            msgByte = msg.getBytes();
-        }
-        byte[] signatureByte = Base64.getDecoder().decode(signData),
-                chnlSecretByte = sm4key.getBytes(),
-                pubKeyByte = Base64.getDecoder().decode(pubKey);
-
-        return EasyGmUtils.verifySm3WithSm2(msgByte, chnlSecretByte, signatureByte, pubKeyByte);
-    }
-
-
-    /**
-     * sm4加密
-     * @param chnlId 渠道id
-     * @param sm4key 渠道sm4密钥
-     * @param message 待加密报文
-     * @return 加密后的报文内容 String
-     * @throws Exception
-     */
-    public static String sm4Encrypt(String chnlId,String sm4key,String message) throws Exception {
-        //用appId加密appSecret获取新秘钥
-        byte[] appSecretEncData = EasyGmUtils.sm4Encrypt(chnlId.substring(0, 16).getBytes("UTF-8"), sm4key.getBytes("UTF-8"));
-        //新秘钥串
-        byte[] secKey = Hex.toHexString(appSecretEncData).toUpperCase().substring(0, 16).getBytes("UTF-8");
-        //加密数据
-        return Hex.toHexString(EasyGmUtils.sm4Encrypt(secKey, message.getBytes("UTF-8"))).toUpperCase();
-    }
-
-    /**
-     * sm4解密
-     * @param chnlId 渠道id
-     * @param sm4key 渠道sm4密钥
-     * @param message 待解密报文
-     * @return 解密后的报文 String
-     * @throws Exception
-     */
-    public static String sm4Decrypt (String chnlId,String sm4key,String message) throws Exception{
-        //生产解密key
-        byte[] appSecretEncDataDecode = EasyGmUtils.sm4Encrypt(chnlId.substring(0, 16).getBytes("UTF-8"), sm4key.getBytes("UTF-8"));
-        byte[] secKeyDecode = Hex.toHexString(appSecretEncDataDecode).toUpperCase().substring(0, 16).getBytes("UTF-8");
-        return new String(EasyGmUtils.sm4Decrypt(secKeyDecode, Hex.decode(message)));
-    }
-
-    private final static String version = "1.0.0";
-    private final static String encType = "sm4";
-    private final static String signType = "sm2";
-    /**
-     * 创建请求报文
-     * @param chnlId 渠道id
-     * @param encData 加密的报文
-     * @param signData 签名的报文
-     * @param transType 请求接口名
-     * @return
-     */
-    public static JSONObject buildMsg(String chnlId,String encData,String signData,String transType){
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("appId",chnlId);
-        jsonObject.put("encData",encData);
-        jsonObject.put("encType",encType);
-        jsonObject.put("signData",signData);
-        jsonObject.put("signType",signType);
-        jsonObject.put("timestamp", System.currentTimeMillis());
-        jsonObject.put("transType",transType);
-        jsonObject.put("version",version);
-        return jsonObject;
-    }
-
-    /**
-     * 创建和加密请求报文
-     * @param chnlId 渠道id
-     * @param sm4key 渠道sm4密钥
-     * @param prvkey 渠道私钥
-     * @param transType 请求接口名
-     * @param body 原始未加密的请求报文体
-     * @return
-     * @throws Exception
-     */
-    public static JSONObject encryptMsg(String chnlId,String sm4key,String prvkey,String transType,JSONObject body) throws Exception {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("appId",chnlId);
-        jsonObject.put("encType",encType);
-        jsonObject.put("data",body);
-        jsonObject.put("signType",signType);
-        jsonObject.put("timestamp", System.currentTimeMillis());
-        jsonObject.put("transType",transType);
-        jsonObject.put("version",version);
-        //加密后的报文
-        String encData = sm4Encrypt(chnlId,sm4key, body.toJSONString());
-        //签名
-        String signData = signature(jsonObject.toJSONString(), sm4key, prvkey,chnlId);
-        jsonObject.remove("data");
-        jsonObject.put("encData",encData);
-        jsonObject.put("signData",signData);
-        return jsonObject;
-    }
-
-    /**
-     * 解密报文
-     * @param jsonObject 医保电子凭证响应的原始加密报文
-     * @param sm4key 渠道sm4密钥
-     * @param pubKey 平台公钥
-     * @param chnlIdSrc 渠道id（兼容旧中台报文返回参数无渠道id参数情况）
-     * @return
-     * @throws Exception
-     */
-    public static String decryptMsg(JSONObject jsonObject,String sm4key,String pubKey,String chnlIdSrc) throws Exception {
-        String chnlId = (String) jsonObject.get("appId");
-        chnlId = StringUtil.isEmpty(chnlId)?chnlIdSrc:chnlId;
-        String msg = (String) jsonObject.get("encData");
-        String message = (String) jsonObject.get("message");
-        String code = (String) jsonObject.get("code");
-        if (!"0".equals(code)){
-            throw new RuntimeException(message);
-        }
-        //解密
-        String msgS = sm4Decrypt(chnlId,sm4key,msg);
-        //验签
-        String signData = (String) jsonObject.get("signData");
-        boolean flag = verify(msgS,jsonObject.toJSONString(),signData,sm4key,pubKey);
-        if (!flag){
-            throw new RuntimeException("验签失败！！！");
-        }
-        return msgS;
-    }
-
-    /**
-     * 移除json中空值的键值对
-     * @param jsonObject
-     */
-    private static void removeEmpty(JSONObject jsonObject){
-        Iterator<Map.Entry<String, Object>> it = jsonObject.entrySet().iterator();
-        while (it.hasNext()){
-            Map.Entry<String, Object> entry = it.next();
-            Object value = entry.getValue();
-            if (value instanceof JSONArray) {
-                JSONArray jsonArray = (JSONArray) value;
-                // 数组长度为0时将其处理,防止Gson转换异常
-                if (jsonArray.size() == 0) {
-                    it.remove();
-                } else {
-                    for (Object o : jsonArray) {
-                        JSONObject asJsonObject = (JSONObject) o;
-                        removeEmpty(asJsonObject);
-                    }
-                }
-            }
-            if (value instanceof JSONObject) {
-                JSONObject asJsonObject = (JSONObject) value;
-                removeEmpty(asJsonObject);
-            }
-            if (value == null){
-                it.remove();
-            }
-            if (value instanceof String &&StringUtil.isEmpty(value)){
-                it.remove();
-            }
-        }
-    }
-
-    public static void main(String[] args) throws Exception{
-
-        /**
-         * 生成sm2公私钥
-         */
-//        System.out.println(SM2Util.getKeyPairStr());
-
-
-        /**
-         * 渠道id
-         */
-        String chnlId = "";
-        /**
-         * 渠道私钥
-         */
-        String prvkey = "TcuVE2p/=";
-        /**
-         * 渠道密钥
-         */
-        String sm4key = "";
-        /**
-         * 平台公钥
-         */
-        String pubKey = "+++Vvnrxdp8CnkYFXBdu6c=";
-
-        /**
-         * 报文体
-         */
-        JSONObject body = new JSONObject();
-        body.put("appUserId","ohNH9sgKsmJC3tR_spm9jcQx_bh");
-        body.put("appId",chnlId);
-        body.put("idNo","");
-        body.put("idType","01");
-        body.put("userName","");
-        body.put("authCode","111111");
-        body.put("redirectURL","www.baidu.com");
-        body.put("phone","18050860136");
-        body.put("certificateStatus","asdas");
-
-
-        JSONObject s1 = encryptMsg(chnlId,sm4key,prvkey,"ec.gen.link",body);
-        System.out.println("加密后的报文:"+s1);
-
-        String s2 = decryptMsg(s1,sm4key,pubKey,chnlId);
-        System.out.println("解密后的报文:"+s2);
-
-    }
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java
deleted file mode 100644
index 48d32f99..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.openhis.utils;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 获取tokenHttp工具类
- */
-public class HttpClientUtil {
-
-    /**
-     * psot请求
-     * @param url
-     * @param param
-     * @param header
-     * @param charset
-     * @param input
-     * @return
-     */
-    public static String sendIOPost(String url, Map<String, String> param, Map<String, String> header, String charset, String input) {
-        String result = null;
-        CloseableHttpResponse response = null;
-        CloseableHttpClient httpclient = null;
-        try {
-            httpclient = HttpClients.createDefault();
-            HttpPost httpPost = new HttpPost(url);
-            List<NameValuePair> list = new ArrayList<>();
-            if (param != null) {
-                Iterator iterator = param.entrySet().iterator();
-                while (iterator.hasNext()) {
-                    Map.Entry<String, String> elem = (Map.Entry<String, String>) iterator.next();
-                    list.add(new BasicNameValuePair(elem.getKey(), elem.getValue()));
-                }
-            }
-            if (list.size() > 0) {
-                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, charset);
-                httpPost.setEntity(entity);
-            }
-            if (input != null) {
-                StringEntity entity = new StringEntity(input, charset);
-                httpPost.setEntity(entity);
-            }
-            if (header != null) {
-                Iterator iterator = header.entrySet().iterator();
-                while (iterator.hasNext()) {
-                    Map.Entry<String, String> elem = (Map.Entry<String, String>) iterator.next();
-                    httpPost.setHeader(elem.getKey(), elem.getValue());
-                }
-            }
-            response = httpclient.execute(httpPost);
-            if (response != null) {
-                HttpEntity resEntity = response.getEntity();
-                if (resEntity != null) {
-                    result = EntityUtils.toString(resEntity, charset);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (response != null) {
-                    response.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            try {
-                if (httpclient != null) {
-                    httpclient.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return result;
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
deleted file mode 100644
index 4086e66d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.openhis.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.List;
-
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.pdf.*;
-import com.openhis.utils.RedisUtil;
-import com.openhis.web.ybmanage.dto.PDFInputDto;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import static com.alibaba.fastjson.JSON.parseObject;
-
-/**
- * PDF模板替换类
- *
- * @author liuhr
- * @date 2025/4/30
- */
-public final class PDFTemplateFillerUtil {
-
-    // "--"分隔处方结束
-    public static final String DASH_LINE =
-            "-------------------------------------------------------------------------------------------------------";
-
-    /**
-     * 根据模板pdf文件，替换生成新的pdf
-     *
-     * @param templatePath     模板pdf文件
-     * @param outputPath       替换后的pdf文件
-     * @param hospitalSealPath 医院盖章路径
-     * @param dto              替换内容
-     */
-    public static void fillPdfTemplate(String templatePath, String outputPath, String hospitalSealPath, PDFInputDto dto)
-            throws IOException, DocumentException {
-        PdfReader reader = new PdfReader(templatePath);
-        PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(outputPath));
-
-        // 设置字体类型和大小（需要提前注册字体）
-        // 设置字体为宋体（SimSun）
-        BaseFont baseFont = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
-        stamper.getAcroFields().setFieldProperty("$HOS_NAME", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$HOS_NAME", "textsize", 14f, null);
-        stamper.getAcroFields().setFieldProperty("$QR_NUMBER", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$QR_NUMBER", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$BUS_NO", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$BUS_NO", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$P_NO", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$P_NO", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$GENDER", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$GENDER", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$AGE", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$AGE", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$CONTRACT", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$CONTRACT", "textsize", 8f, null);
-        stamper.getAcroFields().setFieldProperty("$DATE", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$DATE", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$DAYS", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$DAYS", "textsize", 10f, null);
-        stamper.getAcroFields().setFieldProperty("$DIAG_NAME", "textfont", baseFont, null);
-        stamper.getAcroFields().setFieldProperty("$DIAG_NAME", "textsize", 10f, null);
-
-        // 替换文本内容
-        stamper.getAcroFields().setField("$QR_NUMBER", dto.getRxTraceCode());
-        stamper.getAcroFields().setField("$HOS_NAME", dto.getOrgName());
-        stamper.getAcroFields().setField("$BUS_NO", dto.getIptOtpNo());
-        stamper.getAcroFields().setField("$P_NO", dto.getPrescriptionNo());
-        stamper.getAcroFields().setField("$LOCATION_NAME", dto.getLocationName());
-        stamper.getAcroFields().setField("$PATIENT_NAME", dto.getPatnName());
-        stamper.getAcroFields().setField("$GENDER", dto.getGender());
-        stamper.getAcroFields().setField("$AGE", dto.getPatnAge().toString()+ "岁");
-        stamper.getAcroFields().setField("$CONTRACT", dto.getHiFeesetlType());
-        // 设置时间格式为 "yyyy-MM-dd HH:mm:ss"
-        // 设置时间格式为中文格式 "xx年xx月xx日"
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
-        stamper.getAcroFields().setField("$DATE", sdf.format(dto.getPrscTime()));
-        stamper.getAcroFields().setField("$DIAG_NAME", " " + dto.getDiagName());
-        stamper.getAcroFields().setField("$DAYS", dto.getValiDays().toString() + "天");
-        stamper.getAcroFields().setField("$REASON", dto.getReason());
-        stamper.getAcroFields().setField("$P1_NAME", dto.getPrscDrName());
-        stamper.getAcroFields().setField("$P2_NAME", dto.getPharName());
-        stamper.getAcroFields().setField("$P3_NAME", dto.getDisRevPharName());
-        stamper.getAcroFields().setField("$P4_NAME", dto.getCheckPharName());
-
-        // 处理药品明细信息
-        if (dto.getMedDetailList() != null && !dto.getMedDetailList().isEmpty()) {
-            List<PDFInputDto.MedDetail> medDetails = dto.getMedDetailList();
-            medDetails.forEach(medDetail -> {
-                String strName = medDetail.getMedName() + "   " + medDetail.getDrugSpec();
-                String strDose = "用法： ";
-                // 单次用量及单位
-                if (medDetail.getSinDoscnt() != null && medDetail.getSinDosunt() != null) {
-                    strDose = strDose + medDetail.getSinDoscnt() + medDetail.getSinDosunt();
-                }
-                strDose = strDose + "   " + medDetail.getUsedFrquCodg() + "   " + medDetail.getMedWay();
-
-                int index = medDetails.indexOf(medDetail) + 1;
-
-                try {
-                    stamper.getAcroFields().setFieldProperty("$NAME_" + index, "textfont", baseFont, null);
-                    stamper.getAcroFields().setFieldProperty("$NAME_" + index, "textsize", 10f, null);
-                    stamper.getAcroFields().setFieldProperty("$DOSE_" + index, "textfont", baseFont, null);
-                    stamper.getAcroFields().setFieldProperty("$DOSE_" + index, "textsize", 10f, null);
-
-                    stamper.getAcroFields().setField("$NAME_" + index, strName);
-                    stamper.getAcroFields().setField("$DOSE_" + index, strDose);
-                    boolean isLastItem = medDetails.indexOf(medDetail) == medDetails.size() - 1;
-                    // 最后一张打印“---”
-                    if (isLastItem) {
-                        stamper.getAcroFields().setFieldProperty("$LINE_" + index, "textfont", baseFont, null);
-                        stamper.getAcroFields().setFieldProperty("$LINE_" + index, "textsize", 13f, null);
-                        stamper.getAcroFields().setFieldProperty("$EMPTY_" + index, "textfont", baseFont, null);
-                        stamper.getAcroFields().setFieldProperty("$EMPTY_" + index, "textsize", 7f, null);
-
-                        stamper.getAcroFields().setField("$LINE_" + index, DASH_LINE);
-                        stamper.getAcroFields().setField("$EMPTY_" + index, "(以下是空白)");
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } catch (DocumentException e) {
-                    e.printStackTrace();
-                }
-            });
-        }
-
-        // 删除空白的元素
-        for (int i = 1; i < 6; i++) {
-            // 检查字段是否存在并且内容为空
-            if (stamper.getAcroFields().getField("$EMPTY_" + i) == null || stamper.getAcroFields().getField("$EMPTY_" + i).isEmpty()) {
-                stamper.getAcroFields().removeField("$LINE_" + i);
-                stamper.getAcroFields().removeField("$EMPTY_" + i);
-            }
-        }
-
-        // 生成二维码
-        PdfContentByte cb = stamper.getOverContent(1); // 获取第一页的内容画布
-        int qrX = 80; // 二维码 X 坐标（根据模板调整）
-        int qrY = 680; // 二维码 Y 坐标（根据模板调整）
-        int qrSize = 100; // 二维码大小
-
-        BarcodeQRCode qrCode = new BarcodeQRCode(dto.getRxTraceCode(), qrSize, qrSize, null);
-        Image qrImage = qrCode.getImage();
-        qrImage.setAbsolutePosition(qrX, qrY);
-        cb.addImage(qrImage);
-
-        // 添加医院红章图片
-        if (hospitalSealPath != null && !hospitalSealPath.isEmpty()) {
-            try {
-                Image hospitalSeal = Image.getInstance(hospitalSealPath);
-                // 设置图片的高度和宽度（按照实际需求设置）
-                hospitalSeal.scaleToFit(120, 100); // 设置图片大小为宽100，高100
-                // 获取PDF页面的实际宽度和高度
-                float pageSizeWidth = reader.getPageSize(1).getWidth();
-                float pageSizeHeight = reader.getPageSize(1).getHeight();
-                // 计算右下角的位置（留出一些边距）
-                int sealX = (int) (pageSizeWidth - hospitalSeal.getScaledWidth() - 80); // X坐标（右下角）
-                int sealY = (int) (pageSizeHeight - hospitalSeal.getScaledHeight() - 550); // Y坐标（右下角）
-                hospitalSeal.setAbsolutePosition(sealX, sealY);
-                cb.addImage(hospitalSeal);
-            } catch (Exception e) {
-                e.printStackTrace();
-                System.err.println("添加医院红章图片时发生错误：" + e.getMessage());
-            }
-        }
-
-        stamper.close();
-        reader.close();
-    }
-
-    /**
-     * 处方文件获取
-     *
-     * @param fileName pdf文件名路径
-     */
-    public static String getPDFFile(String fileName) {
-
-        File file = new File(fileName);
-
-        // 校验文件是否存在
-        if (!file.exists() || !file.isFile() || !file.getName().toLowerCase().endsWith(".pdf")) {
-            return null;
-        }
-        try (FileInputStream fis = new FileInputStream(file)) {
-            // 读取文件字节数组
-            byte[] fileBytes = new byte[(int) file.length()];
-            int bytesRead = fis.read(fileBytes);
-            if (bytesRead != fileBytes.length) {
-                return null;
-            }
-            // Base64编码（标准格式，无换行符）
-            return Base64.getEncoder().encodeToString(fileBytes);
-
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * 做成PDF
-     *
-     * @param rxFileString pdf信息
-     * @param fileName     pdf文件名路径
-     */
-    public static Boolean makePDF(String rxFileString, String fileName) {
-        try {
-            // 验证Base64字符串格式
-            if (rxFileString == null || rxFileString.isEmpty()) {
-                return false;
-            }
-            // 解码Base64字符串
-            byte[] pdfBytes = Base64.getDecoder().decode(rxFileString);
-            // 创建目标目录（如果不存在）
-            String directoryPath;
-            int lastSlash = fileName.lastIndexOf('/');
-            if (lastSlash == -1) {
-                // 没有目录部分，可能是当前目录下的文件（如 "file.pdf"）
-                directoryPath = "";  // 或者 "." 表示当前目录
-            } else {
-                directoryPath = fileName.substring(0, lastSlash);
-            }
-            Files.createDirectories(Paths.get(directoryPath));
-
-            // 写入文件
-            try (FileOutputStream fos = new FileOutputStream(fileName)) {
-                fos.write(pdfBytes);
-            }
-
-        } catch (Exception e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * 创建当天日期的文件夹
-     *
-     * @param outputPath   父文件夹
-     * @param datePathName 日期文件夹名
-     */
-    public static Boolean makePath(String outputPath, String datePathName) {
-        try {
-            // 构建代表新文件夹的File对象
-            File newDir = new File(outputPath, datePathName);
-
-            // 检查新文件夹是否已存在
-            if (!newDir.exists()) {
-                // 创建新文件夹
-                boolean created = newDir.mkdir();
-
-                if (created) {
-                    System.out.println("文件夹创建成功：" + newDir.getAbsolutePath());
-                    return true;
-                } else {
-                    System.out.println("文件夹创建失败，可能是父文件夹不存在或者没有写入权限：" + newDir.getAbsolutePath());
-                    return false;
-                }
-            } else {
-                System.out.println("文件夹已存在,不创建新的文件夹：" + newDir.getAbsolutePath());
-                return true;
-            }
-        } catch (Exception e) {
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java
deleted file mode 100644
index 93365981..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java
+++ /dev/null
@@ -1,611 +0,0 @@
-package com.openhis.utils;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.*;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * redis 工具类
- * @Author Scott
- *
- */
-@Component
-public class RedisUtil {
-
-	@Autowired
-	private RedisTemplate<Object, Object> redisTemplate;
-	@Autowired
-	private StringRedisTemplate stringRedisTemplate;
-
-	/**
-	 * 指定缓存失效时间
-	 * 
-	 * @param key  键
-	 * @param time 时间(秒)
-	 * @return
-	 */
-	public boolean expire(String key, long time) {
-		try {
-			if (time > 0) {
-				redisTemplate.expire(key, time, TimeUnit.SECONDS);
-			}
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 根据key 获取过期时间
-	 * 
-	 * @param key 键 不能为null
-	 * @return 时间(秒) 返回0代表为永久有效
-	 */
-	public long getExpire(String key) {
-		return redisTemplate.getExpire(key, TimeUnit.SECONDS);
-	}
-
-	/**
-	 * 判断key是否存在
-	 * 
-	 * @param key 键
-	 * @return true 存在 false不存在
-	 */
-	public boolean hasKey(String key) {
-		try {
-			return redisTemplate.hasKey(key);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 删除缓存
-	 * 
-	 * @param key 可以传一个值 或多个
-	 */
-	@SuppressWarnings("unchecked")
-	public void del(String... key) {
-		if (key != null && key.length > 0) {
-			if (key.length == 1) {
-				redisTemplate.delete(key[0]);
-			} else {
-				redisTemplate.delete((Collection<String>) CollectionUtils.arrayToList(key));
-			}
-		}
-	}
-
-	// ============================String=============================
-	/**
-	 * 普通缓存获取
-	 * 
-	 * @param key 键
-	 * @return 值
-	 */
-	public Object get(String key) {
-		return key == null ? null : redisTemplate.opsForValue().get(key);
-	}
-
-	/**
-	 * 普通缓存放入
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @return true成功 false失败
-	 */
-	public boolean set(String key, Object value) {
-		try {
-			redisTemplate.opsForValue().set(key, value);
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-
-	}
-
-	/**
-	 * 普通缓存放入并设置时间
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
-	 * @return true成功 false 失败
-	 */
-	public boolean set(String key, Object value, long time) {
-		try {
-			if (time > 0) {
-				redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
-			} else {
-				set(key, value);
-			}
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 递增
-	 * 
-	 * @param key 键
-	 * @param by  要增加几(大于0)
-	 * @return
-	 */
-	public long incr(String key, long delta) {
-		if (delta < 0) {
-			throw new RuntimeException("递增因子必须大于0");
-		}
-		return redisTemplate.opsForValue().increment(key, delta);
-	}
-
-	/**
-	 * 递减
-	 * 
-	 * @param key 键
-	 * @param by  要减少几(小于0)
-	 * @return
-	 */
-	public long decr(String key, long delta) {
-		if (delta < 0) {
-			throw new RuntimeException("递减因子必须大于0");
-		}
-		return redisTemplate.opsForValue().increment(key, -delta);
-	}
-
-	// ================================Map=================================
-	/**
-	 * HashGet
-	 * 
-	 * @param key  键 不能为null
-	 * @param item 项 不能为null
-	 * @return 值
-	 */
-	public Object hget(String key, String item) {
-		return redisTemplate.opsForHash().get(key, item);
-	}
-
-	/**
-	 * 获取hashKey对应的所有键值
-	 * 
-	 * @param key 键
-	 * @return 对应的多个键值
-	 */
-	public Map<Object, Object> hmget(String key) {
-		return redisTemplate.opsForHash().entries(key);
-	}
-
-	/**
-	 * HashSet
-	 * 
-	 * @param key 键
-	 * @param map 对应多个键值
-	 * @return true 成功 false 失败
-	 */
-	public boolean hmset(String key, Map<String, Object> map) {
-		try {
-			redisTemplate.opsForHash().putAll(key, map);
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * HashSet 并设置时间
-	 * 
-	 * @param key  键
-	 * @param map  对应多个键值
-	 * @param time 时间(秒)
-	 * @return true成功 false失败
-	 */
-	public boolean hmset(String key, Map<String, Object> map, long time) {
-		try {
-			redisTemplate.opsForHash().putAll(key, map);
-			if (time > 0) {
-				expire(key, time);
-			}
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 向一张hash表中放入数据,如果不存在将创建
-	 * 
-	 * @param key   键
-	 * @param item  项
-	 * @param value 值
-	 * @return true 成功 false失败
-	 */
-	public boolean hset(String key, String item, Object value) {
-		try {
-			redisTemplate.opsForHash().put(key, item, value);
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 向一张hash表中放入数据,如果不存在将创建
-	 * 
-	 * @param key   键
-	 * @param item  项
-	 * @param value 值
-	 * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
-	 * @return true 成功 false失败
-	 */
-	public boolean hset(String key, String item, Object value, long time) {
-		try {
-			redisTemplate.opsForHash().put(key, item, value);
-			if (time > 0) {
-				expire(key, time);
-			}
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 删除hash表中的值
-	 * 
-	 * @param key  键 不能为null
-	 * @param item 项 可以使多个 不能为null
-	 */
-	public void hdel(String key, Object... item) {
-		redisTemplate.opsForHash().delete(key, item);
-	}
-
-	/**
-	 * 判断hash表中是否有该项的值
-	 * 
-	 * @param key  键 不能为null
-	 * @param item 项 不能为null
-	 * @return true 存在 false不存在
-	 */
-	public boolean hHasKey(String key, String item) {
-		return redisTemplate.opsForHash().hasKey(key, item);
-	}
-
-	/**
-	 * hash递增 如果不存在,就会创建一个 并把新增后的值返回
-	 * 
-	 * @param key  键
-	 * @param item 项
-	 * @param by   要增加几(大于0)
-	 * @return
-	 */
-	public double hincr(String key, String item, double by) {
-		return redisTemplate.opsForHash().increment(key, item, by);
-	}
-
-	/**
-	 * hash递减
-	 * 
-	 * @param key  键
-	 * @param item 项
-	 * @param by   要减少记(小于0)
-	 * @return
-	 */
-	public double hdecr(String key, String item, double by) {
-		return redisTemplate.opsForHash().increment(key, item, -by);
-	}
-
-	// ============================set=============================
-	/**
-	 * 根据key获取Set中的所有值
-	 * 
-	 * @param key 键
-	 * @return
-	 */
-	public Set<Object> sGet(String key) {
-		try {
-			return redisTemplate.opsForSet().members(key);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	/**
-	 * 根据value从一个set中查询,是否存在
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @return true 存在 false不存在
-	 */
-	public boolean sHasKey(String key, Object value) {
-		try {
-			return redisTemplate.opsForSet().isMember(key, value);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 将数据放入set缓存
-	 * 
-	 * @param key    键
-	 * @param values 值 可以是多个
-	 * @return 成功个数
-	 */
-	public long sSet(String key, Object... values) {
-		try {
-			return redisTemplate.opsForSet().add(key, values);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return 0;
-		}
-	}
-
-	/**
-	 * 将set数据放入缓存
-	 * 
-	 * @param key    键
-	 * @param time   时间(秒)
-	 * @param values 值 可以是多个
-	 * @return 成功个数
-	 */
-	public long sSetAndTime(String key, long time, Object... values) {
-		try {
-			Long count = redisTemplate.opsForSet().add(key, values);
-			if (time > 0) {
-				expire(key, time);
-			}
-			return count;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return 0;
-		}
-	}
-
-	/**
-	 * 获取set缓存的长度
-	 * 
-	 * @param key 键
-	 * @return
-	 */
-	public long sGetSetSize(String key) {
-		try {
-			return redisTemplate.opsForSet().size(key);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return 0;
-		}
-	}
-
-	/**
-	 * 移除值为value的
-	 * 
-	 * @param key    键
-	 * @param values 值 可以是多个
-	 * @return 移除的个数
-	 */
-	public long setRemove(String key, Object... values) {
-		try {
-			Long count = redisTemplate.opsForSet().remove(key, values);
-			return count;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return 0;
-		}
-	}
-	// ===============================list=================================
-
-	/**
-	 * 获取list缓存的内容
-	 * 
-	 * @param key   键
-	 * @param start 开始
-	 * @param end   结束 0 到 -1代表所有值
-	 * @return
-	 */
-	public List<Object> lGet(String key, long start, long end) {
-		try {
-			return redisTemplate.opsForList().range(key, start, end);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	/**
-	 * 获取list缓存的长度
-	 * 
-	 * @param key 键
-	 * @return
-	 */
-	public long lGetListSize(String key) {
-		try {
-			return redisTemplate.opsForList().size(key);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return 0;
-		}
-	}
-
-	/**
-	 * 通过索引 获取list中的值
-	 * 
-	 * @param key   键
-	 * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
-	 * @return
-	 */
-	public Object lGetIndex(String key, long index) {
-		try {
-			return redisTemplate.opsForList().index(key, index);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	/**
-	 * 将list放入缓存
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @param time  时间(秒)
-	 * @return
-	 */
-	public boolean lSet(String key, Object value) {
-		try {
-			redisTemplate.opsForList().rightPush(key, value);
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 将list放入缓存
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @param time  时间(秒)
-	 * @return
-	 */
-	public boolean lSet(String key, Object value, long time) {
-		try {
-			redisTemplate.opsForList().rightPush(key, value);
-			if (time > 0) {
-				expire(key, time);
-			}
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 将list放入缓存
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @param time  时间(秒)
-	 * @return
-	 */
-	public boolean lSet(String key, List<Object> value) {
-		try {
-			redisTemplate.opsForList().rightPushAll(key, value);
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 将list放入缓存
-	 * 
-	 * @param key   键
-	 * @param value 值
-	 * @param time  时间(秒)
-	 * @return
-	 */
-	public boolean lSet(String key, List<Object> value, long time) {
-		try {
-			redisTemplate.opsForList().rightPushAll(key, value);
-			if (time > 0) {
-				expire(key, time);
-			}
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 根据索引修改list中的某条数据
-	 * 
-	 * @param key   键
-	 * @param index 索引
-	 * @param value 值
-	 * @return
-	 */
-	public boolean lUpdateIndex(String key, long index, Object value) {
-		try {
-			redisTemplate.opsForList().set(key, index, value);
-			return true;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	/**
-	 * 移除N个值为value
-	 * 
-	 * @param key   键
-	 * @param count 移除多少个
-	 * @param value 值
-	 * @return 移除的个数
-	 */
-	public long lRemove(String key, long count, Object value) {
-		try {
-			Long remove = redisTemplate.opsForList().remove(key, count, value);
-			return remove;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return 0;
-		}
-	}
-
-	/**
-	 *  获取指定前缀的一系列key
-	 *  使用scan命令代替keys, Redis是单线程处理，keys命令在KEY数量较多时，
-	 *  操作效率极低【时间复杂度为O(N)】，该命令一旦执行会严重阻塞线上其它命令的正常请求
-	 * @param keyPrefix
-	 * @return
-	 */
-	private Set<String> keys(String keyPrefix) {
-		String realKey = keyPrefix + "*";
-
-		try {
-			return redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
-				Set<String> binaryKeys = new HashSet<>();
-				Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(realKey).count(Integer.MAX_VALUE).build());
-				while (cursor.hasNext()) {
-					binaryKeys.add(new String(cursor.next()));
-				}
-
-				return binaryKeys;
-			});
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 *  删除指定前缀的一系列key
-	 * @param keyPrefix
-	 */
-	public void removeAll(String keyPrefix) {
-		try {
-			Set<String> keys = keys(keyPrefix);
-			redisTemplate.delete(keys);
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java
deleted file mode 100644
index c6572163..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.openhis.utils;
-
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-
-import java.util.*;
-
-
-public class SignUtil {
-    private static List<String> ignoreSign = new ArrayList();
-
-    public static String getSignText(JSONObject jsonObject, String appSecret) {
-        Map<String, String> signMap = new TreeMap();
-        Set<Map.Entry<String, Object>> entrys = jsonObject.entrySet();
-        Iterator var4 = entrys.iterator();
-
-        while (var4.hasNext()) {
-            Map.Entry<String, Object> entry = (Map.Entry) var4.next();
-            if (!StringUtil.isEmpty(entry.getValue()) && !ignoreSign.contains(entry.getKey())) {
-                signMap.put(entry.getKey(), getValue(entry.getValue()));
-            }
-        }
-
-        ArrayList<String> list = new ArrayList();
-        Iterator var10 = signMap.entrySet().iterator();
-
-        while (var10.hasNext()) {
-            Map.Entry<String, String> entry = (Map.Entry) var10.next();
-            if (StringUtil.isNotEmpty(getObjString(entry.getValue()))) {
-                list.add((String) entry.getKey() + "=" + (String) entry.getValue() + "&");
-            }
-        }
-
-        int size = list.size();
-        String[] arrayToSort = (String[]) list.toArray(new String[size]);
-        Arrays.sort(arrayToSort, String.CASE_INSENSITIVE_ORDER);
-        StringBuilder sb = new StringBuilder();
-
-        for (int i = 0; i < size; ++i) {
-            sb.append(arrayToSort[i]);
-        }
-
-        String signText = sb.append("key=").append(appSecret).toString();
-        return signText;
-    }
-
-    public static String getObjString(Object object) {
-        return object == null ? "" : (String) object;
-    }
-
-    public static String getValue(Object value) {
-        return value instanceof String ? getObjString(value) : treeJsonParam(value);
-    }
-
-    private static String treeJsonParam(Object value) {
-        String jsonParam = null;
-        if (value instanceof Map) {
-            Map<String, Object> treeNestedMap = new TreeMap();
-            Map<?, ?> nestedMap = (Map) value;
-            Iterator var4 = nestedMap.entrySet().iterator();
-
-            while (var4.hasNext()) {
-                Map.Entry<?, ?> nestedEntry = (Map.Entry) var4.next();
-                treeNestedMap.put((String) nestedEntry.getKey(), nestedEntry.getValue());
-            }
-
-            jsonParam = JSONObject.toJSONString(treeParams(treeNestedMap));
-        } else if (value instanceof ArrayList) {
-            ArrayList<?> ar = (ArrayList) value;
-            jsonParam = JSONObject.toJSONString(treeList(ar));
-        } else if (value instanceof JSONArray) {
-            JSONArray jarr = (JSONArray) value;
-            jsonParam = JSONObject.toJSONString(treeJsonArray(jarr));
-        } else {
-            jsonParam = value.toString();
-        }
-
-        return jsonParam;
-    }
-
-    private static Map<String, Object> treeParams(Map<String, Object> params) {
-        if (params == null) {
-            return new TreeMap();
-        } else {
-            Map<String, Object> treeParams = new TreeMap();
-            Iterator var2 = params.entrySet().iterator();
-
-            while (true) {
-                while (var2.hasNext()) {
-                    Map.Entry<String, Object> entry = (Map.Entry) var2.next();
-                    String key = (String) entry.getKey();
-                    Object value = entry.getValue();
-                    if (value instanceof Map) {
-                        Map<String, Object> treeNestedMap = new TreeMap();
-                        Map<?, ?> nestedMap = (Map) value;
-                        Iterator var8 = nestedMap.entrySet().iterator();
-
-                        while (var8.hasNext()) {
-                            Map.Entry<?, ?> nestedEntry = (Map.Entry) var8.next();
-                            treeNestedMap.put((String) nestedEntry.getKey(), nestedEntry.getValue());
-                        }
-
-                        treeParams.put(key, treeParams(treeNestedMap));
-                    } else if (value instanceof ArrayList) {
-                        ArrayList<?> ar = (ArrayList) value;
-                        treeParams.put(key, treeList(ar));
-                    } else if (value instanceof JSONArray) {
-                        JSONArray ar = (JSONArray) value;
-                        treeParams.put(key, treeJsonArray(ar));
-                    } else if (!"".equals(value) && value != null) {
-                        treeParams.put(key, value.toString());
-                    }
-                }
-
-                return treeParams;
-            }
-        }
-    }
-
-    private static JSONArray treeList(ArrayList<?> list) {
-        if (list != null && list.size() != 0) {
-            JSONArray jsonArray = new JSONArray();
-            int size = list.size();
-
-            for (int i = 0; i < size; ++i) {
-                jsonArray.add(i, list.get(i));
-            }
-
-            return treeJsonArray(jsonArray);
-        } else {
-            return null;
-        }
-    }
-
-    private static JSONArray treeJsonArray(JSONArray jarr) {
-        if (jarr != null && jarr.size() != 0) {
-            JSONArray jsonArray = new JSONArray();
-            int size = jarr.size();
-
-            for (int i = 0; i < size; ++i) {
-                Object value = jarr.get(i);
-                if (!(value instanceof Map)) {
-                    if (value instanceof ArrayList) {
-                        ArrayList<?> ar = (ArrayList) value;
-                        jsonArray.add(i, treeList(ar));
-                    } else if (value instanceof JSONArray) {
-                        JSONArray ar = (JSONArray) value;
-                        jsonArray.add(i, treeJsonArray(ar));
-                    } else if (!"".equals(value)) {
-                        jsonArray.add(i, value.toString());
-                    }
-                } else {
-                    Map<String, Object> treeNestedMap = new TreeMap();
-                    Map<?, ?> nestedMap = (Map) value;
-                    Iterator var7 = nestedMap.entrySet().iterator();
-
-                    while (var7.hasNext()) {
-                        Map.Entry<?, ?> nestedEntry = (Map.Entry) var7.next();
-                        treeNestedMap.put((String) nestedEntry.getKey(), nestedEntry.getValue());
-                    }
-
-                    jsonArray.add(i, treeParams(treeNestedMap));
-                }
-            }
-
-            return jsonArray;
-        } else {
-            return null;
-        }
-    }
-
-    static {
-        ignoreSign.add("signData");
-        ignoreSign.add("encData");
-        ignoreSign.add("extra");
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java
deleted file mode 100644
index 97631bf9..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java
+++ /dev/null
@@ -1,428 +0,0 @@
-package com.openhis.utils;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.URLDecoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- *
- */
-public final class StringUtil {
-    public static final int XFF00 = 65280;
-    public static final int XF0 = 240;
-    public static final int X0F = 15;
-    public static final int XFF = 255;
-    public static final int X000000FF = 255;
-    public static final int X0000FF00 = 65280;
-    public static final int SIXTEEN = 16;
-    public static final char[] HEX_CHARS = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
-    public StringUtil() {
-    }
-
-    public static String getRandomString(int length) {
-        String base = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        Random random = new Random();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < length; ++i) {
-            int number = random.nextInt(base.length());
-            sb.append(base.charAt(number));
-        }
-
-        return sb.toString();
-    }
-
-    public static String getRandomNumber(int length) {
-        String base = "0123456789";
-        Random random = new Random();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < length; ++i) {
-            int number = random.nextInt(base.length());
-            sb.append(base.charAt(number));
-        }
-
-        return sb.toString();
-    }
-
-    public static int[] splitToIntArray(String s, String delim) {
-        String[] stringValueArray = split(s, delim);
-        int[] intValueArray = new int[stringValueArray.length];
-
-        for (int i = 0; i < intValueArray.length; ++i) {
-            intValueArray[i] = Integer.parseInt(stringValueArray[i]);
-        }
-
-        return intValueArray;
-    }
-
-    public static String[] split(String source, String div) {
-        int arynum = 0;
-        int div_length = div.length();
-        int intIdx;
-        if (source.compareTo("") != 0) {
-            if (source.indexOf(div) != -1) {
-                intIdx = source.indexOf(div);
-
-                for (int var6 = 1; source.indexOf(div, intIdx + div_length) != -1; arynum = var6++) {
-                    intIdx = source.indexOf(div, intIdx + div_length);
-                }
-
-                arynum += 2;
-            } else {
-                arynum = 1;
-            }
-        } else {
-            arynum = 0;
-        }
-
-        String[] returnStr = new String[arynum];
-        if (source.compareTo("") == 0) {
-            return returnStr;
-        } else if (source.indexOf(div) == -1) {
-            returnStr[0] = source.substring(0, source.length());
-            return returnStr;
-        } else {
-            intIdx = source.indexOf(div);
-            returnStr[0] = source.substring(0, intIdx);
-
-            int intCount;
-            for (intCount = 1; source.indexOf(div, intIdx + div_length) != -1; ++intCount) {
-                int intIdex = source.indexOf(div, intIdx + div_length);
-                returnStr[intCount] = source.substring(intIdx + div_length, intIdex);
-                intIdx = source.indexOf(div, intIdx + div_length);
-            }
-
-            returnStr[intCount] = source.substring(intIdx + div_length, source.length());
-            return returnStr;
-        }
-    }
-
-    public static int doNullInt(String srcInt) {
-        return srcInt != null && !"".equals(srcInt) ? Integer.parseInt(srcInt) : 0;
-    }
-
-    public static int doNullInt(Object obj) {
-        String srcInt = doNullStr(obj);
-        return srcInt != null && !"".equals(srcInt) ? Integer.parseInt(srcInt) : 0;
-    }
-
-    public static long doNullLong(String srcInt) {
-        return srcInt != null && !"".equals(srcInt) ? Long.parseLong(srcInt) : 0L;
-    }
-
-    public static long doNullLong(Object obj) {
-        String srcInt = doNullStr(obj);
-        return srcInt != null && !"".equals(srcInt) ? Long.parseLong(srcInt) : 0L;
-    }
-
-    public static String doNullStr(Object obj) {
-        String str = "";
-        if (obj != null) {
-            str = String.valueOf(obj);
-            if (str.equals("null")) {
-                str = "";
-            }
-        }
-
-        return str;
-    }
-
-    public static Integer doNullInteger(Object obj) {
-        String str = doNullStr(obj);
-        if (isEmpty(str)) {
-            str = "0";
-        } else {
-            int i = str.indexOf(".");
-            if (i > 0) {
-                str = str.substring(0, i);
-            }
-        }
-
-        return Integer.valueOf(str);
-    }
-
-    public static boolean isEmpty(String[] string) {
-        return string == null || string.length == 0;
-    }
-
-    public static boolean isEmpty(String string) {
-        return string == null || "".equals(string.trim()) || "null".equals(string.trim());
-    }
-
-    public static boolean isNotEmpty(String string) {
-        return !isEmpty(string);
-    }
-
-    public static boolean isEmpty(Object o) {
-        return o == null || "".equals(o);
-    }
-
-    public static String padRight(String value, int totalWidth, char paddingChar) {
-        String temp = value;
-        if (value.length() > totalWidth) {
-            return value;
-        } else {
-            while (temp.length() < totalWidth) {
-                temp = temp + paddingChar;
-            }
-
-            return temp;
-        }
-    }
-
-    public static String padLeft(String value, int totalWidth, char paddingChar) {
-        String temp = value;
-        if (value.length() > totalWidth) {
-            return value;
-        } else {
-            while (temp.length() < totalWidth) {
-                temp = paddingChar + temp;
-            }
-
-            return temp;
-        }
-    }
-
-    public static String reTrimByString(String value) {
-        String reValue;
-        if (value != null && !value.equals("")) {
-            reValue = value.trim();
-        } else {
-            reValue = "";
-        }
-
-        return reValue;
-    }
-
-    public static String reTrimByObject(Object obj) {
-        String reValue;
-        if (obj != null && !obj.equals("")) {
-            reValue = String.valueOf(obj).trim();
-        } else {
-            reValue = "";
-        }
-
-        return reValue;
-    }
-
-    public static int indexOfStringArray(String[] strArr, String str) {
-        int index = -1;
-        if (strArr != null && str != null) {
-            for (int i = 0; i < strArr.length; ++i) {
-                if (str.equals(strArr[i])) {
-                    index = i;
-                    break;
-                }
-            }
-        }
-
-        return index;
-    }
-
-    public static String replaceFirst(String whole, String strold, String strnew) {
-        if (whole.indexOf(strold) > -1 && strnew != null) {
-            String whole_one = whole.substring(0, whole.indexOf(strold));
-            String whole_two = whole.substring(whole.indexOf(strold) + strold.length());
-            whole = whole_one + strnew + whole_two;
-        }
-
-        return whole;
-    }
-
-    public static Long[] convertionToLong(String[] strs) {
-        Long[] longs = null;
-        if (!isEmpty(strs)) {
-            longs = new Long[strs.length];
-
-            for (int i = 0; i < strs.length; ++i) {
-                String str = strs[i];
-                long thelong = Long.valueOf(str).longValue();
-                longs[i] = thelong;
-            }
-        }
-
-        return longs;
-    }
-
-    public static Long[] convertionToLongArr(String strs, String splitChar) {
-        if (isEmpty(splitChar)) {
-            splitChar = ",";
-        }
-
-        Long[] result = null;
-        if (!isEmpty(strs)) {
-            String[] ids = strs.split(splitChar);
-            result = new Long[ids.length];
-
-            for (int i = 0; i < ids.length; ++i) {
-                result[i] = new Long(ids[i]);
-            }
-        }
-
-        return result;
-    }
-
-    public static String[] decodeStringToArray(String str, String div) {
-        ArrayList<String> array = new ArrayList();
-        StringTokenizer fenxi = new StringTokenizer(str, div);
-
-        while (fenxi.hasMoreTokens()) {
-            String s1 = fenxi.nextToken();
-            array.add(s1);
-        }
-
-        String[] result = new String[array.size()];
-
-        for (int i = 0; i < result.length; ++i) {
-            result[i] = (String) array.get(i);
-        }
-
-        return result;
-    }
-
-    public static String convertionLongToString(Long[] l, String splitChar) {
-        String result = null;
-        if (l != null) {
-            result = Arrays.toString(l);
-            result = result.substring(1, result.length() - 1);
-            if (!isEmpty(splitChar)) {
-                result = result.replaceAll(",", splitChar);
-            }
-        }
-
-        return result;
-    }
-
-    public static String convertionObjectArrayToStr(Object[] strings, String regx) {
-        String result = null;
-        if (regx != null) {
-            result = Arrays.toString(strings);
-            result = result.substring(1, result.length() - 1);
-            if (!isEmpty(regx)) {
-                result = result.replaceAll(",", regx);
-            }
-        }
-
-        return result;
-    }
-
-    public static String charEncoding(String str) {
-        try {
-            str = URLDecoder.decode(str, "UTF-8");
-        } catch (Exception var2) {
-            str = null;
-        }
-
-        return str;
-    }
-
-    public static String getStrTransMean(String str, String sregex, String sreplace) {
-        if (!isEmpty(str)) {
-            str = str.replaceAll(sregex, sreplace);
-        }
-
-        return str;
-    }
-
-    public static String replaceSpecialChar(String s) {
-        return s.replaceAll("/|\\\\|\\$|#|&|%|\\*|\\^|;|,|<|>|&|'|\"", "");
-    }
-
-    public static String replaceSpecialCode(String s) {
-        return null != s && !"".equals(s) ? s.replaceAll("<|>|\"|%|;|\\(|\\)|&|'|\\+|\\\\", "") : s;
-    }
-
-    public static String getMapValue(Map<String, Object> map) {
-        StringBuffer str = new StringBuffer();
-        Iterator it = map.values().iterator();
-
-        while (it.hasNext()) {
-            String val = String.valueOf(it.next());
-            str.append(val);
-        }
-
-        return str.toString();
-    }
-
-    public static String bSubstring(String s, int length) {
-        try {
-            byte[] bytes = s.getBytes("Unicode");
-            int n = 0;
-
-            int i;
-            for (i = 2; i < bytes.length && n < length; ++i) {
-                if (i % 2 == 1) {
-                    ++n;
-                } else if (bytes[i] != 0) {
-                    ++n;
-                }
-            }
-
-            if (i % 2 == 1) {
-                if (bytes[i - 1] != 0) {
-                    --i;
-                } else {
-                    ++i;
-                }
-            }
-
-            return new String(bytes, 0, i, "Unicode");
-        } catch (Exception var5) {
-            return new String("");
-        }
-    }
-
-    public static String getString(Object o) {
-        return o == null ? "" : o.toString();
-    }
-
-    public static Properties getProperties(String filename) {
-        Properties properties = new Properties();
-        InputStream in = null;
-        in = StringUtil.class.getClassLoader().getResourceAsStream(filename);
-
-        try {
-            properties.load(in);
-            return properties;
-        } catch (IOException var4) {
-            return properties;
-        }
-    }
-
-    public static String dateTostr(Date date, String format) throws Exception {
-        SimpleDateFormat dateFormat = new SimpleDateFormat(format);
-        String dateStr = null;
-        dateStr = dateFormat.format(date);
-        return dateStr;
-    }
-
-    public static String iso8859ToUTF8(Object obj) {
-        try {
-            return obj == null ? "" : new String(obj.toString().getBytes("UTF-8"), "iso-8859-1");
-        } catch (Exception var2) {
-            return "";
-        }
-    }
-
-    public static String utf8ToIso8859(Object obj) {
-        try {
-            return obj == null ? "" : new String(obj.toString().getBytes("iso-8859-1"), "UTF-8");
-        } catch (Exception var2) {
-            return "";
-        }
-    }
-
-    public static BigDecimal getStrBigDecimal(String str) {
-        return isEmpty(str) ? null : new BigDecimal(str);
-    }
-
-    public static String cutString(String str, int size) {
-        return isNotEmpty(str) && str.length() > 100 ? str.substring(0, 100) : str;
-    }
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
deleted file mode 100644
index 26c00c38..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 医保所需要的基础信息，如医生信息或者医院信息，目的是为医保服务提供数据信息
- *
- * @author SunJQ
- * @date 2025-05-04
- */
-@Data
-@Accessors(chain = true)
-public class BaseInfo {
-    /******************医保机构信息******************/
-
-
-    /********************医院信息********************/
-
-    /** (必填)统筹区号 */
-    private String admvs;//
-
-    /** (必填)定点医药机构编号 */
-    private String fixmedinsCode;
-
-    /** (必填)定点医药机构名称 */
-    private String fixmedinsName;
-
-    /** (必填)医保app的Controller路径 */
-    private String ybUrl;
-
-    /** (必填)客戶端id */
-    private String ybClientId;//医保用 2025/05/21 无人解答医保与电子处方的这些信息是否一致，防止修改某一变量导致另一个功能失效，分开保存
-
-    /** (必填)客戶端安全码 */
-    private String ybClientSecret;//医保用
-
-    /** (必填)医保服务平台账号 */
-    private String ybUsername;//医保用
-
-    /** (必填)医保服务平台密码 */
-    private String ybPassword;//医保用
-
-    /** (必填)终端授权类型 */
-    private String ybGrantType;//医保用
-
-    /** (必填)终端授权范围 */
-    private String ybScope;//医保用
-
-    /** (必填)秘钥 */
-    private String ybCliPrvKey;//医保用
-
-    /********************医护信息********************/
-
-    /** (必填) 用户id  */
-    private Long UserId;
-
-    /** (必填)登录人名字 */
-    private String realname;
-
-    /********************患者信息********************/
-
-    /** 参保地医保区划 */
-    private String insuplcAdmdvs;//如果交易输入中含有人员编号，此项必填，可通过【1101】人员信息获取交易取得 2025/05/20 经测试发现2201-2208几个接口没传psn_no但是也要传这个
-
-    /********************电子处方********************/
-    //电子处方
-    private String cliPrvKey;
-    private String cliPubKey;
-    private String clientId;
-    private String eleAddress;
-    private String username;
-    private String password;
-    private String scope;
-    private String grantType;
-    private String clientSecret;
-    private String time;
-    private String preAppId;
-    private String preAppSecret;
-    private String prePrvKey;
-    private String prePubKey;
-    private String templatePath;
-    private String outputPath;
-    private String hospitalSealPath;
-    private String medType;
-    private String dutyDoctorName;
-    /********************共通参数********************/
-    //是否解密
-    private String decryptFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java
deleted file mode 100644
index 427c6fdc..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class BaseParam {
-
-    Object data;
-
-    BaseInfo baseInfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java
deleted file mode 100644
index 37cd72d7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 退费入参
- *
- * @author SunJQ
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-public class CancelPaymentDto {
-    /**
-     * id
-     */
-    private Long id;
-
-    /** 收款员 */
-    private Long entererId;
-
-    /** 支付的患者ID */
-    @NotNull
-    private Long patientId;
-
-    /** 应收金额 */
-    private BigDecimal tenderedAmount;
-
-    /** 找零金额 */
-    private BigDecimal returnedAmount;
-
-    /** 付款总额 */
-    private BigDecimal displayAmount;
-
-    /** 就诊ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long encounterId;
-
-    /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
-
-    /** 支付详细 */
-    @NotEmpty
-    private List<PaymentDetailDto> paymentDetails;
-
-      /** 支付批次号 */
-    private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java
deleted file mode 100644
index 2e7a44f4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.openhis.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-@Accessors(chain = true)
-public class CancelRegPaymentDto {
-    /**
-     * id
-     */
-    private Long id;
-
-    /** 收款员 */
-    private Long entererId;
-
-    /** 支付的患者ID */
-    @NotNull
-    private Long patientId;
-
-    /** 应收金额 */
-    private BigDecimal tenderedAmount;
-
-    /** 找零金额 */
-    private BigDecimal returnedAmount;
-
-    /** 付款总额 */
-    private BigDecimal displayAmount;
-
-    /** 就诊ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long encounterId;
-
-    /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
-
-    /** 支付详细 */
-    @NotEmpty
-    private List<PaymentDetailDto> paymentDetails;
-
-    /** 支付批次号 */
-    private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java
deleted file mode 100644
index 919f504e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.openhis.vo;
-
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 【1312】医保目录信息查询
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Catalogue1312Output extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-    // 医保目录编码
-    private String hilistCode;
-
-    // 医保目录名称
-    private String hilistName;
-
-    // 参保机构医保区划
-    private String insuAdmdvs;
-
-    // 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date begndate;
-
-    // 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date enddate;
-
-    // 医疗收费项目类别
-    private String medChrgitmType;
-
-    // 收费项目等级
-    private String chrgitmLv;
-
-    // 限制使用标志
-    private String lmtUsedFlag;
-
-    // 目录类别
-    private String listType;
-
-    // 医疗使用标志
-    private String medUseFlag;
-
-    // 生育使用标志
-    private String matnUsedFlag;
-
-    // 医保目录使用类别
-    private String hilistUseType;
-
-    // 限复方使用类型
-    private String lmtCpndType;
-
-    // 五笔助记码
-    private String wubi;
-
-    // 拼音助记码
-    private String pinyin;
-
-    // 备注
-    private String memo;
-
-    // 有效标志
-    private String valiFlag;
-
-    // 唯一记录号
-    private String rid;
-
-    // 更新时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updtTime;
-
-    // 创建人
-    private String crterId;
-
-    // 创建人姓名
-    private String crterName;
-
-    // 创建时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date crteTime;
-
-    // 创建机构
-    private String crteOptinsNo;
-
-    // 经办人
-    private String opterId;
-
-    // 经办人姓名
-    private String opterName;
-
-    // 经办时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date optTime;
-
-    // 经办机构
-    private String optinsNo;
-
-    // 统筹区
-    private String poolareaNo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java
deleted file mode 100644
index b2f2ea66..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【1312】医保目录信息查询
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Catalogue1312QueryParam {
-
-    // 医保目录编码
-    @JSONField(name = "hilist_code")
-    private String hilistCode;
-
-    // 参保地区编码
-    @JSONField(name = "insuplc_admdvs")
-    private String insuplcAdmdvs;
-    // 更新时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "updt_time")
-    private Date updtTime;
-
-    // 页数
-    @JSONField(name = "page_num")
-    private Integer pageNum;
-    // 当前页面查询数量
-    @JSONField(name = "page_size")
-    private Integer pageSize;
-
-    // 解密标记
-    @JSONField(name = "decrypt_flag")
-    private String decryptFlag;
-
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java
deleted file mode 100644
index c0122710..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.openhis.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class ChargeItemDetailVO {
-
-    @Dict(dictCode = "chrgitm_lv")
-    private String dirClass;//医保等级
-
-
-    /** ID */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 状态 */
-    private Integer statusEnum;
-
-    /**
-     * 账单生成来源
-     */
-    private Integer generateSourceEnum;
-
-    /** 层级 */
-    private String busNo;
-
-    /** 处方号 */
-    private String prescriptionNo;
-
-    /** 患者ID */
-    private Long patientId;
-
-    /** 类别 */
-    private Integer contextEnum;
-
-    /** 就诊ID */
-    private Long encounterId;
-
-    /** 发生时间 */
-    private Date occurrenceTime;
-
-    /** 执行人Id */
-    private Long performerId;
-
-    /** 执行科室 */
-    private Long performingOrgId;
-
-    /** 开立科室 */
-    private Long requestingOrgId;
-
-    /** 成本科室 */
-    private Long costOrgId;
-
-    /** 数量 */
-    private Integer quantityValue;
-
-    /** 单位 */
-    private String quantityUnit;
-
-    /** 单价 */
-    private BigDecimal unitPrice;
-
-    /** 总价 */
-    private BigDecimal totalPrice;
-
-    /** 费用定价ID */
-    private Long definitionId;
-
-    /** 定价子表主键 */
-    private Long defDetailId;
-
-    /** 原价 */
-    private BigDecimal baseAmount;
-
-    /** 折后价格 */
-    private BigDecimal discountAmount;
-
-    /** 附加价格 */
-    private BigDecimal surchargeAmount;
-
-    /** 改价原因 */
-    private String overrideReasonCode;
-
-    /** 改价原因文本 */
-    private String overrideReasonText;
-
-    /** 开立人ID */
-    private Long entererId;
-
-    /** 开立时间 */
-    private Date enteredDate;
-
-    /** 医疗服务所在表 */
-    private String serviceTable;
-
-    /** 医疗服务ID */
-    private Long serviceId;
-
-    /** 产品所在表 */
-    private String productTable;
-
-    /** 产品ID */
-    private Long productId;
-
-    /** 索赔结果 */
-    private Integer claimStateEnum;
-
-    /** 打印次数 */
-    private Integer printCount;
-
-    /** 关联账户ID */
-    private Long accountId;
-
-    /** 机构 */
-    private Long orgId;
-
-    /** 退费ID */
-    private Long refundId;
-
-    /** 诊断ID */
-    private Long diagnosisId;//adm_encounter_diagnosis表主键
-
-    /**
-     * 子项json
-     */
-    private String childrenJson;
-
-    /**
-     * 诊断id
-     */
-    private Long conditionId;
-
-    /**
-     * 就诊诊断id
-     */
-    private Long encounterDiagnosisId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java
deleted file mode 100644
index 21bc1332..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 收费项目
- *
- * @author SunJQ
- * @date 2025-03-31
- */
-@Data
-@Accessors(chain = true)
-public class ChargeItemDto {
-
-    private String typeCode;
-
-
-    /** ID */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /** 状态 */
-    private Integer statusEnum;
-
-    /**
-     * 账单生成来源
-     */
-    private Integer generateSourceEnum;
-
-    /** 层级 */
-    private String busNo;
-
-    /** 处方号 */
-    private String prescriptionNo;
-
-    /** 患者ID */
-    private Long patientId;
-
-    /** 类别 */
-    private Integer contextEnum;
-
-    /** 就诊ID */
-    private Long encounterId;
-
-    /** 发生时间 */
-    private Date occurrenceTime;
-
-    /** 执行人Id */
-    private Long performerId;
-
-    /** 执行科室 */
-    private Long performingOrgId;
-
-    /** 开立科室 */
-    private Long requestingOrgId;
-
-    /** 成本科室 */
-    private Long costOrgId;
-
-    /** 数量 */
-    private Integer quantityValue;
-
-    /** 单位 */
-    private String quantityUnit;
-
-    /** 单价 */
-    private BigDecimal unitPrice;
-
-    /** 总价 */
-    private BigDecimal totalPrice;
-
-    /** 费用定价ID */
-    private Long definitionId;
-
-    /** 定价子表主键 */
-    private Long defDetailId;
-
-    /** 原价 */
-    private BigDecimal baseAmount;
-
-    /** 折后价格 */
-    private BigDecimal discountAmount;
-
-    /** 附加价格 */
-    private BigDecimal surchargeAmount;
-
-    /** 改价原因 */
-    private String overrideReasonCode;
-
-    /** 改价原因文本 */
-    private String overrideReasonText;
-
-    /** 开立人ID */
-    private Long entererId;
-
-    /** 开立时间 */
-    private Date enteredDate;
-
-    /** 医疗服务所在表 */
-    private String serviceTable;
-
-    /** 医疗服务ID */
-    private Long serviceId;
-
-    /** 产品所在表 */
-    private String productTable;
-
-    /** 产品ID */
-    private Long productId;
-
-    /** 索赔结果 */
-    private Integer claimStateEnum;
-
-    /** 打印次数 */
-    private Integer printCount;
-
-    /** 关联账户ID */
-    private Long accountId;
-
-    /** 机构 */
-    private Long orgId;
-
-    /** 退费ID */
-    private Long refundId;
-
-    /** 诊断ID */
-    private Long diagnosisId;//adm_encounter_diagnosis表主键
-
-    /**
-     * 子项json
-     */
-    private String childrenJson;
-
-    /**
-     * 诊断id
-     */
-    private Long conditionId;
-
-    /**
-     * 就诊诊断id
-     */
-    private Long encounterDiagnosisId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java
deleted file mode 100644
index b08ca800..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3204A】清算申请撤销(吉林省)
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clearing3204AParam {
-
-    // 机构清算申请事件ID
-    @JSONField(name = "clr_apply_evt_id")
-    private String clrApplyEvtId;
-
-    // 清算机构
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java
deleted file mode 100644
index f0811709..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3205A】清算申请状态查询（吉林省）
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clearing3205AParma extends Financial3203AParam {
-
-    // 清算机构
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 清算状态
-    @JSONField(name = "clr_stas")
-    private String clrStas;
-
-    // 清算月份
-    @JSONField(name = "clr_ym")
-    private String clrYm;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java
deleted file mode 100644
index 6731710f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3205A】清算申请状态查询（吉林省）
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clearing3205AResult {
-    // 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 清算状态
-    @JSONField(name = "clr_stas")
-    private String clrStas;
-
-    // 经办时间
-    @JSONField(name = "opt_time")
-    private Date optTime;
-
-    // 医疗费总额
-    @JSONField(name = "medfee_Sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 医保费用总额
-    @JSONField(name = "hi_agre_sumfee")
-    private BigDecimal hiAgreSumfee;
-
-    // 基金申报总额
-    @JSONField(name = "fund_appy_sum")
-    private BigDecimal fundAppySum;
-
-    // 现金支付金额
-    @JSONField(name = "cash_payamt")
-    private BigDecimal cashPayamt;
-
-    // 个人账户支出
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay;
-
-    // 开始日期
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 结束日期
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 清算年月
-    @JSONField(name = "clr_ym")
-    private String clrYm;
-
-    // 清算经办机构
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 经办人
-    @JSONField(name = "opter_id")
-    private String opterId;
-
-    // 经办人姓名
-    @JSONField(name = "opter_name")
-    private String opterName;
-
-    // 经办机构
-    @JSONField(name = "optins_no")
-    private String optinsNo;
-
-    // 机构清算申请事件ID
-    @JSONField(name = "clr_appy_evt_id")
-    private String clrAppyEvtId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java
deleted file mode 100644
index 491f0c0b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 【3205A】前端入参
- *
- * @author SunJQ
- * @date 2025-04-17
- */
-@Data
-public class Clearing3205AWebParma {
-    // 清算机构
-    @NotNull
-    private String clrOptins;
-
-    // 清算状态
-    private String clrStas;
-
-    // 清算月份 例如：202310
-    private String clrYm;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java
deleted file mode 100644
index 7615d93f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【3206A】清算机构查询(吉林省)
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clearing3206AParam {
-
-    //定点编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    //页数
-    @JSONField(name = "page_num")
-    private Integer pageNum = 1;
-
-    //当前页面
-    @JSONField(name = "page_size")
-    private Integer pageSize;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java
deleted file mode 100644
index 389ac900..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【3206A】清算机构查询(吉林省)
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clearing3206AResult {
-    //总页数
-    @JSONField(name = "pages")
-    private Integer pages;
-    //清算机构（明细）
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-    //页数
-    @JSONField(name = "page_num")
-    private Integer pageNum;
-    //当前页面查询数量
-    @JSONField(name = "page_size")
-    private Integer pageSize;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java
deleted file mode 100644
index 6e44a822..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.annotation.Excel;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【2203】门诊就诊信息上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2203DiseInfoParam extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-    //就诊ID内部
-    @Excel(name = "就诊ID内部", width = 15)
-    @JSONField(serialize=false)
-    private String encounterId;
-    //定点医药机构编号
-    @JSONField(serialize=false)
-    private String fixmedinsCode;
-
-    //定点医药机构名称
-    @JSONField(serialize=false)
-    private String fixmedinsName;
-    // 就医地医保区划 
-    @JSONField(serialize=false)
-    private String mdtrtareaAdmvs;
-    // 参保地医保区划 
-    @JSONField(serialize=false)
-    private String insuplcAdmdvs;
-    // 就诊ID 
-    @Excel(name = "就诊ID", width = 15)
-    @JSONField(serialize=false)
-    private String mdtrtId;
-    // 就诊信息ID 
-    @JSONField(serialize=false)
-    private String medicalId;
-    // 诊断类别 
-    @JSONField(name="diag_type")
-    private String diagType;
-    // 诊断排序号 
-    @JSONField(name="diag_srt_no")
-    private String diagSrtNo;
-    // 诊断代码 
-    @JSONField(name="diag_code")
-    private String diagCode;
-    // 诊断名称 
-    @JSONField(name="diag_name")
-    private String diagName;
-    // 诊断科室 
-    @JSONField(name="diag_dept")
-    private String diagDept;
-    // 诊断医生编码 
-    @JSONField(name="dise_dor_no")
-    private String diseDorNo;
-    // 诊断医生姓名 
-    @JSONField(name="dise_dor_name")
-    private String diseDorName;
-    // 诊断时间 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name="diag_time")
-    private Date diagTime;
-    // 有效标志 
-    @JSONField(name="vali_flag")
-    private String valiFlag;
-//    // 创建人 
-//    @JSONField(serialize=false)
-//    private String createBy;
-//    // 创建日期 
-//    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @JSONField(serialize=false)
-//    private Date createTime;
-//    // 更新人 
-//    @JSONField(serialize=false)
-//    private String updateBy;
-//    // 更新日期 
-//    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @JSONField(serialize=false)
-//    private Date updateTime;
-    // 所属部门 
-//    @JSONField(serialize=false)
-//    private String sysOrgCode;
-//    // 租户编码 
-//    @JSONField(serialize=false)
-//    private String tenantId;
-//    @JSONField(serialize=false)
-//    private String district;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java
deleted file mode 100644
index 948a35d6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【2203】门诊就诊信息上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2203Medical extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-    // 主键  
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-    // 就诊ID内部 
-    @JSONField(serialize=false)
-    private String regId;
-    // 定点医药机构编号 
-    @JSONField(serialize=false)
-    private String fixmedinsCode;
-    // 定点医药机构名称 
-    @JSONField(serialize=false)
-    private String fixmedinsName;
-    // 就医地医保区划 
-    @JSONField(serialize=false)
-    private String mdtrtareaAdmvs;
-    // 参保地医保区划 
-    @JSONField(serialize=false)
-    private String insuplcAdmdvs;
-    // 就诊ID 
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-    // 人员编号 
-    @JSONField(name="psn_no")
-    private String psnNo;
-    // 医疗类别 
-    @Dict(dictCode = "med_type")
-    @JSONField(name="med_type")
-    private String medType;
-    // 诊断时间 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name="begntime")
-    private Date begntime;
-    // 主要病情描述 
-    @JSONField(name="main_cond_dscr")
-    private String mainCondDscr;
-    // 病种编码  
-    @JSONField(name="dise_codg")
-    private String diseCodg;
-    // 病种名称 
-    @JSONField(name="dise_name")
-    private String diseName;
-    // 计划生育手术类别 
-    @Dict(dictCode = "birctrl_type")
-    @JSONField(name="birctrl_type")
-    private String birctrlType;
-    // 计划生育手术或生育日期 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name="birctrl_matn_date")
-    private Date birctrlMatnDate;
-    @JSONField(serialize=false)
-    private String district;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java
deleted file mode 100644
index 4130639b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2203】门诊就诊信息上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clinic2203MedicalParam {
-    // 主键
-    @JSONField(serialize = false)
-    private String id;
-    // 就诊ID内部
-    @JSONField(serialize = false)
-    private String regId;
-    // 定点医药机构编号
-    @JSONField(serialize = false)
-    private String fixmedinsCode;
-    // 定点医药机构名称
-    @JSONField(serialize = false)
-    private String fixmedinsName;
-    // 就医地医保区划
-    @JSONField(serialize = false)
-    private String mdtrtareaAdmvs;
-    // 参保地医保区划
-    @JSONField(name = "insuplc_admdvs")
-    private String insuplcAdmdvs;
-    // 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-    // 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-    // 医疗类别
-    @Dict(dictCode = "med_type")
-    @JSONField(name = "med_type")
-    private String medType;
-    // 诊断时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "begntime")
-    private Date begntime;
-    // 主要病情描述
-    @JSONField(name = "main_cond_dscr")
-    private String mainCondDscr;
-    // 病种编码
-    @JSONField(name = "dise_codg")
-    private String diseCodg;
-    // 病种名称
-    @JSONField(name = "dise_name")
-    private String diseName;
-    // 计划生育手术类别
-    @Dict(dictCode = "birctrl_type")
-    @JSONField(name = "birctrl_type")
-    private String birctrlType;
-    // 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-    @JSONField(name = "diseinfo")
-    private List<Clinic2203DiseInfoParam> diseinfoList;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java
deleted file mode 100644
index 74328158..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.annotation.Excel;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【2204】门诊费用明细信息上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2204FeeDetailParam extends HisBaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-	//主键
-	@TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-	//就诊ID内部
-    @JSONField(serialize=false)
-    private String regId;
-	//订单主键
-    @JSONField(serialize=false)
-    private String orderId;
-	//定点医药机构编号
-    @JSONField(serialize=false)
-    private String fixmedinsCode;
-	//定点医药机构名称
-    @JSONField(serialize=false)
-    private String fixmedinsName;
-	//就医地医保区划
-    @JSONField(serialize=false)
-    private String mdtrtareaAdmvs;
-	//参保地医保区划
-    @JSONField(serialize=false)
-    private String insuplcAdmdvs;
-	//病历号
-    @JSONField(serialize=false)
-    private String medicalNo;
-	//费用明细流水号
-    @JSONField(name="feedetl_sn")
-    private String feedetlSn;
-	//就诊ID
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-	//人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-	//收费批次号
-    @JSONField(name="chrg_bchno")
-    private String chrgBchno;
-	//病种编码
-    @JSONField(name="dise_codg")
-    private String diseCodg;
-	//处方号
-    @JSONField(name="rxno")
-    private String rxno;
-	//外购处方标志
-    @Dict(dictCode = "rx_circ_flag")
-    @JSONField(name="rx_circ_flag")
-    private String rxCircFlag;
-	//费用发生时间
-	@Excel(name = "费用发生时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JSONField(name="fee_ocur_time")
-    private Date feeOcurTime;
-	//商品名
-	@Excel(name = "商品名", width = 15)
-    private String tradename;
-	//药品类别
-    @Dict(dictCode = "list_type")
-    private String drugtype;
-	//剂型
-    @Dict(dictCode = "drug_dosform")
-    private String dosemodel;
-	//项目等级
-    @Dict(dictCode = "chrgitm_lv")
-    private String feegrade;
-	//处方标志
-    @Dict(dictCode = "rx_flag")
-    private String rxflag;
-	//生产厂家
-	@Excel(name = "生产厂家", width = 15)
-    private String producingarea;
-	//医疗目录编码
-	@Excel(name = "医疗目录编码", width = 15)
-    @JSONField(name="med_list_codg")
-    private String medListCodg;
-	//医药机构目录编码
-	@Excel(name = "医药机构目录编码", width = 15)
-    @JSONField(name="medins_list_codg")
-    private String medinsListCodg;
-	//明细项目费用总额
-	@Excel(name = "明细项目费用总额", width = 15)
-    @JSONField(name="det_item_fee_sumamt")
-    private Double detItemFeeSumamt;
-	//数量
-	@Excel(name = "数量", width = 15)
-    @JSONField(name="cnt")
-    private Double cnt;
-	//单价
-    @JSONField(name="pric")
-    private Double pric;
-	//单次剂量描述
-    @JSONField(name="sin_dos_dscr")
-    private String sinDosDscr;
-	//使用频次描述
-    @JSONField(name="used_frqu_dscr")
-    private String usedFrquDscr;
-	//周期天数
-    @JSONField(name="prd_days")
-    private String prdDays;
-	//用药途径描述
-    @JSONField(name="medc_way_dscr")
-    private String medcWayDscr;
-	//开单科室编码
-    @JSONField(name="bilg_dept_codg")
-    private String bilgDeptCodg;
-	//开单科室名称
-    @JSONField(name="bilg_dept_name")
-    private String bilgDeptName;
-	//开单医生编码
-    @JSONField(name="bilg_dr_codg")
-    private String bilgDrCodg;
-	//开单医师姓名
-    @JSONField(name="bilg_dr_name")
-    private String bilgDrName;
-	//受单科室编码
-    @JSONField(name="acord_dept_codg")
-    private String acordDeptCodg;
-	//受单科室名称
-    @JSONField(name="acord_dept_name")
-    private String acordDeptName;
-	//受单医生编码
-    @JSONField(name="orders_dr_code")
-    private String ordersDrCode;
-	//受单医生姓名
-    @JSONField(name="orders_dr_name")
-    private String ordersDrName;
-	//医院审批标志
-    @Dict(dictCode = "hosp_appr_flag")
-    @JSONField(name="hosp_appr_flag")
-    private String hospApprFlag;
-	//中药使用方式
-    @Dict(dictCode = "tcmdrug_used_way")
-    @JSONField(name="tcmdrug_used_way")
-    private String tcmdrugUsedWay;
-	//外检标志
-    @Dict(dictCode = "etip_flag")
-    @JSONField(name="etip_flag")
-    private String etipFlag;
-	//外检医院编码
-    @JSONField(name="etip_hosp_code")
-    private String etipHospCode;
-	//出院带药标志
-    @Dict(dictCode = "dscg_tkdrug_flag")
-    @JSONField(name="dscg_tkdrug_flag")
-    private String dscgTkdrugFlag;
-	//生育费用标志
-    @Dict(dictCode = "matn_fee_flag")
-    @JSONField(name="matn_fee_flag")
-    private String matnFeeFlag;
-	//定价上限金额
-    @JSONField(name="pric_uplmt_amt")
-    private Double pricUplmtAmt;
-	//自付比例
-    @JSONField(name="selfpay_prop")
-    private Double selfpayProp;
-	//全自费金额
-    @JSONField(name="fulamt_ownpay_amt")
-    private Double fulamtOwnpayAmt;
-	//超限价金额
-    @JSONField(name="overlmt_amt")
-    private Double overlmtAmt;
-	//先行自付金额
-    @JSONField(name="preselfpay_amt")
-    private Double preselfpayAmt;
-	//符合政策范围金额
-    @JSONField(name="inscp_scp_amt")
-    private Double inscpScpAmt;
-	//收费项目等级
-    @Dict(dictCode = "chrgitm_lv")
-    @JSONField(name="chrgitm_lv")
-    private String chrgitmLv;
-	//医疗收费项目类别
-    @Dict(dictCode = "med_chrgitm_type")
-    @JSONField(name="med_chrgitm_type")
-    private String medChrgitmType;
-	//基本药物标志
-    @Dict(dictCode = "bas_medn_flag")
-    @JSONField(name="bas_medn_flag")
-    private String basMednFlag;
-	//医保谈判药品标志
-    @Dict(dictCode = "hi_nego_drug_flag")
-    @JSONField(name="hi_nego_drug_flag")
-    private String hiNegoDrugFlag;
-	//儿童用药标志
-    @Dict(dictCode = "chld_medc_flag")
-    @JSONField(name="chld_medc_flag")
-    private String chldMedcFlag;
-	//目录特项标志
-    @Dict(dictCode = "list_sp_item_flag")
-    @JSONField(name="list_sp_item_flag")
-    private String listSpItemFlag;
-	//限制使用标志
-    @Dict(dictCode = "lmt_used_flag")
-    @JSONField(name="lmt_used_flag")
-    private String lmtUsedFlag;
-	//直报标志
-    @Dict(dictCode = "drt_reim_flag")
-    @JSONField(name="drt_reim_flag")
-    private String drtReimFlag;
-	//备注
-    @JSONField(name="memo")
-    private String memo;
-	//上报状态，0-未上报，1-已上报
-    @JSONField(serialize=false)
-    private String status;
-    private String district;
-    @TableField(exist = false)
-    private String setlTimeStart;
-    @TableField(exist = false)
-    private String setlTimeEnd;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java
deleted file mode 100644
index 32ab6b49..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【2204】接口返回参数
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2204FeeDetailResult {
-    // 主键字段（根据Y标识判断）
-    @JSONField(name = "feedetl_sn")
-    private String feedetlSn; // 费用明细流水号
-
-    // 数值型字段使用BigDecimal保证精度
-    @JSONField(name = "det_item_fee_sumamt")
-    private BigDecimal detItemFeeSumamt; // 明细项目费用总额
-
-    @JSONField(name = "cnt")
-    private BigDecimal cnt; // 数量
-
-    @JSONField(name = "pric")
-    private BigDecimal pric; // 单价
-
-    @JSONField(name = "pric_uplmt_amt")
-    private BigDecimal pricUplmtAmt; // 定价上限金额
-
-    @JSONField(name = "selfpay_prop")
-    private BigDecimal selfpayProp; // 自付比例
-
-    @JSONField(name = "fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    @JSONField(name = "overlmt_amt")
-    private BigDecimal overlmtAmt; // 超限价金额
-
-    @JSONField(name = "preselfpay_amt")
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    @JSONField(name = "inscp_scp_amt")
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    // 字符型字段
-    @JSONField(name = "chrgitm_lv")
-    private String chrgitmLv; // 收费项目等级
-
-    @JSONField(name = "med_chrgitm_type")
-    private String medChrgitmType; // 医疗收费项目类别
-
-    @JSONField(name = "bas_medn_flag")
-    private String basMednFlag; // 基本药物标志
-
-    @JSONField(name = "hi_nego_drug_flag")
-    private String hiNegoDrugFlag; // 医保谈判药品标志
-
-    @JSONField(name = "chld_medc_flag")
-    private String chldMedcFlag; // 儿童用药标志
-
-    @JSONField(name = "list_sp_item_flag")
-    private String listSpItemFlag; // 目录特项标志
-
-    @JSONField(name = "lmt_used_flag")
-    private String lmtUsedFlag; // 限制使用标志
-
-    @JSONField(name = "drt_reim_flag")
-    private String drtReimFlag; // 直报标志
-
-    @JSONField(name = "memo")
-    private String memo; // 备注
-
-    @JSONField(name = "exp_content")
-    private String expContent; // 字段扩展
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java
deleted file mode 100644
index 636e52c0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 【2204】门诊费用明细信息上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clinic2204OrderParam {
-    // 就医地医保区划
-    @JSONField(serialize = false)
-    private String mdtrtareaAdmvs;
-    // 参保地医保区划
-    @JSONField(name = "insuplc_admdvs")
-    private String insuplcAdmdvs;
-    @JSONField(serialize = false)
-    private String chrgBchno;
-    @JSONField(name = "feedetail")
-    private List<Clinic2204FeeDetailParam> feedetail;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java
deleted file mode 100644
index 72156dc6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- *【2204】门诊费用明细信息上传
- *
- * @author SunJQ
- * @date 2025-04-20
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Clinic2204OrderResult {
-    //2204门诊费用明细信息上传输出
-    @JSONField(name = "result")
-    List<Clinic2204FeeDetailResult> result;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java
deleted file mode 100644
index b6d4c369..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 就诊明细撤销
- *
- * @author SunJQ
- * @date 2025-05-07
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2205OrderParam {
-
-    //就诊ID
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-
-    //收费批次号
-    @JSONField(name="chrg_bchno")
-    private String chrgBchno;
-
-    //人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-
-    //人员编号
-    @JSONField(name="exp_content")
-    private String expContent;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
deleted file mode 100644
index 99b72c73..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【2206】医保基金支付详情
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2206FundPaymentResult {
-    // 主键字段（根据Y标识判断）
-    //@JSONField(name = "fund_pay_type")
-    private String fundPayType; // 基金支付类型
-
-    // 数值型字段使用BigDecimal保证精度
-    //@JSONField(name = "inscp_scp_amt")
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    //@JSONField(name = "crt_payb_lmt_amt")
-    private BigDecimal crtPaybLmtAmt; // 本次可支付限额金额
-
-    //@JSONField(name = "fund_payamt")
-    private BigDecimal fundPayamt; // 基金支付金额
-
-    // 字符型字段
-    //@JSONField(name = "fund_pay_type_name")
-    private String fundPayTypeName; // 基金支付类型名称
-
-    //@JSONField(name = "setl_proc_info")
-    private String setlProcInfo; // 结算过程信息
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java
deleted file mode 100644
index bdcfaa48..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2206】医保预结算的输出参数
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2206OrderOutput {
-    // 主键字段
-    private String mdtrtId; // 就诊ID
-
-    private String psnNo; // 人员编号
-
-    private String psnName; // 人员姓名
-
-    private String psnCertType; // 人员证件类型
-
-    private String certno; // 证件号码
-
-    private String gend; // 性别
-
-    private String naty; // 民族
-
-    private Date brdy; // 出生日期
-
-    private BigDecimal age; // 年龄
-
-    private String insutype; // 险种类型
-
-    private String psnType; // 人员类别
-
-    private String cvlservFlag; // 公务员标志
-
-    private Date setlTime; // 结算时间
-
-    private String mdtrtCertType; // 就诊凭证类型
-
-    private String medType; // 医疗类别
-
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    private BigDecimal othPay; // 其他支出
-
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    private BigDecimal acctPay; // 个人账户支出
-
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    private BigDecimal balc; // 余额
-
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
-
-    private String clrOptins; // 清算经办机构
-
-    private String clrWay; // 清算方式
-
-    private String clrType; // 清算类别
-
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    private String expContent; // 字段扩展
-
-    private List<Clinic2206FundPaymentResult> setldetail;// 结算详细信息
-
-    private String mdtrtCertNo; // 就诊凭证编号
-
-    private String chrgBchno; // 收费批次号
-
-    private String busNo; // 挂号采访码
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java
deleted file mode 100644
index 577f44ea..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【2206】门诊预结算
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2206OrderParam extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//主键
-	@TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-	//内部就诊ID
-    @JSONField(serialize=false)
-    private String regId;
-	//人员姓名
-    @JSONField(serialize=false)
-    private String name;
-	//性别
-    @Dict(dictCode = "sex")
-    @JSONField(serialize=false)
-    private String sex;
-	//民族
-    @Dict(dictCode = "naty")
-    @JSONField(serialize=false)
-    private String naty;
-	//出生日期
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JSONField(serialize=false)
-    private Date brdy;
-	//年龄
-    @JSONField(serialize=false)
-    private Double age;
-	//定点医药机构编号
-    @JSONField(serialize=false)
-    private String fixmedinsCode;
-	//定点医药机构名称
-    @JSONField(serialize=false)
-    private String fixmedinsName;
-	//就医地医保区划
-    @JSONField(serialize=false)
-    private String mdtrtareaAdmvs;
-	//参保地医保区划
-    @JSONField(name="insuplc_admdvs")
-    private String insuplcAdmdvs;
-	//病历号
-    @JSONField(serialize=false)
-    private String medicalNo;
-	//人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-	//就诊凭证类型
-    @Dict(dictCode = "mdtrt_cert_type")
-    @JSONField(name="mdtrt_cert_type")
-    private String mdtrtCertType;
-	//就诊凭证编号
-    @JSONField(name="mdtrt_cert_no")
-    private String mdtrtCertNo;
-    //就诊凭证加密
-    @TableField(exist = false)
-    @JSONField(serialize=false)
-    private String mdtrtCertNoEncrypt;
-	//医疗类别
-    @Dict(dictCode = "med_type")
-    @JSONField(name="med_type")
-    private String medType;
-	//医疗费总额
-    @JSONField(name="medfee_sumamt")
-    private Double medfeeSumamt;
-	//个人结算方式
-    @Dict(dictCode = "psn_setlway")
-    @JSONField(name="psn_setlway")
-    private String psnSetlway;
-	//就诊ID
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-	//收费批次号
-    @JSONField(name="chrg_bchno")
-    private String chrgBchno;
-	//险种类型
-    @Dict(dictCode = "insutype")
-    @JSONField(name="insutype")
-    private String insutype;
-	//个人账户使用标志
-    @Dict(dictCode = "acct_used_flag")
-    @JSONField(name="acct_used_flag")
-    private String acctUsedFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java
deleted file mode 100644
index b963faa5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2206】医保预结算的输出参数
- *
- * @author SunJQ
- * @date 2025-04-19
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2206OrderResult {
-    // 主键字段
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId; // 就诊ID
-
-    @JSONField(name = "psn_no")
-    private String psnNo; // 人员编号
-
-    @JSONField(name = "psn_name")
-    private String psnName; // 人员姓名
-
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType; // 人员证件类型
-
-    @JSONField(name = "certno")
-    private String certno; // 证件号码
-
-    @JSONField(name = "gend")
-    private String gend; // 性别
-
-    @JSONField(name = "naty")
-    private String naty; // 民族
-
-    @JSONField(name = "brdy")
-    private Date brdy; // 出生日期
-
-    @JSONField(name = "age")
-    private BigDecimal age; // 年龄
-
-    @JSONField(name = "insutype")
-    private String insutype; // 险种类型
-
-    @JSONField(name = "psn_type")
-    private String psnType; // 人员类别
-
-    @JSONField(name = "cvlserv_flag")
-    private String cvlservFlag; // 公务员标志
-
-    @JSONField(name = "setl_time")
-    private Date setlTime; // 结算时间
-
-    @JSONField(name = "mdtrt_cert_type")
-    private String mdtrtCertType; // 就诊凭证类型
-
-    @JSONField(name = "med_type")
-    private String medType; // 医疗类别
-
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    @JSONField(name = "fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    @JSONField(name = "overlmt_selfpay")
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    @JSONField(name = "preselfpay_amt")
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    @JSONField(name = "inscp_scp_amt")
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    @JSONField(name = "act_pay_dedc")
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    @JSONField(name = "hifp_pay")
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    @JSONField(name = "pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    @JSONField(name = "cvlserv_pay")
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    @JSONField(name = "hifes_pay")
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    @JSONField(name = "hifmi_pay")
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    @JSONField(name = "hifob_pay")
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    @JSONField(name = "maf_pay")
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    @JSONField(name = "oth_pay")
-    private BigDecimal othPay; // 其他支出
-
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    @JSONField(name = "psn_part_amt")
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay; // 个人账户支出
-
-    @JSONField(name = "psn_cash_pay")
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    @JSONField(name = "hosp_part_amt")
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    @JSONField(name = "balc")
-    private BigDecimal balc; // 余额
-
-    @JSONField(name = "acct_mulaid_pay")
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    @JSONField(name = "medins_setl_id")
-    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
-
-    @JSONField(name = "clr_optins")
-    private String clrOptins; // 清算经办机构
-
-    @JSONField(name = "clr_way")
-    private String clrWay; // 清算方式
-
-    @JSONField(name = "clr_type")
-    private String clrType; // 清算类别
-
-    @JSONField(name = "hifdm_pay")
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    @JSONField(name = "exp_content")
-    private String expContent; // 字段扩展
-
-    @JSONField(name = "setldetail")
-    private List<Clinic2206FundPaymentResult> setldetail;// 结算详细信息
-
-    @JSONField(name = "mdtrt_cert_no")
-    private String mdtrtCertNo; // 就诊凭证编号
-
-    @JSONField(serialize = false)
-    private String chrgBchno; // 收费批次号
-
-    @JSONField(serialize = false)
-    private String busNo; // 挂号
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java
deleted file mode 100644
index 717ac2d6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 预结算结果集
- *
- * @author SunJQ
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2206OrderResultDto {
-
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    @JSONField(name = "fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    @JSONField(name = "overlmt_selfpay")
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    @JSONField(name = "preselfpay_amt")
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    @JSONField(name = "inscp_scp_amt")
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    @JSONField(name = "act_pay_dedc")
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    @JSONField(name = "hifp_pay")
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    @JSONField(name = "pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    @JSONField(name = "cvlserv_pay")
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    @JSONField(name = "hifes_pay")
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    @JSONField(name = "hifmi_pay")
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    @JSONField(name = "hifob_pay")
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    @JSONField(name = "maf_pay")
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    @JSONField(name = "oth_pay")
-    private BigDecimal othPay; // 其他支出
-
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    @JSONField(name = "psn_part_amt")
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay; // 个人账户支出
-
-    @JSONField(name = "psn_cash_pay")
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    @JSONField(name = "hosp_part_amt")
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    @JSONField(name = "hifdm_pay")
-    private BigDecimal hifdmPay;
-
-    @JSONField(name = "acct_mulaid_pay")
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    private String chrgBchno;//收费批次号
-
-    private Long accountId;//账户id
-
-    private String medType;//医疗类型
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java
deleted file mode 100644
index e754138c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.annotation.Excel;
-import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- *【2206】门诊预结算-输出参数
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2206SetldetaiResult extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//主键
-	@TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-	//结算清单主键
-	@Excel(name = "结算清单主键", width = 15)
-    @JSONField(serialize=false)
-    private String orderId;
-	//结算信息主键
-    @JSONField(serialize=false)
-    private String setlinfoId;
-	//内部就诊ID
-    @JSONField(serialize=false)
-    private String regId;
-	//基金支付类型
-    @JSONField(name="fund_pay_type")
-    @Dict(dictCode = "fund_pay_type")
-    private String fundPayType;
-	//符合政策范围金额
-    @JSONField(name="inscp_scp_amt")
-    private Double inscpScpAmt;
-	//本次可支付限额金额
-    @JSONField(name="crt_payb_lmt_amt")
-    private Double crtPaybLmtAmt;
-	//基金支付金额
-    @JSONField(name="fund_payamt")
-    private Double fundPayamt;
-	//基金支付类型名称
-    @JSONField(name="fund_pay_type_name")
-    private String fundPayTypeName;
-	//结算过程信息
-    @JSONField(name="setl_proc_info")
-    private String setlProcInfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java
deleted file mode 100644
index af91b63f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2207】医保预结算的输出参数
- *
- * @author SunJQ
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2207OrderResult {
-    // 主键字段
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId; // 就诊ID
-
-    @JSONField(name = "setl_id")
-    private String setlId;// 结算id 2207时有值 2206无值
-
-    @JSONField(name = "psn_no")
-    private String psnNo; // 人员编号
-
-    @JSONField(name = "psn_name")
-    private String psnName; // 人员姓名
-
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType; // 人员证件类型
-
-    @JSONField(name = "certno")
-    private String certno; // 证件号码
-
-    @JSONField(name = "gend")
-    private String gend; // 性别
-
-    @JSONField(name = "naty")
-    private String naty; // 民族
-
-    @JSONField(name = "brdy")
-    private Date brdy; // 出生日期
-
-    @JSONField(name = "age")
-    private BigDecimal age; // 年龄
-
-    @JSONField(name = "insutype")
-    private String insutype; // 险种类型
-
-    @JSONField(name = "psn_type")
-    private String psnType; // 人员类别
-
-    @JSONField(name = "cvlserv_flag")
-    private String cvlservFlag; // 公务员标志
-
-    @JSONField(name = "setl_time")
-    private Date setlTime; // 结算时间
-
-    @JSONField(name = "mdtrt_cert_type")
-    private String mdtrtCertType; // 就诊凭证类型
-
-    @JSONField(name = "med_type")
-    private String medType; // 医疗类别
-
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    @JSONField(name = "fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    @JSONField(name = "overlmt_selfpay")
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    @JSONField(name = "preselfpay_amt")
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    @JSONField(name = "inscp_scp_amt")
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    @JSONField(name = "act_pay_dedc")
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    @JSONField(name = "hifp_pay")
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    @JSONField(name = "pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    @JSONField(name = "cvlserv_pay")
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    @JSONField(name = "hifes_pay")
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    @JSONField(name = "hifmi_pay")
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    @JSONField(name = "hifob_pay")
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    @JSONField(name = "maf_pay")
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    @JSONField(name = "oth_pay")
-    private BigDecimal othPay; // 其他支出
-
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    @JSONField(name = "psn_part_amt")
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay; // 个人账户支出
-
-    @JSONField(name = "psn_cash_pay")
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    @JSONField(name = "hosp_part_amt")
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    @JSONField(name = "balc")
-    private BigDecimal balc; // 余额
-
-    @JSONField(name = "acct_mulaid_pay")
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    @JSONField(name = "medins_setl_id")
-    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
-
-    @JSONField(name = "clr_optins")
-    private String clrOptins; // 清算经办机构
-
-    @JSONField(name = "clr_way")
-    private String clrWay; // 清算方式
-
-    @JSONField(name = "clr_type")
-    private String clrType; // 清算类别
-
-    @JSONField(name = "hifdm_pay")
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    @JSONField(name = "exp_content")
-    private String expContent; // 字段扩展
-
-    @JSONField(name = "setldetail")
-    private List<Clinic2206FundPaymentResult> setldetail;// 结算详细信息
-
-    @JSONField(serialize = false)
-    private String chrgBchno; // 收费批次号
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java
deleted file mode 100644
index 22accbf0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-public class Clinic2207OrderResultDto extends Clinic2207OrderResult {
-
-    private Long accountId;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java
deleted file mode 100644
index 92f40fc4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 结算基础信息
- *
- * @author SunJQ
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2207OrderResultInfoDto {
-    // 主键字段
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId; // 就诊ID
-
-    @JSONField(name = "psn_no")
-    private String psnNo; // 人员编号
-
-    @JSONField(name = "psn_name")
-    private String psnName; // 人员姓名
-
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType; // 人员证件类型
-
-    @JSONField(name = "certno")
-    private String certno; // 证件号码
-
-    @JSONField(name = "gend")
-    private String gend; // 性别
-
-    @JSONField(name = "naty")
-    private String naty; // 民族
-
-    @JSONField(name = "brdy")
-    private Date brdy; // 出生日期
-
-    @JSONField(name = "age")
-    private BigDecimal age; // 年龄
-
-    @JSONField(name = "insutype")
-    private String insutype; // 险种类型
-
-    @JSONField(name = "psn_type")
-    private String psnType; // 人员类别
-
-    @JSONField(name = "cvlserv_flag")
-    private String cvlservFlag; // 公务员标志
-
-    @JSONField(name = "setl_time")
-    private Date setlTime; // 结算时间
-
-    @JSONField(name = "mdtrt_cert_type")
-    private String mdtrtCertType; // 就诊凭证类型
-
-    @JSONField(name = "med_type")
-    private String medType; // 医疗类别
-
-    @JSONField(name = "medins_setl_id")
-    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
-
-    @JSONField(name = "setldetail")
-    private List<Clinic2206FundPaymentResult> setldetail;// 结算详细信息
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java
deleted file mode 100644
index b30c7556..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2208】门诊结算撤销
- *
- * @author SunJQ
- * @date 2025-04-21
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2208UnSetlInfoOutput {
-
-    // 1. 就诊ID（字符型，30位，必填）
-    private String mdtrtId;
-
-    // 2. 结算ID（字符型，30位，必填）
-    private String setlId;
-
-    // 3. 清算经办机构（字符型，6位）
-    private String clrOptins;
-
-    // 4. 结算时间（日期时间型，格式：yyyy-MM-dd HH:mm:ss，必填）
-    private Date setlTime;
-
-    // 5. 医疗费总额（数值型，16位含2位小数，必填）
-    private BigDecimal medfeeSumamt;
-
-    // 6. 全自费金额（数值型，16位含2位小数，必填）
-    private BigDecimal fulamtOwnpayAmt;
-
-    // 7. 超限价自费费用（数值型，16位含2位小数，必填）
-    private BigDecimal overlmtSelfpay;
-
-    // 8. 先行自付金额（数值型，16位含2位小数，必填）
-    private BigDecimal preselfpayAmt;
-
-    // 9. 符合政策范围金额（数值型，16位含2位小数，必填）
-    private BigDecimal inscpScpAmt;
-
-    // 10. 实际支付起付线（数值型，16位含2位小数）
-    private BigDecimal actPayDedc;
-
-    // 11. 基本医疗保险统筹基金支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifpPay;
-
-    // 12. 统筹基金支付比例（数值型，5位含4位小数，必填）
-    private BigDecimal poolPropSelfpay;
-
-    // 13. 公务员医疗补助支出（数值型，16位含2位小数，必填）
-    private BigDecimal cvlservPay;
-
-    // 14. 企业补充医保支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifesPay;
-
-    // 15. 居民大病保险支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifmiPay;
-
-    // 16. 职工大额医疗补助支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifobPay;
-
-    // 17. 医疗救助基金支出（数值型，16位含2位小数，必填）
-    private BigDecimal mafPay;
-
-    // 18. 其他支出（数值型，16位含2位小数，必填）
-    private BigDecimal othPay;
-
-    // 19. 基金支付总额（数值型，16位含2位小数，必填）
-    private BigDecimal fundPaySumamt;
-
-    // 20. 个人负担总金额（数值型，16位含2位小数，必填）
-    private BigDecimal psnPartAmt;
-
-    // 21. 个人账户支出（数值型，16位含2位小数，必填）
-    private BigDecimal acctPay;
-
-    // 22. 余额（数值型，16位含2位小数，必填）
-    private BigDecimal balc;
-
-    // 23. 个人账户共济支付（数值型，16位含2位小数，必填）
-    private BigDecimal acctMulaidPay;
-
-    // 24. 医院负担金额（数值型，16位含2位小数，必填）
-    private BigDecimal hospPartAmt;
-
-    // 25. 医药机构结算ID（字符型，30位，必填）
-    private String medinsSetlId;
-
-    // 26. 个人现金支出（数值型，16位含2位小数，必填）
-    private BigDecimal pdnCashPay;
-
-    // 27. 伤残人员医疗补助支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifdmPay;
-
-    //结算详细信息
-    private List<Clinic2206FundPaymentResult> setldetail;//结算详细信息
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java
deleted file mode 100644
index 88ae1c5d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- *【2208】门诊结算撤销
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2208UnSetlInfoParam extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	//就诊ID
-    @JSONField(name="mdtrt_id")
-    private String mdtrtId;
-	//结算ID
-    @JSONField(name="setl_id")
-    private String setlId;
-	//参保地医保区划
-//    @JSONField(name="insuplc_admdvs")
-//    private String insuplcAdmdvs;
-	//人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java
deleted file mode 100644
index ab15332a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2208】门诊结算撤销
- *
- * @author SunJQ
- * @date 2025-04-21
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2208UnSetlInfoResult {
-
-    // 1. 就诊ID（字符型，30位，必填）
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 结算ID（字符型，30位，必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 3. 清算经办机构（字符型，6位）
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 4. 结算时间（日期时间型，格式：yyyy-MM-dd HH:mm:ss，必填）
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "setl_time")
-    private Date setlTime;
-
-    // 5. 医疗费总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 6. 全自费金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    // 7. 超限价自费费用（数值型，16位含2位小数，必填）
-    @JSONField(name = "overlmt_selfpay")
-    private BigDecimal overlmtSelfpay;
-
-    // 8. 先行自付金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    // 9. 符合政策范围金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    // 10. 实际支付起付线（数值型，16位含2位小数）
-    @JSONField(name = "act_pay_dedc")
-    private BigDecimal actPayDedc;
-
-    // 11. 基本医疗保险统筹基金支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "hifp_pay")
-    private BigDecimal hifpPay;
-
-    // 12. 统筹基金支付比例（数值型，5位含4位小数，必填）
-    @JSONField(name = "pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay;
-
-    // 13. 公务员医疗补助支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "cvlserv_pay")
-    private BigDecimal cvlservPay;
-
-    // 14. 企业补充医保支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "hifes_pay")
-    private BigDecimal hifesPay;
-
-    // 15. 居民大病保险支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "hifmi_pay")
-    private BigDecimal hifmiPay;
-
-    // 16. 职工大额医疗补助支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "hifob_pay")
-    private BigDecimal hifobPay;
-
-    // 17. 医疗救助基金支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "maf_pay")
-    private BigDecimal mafPay;
-
-    // 18. 其他支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "oth_pay")
-    private BigDecimal othPay;
-
-    // 19. 基金支付总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    // 20. 个人负担总金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "psn_part_amt")
-    private BigDecimal psnPartAmt;
-
-    // 21. 个人账户支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay;
-
-    // 22. 余额（数值型，16位含2位小数，必填）
-    @JSONField(name = "balc")
-    private BigDecimal balc;
-
-    // 23. 个人账户共济支付（数值型，16位含2位小数，必填）
-    @JSONField(name = "acct_mulaid_pay")
-    private BigDecimal acctMulaidPay;
-
-    // 24. 医院负担金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "hosp_part_amt")
-    private BigDecimal hospPartAmt;
-
-    // 25. 医药机构结算ID（字符型，30位，必填）
-    @JSONField(name = "medins_setl_id")
-    private String medinsSetlId;
-
-    // 26. 个人现金支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "pdn_cash_pay")
-    private BigDecimal pdnCashPay;
-
-    // 27. 伤残人员医疗补助支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "hifdm_pay")
-    private BigDecimal hifdmPay;
-
-    //结算详细信息
-    @JSONField(name = "setldetail")
-    private List<Clinic2206FundPaymentResult> setldetail;//结算详细信息
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java
deleted file mode 100644
index 8e7aa26f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【2201】【2202】挂号 退号
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class ClinicReg extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//主键
-	@TableId(type = IdType.ASSIGN_ID)
-	@JSONField(serialize=false)
-    private String id;
-	//就诊ID
-	@JSONField(name="mdtrt_id")
-    private String mdtrtId;
-	//参保地医保区划
-	@JSONField(serialize=false)
-    private String insuplcAdmdvs;
-	//人员编号
-	@JSONField(name="psn_no")
-    private String psnNo;
-	//险种类型
-	//@Dict(dictCode = "insutype")
-	@JSONField(name="insutype")
-    private String insutype;
-	//医疗类别
-	//@Dict(dictCode = "med_type")
-	@JSONField(serialize=false)
-    private String medType;
-	//挂号时间
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@JSONField(name="begntime")
-    private Date begntime;
-	//就诊凭证类型
-	@Dict(dictCode = "mdtrt_cert_type")
-	@JSONField(name="mdtrt_cert_type")
-    private String mdtrtCertType;
-	//就诊凭证编号
-	@JSONField(name="mdtrt_cert_no")
-    private String mdtrtCertNo;
-//	//证件加密串
-//	@JSONField(serialize=false)
-//	@TableField(exist = false)
-//	private String mdtrtCertNoEncrypt;
-	//住院/门诊号
-	@JSONField(name="ipt_otp_no")
-    private String iptOtpNo;//使用bus_no
-	//医师编码
-	//@Dict(dictTable = "business_pub_medicalstaff", dictText = "name", dictCode = "id")
-	@JSONField(name="atddr_no")
-    private String atddrNo;
-	//医师姓名
-	@JSONField(name="dr_name")
-    private String drName;
-	//科室编码
-	//@Dict(dictTable = "business_pub_dept", dictText = "hosp_dept_name", dictCode = "id")
-	@JSONField(name="dept_code")
-    private String deptCode;
-	//科室名称
-	@JSONField(name="dept_name")
-    private String deptName;
-	//科别
-	@Dict(dictCode = "dept")
-	@JSONField(name="caty")
-    private String caty;
-	//挂号费
-	@JSONField(serialize=false)
-    private Double regFee;
-	//检查费
-	@JSONField(serialize=false)
-    private Double checkFee;
-	//应收金额 
-	@JSONField(serialize=false)
-    private Double totalFee;
-	//状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算
-	@JSONField(serialize=false)
-	@Dict(dictCode = "clinc_status")
-    private String status;
-
-	@JSONField(name="psn_cert_type")
-	@TableField(exist = false)
-	private String psnCertType;
-	@JSONField(name="certno")
-	@TableField(exist = false)
-	private String certno;
-	@JSONField(name="psn_type")
-	@TableField(exist = false)
-	private String psnType;
-	@JSONField(name="psn_name")
-	@TableField(exist = false)
-	private String psnName;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java
deleted file mode 100644
index 25b9d60d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@Accessors(chain = true)
-public class ClinicReg2201Output {
-    private static final long serialVersionUID = 1L;
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-    //就诊ID
-    private String mdtrtId;
-    //参保地医保区划
-    @JSONField(serialize=false)
-    private String insuplcAdmdvs;
-    //人员编号
-    private String psnNo;
-    //险种类型
-    private String insutype;
-    //医疗类别
-    @JSONField(serialize=false)
-    private String medType;
-    //挂号时间
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date begntime;
-    //就诊凭证类型
-    private String mdtrtCertType;
-    //就诊凭证编号
-    private String mdtrtCertNo;
-    //证件加密串
-    @JSONField(serialize=false)
-    @TableField(exist = false)
-    private String mdtrtCertNoEncrypt;
-    //住院/门诊号
-    private String iptOtpNo;
-    //医师编码
-    private String atddrNo;
-    //医师姓名
-    private String drName;
-    //科室编码
-    private String deptCode;
-    //科室名称
-    private String deptName;
-    //科别
-    private String caty;
-    //挂号费
-    private Double regFee;
-    //检查费
-    private Double checkFee;
-    //应收金额
-    private Double totalFee;
-    //状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算
-    private String status;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java
deleted file mode 100644
index 6748837f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 药品发放和库存表连接信息
- *
- * @author wangyang
- * @date 2025-03-14
- */
-@Data
-@Accessors(chain = true)
-public class DispenseInventory3505Dto {
-
-    /** 药品发放表主键ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long dispenseId;
-
-    /** 就诊id */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long encounterId;
-
-    /** 药品请求表主键ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long medReqId;
-
-    /** 病人id */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long patientId;
-
-    /** 请求单位编码 */
-    private String dispenseUnitCode;
-
-    /** 请求数量 */
-    private Integer dispenseQuantity;
-
-    /** 发放数量 */
-    private Integer dispenseStatus;
-
-    /** 库存项目表主键ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long inventoryId;
-
-    /** 拆零单位 */
-    private String inventoryUnitCode;
-
-    /** 当前库存数量(拆零单位) */
-    private BigDecimal inventoryQuantity;
-
-    /** 拆零比 */
-    private BigDecimal partPercent;
-
-    /** 批号 */
-    private String lotNumber;
-
-    /** 生产日期 */
-    private Date productionDate;
-
-    /** 发药时间 */
-    private Date dispenseTime;
-
-    /** 有效期止 */
-    private Date expirationDate;
-
-    /** 追溯码 */
-    private String traceNo;
-
-    /** 医保编码 */
-    private String ybNo;
-
-    /** 就诊编号 */
-    private String encounterNo;
-
-    /** 药品编码 */
-    private String medicationNo;
-
-    /** 执业资格证号 */
-    private String pharPracCertNo;
-
-    /** 发药编号 */
-    private String dispenseNo;
-
-    /** 处方标志 */
-    private Integer rxFlag;
-
-    /** 配药人 */
-    private String preparerName;
-
-    /** 发药人 */
-    private String dispenseName;
-
-    /** 开方人 */
-    private String practitionerName;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java
deleted file mode 100644
index 76fd2746..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- *  收费项目明细
- *
- * @author yuxj
- * @date 2025-04-22
- */
-@Data
-@Accessors(chain = true)
-public class EleInvoiceChargeDetailDto {
-
-    // 医疗收费项目类别;
-    private String ybType;
-    // 数量
-    private Integer number;
-    // 金额
-    private BigDecimal amt;
-    // 自费金额
-    private BigDecimal selfAmt;
-    // 收费项目名称
-    private String chargeName;
-    // 收费项目代码
-    private String chargeCode;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java
deleted file mode 100644
index 2d94610e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 清单项目明细
- *
- * @author yuxj
- * @date 2025-04-22
- */
-@Data
-@Accessors(chain = true)
-public class EleInvoiceListDetailDto {
-    // 明细流水号
-    private Long listDetailNo;
-    // 医疗收费项目类别;
-    private String ybType;
-    // 药品编码
-    private String code;
-    // 药品名称
-    private String name;
-    // 医保项目编码
-    private String ybCode;
-    // 计量单位
-    private String unit;
-    // 单价
-    private BigDecimal std;
-    // 数量
-    private Integer number;
-    // 金额
-    private BigDecimal amt;
-    // 自费金额
-    private BigDecimal selfAmt;
-    // 医保药品分类
-    private Integer medicalCareType;
-    // 收费项目名称
-    private String chargeName;
-    // 收费项目代码
-    private String chargeCode;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java
deleted file mode 100644
index e70a64b0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 患者信息
- *
- * @author yuxj
- * @date 2025-04-22
- */
-@Data
-@Accessors(chain = true)
-public class EleInvoicePatientInfoDto {
-    // 患者id
-    private Long payerId;
-
-    // 患者姓名
-    private String payer;
-
-    // 患者院内编码/病历号
-    private String caseNumber;
-
-    // 性别
-    private Integer genderEnum;
-    private String genderEnum_enumText;
-
-    // 生日
-    private Date birthDate;
-
-    // 电话
-    private String tel;
-
-    // 身份证号
-    private String cardNo;
-
-    // 就诊编码
-    private String encounterBusNo;
-
-    // 就诊日期
-    private String consultationDate;
-
-    // 住院日期
-    private String inHospitalDate;
-
-    // 出院日期
-    private String outHospitalDate;
-
-    // 就诊科室名称
-    private String patientCategory;
-
-    // 就诊科室编码
-    private String patientCategoryCode;
-
-    // 医疗机构类型
-    private String medicalInstitution;
-
-    // 医保区域编码
-    private String medCareAreaCode;
-
-    // 入院科室编码
-    private String categoryCode;
-    // 入院科室名称
-    private String category;
-    // 出院科室编码
-    private String leaveCategoryCode;
-    // 出院科室名称
-    private String leaveCategory;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java
deleted file mode 100644
index 34025f8c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 付款信息
- *
- * @author yuxj
- * @date 2025-04-22
- */
-@Data
-@Accessors(chain = true)
-public class EleInvoicePaymentInfoDto {
-    // 付款状态
-    private Integer paymentStatus;
-
-    // 发票id
-    private Long invoiceId;
-
-    // 发票状态
-    private Integer invoiceStatus;
-
-    // 结算id
-    private Long paymentId;
-
-    // 支付的业务标识符(用于显示,支付流水号)
-    private String busNo;
-
-    // 收费员
-    private String payee;
-
-    // 开票总金额
-    private BigDecimal totalAmt;
-
-    // 个人现金支付金额
-    private BigDecimal rmbCashPayAmount;
-    // 个人现金支付金额(微信)
-    private BigDecimal wxPayAmount;
-    // 个人现金支付金额(支付宝)
-    private BigDecimal aliPayAmount;
-    // 个人现金支付金额(银联)
-    private BigDecimal debitPayAmount;
-    // 个人医保账户支付
-    private BigDecimal zhPayAmount;
-    // 基金支付总额
-    private BigDecimal ybFundFayAmount;
-    // 其他（如医院负担金额）
-    private BigDecimal otherPayAmount;
-    // 账户共济支付金额
-    private BigDecimal aelfYbZhGjValue;
-
-    // 付款账单集合
-    private String chargeItemIds;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java
deleted file mode 100644
index e7f3525f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.openhis.common.enums.InvoiceStatus;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- *  返回信息
- *
- * @author yuxj
- * @date 2025-04-22
- */
-@Data
-@Accessors(chain = true)
-public class EleInvoiceResultDto {
-
-    private Long id;
-
-    /** 患者ID */
-    private Long patientId;
-
-    /** 状态 */
-    private InvoiceStatus statusEnum;
-
-    /** 类别 */
-    private String typeCode;
-
-    /** 取消原因 */
-    private String cancelledReason;
-
-    /** 收费项 */
-    private String chargeItemIds;
-
-    /** 发票净额总记 */
-    private BigDecimal totalNet;
-
-    /** 发票总计金额 */
-    private BigDecimal totalGross;
-
-    /** 付款详情 */
-    private String paymentTerms;
-
-    /** 账单批次号 */
-    private String batchCode;
-
-    /** 结算批次号 */
-    private String qrCode;
-
-    /** 发票编号 */
-    private String busNo;
-
-    /** 开票员 */
-    private Long invoicingStaffId;
-    /** 电子票据代码 */
-    private String billBatchCode;
-    /** 电子票据号码 */
-    private String billNo;
-    /** 电子校验码 */
-    private String random;
-    /** 电子票据生成时间 */
-    private String billCreateTime;
-    /** 电子票据二维码图片数据 */
-    private String billQrCode;
-    /** 电子票据H5页面URL */
-    private String pictureUrl;
-    /** 电子票据外网H5页面URL */
-    private String pictureNetUrl;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java
deleted file mode 100644
index 460d7e96..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-@Data
-public class File9101Param {
-
-    private MultipartFile file;
-
-    private String filename;
-
-    private String fixmedinsCode;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java
deleted file mode 100644
index 291e560b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 【9102】下载实体
- */
-@Data
-@Accessors(chain = true)
-public class FileDownload {
-    @JSONField(serialize = false)
-    private String code;
-    @JSONField(name = "ver")
-    private String version;
-    @JSONField(name = "filename")
-    private String filename;
-    @JSONField(name = "file_qury_no")
-    private String fileQuryNo;
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java
deleted file mode 100644
index f6ecfcf0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 【9101】【9102】公用
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FileResult {
-
-    // 文件查询号
-    @JSONField(name="file_qury_no")
-    private String fileQuryNo;
-
-    // 文件名称
-    @JSONField(name="filename")
-    private String filename;
-
-    // 下载截止时间
-    @JSONField(name="dld_endtime")
-    private Date dldEndtime;
-
-    // 文件数据
-    @JSONField(serialize=false)
-    private byte[] fileData;
-
-    // 医药机构编号
-    @JSONField(name="fixmedins_code")
-    private String fixmedinsCode;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java
deleted file mode 100644
index 0d4506b1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【13203】医药机构费用结算日对账结果查询
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Financial13203Param {
-
-    // 对账日期，格式：YYYY-MM-DD
-    @JSONField(name = "stmt_date")
-    private String stmtDate;
-
-    // 明细对账结果，1：不平，0：平
-    @JSONField(name = "stmt_rslt")
-    private String stmtRslt;
-
-    // 查询页面数据量，最大100
-    @JSONField(name = "page_size")
-    private String pageSize;
-
-    // 页数，默认1
-    @JSONField(name = "page_num")
-    private String pageNum;
-
-    // 清算机构编码
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 清算类别
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 险种
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 就医类别，2：本地就医，3：省内异地就医，4：跨省就医
-    @JSONField(name = "clr_pay_loc")
-    private String clrPayLoc;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java
deleted file mode 100644
index b931d301..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【13203】医药机构费用结算日对账结果查询-输出参数
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Financial13203Result {
-
-    // 退费标识
-    @JSONField(name = "refd_setl_flag")
-    private String refdSetlFlag;
-
-    // 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 就诊流水号
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 结算ID
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 人员名称
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 对账结果
-    @JSONField(name = "stmt_rslt")
-    private String stmtRslt;
-
-    // 总医疗费
-    @JSONField(name = "medfee_sumamt")
-    private String medfeeSumamt;
-
-    // 清算机构编码
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 报文ID
-    @JSONField(name = "msg_id")
-    private String msgId;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java
deleted file mode 100644
index 1a0e123e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-/**
- * 【13202】前台入参
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Financial13203WebParam {
-
-    // 对账日期，格式：YYYY-MM-DD
-    @JSONField(name = "stmt_date")
-    private String stmtDate;
-
-    // 明细对账结果，1：不平，0：平
-    @JSONField(name = "stmt_rslt")
-    private String stmtRslt;
-
-    // 查询页面数据量，最大100
-    @JSONField(name = "page_size")
-    private String pageSize;
-
-    // 页数，默认1
-    @JSONField(name = "page_num")
-    private String pageNum;
-
-    // 清算机构编码
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 清算类别
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 险种
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 就医类别，2：本地就医，3：省内异地就医，4：跨省就医
-    @JSONField(name = "clr_pay_loc")
-    private String clrPayLoc;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java
deleted file mode 100644
index e53070b2..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Financial3201Output {
-
-    //结算经办机构
-    private String setlOptins;
-    //对账结果
-    private String stmtRslt;
-    //对账结果说明
-    private String stmtRsltDscr;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java
deleted file mode 100644
index 444cb58a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.core.common.annotation.Excel;
-import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- *【3201】月结对账
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false) 
-public class Financial3201Param extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//定点医药机构编号
-	@Excel(name = "定点医药机构编号", width = 15)
-	@JSONField(serialize=false)
-    private String fixmedinsCode;
-	//定点医药机构名称
-	@Excel(name = "定点医药机构名称", width = 15)
-	@JSONField(serialize=false)
-    private String fixmedinsName;
-	//医保区划
-	@Excel(name = "医保区划", width = 15)
-	@JSONField(serialize=false)
-    private String admvs;
-	//险种
-	@Excel(name = "险种", width = 15, dictType = "insutype")
-	@Dict(dictCode = "insutype")
-	@JSONField(name="insutype")
-    private String insutype;
-	//清算类别
-	@Excel(name = "清算类别", width = 15, dictType = "clr_type")
-	@Dict(dictCode = "clr_type")
-	@JSONField(name="clr_type")
-    private String clrType;
-	//结算经办机构
-	@Excel(name = "结算经办机构", width = 15)
-	@JSONField(name="setl_optins")
-    private String setlOptins;
-	//对账开始日期
-	@Excel(name = "对账开始日期", width = 15, dateFormat = "yyyy-MM-dd")
-	@JSONField(name="stmt_begndate")
-    private String stmtBegndate;
-	//对账结束日期
-	@Excel(name = "对账结束日期", width = 15, dateFormat = "yyyy-MM-dd")
-	@JSONField(name="stmt_enddate")
-    private String stmtEnddate;
-	//医疗费总额
-	@Excel(name = "医疗费总额", width = 15)
-	@JSONField(name="medfee_sumamt")
-    private Double medfeeSumamt;
-	//基金支付总额
-	@Excel(name = "基金支付总额", width = 15)
-	@JSONField(name="fund_pay_sumamt")
-    private Double fundPaySumamt;
-	//个人账户支付金额
-	@Excel(name = "个人账户支付金额", width = 15)
-	@JSONField(name="acct_pay")
-    private Double acctPay;
-	//定点医药机构结算笔数
-	@Excel(name = "定点医药机构结算笔数", width = 15)
-	@JSONField(name="fixmedins_setl_cnt")
-    private Integer fixmedinsSetlCnt;
-	//对账结果
-	@Excel(name = "对账结果", width = 15, dictType = "stmt_rslt")
-	@Dict(dictCode = "stmt_rslt")
-	@JSONField(serialize=false)
-    private String stmtRslt;
-	//对账结果说明
-	@Excel(name = "对账结果说明", width = 15)
-	@JSONField(serialize=false)
-    private String stmtRsltDscr;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java
deleted file mode 100644
index cc9bc902..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【3202】文件输入实体
- *
- * @author SunJQ
- * @date 2025-04-22
- */
-@Data
-@Accessors(chain = true)
-public class Financial3202FileParam {
-    // 1. 结算ID（字符型，30位，必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 2. 就诊ID（字符型，30位，必填）
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 3. 人员编号（字符型，30位，必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 4. 医疗费总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 5. 基金支付总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    // 6. 个人账户支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay;
-
-    // 7. 退费结算标志（字符型，3位，必填）
-    @JSONField(name = "refd_setl_flag")
-    private String refdSetlFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java
deleted file mode 100644
index 106f5d99..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import java.math.BigDecimal;
-
-/**
- * 【3202】文件输出实体
- *
- * @author SunJQ
- * @date 2025-04-22
- */
-public class Financial3202FileResult {
-    // 1. 人员编号（字符型，30位，必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 就诊ID（字符型，30位，非必填）
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 3. 结算ID（字符型，30位，非必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 4. 发送方报文ID（字符型，30位，必填）
-    @JSONField(name = "msgid")
-    private String msgid;
-
-    // 5. 对账结果（字符型，6位，必填）
-    @JSONField(name = "stmt_rslt")
-    private String stmtRslt;
-
-    // 6. 退费结算标志（字符型，3位，必填）
-    @JSONField(name = "refd_setl_flag")
-    private String refdSetlFlag;
-
-    // 7. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 8. 医疗费总额（数值型，16位含2位小数，非必填）
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 9. 基金支付总额（数值型，16位含2位小数，非必填）
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    // 10. 个人账户支出（数值型，16位含2位小数，非必填）
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java
deleted file mode 100644
index d02f5261..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *【3203A】清算
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Financial3203AParam extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 1. 清算类别（字符型，30位，必填）
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 2. 医疗费总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 3. 医保认可费用总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "med_sumfee")
-    private BigDecimal medSumfee;
-
-    // 4. 基金申报总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "fund_appy_sum")
-    private BigDecimal fundAppySum;
-
-    // 5. 现金支付金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "cash_payamt")
-    private BigDecimal cashPayamt;
-
-    // 6. 个人账户支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay;
-
-    // 7. 开始日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "begndate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date begndate;
-
-    // 8. 结束日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "enddate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date enddate;
-
-    // 9. 清算机构（字符型，6位，必填）
-    @JSONField(name = "clr_optins")
-    private String clrOptins; // 必须是准确的6位编码
-//
-//    // 统筹区号,仅传参用
-//    @JSONField(deserialize = false)
-//    private String admvs; // 必须是准确的6位编码
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java
deleted file mode 100644
index a5f5daf1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * 【3203A】前台入参
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-public class Financial3203AWebParam {
-
-    /** 清算类别 */
-    @NotNull
-    private String clrType;
-    /** 开始时间 */
-    @NotNull
-    private Date stmtBegnDate;
-    /** 结束时间 */
-    @NotNull
-    private Date stmtEndDate;
-    /** 清算机构 */
-    @NotNull
-    private String clrOptins;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java
deleted file mode 100644
index 917bc7d8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3203】清算申请
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Financial3203Param {
-    private static final long serialVersionUID = 1L;
-
-    // 1. 清算类别（字符型，30位，必填）
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 10. 清算方式（字符型，30位，必填）
-    @JSONField(name = "clr_way")
-    private String clrWay;
-
-    // 2. 医疗费总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 3. 医保认可费用总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "med_sumfee")
-    private BigDecimal medSumfee;
-
-    // 4. 基金申报总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "fund_appy_sum")
-    private BigDecimal fundAppySum;
-
-    // 5. 现金支付金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "cash_payamt")
-    private BigDecimal cashPayamt;
-
-    // 6. 个人账户支出（数值型，16位含2位小数，必填）
-    @JSONField(name = "acct_pay")
-    private BigDecimal acctPay;
-
-    // 7. 开始日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "begndate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date begndate;
-
-    // 8. 结束日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "enddate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date enddate;
-
-    // 9. 清算年月
-    @JSONField(name = "setlym")
-    private String setlym;
-
-    // 11. 清算人次
-    @JSONField(name = "psntime")
-    private Long psntime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java
deleted file mode 100644
index 50cac93d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 【3203】后台计算结果  DB映射实体
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Financial3203VO {
-    // 清算人次
-    private Long psntime;
-    // 医保认可费用总额（数值型，16位含2位小数，必填）
-    private BigDecimal medSumfee;
-    // 现金支付金额（数值型，16位含2位小数，必填）
-    private BigDecimal cashPayamt;
-    // 个人账户支出（数值型，16位含2位小数，必填）
-    private BigDecimal acctPay;
-    /** 医疗费用总额 */
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-    private BigDecimal acctGjPay;
-    /** 现金支付总额 */
-    private BigDecimal selfPayCash;
-    /** 微信支付总额 */
-    private BigDecimal selfPayVX;
-    /** 阿里支付总额 */
-    private BigDecimal selfPayALI;
-    /** 银行卡支付总额 */
-    private BigDecimal selfPayUNION;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java
deleted file mode 100644
index 6c66ef21..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 【3203】前台入参
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Financial3203WebParam {
-
-    // 清算类别（字符型，30位，必填）
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 清算方式（字符型，30位，必填）
-    @JSONField(name = "clr_way")
-    private String clrWay;
-
-    // 开始日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "begndate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date begndate;
-
-    // 结束日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "enddate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date enddate;
-
-    // 清算年月
-    @JSONField(name = "setlym")
-    private String setlym;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java
deleted file mode 100644
index ffc76743..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3204A】清算申请撤销
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Financial3204Param {
-    /**
-     * 机构清算申请事件ID
-     */
-    @JSONField(name = "clr_appy_evt_id")
-    private String clrAppyEvtId;
-    /**
-     * 清算机构
-     */
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java
deleted file mode 100644
index 9dcbbaa6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3202】医药机构费用结算对明细账
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FinancialSettlement3202Param {
-    // 1. 结算经办机构（字符型，6位，必填）
-    @JSONField(name = "setl_optins")
-    private String setlOptins;
-
-    // 2. 文件查询号（字符型，30位，必填）
-    @JSONField(name = "file_qury_no")
-    private String fileQuryNo;
-
-    // 3. 对账开始日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "stmt_begndate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String stmtBegndate;
-
-    // 4. 对账结束日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "stmt_enddate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date stmtEnddate;
-
-    // 5. 医疗费总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 6. 基金支付总额（数值型，16位含2位小数，必填）
-    @JSONField(name = "fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    // 7. 现金支付金额（数值型，16位含2位小数，必填）
-    @JSONField(name = "cash_payamt")
-    private BigDecimal cashPayamt;
-
-    // 8. 定点医药机构结算笔数（数值型，10位，必填）
-    @JSONField(name = "fixmedins_setl_cnt")
-    private Integer fixmedinsSetlCnt;
-
-    // 9. 清算类别（字符型，6位，必填）
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 10. 退费结算标志（字符型，3位，必填）
-    @JSONField(name = "refd_setl_flag")
-    private String refdSetlFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java
deleted file mode 100644
index 64dbf268..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 【3202】医药机构费用结算对明细账-文件输出实体
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FinancialSettlement3202Result {
-    // 1. 文件查询号（字符型，30位，必填）
-    @JSONField(name = "file_qury_no")
-    private String fileQuryNo;
-
-    // 2. 文件名称（字符型，200位，必填）
-    @JSONField(name = "filename")
-    private String filename;
-
-    // 3. 下载截止时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "dld_endtime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date dldEndtime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java
deleted file mode 100644
index f2b21c79..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- *【3209A】查询跨省三方对账未成功数据(吉林省)-输入参数
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FinancialSettlement3209AParam {
-
-    // 清算类别
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 开始日期
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 结束日期
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 清算机构
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java
deleted file mode 100644
index db17e7a0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3209A】查询跨省三方对账未成功数据(吉林省)-输出参数]
- *
- * @author SunJQ
- * @date 2025-04-21
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FinancialSettlement3209AResult {
-    // 结算ID
-    @JSONField(name = "setlId")
-    private String setlId;
-
-    // 参保地区划
-    @JSONField(name = "insuAdmdvs")
-    private String insuAdmdvs;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java
deleted file mode 100644
index f0299ae4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * 【3101】明细审核事前分析服务（输入-规则分析信息）
- * 【3102】明细审核事中分析服务（输入-规则分析信息）
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiConsultation3101Param {
-
-    // 1. 系统编码
-    @JSONField(name = "syscode")
-    private String syscode;
-
-    // 2. 参保人信息
-    @JSONField(name = "patient_dtos")
-    private List<FsiPatient3101Param> patientDtos;
-
-    // 3. 规则标识集合（非必填）
-    @JSONField(name = "rule_ids")
-    private Set<String> ruleIds;
-
-    // 4. 任务ID
-    @JSONField(name = "task_id")
-    private String taskId;
-
-    // 5. 触发场景
-    @JSONField(name = "trig_scen")
-    private String trigScen;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java
deleted file mode 100644
index 7576cc88..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【3101】明细审核事前分析服务（输入-诊断信息）
- * 【3102】明细审核事中分析服务（输入-诊断信息）
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiDiagnose3101Param {
-
-    // 1. 诊断标识
-    @JSONField(name = "dise_id")
-    private String diseId;
-
-    // 2. 出入诊断类别
-    @JSONField(name = "inout_dise_type")
-    private String inoutDiseType;
-
-    // 3. 主诊断标志
-    @JSONField(name = "maindise_flag")
-    private String maindiseFlag;
-
-    // 4. 诊断排序号
-    @JSONField(name = "dias_srt_no")
-    private String diasSrtNo;
-
-    // 5. 诊断(疾病)编码
-    @JSONField(name = "dise_codg")
-    private String diseCodg;
-
-    // 6. 诊断(疾病)名称
-    @JSONField(name = "dise_name")
-    private String diseName;
-
-    // 7. 诊断日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "dise_date")
-    private Date diseDate;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java
deleted file mode 100644
index 4bbbfa0f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【3101】明细审核事前分析服务（输入-就诊信息）
- * 【3102】明细审核事中分析服务（输入-就诊信息）
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiEncounter3101Param {
-    // 1. 就诊标识
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 医疗服务机构标识
-    @JSONField(name = "medins_id")
-    private String medinsId;
-
-    // 3. 医疗机构名称
-    @JSONField(name = "medins_name")
-    private String medinsName;
-
-    // 4. 医疗机构行政区划编码
-    @JSONField(name = "medins_admdvs")
-    private String medinsAdmdvs;
-
-    // 5. 医疗服务机构类型
-    @JSONField(name = "medins_type")
-    private String medinsType;
-
-    // 6. 医疗机构等级
-    @JSONField(name = "medins_lv")
-    private String medinsLv;
-
-    // 7. 病区标识
-    @JSONField(name = "wardarea_codg")
-    private String wardareaCodg;
-
-    // 8. 病房号
-    @JSONField(name = "wardno")
-    private String wardno;
-
-    // 9. 病床号
-    @JSONField(name = "bedno")
-    private String bedno;
-
-    // 10. 入院日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "adm_date")
-    private Date admDate;
-
-    // 11. 出院日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "dscg_date")
-    private Date dscgDate;
-
-    // 12. 主诊断编码
-    @JSONField(name = "dscg_main_dise_codg")
-    private String dscgMainDiseCodg;
-
-    // 13. 主诊断名称
-    @JSONField(name = "dscg_main_dise_name")
-    private String dscgMainDiseName;
-
-    // 14. 诊断信息DTO
-    @JSONField(name = "fsi_diagnose_dtos")
-    private List<FsiDiagnose3101Param> fsiDiagnoseDtos;
-
-    // 15. 医师标识
-    @JSONField(name = "dr_codg")
-    private String drCodg;
-
-    // 16. 入院科室标识
-    @JSONField(name = "adm_dept_codg")
-    private String admDeptCodg;
-
-    // 17. 入院科室名称
-    @JSONField(name = "adm_dept_name")
-    private String admDeptName;
-
-    // 18. 出院科室标识
-    @JSONField(name = "dscg_dept_codg")
-    private String dscgDeptCodg;
-
-    // 19. 出院科室名称
-    @JSONField(name = "dscg_dept_name")
-    private String dscgDeptName;
-
-    // 20. 就诊类型
-    @JSONField(name = "med_mdtrt_type")
-    private String medMdtrtType;
-
-    // 21. 医疗类别
-    @JSONField(name = "med_type")
-    private String medType;
-
-    // 22. 处方(医嘱)信息
-    @JSONField(name = "fsi_order_dtos")
-    private List<FsiOrder3101Param> fsiOrderDtos;
-
-    // 23. 生育状态
-    @JSONField(name = "matn_stas")
-    private String matnStas;
-
-    // 24. 总费用
-    @JSONField(name = "medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    // 25. 自费金额
-    @JSONField(name = "ownpay_amt")
-    private BigDecimal ownpayAmt;
-
-    // 26. 自付金额
-    @JSONField(name = "selfpay_amt")
-    private BigDecimal selfpayAmt;
-
-    // 27. 个人账户支付金额
-    @JSONField(name = "acct_payamt")
-    private BigDecimal acctPayamt;
-
-    // 28. 救助金支付金额
-    @JSONField(name = "ma_amt")
-    private BigDecimal maAmt;
-
-    // 29. 统筹金支付金额
-    @JSONField(name = "hifp_payamt")
-    private BigDecimal hifpPayamt;
-
-    // 30. 结算总次数
-    @JSONField(name = "setl_totlnum")
-    private Integer setlTotlnum;
-
-    // 31. 险种
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 32. 报销标志
-    @JSONField(name = "reim_flag")
-    private String reimFlag;
-
-    // 33. 异地结算标志
-    @JSONField(name = "out_setl_flag")
-    private String outSetlFlag;
-
-    // 34. 手术操作集合
-    @JSONField(name = "fsi_operation_dtos")
-    private List<FsiOperation3101Param> fsiOperationDtos;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java
deleted file mode 100644
index 7d44ea4f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 【3103】事前事中服务反馈服务（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiFeedback3103DataParam {
-    // 1. 反馈类型
-    @JSONField(name = "warn_type")
-    private String warnType;
-
-    // 2. 处理数据集合
-    @JSONField(name = "warns")
-    private List<FsiFeedback3103WarnsParam> warns;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java
deleted file mode 100644
index b2645272..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3103】事前事中服务反馈服务（输入-反馈处理数据）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiFeedback3103WarnsParam {
-    // 1. 违规标识
-    @JSONField(name = "warn_rslt_id")
-    private String warnRsltId;
-
-    // 2. 处理方式
-    @JSONField(name = "dspo_way")
-    private String dspoWay;
-
-    // 3. 处理原因
-    @JSONField(name = "dspo_way_rea")
-    private String dspoWayRea;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java
deleted file mode 100644
index 9472bc69..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【3101】明细审核事前分析服务（输入-手术操作信息）
- * 【3102】明细审核事中分析服务（输入-手术操作信息）
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiOperation3101Param {
-
-    // 1. 手术操作ID
-    @JSONField(name = "setl_list_oprn_id")
-    private String setlListOprnId;
-
-    // 2. 手术操作代码
-    @JSONField(name = "oprn_code")
-    private String oprnCode;
-
-    // 3. 手术操作名称
-    @JSONField(name = "oprn_name")
-    private String oprnName;
-
-    // 4. 主手术操作标志
-    @JSONField(name = "main_oprn_flag")
-    private String mainOprnFlag;
-
-    // 5. 手术操作日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "oprn_date")
-    private Date oprnDate;
-
-    // 6. 麻醉方式
-    @JSONField(name = "anst_way")
-    private String anstWay;
-
-    // 7. 术者医师姓名
-    @JSONField(name = "oper_dr_name")
-    private String operDrName;
-
-    // 8. 术者医师代码
-    @JSONField(name = "oper_dr_code")
-    private String operDrCode;
-
-    // 9. 麻醉医师姓名
-    @JSONField(name = "anst_dr_name")
-    private String anstDrName;
-
-    // 10. 麻醉医师代码
-    @JSONField(name = "anst_dr_code")
-    private String anstDrCode;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java
deleted file mode 100644
index 440f86ce..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3101】明细审核事前分析服务（输入-处方（医嘱）信息）
- * 【3102】明细审核事中分析服务（输入-处方（医嘱）信息）
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiOrder3101Param {
-
-    // 1. 处方(医嘱)标识
-    @JSONField(name = "rx_id")
-    private String rxId;
-
-    // 2. 处方号
-    @JSONField(name = "rxno")
-    private String rxno;//2025/05/05 李要求该字段对应耗材时使用buz_no,药品时使用处方号
-
-    // 3. 组编号
-    @JSONField(name = "grpno")
-    private String grpno;
-
-    // 4. 是否为长期医嘱 [1=是,0=否]
-    @JSONField(name = "long_drord_flag")
-    private String longDrordFlag;
-
-    // 5. 目录类别（参考字典表）
-    @JSONField(name = "hilist_type")
-    private String hilistType;
-
-    // 6. 收费类别（参考字典表）
-    @JSONField(name = "chrg_type")
-    private String chrgType;
-
-    // 7. 医嘱行为（参考字典表）
-    @JSONField(name = "drord_bhvr")
-    private String drordBhvr;
-
-    // 8. 医保目录代码（国家统一标准编码）
-    @JSONField(name = "hilist_code")
-    private String hilistCode;
-
-    // 9. 医保目录名称（国家统一标准名称）
-    @JSONField(name = "hilist_name")
-    private String hilistName;
-
-    // 10. 医保目录(药品)剂型（国家统一标准药品剂型）
-    @JSONField(name = "hilist_dosform")
-    private String hilistDosform;
-
-    // 11. 医保目录等级
-    @JSONField(name = "hilist_lv")
-    private String hilistLv;
-
-    // 12. 医保目录价格
-    @JSONField(name = "hilist_pric")
-    private BigDecimal hilistPric;
-
-    // 13. 一级医院目录价格
-    @JSONField(name = "lv1_hosp_item_pric")
-    private BigDecimal lv1HospItemPric;
-
-    // 14. 二级医院目录价格
-    @JSONField(name = "lv2_hosp_item_pric")
-    private BigDecimal lv2HospItemPric;
-
-    // 15. 三级医院目录价格
-    @JSONField(name = "lv3_hosp_item_pric")
-    private BigDecimal lv3HospItemPric;
-
-    // 16. 医保目录备注
-    @JSONField(name = "hilist_memo")
-    private String hilistMemo;
-
-    // 17. 医院目录代码
-    @JSONField(name = "hosplist_code")
-    private String hosplistCode;
-
-    // 18. 医院目录名称
-    @JSONField(name = "hosplist_name")
-    private String hosplistName;
-
-    // 19. 医院目录(药品)剂型
-    @JSONField(name = "hosplist_dosform")
-    private String hosplistDosform;
-
-    // 20. 数量
-    @JSONField(name = "cnt")
-    private BigDecimal cnt;
-
-    // 21. 单价
-    @JSONField(name = "pric")
-    private BigDecimal pric;
-
-    // 22. 总费用
-    @JSONField(name = "sumamt")
-    private BigDecimal sumamt;
-
-    // 23. 自费金额
-    @JSONField(name = "ownpay_amt")
-    private BigDecimal ownpayAmt;
-
-    // 24. 自付金额
-    @JSONField(name = "selfpay_amt")
-    private BigDecimal selfpayAmt;
-
-    // 25. 规格
-    @JSONField(name = "spec")
-    private String spec;
-
-    // 26. 数量单位
-    @JSONField(name = "spec_unt")
-    private String specUnt;
-
-    // 27. 医嘱开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "drord_begn_date")
-    private Date drordBegnDate;
-
-    // 28. 医嘱停止日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "drord_stop_date")
-    private Date drordStopDate;
-
-    // 29. 下达医嘱的科室标识
-    @JSONField(name = "drord_dept_codg")
-    private String drordDeptCodg;
-
-    // 30. 下达医嘱科室名称
-    @JSONField(name = "drord_dept_name")
-    private String drordDeptName;
-
-    // 31. 开处方(医嘱)医生标识
-    @JSONField(name = "drord_dr_codg")
-    private String drordDrCodg;
-
-    // 32. 开处方(医嘱)医生姓名
-    @JSONField(name = "drord_dr_name")
-    private String drordDrName;
-
-    // 33. 开处方(医嘱)医职称
-    @JSONField(name = "drord_dr_profttl")
-    private String drordDrProfttl;
-
-    // 34. 是否当前处方(医嘱)[1=是,0=否]
-    @JSONField(name = "curr_drord_flag")
-    private String currDrordFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java
deleted file mode 100644
index 95de10c1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【3101】明细审核事前分析服务（输入-参保人信息）
- * 【3102】明细审核事中分析服务（输入-参保人信息）
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiPatient3101Param {
-
-    // 1. 参保人标识
-    @JSONField(name = "patn_id")
-    private String patnId;
-
-    // 2. 姓名
-    @JSONField(name = "patn_name")
-    private String patnName;
-
-    // 3. 性别
-    @JSONField(name = "gend")
-    private String gend;
-
-    // 4. 出生日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "brdy")
-    private Date brdy;
-
-    // 5. 统筹区编码
-    @JSONField(name = "poolarea")
-    private String poolarea;
-
-    // 6. 当前就诊标识
-    @JSONField(name = "curr_mdtrt_id")
-    private String currMdtrtId;
-
-    // 7. 就诊信息集合
-    @JSONField(name = "fsi_encounter_dtos")
-    private List<FsiEncounter3101Param> fsiEncounterDtos;
-
-//    // 8. 医院信息集合（非必填项）
-//    @JSONField(name = "fsi_his_data_dto")
-//    private FsiHisData fsiHisDataDto;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java
deleted file mode 100644
index 43fde8ff..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 【3101】明细审核事前分析服务（输出-违规信息）
- * 【3102】明细审核事中分析服务（输出-违规信息）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiViolation3101Result {
-    // 1. 违规标识
-    @JSONField(name = "jr_id")
-    private String jrId;
-
-    // 2. 规则ID
-    @JSONField(name = "rule_id")
-    private String ruleId;
-
-    // 3. 规则名称
-    @JSONField(name = "rule_name")
-    private String ruleName;
-
-    // 4. 违规内容
-    @JSONField(name = "vola_cont")
-    private String volaCont;
-
-    // 5. 参保人ID
-    @JSONField(name = "patn_id")
-    private String patnId;
-
-    // 6. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 7. 违规明细
-    @JSONField(name = "judge_result_detail_dtos")
-    private List<FsiViolationDetail3101Result> judgeResultDetailDtos;
-
-    // 8. 违规金额
-    @JSONField(name = "vola_amt")
-    private BigDecimal volaAmt;
-
-    // 9. 违规金额计算状态
-    @JSONField(name = "vola_amt_stas")
-    private String volaAmtStas;
-
-    // 10. 严重程度
-    @JSONField(name = "sev_deg")
-    private String sevDeg;
-
-    // 11. 违规依据
-    @JSONField(name = "vola_evid")
-    private String volaEvid;
-
-    // 12. 违规行为分类
-    @JSONField(name = "vola_bhvr_type")
-    private String volaBhvrType;
-
-    // 13. 任务ID
-    @JSONField(name = "task_id")
-    private String taskId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java
deleted file mode 100644
index 8fee16d6..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【3101】明细审核事前分析服务（输出-违规明细信息）
- * 【3102】明细审核事中分析服务（输出-违规明细信息）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class FsiViolationDetail3101Result {
-    // 1. 违规明细标识
-    @JSONField(name = "jrd_id")
-    private String jrdId;
-
-    // 2. 参保人标识
-    @JSONField(name = "patn_id")
-    private String patnId;
-
-    // 3. 就诊标识
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 4. 处方(医嘱)标识
-    @JSONField(name = "rx_id")
-    private String rxId;
-
-    // 5. 违规明细类型
-    @JSONField(name = "vola_item_type")
-    private String volaItemType;
-
-    // 6. 违规金额
-    @JSONField(name = "vola_amt")
-    private BigDecimal volaAmt;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java
deleted file mode 100644
index 4fa77568..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【2401】入院办理（输入-入院诊断信息）
- *
- * @author yuanzs
- * @date 2025-05-07
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2401DiseInfoParam {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 诊断类别
-    @JSONField(name = "diag_type")
-    private String diagType;
-
-    // 3. 主诊断标志
-    @JSONField(name = "maindiag_flag")
-    private String maindiagFlag;
-
-    // 4. 诊断排序号
-    @JSONField(name = "diag_srt_no")
-    private BigDecimal diagSrtNo;
-
-    // 5. 诊断代码
-    @JSONField(name = "diag_code")
-    private String diagCode;
-
-    // 6. 诊断名称
-    @JSONField(name = "diag_name")
-    private String diagName;
-
-    // 7. 入院病情
-    @JSONField(name = "adm_cond")
-    private String admCond;
-
-    // 8. 诊断科室
-    @JSONField(name = "diag_dept")
-    private String diagDept;
-
-    // 9. 诊断医生编码
-    @JSONField(name = "dise_dor_no")
-    private String diseDorNo;
-
-    // 10. 诊断医生姓名
-    @JSONField(name = "dise_dor_name")
-    private String diseDorName;
-
-    // 11. 诊断时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "diag_time")
-    private Date diagTime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java
deleted file mode 100644
index ae1910b4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2401】入院办理
- *
- * @author yuanzs
- * @date 2025-05-07
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2401MdtInfoParam {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 联系人姓名
-    @JSONField(name = "coner_name")
-    private String conerName;
-
-    // 4. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 5. 开始时间（入院时间）
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "begntime")
-    private Date begntime;
-
-    // 6. 就诊凭证类型
-    @JSONField(name = "mdtrt_cert_type")
-    private String mdtrtCertType;
-
-    // 7. 就诊凭证编号
-    @JSONField(name = "mdtrt_cert_no")
-    private String mdtrtCertNo;
-
-    // 8. 医疗类别
-    @JSONField(name = "med_type")
-    private String medType;
-
-    // 9. 住院号
-    @JSONField(name = "ipt_no")
-    private String iptNo;
-
-    // 10. 病历号
-    @JSONField(name = "medrcdno")
-    private String medrcdno;
-
-    // 11. 主治医生编码
-    @JSONField(name = "atddr_no")
-    private String atddrNo;
-
-    // 12. 主诊医师姓名
-    @JSONField(name = "chfpdr_name")
-    private String chfpdrName;
-
-    // 13. 入院诊断描述
-    @JSONField(name = "adm_diag_dscr")
-    private String admDiagDscr;
-
-    // 14. 入院科室编码
-    @JSONField(name = "adm_dept_codg")
-    private String admDeptCodg;
-
-    // 15. 入院科室名称
-    @JSONField(name = "adm_dept_name")
-    private String admDeptName;
-
-    // 16. 入院床位
-    @JSONField(name = "adm_bed")
-    private String admBed;
-
-    // 17. 住院主诊断代码
-    @JSONField(name = "dscg_maindiag_code")
-    private String dscgMaindiagCode;
-
-    // 18. 住院主诊断名称
-    @JSONField(name = "dscg_maindiag_name")
-    private String dscgMaindiagName;
-
-    // 19. 主要病情描述
-    @JSONField(name = "main_cond_dscr")
-    private String mainCondDscr;
-
-    // 20. 病种编码
-    @JSONField(name = "dise_codg")
-    private String diseCodg;
-
-    // 21. 病种名称
-    @JSONField(name = "dise_name")
-    private String diseName;
-
-    // 22. 手术操作代码
-    @JSONField(name = "oprn_oprt_code")
-    private String oprnOprtCode;
-
-    // 23. 手术操作名称
-    @JSONField(name = "oprn_oprt_name")
-    private String oprnOprtName;
-
-    // 24. 计划生育服务证号
-    @JSONField(name = "fpsc_no")
-    private String fpscNo;
-
-    // 25. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 26. 计划生育手术类别
-    @JSONField(name = "birctrl_type")
-    private String birctrlType;
-
-    // 27. 晚育标志
-    @JSONField(name = "latechb_flag")
-    private String latechbFlag;
-
-    // 28. 孕周数
-    @JSONField(name = "geso_val")
-    private BigDecimal gesoVal;
-
-    // 29. 胎次
-    @JSONField(name = "fetts")
-    private BigDecimal fetts;
-
-    // 30. 胎儿数
-    @JSONField(name = "fetus_cnt")
-    private BigDecimal fetusCnt;
-
-    // 31. 早产标志
-    @JSONField(name = "pret_flag")
-    private String pretFlag;
-
-    // 32. 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-
-    // 33. 病种类型
-    @JSONField(name = "dise_type_code")
-    private String diseTypeCode;
-
-    // 34. 字段扩展
-    @JSONField(name = "exp_content")
-    private String expContent;
-
-    // 35. 参保地医保区划
-    @JSONField(name = "insuplc_admdvs")
-    private String insuplcAdmdvs;
-
-    // 36. 就医地医保区划
-    @JSONField(name = "mdtrtarea_admvs")
-    private String mdtrtareaAdmvs;
-
-    // 37. 外伤标识（仅对异地根据情况填写）
-    @JSONField(name = "trum_flag")
-    private String trumFlag;
-
-    // 38. 涉及第三方标志（仅对异地根据情况填写）
-    @JSONField(name = "rel_ttp_flag")
-    private String relTtpFlag;
-
-    // 39. 就诊人群类型（仅对异地根据情况填写）
-    @JSONField(name = "mdtrt_grp_type")
-    private String mdtrtGrpType;
-
-    // 40. 入院诊断信息集合
-    private List<HospAdm2401DiseInfoParam> diseInfoParams;
-
-    // 41. 就诊ID（输出）
-    @JSONField(name = "mdtrtId")
-    private String mdtrt_id;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java
deleted file mode 100644
index 2d95d31f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【2402】出院办理（输入-出院诊断信息）
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2402DiseInfoParam {
-
-    // 1. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 诊断类别
-    @JSONField(name = "diag_type")
-    private String diagType;
-
-    // 4. 主诊断标志
-    @JSONField(name = "maindiag_flag")
-    private String maindiagFlag;
-
-    // 5. 诊断排序号
-    @JSONField(name = "diag_srt_no")
-    private BigDecimal diagSrtNo;
-
-    // 6. 诊断代码
-    @JSONField(name = "diag_code")
-    private String diagCode;
-
-    // 7. 诊断名称
-    @JSONField(name = "diag_name")
-    private String diagName;
-
-    // 8. 诊断科室
-    @JSONField(name = "diag_dept")
-    private String diagDept;
-
-    // 9. 诊断医生编码
-    @JSONField(name = "dise_dor_no")
-    private String diseDorNo;
-
-    // 10. 诊断医生姓名
-    @JSONField(name = "dise_dor_name")
-    private String diseDorName;
-
-    // 11. 诊断时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "diag_time")
-    private Date diagTime;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java
deleted file mode 100644
index 4242b936..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2402】出院办理
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2402DscgInfoParam {
-    // 1. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 4. 结束时间（出院时间）
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "endtime")
-    private Date endtime;
-
-    // 5. 病种编码
-    @JSONField(name = "dise_codg")
-    private String diseCodg;
-
-    // 6. 病种名称
-    @JSONField(name = "dise_name")
-    private String diseName;
-
-    // 7. 手术操作代码（日间手术病种时必填）
-    @JSONField(name = "oprn_oprt_code")
-    private String oprnOprtCode;
-
-    // 8. 手术操作名称
-    @JSONField(name = "oprn_oprt_name")
-    private String oprnOprtName;
-
-    // 9. 计划生育服务证号
-    @JSONField(name = "fpsc_no")
-    private String fpscNo;
-
-    // 10. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 11. 计划生育手术类别
-    @JSONField(name = "birctrl_type")
-    private String birctrlType;
-
-    // 12. 晚育标志
-    @JSONField(name = "latechb_flag")
-    private String latechbFlag;
-
-    // 13. 孕周数
-    @JSONField(name = "esso_val")
-    private BigDecimal essoVal;
-
-    // 14. 胎次
-    @JSONField(name = "fetts")
-    private BigDecimal fetts;
-
-    // 15. 胎儿数
-    @JSONField(name = "fetus_cnt")
-    private BigDecimal fetusCnt;
-
-    // 16. 早产标志
-    @JSONField(name = "pret_flag")
-    private String pretFlag;
-
-    // 17. 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-
-    // 18. 伴有并发症标志
-    @JSONField(name = "cop_flag")
-    private String copFlag;
-
-    // 19. 出院科室编码
-    @JSONField(name = "dscg_dept_codg")
-    private String dscgDeptCodg;
-
-    // 20. 出院科室名称
-    @JSONField(name = "dscg_dept_name")
-    private String dscgDeptName;
-
-    // 21. 出院床位
-    @JSONField(name = "dscg_bed")
-    private String dscgBed;
-
-    // 22. 离院方式
-    @JSONField(name = "dscg_way")
-    private String dscgWay;
-
-    // 23. 死亡日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "die_date")
-    private Date dieDate;
-
-    // 24. 字段扩展
-    @JSONField(name = "exp_content")
-    private String expContent;
-
-    // 25. 出院诊断信息
-    private List<HospAdm2402DiseInfoParam> diseInfoParams;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java
deleted file mode 100644
index 6e8479f7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2403】住院信息变更
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2403AdmInfoParam {
-
-    // 1. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 联系人姓名
-    @JSONField(name = "coner_name")
-    private String conerName;
-
-    // 4. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 5. 开始时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "begntime")
-    private Date begntime;
-
-    // 6. 结束时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "endtime")
-    private Date endtime;
-
-    // 7. 就诊凭证类型
-    @JSONField(name = "mdtrt_cert_type")
-    private String mdtrtCertType;
-
-    // 8. 医疗类别
-    @JSONField(name = "med_type")
-    private String medType;
-
-    // 9. 住院/门诊号
-    @JSONField(name = "ipt_otp_no")
-    private String iptOtpNo;
-
-    // 10. 病历号
-    @JSONField(name = "medrcdno")
-    private String medrcdno;
-
-    // 11. 主治医生编码
-    @JSONField(name = "atddr_no")
-    private String atddrNo;
-
-    // 12. 主诊医师姓名
-    @JSONField(name = "chfpdr_name")
-    private String chfpdrName;
-
-    // 13. 入院诊断描述
-    @JSONField(name = "adm_diag_dscr")
-    private String admDiagDscr;
-
-    // 14. 入院科室编码
-    @JSONField(name = "adm_dept_codg")
-    private String admDeptCodg;
-
-    // 15. 入院科室名称
-    @JSONField(name = "adm_dept_name")
-    private String admDeptName;
-
-    // 16. 入院床位
-    @JSONField(name = "adm_bed")
-    private String admBed;
-
-    // 17. 住院主诊断代码
-    @JSONField(name = "dscg_maindiag_code")
-    private String dscgMaindiagCode;
-
-    // 18. 住院主诊断名称
-    @JSONField(name = "dscg_maindiag_name")
-    private String dscgMaindiagName;
-
-    // 19. 主要病情描述
-    @JSONField(name = "main_cond_dscr")
-    private String mainCondDscr;
-
-    // 20. 病种编码
-    @JSONField(name = "dise_codg")
-    private String diseCodg;
-
-    // 21. 病种名称
-    @JSONField(name = "dise_name")
-    private String diseName;
-
-    // 22. 手术操作代码
-    @JSONField(name = "oprn_oprt_code")
-    private String oprnOprtCode;
-
-    // 23. 手术操作名称
-    @JSONField(name = "oprn_oprt_name")
-    private String oprnOprtName;
-
-    // 24. 计划生育服务证号
-    @JSONField(name = "fpsc_no")
-    private String fpscNo;
-
-    // 25. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 26. 计划生育手术类别
-    @JSONField(name = "birctrl_type")
-    private String birctrlType;
-
-    // 27. 晚育标志
-    @JSONField(name = "latechb_flag")
-    private String latechbFlag;
-
-    // 28. 孕周数
-    @JSONField(name = "esso_val")
-    private Integer essoVal;
-
-    // 29. 胎次
-    @JSONField(name = "fetts")
-    private Integer fetts;
-
-    // 30. 胎儿数
-    @JSONField(name = "fetus_cnt")
-    private Integer fetusCnt;
-
-    // 31. 早产标志
-    @JSONField(name = "pret_flag")
-    private String pretFlag;
-
-    // 32. 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-
-    // 33. 病种编号
-    @JSONField(name = "dise_type_code")
-    private String diseTypeCode;
-
-    // 34. 字段扩展
-    @JSONField(name = "exp_content")
-    private String expContent;
-
-    // 35. 外伤标识（仅对异地根据情况填写）
-    @JSONField(name = "trum_flag")
-    private String trumFlag;
-
-    // 36. 涉及第三方标志（仅对异地根据情况填写）
-    @JSONField(name = "rel_ttp_flag")
-    private String relTtpFlag;
-
-    // 37. 就诊人群类型（仅对异地根据情况填写）
-    @JSONField(name = "mdtrt_grp_type")
-    private String mdtrtGrpType;
-
-    // 38. 入院诊断信息集合
-    private List<HospAdm2403DiseInfoParam> diseInfoParams;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java
deleted file mode 100644
index b09e1d73..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【2403】住院信息变更（输入-入院诊断信息）
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2403DiseInfoParam {
-
-    // 1. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 诊断类别
-    @JSONField(name = "diag_type")
-    private String diagType;
-
-    // 4. 主诊断标志
-    @JSONField(name = "maindiag_flag")
-    private String maindiagFlag;
-
-    // 5. 诊断排序号
-    @JSONField(name = "diag_srt_no")
-    private BigDecimal diagSrtNo;
-
-    // 6. 诊断代码
-    @JSONField(name = "diag_code")
-    private String diagCode;
-
-    // 7. 诊断名称
-    @JSONField(name = "diag_name")
-    private String diagName;
-
-    // 8. 入院病情
-    @JSONField(name = "adm_cond")
-    private String admCond;
-
-    // 9. 诊断科室
-    @JSONField(name = "diag_dept")
-    private String diagDept;
-
-    // 10. 诊断医生编码
-    @JSONField(name = "dise_dor_no")
-    private String diseDorNo;
-
-    // 11. 诊断医生姓名
-    @JSONField(name = "dise_dor_name")
-    private String diseDorName;
-
-    // 12. 诊断时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "diag_time")
-    private Date diagTime;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java
deleted file mode 100644
index bafa4284..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【2404】入院撤销
- * 【2405】出院撤销
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2404AdmCnlParam {
-
-    // 1. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 字段扩展
-    @JSONField(name = "exp_content")
-    private String expContent;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java
deleted file mode 100644
index 91ad0909..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【2401】就医特殊属性上传
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2406SmAttrUpParam {
-
-    // 1. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 人员证件类型
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 4. 证件号码
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 5. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 6. 住院/门诊号
-    @JSONField(name = "ipt_otp_no")
-    private String iptOtpNo;
-
-    // 7. 就医人员特殊标识类型
-    @JSONField(name = "ipt_psn_sp_flag_type")
-    private String iptPsnSpFlagType;
-
-    // 8. 就医人员特殊标识
-    @JSONField(name = "ipt_psn_sp_flag")
-    private String iptPsnSpFlag;
-
-    // 9. 备注
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 10. 医保区划
-    @JSONField(name = "admdvs")
-    private String admdvs;
-
-    // 11. 就医人员特殊标识明细id（输出）
-    @JSONField(name = "ipt_psn_sp_flag_detl_id")
-    private String iptPsnSpFlagDetlId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java
deleted file mode 100644
index 599ef096..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 【2407】就医特殊属性查询（输入）
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2407SmAttrSelectParam {
-
-    // 1. 分页条数
-    @JSONField(name = "page_num")
-    private BigDecimal pageNum;
-
-    // 2. 分页大小
-    @JSONField(name = "page_size")
-    private BigDecimal pageSize;
-
-    // 3. 就医人员特殊标识明细id
-    @JSONField(name = "ipt_psn_sp_flag_detl_id")
-    private String iptPsnSpFlagDetlId;
-
-    // 4. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 5. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 6. 人员证件类型
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 7. 证件号码
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 8. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 9. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 10. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 11. 住院/门诊号
-    @JSONField(name = "ipt_otp_no")
-    private String iptOtpNo;
-
-    // 12. 就医人员特殊标识类型
-    @JSONField(name = "ipt_psn_sp_flag_type")
-    private String iptPsnSpFlagType;
-
-    // 13. 就医人员特殊标识
-    @JSONField(name = "ipt_psn_sp_flag")
-    private String iptPsnSpFlag;
-
-    // 14. 医保区划
-    @JSONField(name = "admdvs")
-    private String admdvs;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java
deleted file mode 100644
index 069c632c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【2407】就医特殊属性查询（输出）
- *
- * @author yuanzs
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospAdm2407SmAttrSelectResult {
-
-    // 1. 就医人员特殊标识明细id
-    @JSONField(name = "ipt_psn_sp_flag_detl_id")
-    private String iptPsnSpFlagDetlId;
-
-    // 2. 就诊ID
-    @JSONField(name = "mdtrt_id")
-    private String mdtrtId;
-
-    // 3. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 4. 人员证件类型
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 5. 证件号码
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 6. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 7. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 8. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 9. 住院/门诊号
-    @JSONField(name = "ipt_otp_no")
-    private String iptOtpNo;
-
-    // 10. 就医人员特殊标识类型
-    @JSONField(name = "ipt_psn_sp_flag_type")
-    private String iptPsnSpFlagType;
-
-    // 11. 就医人员特殊标识
-    @JSONField(name = "ipt_psn_sp_flag")
-    private String iptPsnSpFlag;
-
-    // 12. 医保区划
-    @JSONField(name = "admdvs")
-    private String admdvs;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java
deleted file mode 100644
index 579ffcdc..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import java.util.List;
-
-/**
- * 【3401A】科室信息上传(批量)
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-public class HospDept3401AParam {
-    private List<HospDept3401Param> deptinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java
deleted file mode 100644
index d8619749..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import java.util.Date;
-
-/**
- * 【3401】科室信息上传
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-public class HospDept3401Param {
-
-    // 1. 医院科室编码（院内唯一编码）
-    @JSONField(name = "hosp_dept_codg") // JSON字段名映射
-    private String hospDeptCodg;
-
-    // 2. 科别（参照科室代码）
-    @JSONField(name = "caty")
-    private String caty;
-
-    // 3. 医院科室名称
-    @JSONField(name = "hosp_dept_name")
-    private String hospDeptName;
-
-    // 4. 开始时间（日期时间格式）
-    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss") // 指定时间格式
-    private Date begnTime;
-
-    // 5. 结束时间（日期时间格式）
-    @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    // 6. 科室简介
-    @JSONField(name = "itro")
-    private String itro;
-
-    // 7. 科室负责人姓名
-    @JSONField(name = "dept_resper_name")
-    private String deptResperName;
-
-    // 8. 科室负责人电话
-    @JSONField(name = "dept_resper_tel")
-    private String deptResperTel;
-
-    // 9. 科室医疗服务范围
-    @JSONField(name = "dept_med_serv_scp")
-    private String deptMedServScp;
-
-    // 10. 科室成立日期（日期格式）
-    @JSONField(name = "dept_estbdat", format = "yyyy-MM-dd")
-    private Date deptEstbdat;
-
-    // 11. 批准床位数量（长整型）
-    @JSONField(name = "aprv_bed_cnt")
-    private Long aprvBedCnt;
-
-    // 12. 医保认可床位数（长整型）
-    @JSONField(name = "hi_crtf_bed_cnt")
-    private Long hiCrtfBedCnt;
-
-    // 13. 统筹区编号
-    @JSONField(name = "poolarea_no")
-    private String poolareaNo;
-
-    // 14. 医师人数（整型）
-    @JSONField(name = "dr_psncnt")
-    private Integer drPsncnt;
-
-    // 15. 药师人数（整型）
-    @JSONField(name = "phar_psncnt")
-    private Integer pharPsncnt;
-
-    // 16. 护士人数（整型）
-    @JSONField(name = "nurs_psncnt")
-    private Integer nursPsncnt;
-
-    // 17. 技师人数（整型）
-    @JSONField(name = "tecn_psncnt")
-    private Integer tecnPsncnt;
-
-    // 18. 备注
-    @JSONField(name = "memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java
deleted file mode 100644
index 53eae8bb..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import java.util.Date;
-
-/**
- * 【3402】科室信息变更
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-public class HospDept3402Param {
-
-    // 1. 医院科室编码（院内唯一编码）
-    @JSONField(name = "hosp_dept_codg")
-    private String hospDeptCodg;
-
-    // 2. 医院科室名称
-    @JSONField(name = "hosp_dept_name")
-    private String hospDeptName;
-
-    // 3. 开始时间（日期时间格式）
-    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss")
-    private Date begnTime;
-
-    // 4. 结束时间（日期时间格式）
-    @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    // 5. 科室简介
-    @JSONField(name = "itro")
-    private String itro;
-
-    // 6. 科室负责人姓名
-    @JSONField(name = "dept_resper_name")
-    private String deptResperName;
-
-    // 7. 科室负责人电话
-    @JSONField(name = "dept_resper_tel")
-    private String deptResperTel;
-
-    // 8. 科室医疗服务范围
-    @JSONField(name = "dept_med_serv_scp")
-    private String deptMedServScp;
-
-    // 9. 科别（参照科室代码）
-    @JSONField(name = "caty")
-    private String caty;
-
-    // 10. 科室成立日期（日期格式）
-    @JSONField(name = "dept_estbdat", format = "yyyy-MM-dd")
-    private Date deptEstbdat;
-
-    // 11. 批准床位数量（长整型）
-    @JSONField(name = "aprv_bed_cnt")
-    private Long aprvBedCnt;
-
-    // 12. 医保认可床位数（长整型）
-    @JSONField(name = "hi_crtf_bed_cnt")
-    private Long hiCrtfBedCnt;
-
-    // 13. 统筹区编号
-    @JSONField(name = "poolarea_no")
-    private String poolareaNo;
-
-    // 14. 医师人数（整型）
-    @JSONField(name = "dr_psncnt")
-    private Integer drPsncnt;
-
-    // 15. 药师人数（整型）
-    @JSONField(name = "phar_psncnt")
-    private Integer pharPsncnt;
-
-    // 16. 护士人数（整型）
-    @JSONField(name = "nurs_psncnt")
-    private Integer nursPsncnt;
-
-    // 17. 技师人数（整型）
-    @JSONField(name = "tecn_psncnt")
-    private Integer tecnPsncnt;
-
-    // 18. 备注
-    @JSONField(name = "memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java
deleted file mode 100644
index 9fe60c3f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import java.util.Date;
-
-/**
- * 【3403】科室信息撤销
- *
- * @author SunJQ
- * @date 2025-04-28
- */
-public class HospDept3403Param {
-    // 1. 医院科室编码（院内唯一编码）
-    @JSONField(name = "hosp_dept_codg")
-    private String hospDeptCodg;
-
-    // 2. 医院科室名称
-    @JSONField(name = "hosp_dept_name")
-    private String hospDeptName;
-
-    // 3. 开始时间（日期时间格式）
-    @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss")
-    private Date begnTime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java
deleted file mode 100644
index e49d5417..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【2501A】转院备案（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospTrf2501ARefmedinParam {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 4. 联系地址
-    @JSONField(name = "addr")
-    private String addr;
-
-    // 5. 参保机构医保区划
-    @JSONField(name = "insu_optins")
-    private String insuOptins;
-
-    // 6. 诊断代码
-    @JSONField(name = "diag_code")
-    private String diagCode;
-
-    // 7. 诊断名称
-    @JSONField(name = "diag_name")
-    private String diagName;
-
-    // 8. 疾病病情描述
-    @JSONField(name = "dise_cond_dscr")
-    private String diseCondDscr;
-
-    // 9. 转往定点医药机构编号
-    @JSONField(name = "reflin_medins_no")
-    private String reflinMedinsNo;
-
-    // 10. 转往医院名称
-    @JSONField(name = "reflin_medins_name")
-    private String reflinMedinsName;
-
-    // 11. 就医地行政区划
-    @JSONField(name = "mdtrtarea_admdvs")
-    private String mdtrtareaAdmdvs;
-
-    // 12. 医院同意转院标志
-    @JSONField(name = "hosp_agre_refl_flag")
-    private String hospAgreReflFlag;
-
-    // 13. 转院类型
-    @JSONField(name = "refl_type")
-    private String reflType;
-
-    // 14. 转院日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "refl_date")
-    private Date reflDate;
-
-    // 15. 转院原因
-    @JSONField(name = "refl_rea")
-    private String reflRea;
-
-    // 16. 转院意见
-    @JSONField(name = "refl_opnn")
-    private String reflOpnn;
-
-    // 17. 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 18. 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 19. 转院前就诊id
-    @JSONField(name = "refl_old_mdtrt_id")
-    private String reflOldMdtrtId;
-
-    // 20. 待遇申报明细流水号（输出）
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java
deleted file mode 100644
index e89d8831..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【2501】转院备案（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class HospTrf2501RefmedinParam {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 4. 联系地址
-    @JSONField(name = "addr")
-    private String addr;
-
-    // 5. 参保机构医保区划
-    @JSONField(name = "insu_optins")
-    private String insuOptins;
-
-    // 6. 诊断代码
-    @JSONField(name = "diag_code")
-    private String diagCode;
-
-    // 7. 诊断名称
-    @JSONField(name = "diag_name")
-    private String diagName;
-
-    // 8. 疾病病情描述
-    @JSONField(name = "dise_cond_dscr")
-    private String diseCondDscr;
-
-    // 9. 转往定点医药机构编号
-    @JSONField(name = "reflin_medins_no")
-    private String reflinMedinsNo;
-
-    // 10. 转往医院名称
-    @JSONField(name = "reflin_medins_name")
-    private String reflinMedinsName;
-
-    // 11. 就医地行政区划
-    @JSONField(name = "mdtrtarea_admdvs")
-    private String mdtrtareaAdmdvs;
-
-    // 12. 医院同意转院标志
-    @JSONField(name = "hosp_agre_refl_flag")
-    private String hospAgreReflFlag;
-
-    // 13. 转院类型
-    @JSONField(name = "refl_type")
-    private String reflType;
-
-    // 14. 转院日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "refl_date")
-    private Date reflDate;
-
-    // 15. 转院原因
-    @JSONField(name = "refl_rea")
-    private String reflRea;
-
-    // 16. 转院意见
-    @JSONField(name = "refl_opnn")
-    private String reflOpnn;
-
-    // 17. 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 18. 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 19. 转诊使用标志
-    @JSONField(name = "refl_used_flag")
-    private String reflUsedFlag;
-
-    // 20. 待遇申报明细流水号（输出）
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java
deleted file mode 100644
index eef7d320..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【2502】转院备案撤销（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-
-public class HospTrfCxl2502Param {
-    // 1. 待遇申报明细流水号
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 备注
-    @JSONField(name = "memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java
deleted file mode 100644
index f985ba13..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.openhis.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- *【1101】获取身份信息
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Info1101Output extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//人员编号
-    private String psnNo;
-	//人员证件类型
-    private String psnCertType;
-	//证件号码
-    private String certno;
-	//人员姓名
-    private String psnName;
-	//性别
-    private String gend;
-	//民族
-    private String naty;
-	//出生日期
-    private Date brdy;
-	//年龄
-    private Double age;
-	//参保地医保区划
-    private String insuplcAdmdvs;
-    //险种类型
-    private String insutype;
-    //余额
-    private String balc;
-    //人员类别
-    @TableField(exist = false)
-    private String psnType;
-
-    //人员参保状态
-    @TableField(exist = false)
-    private String psnInsuStas;
-
-    //个人参保日期
-    @TableField(exist = false)
-    private String psnInsuDate;
-
-    //公务员标志
-    @TableField(exist = false)
-    private String cvlservFlag;
-
-    //单位名称
-    @TableField(exist = false)
-    private String empName;
-    //特慢病
-    @TableField(exist = false)
-    private List<Info5301SpecialConditionResult> feedetail;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java
deleted file mode 100644
index d0d96767..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *【1101】获取身份信息
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Info1101PerinfoResult extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//人员编号
-    @JSONField(name="psn_no")
-    private String psnNo;
-	//人员证件类型
-    @JSONField(name="psn_cert_type")
-    private String psnCertType;
-	//证件号码
-    @JSONField(name="certno")
-    private String certno;
-	//人员姓名
-    @JSONField(name="psn_name")
-    private String psnName;
-	//性别
-    @JSONField(name="gend")
-    private String gend;
-	//民族
-    @JSONField(name="naty")
-    private String naty;
-	//出生日期
-    @JSONField(name="brdy")
-    private Date brdy;
-	//年龄
-    @JSONField(name="age")
-    private Double age;
-	//参保地医保区划
-    @JSONField(serialize = false)
-    private String insuplcAdmdvs;
-    //险种类型
-    @JSONField(serialize = false)
-    private String insutype;
-    //余额
-    @JSONField(serialize = false)
-    private String balc;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java
deleted file mode 100644
index a645aca1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- *【1101】获取身份信息
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Info1101ReadcardParam extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//就诊凭证类型
-    @JSONField(name="mdtrt_cert_type")
-    private String mdtrtCertType;
-	//就诊凭证编号
-    @JSONField(name="mdtrt_cert_no")
-    private String mdtrtCertNo;
-	//卡识别码
-    @JSONField(name="card_sn")
-    private String cardSn;
-	//开始时间
-    @JSONField(name="begntime")
-    private String begntime;
-	//人员证件类型
-    @JSONField(name="psn_cert_type")
-    private String psnCertType;
-	//证件号码
-    @JSONField(name="certno")
-    private String certno;
-	//人员姓名
-    @JSONField(name="psn_name")
-    private String psnName;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java
deleted file mode 100644
index 90353f71..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Info5301Param {
-    @JSONField(name = "psn_no")
-    private String psnNo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java
deleted file mode 100644
index b3eb44ea..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class Info5301SpecialConditionResult {
-
-    private static final long serialVersionUID = 1L;
-
-    //门慢门特病种目录代码
-    private String opspDiseCode;
-    //门慢门特病种名称
-    private String opspDiseName;
-    //开始日期
-    private String begndate;
-    //结束日期
-    private String enddate;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java
deleted file mode 100644
index c6d04213..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 电子发票基础信息查询实体
- *
- * @author SunJQ
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-public class InvoiceBaseInfoDto {
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-
-    private String setlId;//结算id
-
-    private String mdtrtId; // 就诊ID
-
-    private String psnName; // 人员姓名
-
-    private String psnCertType; // 人员证件类型
-
-    private String certno; // 证件号码
-
-    private String insutype; // 险种类型
-
-    private String psnType; // 人员类别
-
-    private String cvlservFlag; // 公务员标志
-
-    private Date setlTime; // 结算时间
-
-    private String mdtrtCertType; // 就诊凭证类型
-
-    private String medType; // 医疗类别
-
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    private BigDecimal othPay; // 其他支出
-
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    private BigDecimal acctPay; // 个人账户支出
-
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    private BigDecimal balc; // 余额
-
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    private String medinsSetlId; // 医药机构结算ID
-
-    private String clrOptins; // 清算经办机构
-
-    private String clrWay; // 清算方式
-
-    private String clrType; // 清算类别
-
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    private String paymentNo;//结算业务流水号  Payment与ClinicSettle是1：N
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java
deleted file mode 100644
index 480d63dd..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.openhis.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class LoginUser {
-
-	/** 登录人id */
-	private String id;
-	/** 登录人账号 */
-	private String username;
-	/** 登录人名字 */
-	private String realname;
-	/** 登录人密码 */
-	private String password;
-     /** 当前登录部门code */
-    private String orgCode;
-	/** 头像 */
-	private String avatar;
-	/** 生日 */
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date birthday;
-	/** 性别（1：男 2：女） */
-	private Integer sex;
-	/** 电子邮件 */
-	private String email;
-	/** 电话 */
-	private String phone;
-	/** 状态(1：正常 2：冻结 ） */
-	private Integer status;
-	/**逻辑删除标志 */
-	private Integer delFlag;
-	/**  同步工作流引擎1同步0不同步 */
-    private Integer activitiSync;
-	/**创建时间 */
-	private Date createTime;
-	/** 身份（1 普通员工 2 上级）*/
-	private Integer userIdentity;
-	/** 管理部门ids */
-	private String departIds;
-	/** 职务，关联职务表 */
-	private String post;
-	/** 座机号*/
-	private String telephone;
-	/**多租户id配置，编辑用户的时候设置*/
-	private String relTenantIds;
-	/**医保类型，1-市医保，2-省医保，3-省市医保*/
-	private String medicareType;
-	/** 定点医药机构编号 */
-	private String fixmedinsCode;
-	/** 定点医药机构名称 */
-	private String fixmedinsName;
-	/** 统筹区号 */
-	private String admvs;
-	/** 行政区划 */
-	private String district;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java
deleted file mode 100644
index f3ff5917..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【25007】生育津贴登记（输入）
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MatAllowReg25007Param {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 3. 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-
-    // 4. 孕周数
-    @JSONField(name = "geso_val")
-    private BigDecimal gesoVal;
-
-    // 5. 胎次
-    @JSONField(name = "fetts")
-    private BigDecimal fetts;
-
-    // 6. 胎儿数
-    @JSONField(name = "fetus_cnt")
-    private BigDecimal fetusCnt;
-
-    // 7. 经办人姓名
-    @JSONField(name = "opter_name")
-    private String opterName;
-
-    // 8. 结算ID
-    @JSONField(name = "setl_id")
-    private String setlId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java
deleted file mode 100644
index 3377a414..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【25007】生育津贴登记（输出）
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MatAllowReg25007Result {
-    // 1. 生育津贴登记ID
-    @JSONField(name = "matn_alwn_reg_id")
-    private String matnAlwnRegId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 4. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 5. 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-
-    // 6. 孕周数
-    @JSONField(name = "geso_val")
-    private BigDecimal gesoVal;
-
-    // 7. 胎次
-    @JSONField(name = "fetts")
-    private BigDecimal fetts;
-
-    // 8. 胎儿数
-    @JSONField(name = "fetus_cnt")
-    private BigDecimal fetusCnt;
-
-    // 9. 结算ID
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 10. 有效标志
-    @JSONField(name = "vali_flag")
-    private String valiFlag;
-
-    // 11. 审核标志
-    @JSONField(name = "rchk_flag")
-    private String rchkFlag;
-
-    // 12. 审核意见
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 13. 经办人姓名
-    @JSONField(name = "opter_name")
-    private String opterName;
-
-    // 14. 经办时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "opt_time")
-    private Date optTime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java
deleted file mode 100644
index 188a91d7..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【25008】生育津贴登记信息查询（输出）
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MatAllowRegSel25008Param {
-    // 1. 生育津贴登记ID
-    @JSONField(name = "matn_alwn_reg_id")
-    private String matnAlwnRegId;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 4. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 5. 计划生育手术或生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "birctrl_matn_date")
-    private Date birctrlMatnDate;
-
-    // 6. 孕周数
-    @JSONField(name = "geso_val")
-    private BigDecimal gesoVal;
-
-    // 7. 胎次
-    @JSONField(name = "fetts")
-    private BigDecimal fetts;
-
-    // 8. 胎儿数
-    @JSONField(name = "fetus_cnt")
-    private BigDecimal fetusCnt;
-
-    // 9. 结算ID
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 10. 有效标志
-    @JSONField(name = "vali_flag")
-    private String valiFlag;
-
-    // 11. 审核标志
-    @JSONField(name = "rchk_flag")
-    private String rchkFlag;
-
-    // 12. 审核意见
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 13. 经办人姓名
-    @JSONField(name = "opter_name")
-    private String opterName;
-
-    // 14. 经办时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "opt_time")
-    private Date optTime;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java
deleted file mode 100644
index 6c40d521..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *【3503】商品采购
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3503Param {
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 随货单号（字符型，50位，非必填）
-    @JSONField(name = "dynt_no")
-    private String dyntNo;
-
-    // 5. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 6. 供应商名称（字符型，200位，必填）
-    @JSONField(name = "spler_name")
-    private String splerName;
-
-    // 7. 供应商许可证号（字符型，50位，非必填）
-    @JSONField(name = "spler_pmtno")
-    private String splerPmtno;
-
-    // 8. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 9. 生产厂家名称（字符型，200位，必填）
-    @JSONField(name = "prodentp_name")
-    private String prodentpName;
-
-    // 10. 批准文号（字符型，100位，必填）
-    @JSONField(name = "aprvno")
-    private String aprvno;
-
-    // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 13. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 14. 采购/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "purc_retn_cnt")
-    private BigDecimal purcRetnCnt;
-
-    // 15. 采购发票编码（字符型，50位，非必填）
-    @JSONField(name = "purc_invo_codg")
-    private String purcInvoCodg;
-
-    // 16. 采购发票号（字符型，50位，非必填）
-    @JSONField(name = "purc_invo_no")
-    private String purcInvoNo;
-
-    // 17. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 18. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "purc_retn_stoin_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purcRetnStoinTime;
-
-    // 19. 采购/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "purc_retn_opter_name")
-    private String purcRetnOpterName;
-
-    // 20. 商品赠送标志（字符型，3位，必填）
-    @JSONField(name = "prod_geay_flag")
-    private String prodGeayFlag;
-
-    // 21. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java
deleted file mode 100644
index 01de3ee1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【3505】商品销售
- *
- * @author zwh
- * @date 2025-05-29
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3505Model {
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 开方医师证件类型（字符型，6位，非必填）
-    @JSONField(name = "prsc_dr_cert_type")
-    private String prscDrCertType;
-
-    // 6. 开方医师证件号码（字符型，50位，非必填）
-    @JSONField(name = "prsc_dr_certno")
-    private String prscDrCertno;
-
-    // 7. 开方医师姓名（字符型，50位，必填）
-    @JSONField(name = "prsc_dr_name")
-    private String prscDrName;
-
-    // 8. 药师证件类型（字符型，6位，非必填）
-    @JSONField(name = "phar_cert_type")
-    private String pharCertType;
-
-    // 9. 药师证件号码（字符型，50位，非必填）
-    @JSONField(name = "phar_certno")
-    private String pharCertno;
-
-    // 10. 药师姓名（字符型，50位，必填）
-    @JSONField(name = "phar_name")
-    private String pharName;
-
-    // 11. 药师执业资格证号（字符型，50位，必填）
-    @JSONField(name = "phar_prac_cert_no")
-    private String pharPracCertNo;
-
-    // 12. 医保费用结算类型（字符型，6位，必填）
-    @JSONField(name = "hi_feesetl_type")
-    private String hiFeesetlType;
-
-    // 13. 结算ID（字符型，30位，非必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 14. 就医流水号（字符型，30位，必填）
-    @JSONField(name = "mdtrt_sn")
-    private String mdtrtSn;
-
-    // 15. 人员编号（字符型，30位，非必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 16. 人员证件类型（字符型，6位，必填）
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 17. 证件号码（字符型，50位，非必填）
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 18. 人员姓名（字符型，50位，非必填）
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 19. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 20. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 21. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 22. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 23. 拆零标志（字符型，3位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 24. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 25. 处方号（字符型，40位，非必填）
-    @JSONField(name = "rxno")
-    private String rxno;
-
-    // 26. 外购处方标志（字符型，3位，必填）
-    @JSONField(name = "rx_circ_flag")
-    private String rxCircFlag;
-
-    // 27. 零售单据号（字符型，40位，必填）
-    @JSONField(name = "rtal_docno")
-    private String rtalDocno;
-
-    // 29. 销售出库单据号（字符型，40位，非必填）
-    @JSONField(name = "stoout_no")
-    private String stooutNo;
-
-    // 30. 批次号（字符型，30位，非必填）
-    @JSONField(name = "bchno")
-    private String bchno;
-
-    // 32. 药品条形码（字符型，30位，非必填）
-    @JSONField(name = "drug_prod_barc")
-    private String drugProdBarc;
-
-    // 33. 货架位（字符型，20位，非必填）
-    @JSONField(name = "shelf_posi")
-    private String shelfPosi;
-
-    // 34. 销售/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "sel_retn_cnt")
-    private BigDecimal selRetnCnt;
-
-    // 35. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "sel_retn_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date selRetnTime;
-
-    // 36. 销售/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "sel_retn_opter_name")
-    private String selRetnOpterName;
-
-    // 37. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 38. 就诊结算类型（字符型，6位，非必填）
-    @JSONField(name = "mdtrt_setl_type")
-    private String mdtrtSetlType;
-
-    @JSONField(name = "drugtracinfo")
-    private String drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java
deleted file mode 100644
index 80ceb83d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【3505】商品销售
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3505Param {
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 开方医师证件类型（字符型，6位，非必填）
-    @JSONField(name = "prsc_dr_cert_type")
-    private String prscDrCertType;
-
-    // 6. 开方医师证件号码（字符型，50位，非必填）
-    @JSONField(name = "prsc_dr_certno")
-    private String prscDrCertno;
-
-    // 7. 开方医师姓名（字符型，50位，必填）
-    @JSONField(name = "prsc_dr_name")
-    private String prscDrName;
-
-    // 8. 药师证件类型（字符型，6位，非必填）
-    @JSONField(name = "phar_cert_type")
-    private String pharCertType;
-
-    // 9. 药师证件号码（字符型，50位，非必填）
-    @JSONField(name = "phar_certno")
-    private String pharCertno;
-
-    // 10. 药师姓名（字符型，50位，必填）
-    @JSONField(name = "phar_name")
-    private String pharName;
-
-    // 11. 药师执业资格证号（字符型，50位，必填）
-    @JSONField(name = "phar_prac_cert_no")
-    private String pharPracCertNo;
-
-    // 12. 医保费用结算类型（字符型，6位，必填）
-    @JSONField(name = "hi_feesetl_type")
-    private String hiFeesetlType;
-
-    // 13. 结算ID（字符型，30位，非必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 14. 就医流水号（字符型，30位，必填）
-    @JSONField(name = "mdtrt_sn")
-    private String mdtrtSn;
-
-    // 15. 人员编号（字符型，30位，非必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 16. 人员证件类型（字符型，6位，必填）
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 17. 证件号码（字符型，50位，非必填）
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 18. 人员姓名（字符型，50位，非必填）
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 19. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 20. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 21. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 22. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 23. 拆零标志（字符型，3位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 24. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 25. 处方号（字符型，40位，非必填）
-    @JSONField(name = "rxno")
-    private String rxno;
-
-    // 26. 外购处方标志（字符型，3位，必填）
-    @JSONField(name = "rx_circ_flag")
-    private String rxCircFlag;
-
-    // 27. 零售单据号（字符型，40位，必填）
-    @JSONField(name = "rtal_docno")
-    private String rtalDocno;
-
-    // 29. 销售出库单据号（字符型，40位，非必填）
-    @JSONField(name = "stoout_no")
-    private String stooutNo;
-
-    // 30. 批次号（字符型，30位，非必填）
-    @JSONField(name = "bchno")
-    private String bchno;
-
-    // 32. 药品条形码（字符型，30位，非必填）
-    @JSONField(name = "drug_prod_barc")
-    private String drugProdBarc;
-
-    // 33. 货架位（字符型，20位，非必填）
-    @JSONField(name = "shelf_posi")
-    private String shelfPosi;
-
-    // 34. 销售/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "sel_retn_cnt")
-    private BigDecimal selRetnCnt;
-
-    // 35. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "sel_retn_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date selRetnTime;
-
-    // 36. 销售/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "sel_retn_opter_name")
-    private String selRetnOpterName;
-
-    // 37. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 38. 就诊结算类型（字符型，6位，非必填）
-    @JSONField(name = "mdtrt_setl_type")
-    private String mdtrtSetlType;
-
-    // 39. 溯源码节点信息（字符型，长度未明确，暂定500位）
-    @JSONField(name = "drugtracinfo")
-    private JSONArray drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java
deleted file mode 100644
index 6b3df3a0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3505】【3506】商品销售
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3505Result {
-
-    // 返回结果
-    @JSONField(name = "retRslt")
-    private String retRslt;
-
-    // 返回信息
-    @JSONField(name = "msgRslt")
-    private String msgRslt;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java
deleted file mode 100644
index 360358b4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【3506】商品销售退货
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3506Param {
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 结算ID（字符型，30位，非必填）
-    @JSONField(name = "setl_id")
-    private String setlId;
-
-    // 6. 人员编号（字符型，30位，非必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 7. 人员证件类型（字符型，6位，必填）
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 8. 证件号码（字符型，50位，非必填）
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 9. 人员姓名（字符型，50位，非必填）
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 10. 生产批号（字符型，30位，必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 13. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 14. 拆零标志（字符型，3位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 15. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 16. 销售/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "sel_retn_cnt")
-    private BigDecimal selRetnCnt;
-
-    // 17. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "sel_retn_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date selRetnTime;
-
-    // 18. 销售/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "sel_retn_opter_name")
-    private String selRetnOpterName;
-
-    // 19. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 20. 商品销售流水号（字符型，50位，非必填）
-    @JSONField(name = "medins_prod_sel_no")
-    private String medinsProdSelNo;
-
-    // 21. 就医流水号（字符型，30位，必填）
-    @JSONField(name = "mdtrt_sn")
-    private String mdtrtSn;
-
-    // 22. 溯源码节点信息（字符型，长度未明确，暂定500位）
-    @JSONField(name = "drugtracinfo")
-    private JSONArray drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java
deleted file mode 100644
index b81f2321..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【3507】商品信息删除
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3507Param {
-
-    // 定点医药机构批次流水号
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 进销存数据类型
-    @JSONField(name = "inv_data_type")
-    private String invDataType;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java
deleted file mode 100644
index c1622648..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- *【3508】定点医药机构商品库存信息查询
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3508Param {
-    // 定点医药机构编号
-    private String fixmedinsCode;
-
-    // 医药机构目录编码
-    private String medinsListCodg;
-
-    // 定点医药机构批次流水号
-    private String fixmedinsBchno;
-
-    // 开始日期
-    private Date begndate;
-
-    // 结束日期
-    private Date enddate;
-
-    // 定点医药机构商品库存流水号
-    private String medinsProdInvNo;
-
-    // 医疗目录编码
-    private String medListCodg;
-
-    // 医药机构目录名称
-    private String medinsListName;
-
-    // 处方药标志
-    private String rxFlag;
-
-    // 目录特项标志
-    private String listSpItemFlag;
-
-    // 拆零标志
-    private String trdnFlag;
-
-    // 库存日期
-    private Date invdate;
-
-    // 生产批号
-    private String manuLotnum;
-
-    // 生产日期
-    private Date manuDate;
-
-    // 有效期止
-    private Date expyEnd;
-
-    // 备注
-    private String memo;
-
-    // 有效标志
-    private String valiFlag;
-
-    // 数据唯一记录号
-    private String rid;
-
-    // 创建人ID
-    private String crterId;
-
-    // 创建人姓名
-    private String crterName;
-
-    // 创建机构编号
-    private String crteOptinsNo;
-
-    // 经办人ID
-    private String opterId;
-
-    // 经办人姓名
-    private String opterName;
-
-    // 经办机构编号
-    private String optinsNo;
-
-    // 统筹区编号
-    private String poolareaNo;
-
-    // 说明：medins_list_codg和fixmedins_bchno为互斥必填项，至少传其中一个字段
-}
-
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java
deleted file mode 100644
index 29d550cb..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *【3508】定点医药机构商品库存信息查询
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Medical3508Result {
-
-    // 有效期止
-    private Date expyEnd;
-
-    // 医疗目录编码
-    private String medListCodg;
-
-    // 统筹区编号
-    private String poolareaNo;
-
-    // 创建机构编号
-    private String crteOptinsNo;
-
-    // 库存数量
-    private BigDecimal invCnt;
-
-    // 医药机构目录编码
-    private String medinsListCodg;
-
-    // 备注
-    private String memo;
-
-    // 数据更新时间
-    private Date updtTime;
-
-    // 生产日期
-    private Date manuDate;
-
-    // 经办人姓名
-    private String opterName;
-
-    // 数据唯一记录号
-    private String rid;
-
-    // 数据创建时间
-    private Date crteTime;
-
-    // 库存日期
-    private Date invdate;
-
-    // 有效标志
-    private String valiFlag;
-
-    // 定点医药机构编号
-    private String fixmedinsCode;
-
-    // 处方药标志
-    private String rxFlag;
-
-    // 目录特项标志
-    private String listSpItemFlag;
-
-    // 定点医药机构批次流水号
-    private String fixmedinsBchno;
-
-    // 经办时间
-    private Date optTime;
-
-    // 经办人ID
-    private String opterId;
-
-    // 生产批号
-    private String manuLotnum;
-
-    // 医药机构目录名称
-    private String medinsListName;
-
-    // 创建人姓名
-    private String crterName;
-
-    // 定点医药机构商品库存流水号
-    private String medinsProdInvNo;
-
-    // 创建人ID
-    private String crterId;
-
-    // 经办机构编号
-    private String optinsNo;
-
-    // 拆零标志
-    private String trdnFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java
deleted file mode 100644
index be4cc2a5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * MedicalDirectory3301ListParam
- *
- * @author Wuser
- * @date 2025/5/24
- */
-@Data
-public class MedicalDirectory3301ListParam {
-    List<MedicalDirectory3301Param> data;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java
deleted file mode 100644
index f13948b0..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【3301】目录对照上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalDirectory3301Param {
-
-    // 定点医药机构目录编号
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 定点医药机构目录名称
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 目录类别
-    @JSONField(name = "list_type")
-    private String listType;
-
-    // 医疗目录编码
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 开始日期
-    @JSONField(name = "begndate")
-    private String begndate;
-
-    // 结束日期
-    @JSONField(name = "enddate")
-    private String enddate;
-
-    // 批准文号
-    private String aprvno;
-
-    // 剂型
-    private String dosform;
-
-    // 除外内容
-    private String exctCont;
-
-    // 项目内涵
-    private String itemCont;
-
-    // 计价单位
-    private String prcunt;
-
-    // 规格
-    private String spec;
-
-    // 包装规格
-    private String pacspec;
-
-    // 备注
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java
deleted file mode 100644
index 398587cf..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalDirectory3302Param {
-    // 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 定点医药机构目录编号
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 目录类别
-    @JSONField(name = "list_type")
-    private String listType;
-
-    // 医疗目录编码
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java
deleted file mode 100644
index c3c4df05..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- *【3302】目录对照撤销
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalDirectory3302ParamDto {
-
-    // 定点医药机构编号
-    private String fixmedinsCode;
-
-    // 定点医药机构目录编号
-    private String fixmedinsHilistId;
-
-    // 目录类别
-    private String listType;
-
-    // 医疗目录编码
-    private String medListCodg;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java
deleted file mode 100644
index c95b7477..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *【3501】商品盘存上传
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalInventory3501Param {
-
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 5. 盘存日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "invdate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date invdate;
-
-    // 6. 库存数量（数值型，16位含2位小数，必填）
-    @JSONField(name = "inv_cnt")
-    private BigDecimal invCnt;
-
-    // 7. 生产批号（字符型，30位，非必填）
-    @JSONField(name = "manu_lotnum")
-    private String manuLotnum;
-
-    // 8. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 9. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 10. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 11. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java
deleted file mode 100644
index a7b67da5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【3502】商品库存变更
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalInventory3502Param {
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 库存变更类型（字符型，6位，必填）
-    @JSONField(name = "inv_chg_type")
-    private String invChgType;
-
-    // 3. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 4. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 5. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 6. 单价（数值型，16位含6位小数，必填）
-    @JSONField(name = "pric")
-    private BigDecimal pric;
-
-    // 7. 数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "cnt")
-    private BigDecimal cnt;
-
-    // 8. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 9. 库存变更时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "inv_chg_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date invChgTime;
-
-    // 10. 库存变更经办人姓名（字符型，50位，非必填）
-    @JSONField(name = "inv_chg_opter_name")
-    private String invChgOpterName;
-
-    // 11. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 12. 拆零标志（字符型，2位，必填）
-    @JSONField(name = "trdn_flag")
-    private String trdnFlag;
-
-    // 13. 溯源码节点信息（字符型，长度未明确，暂定500位）
-    @JSONField(name = "drugtracinfo")
-    private JSONArray drugtracinfo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java
deleted file mode 100644
index be8d63b8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *【3504】商品采购退货
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalPurchase3504Param {
-    // 1. 医疗目录编码（字符型，50位，必填）
-    @JSONField(name = "med_list_codg")
-    private String medListCodg;
-
-    // 2. 定点医药机构目录编号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_hilist_id")
-    private String fixmedinsHilistId;
-
-    // 3. 定点医药机构目录名称（字符型，200位，必填）
-    @JSONField(name = "fixmedins_hilist_name")
-    private String fixmedinsHilistName;
-
-    // 4. 定点医药机构批次流水号（字符型，30位，必填）
-    @JSONField(name = "fixmedins_bchno")
-    private String fixmedinsBchno;
-
-    // 5. 供应商名称（字符型，200位，必填）
-    @JSONField(name = "spler_name")
-    private String splerName;
-
-    // 6. 供应商许可证号（字符型，50位，非必填）
-    @JSONField(name = "spler_pmtno")
-    private String splerPmtno;
-
-    // 7. 生产日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "manu_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date manuDate;
-
-    // 8. 有效期止（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "expy_end")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expyEnd;
-
-    // 9. 最终成交单价（数值型，16位含6位小数，非必填）
-    @JSONField(name = "finl_trns_pric")
-    private BigDecimal finlTrnsPric;
-
-    // 10. 采购/退货数量（数值型，16位含4位小数，必填）
-    @JSONField(name = "purc_retn_cnt")
-    private BigDecimal purcRetnCnt;
-
-    // 11. 采购发票编码（字符型，50位，非必填）
-    @JSONField(name = "purc_invo_codg")
-    private String purcInvoCodg;
-
-    // 12. 采购发票号（字符型，50位，必填）
-    @JSONField(name = "purc_invo_no")
-    private String purcInvoNo;
-
-    // 13. 处方药标志（字符型，3位，必填）
-    @JSONField(name = "rx_flag")
-    private String rxFlag;
-
-    // 14. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss）
-    @JSONField(name = "purc_retn_stoin_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purcRetnStoinTime;
-
-    // 15. 采购/退货经办人姓名（字符型，50位，必填）
-    @JSONField(name = "purc_retn_opter_name")
-    private String purcRetnOpterName;
-
-    // 16. 备注（字符型，500位，非必填）
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 20. 商品采购流水号（字符型，50位，非必填）
-    @JSONField(name = "medins_prod_purc_no")
-    private String medinsProdPurcNo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java
deleted file mode 100644
index d2a61415..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 药品追溯码dto
- *
- * @author zwh
- * @date 2025-05-28
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class MedicalTraceNoDto {
-
-    // 药品追溯码（字符型，100）
-    @JSONField(name = "drug_trac_codg")
-    private String drugTracCodg;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java
deleted file mode 100644
index 402a849b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.openhis.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-@Accessors(chain = true)
-public class PatientInfoDto {
-
-    //患者信息
-    /** ID */
-    @TableId(type = IdType.ASSIGN_ID)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /** 活动标记 */
-    private Integer activeFlag;
-
-    /** 临时标识 */
-    private Integer tempFlag;
-
-    /** 患者姓名 */
-    private String name;
-
-    /** 患者院内编码/病历号 */
-    private String busNo;
-
-    /** 性别编码 */
-    private Integer genderEnum;
-
-    /** 生日 */
-    private Date birthDate;
-
-    /** 民族 */
-    private String nationalityCode;
-
-    /** 身份证号 */
-    private String idCard;
-
-    /** 拼音码 */
-    private String pyStr;
-
-    /** 五笔码 */
-    private String wbStr;
-
-    /** 机构Id */
-    private Long organizationId;
-
-    /** 特慢病等 */
-    private List<Info5301SpecialConditionResult> feedetail;
-
-    //医保信息 2025/05/23 弃用，费用性质固定，如农大只有省医保，费用性质只显示省医保和自费即可，由@GetMapping(value = "/contract-list")接口提供数据
-    /** 合同Id */
-    private Long contractId;//弃用 2025/05/23
-
-    /** 合同名称 */
-    private String contractName;//弃用 2025/05/23
-
-    /** 状态 */
-    private Integer statusEnum;//弃用 2025/05/23
-
-    /** 合同的类别 */
-    private Integer categoryEnum;//弃用 2025/05/23
-
-    /** 合同编码 */
-    private String contractBusNo;//弃用 2025/05/23
-
-    /** 机构 */
-    private Long contractOrgId;//弃用 2025/05/23
-
-    /** 是否医保 */
-    private Integer ybFlag;//弃用 2025/05/23
-
-    /** 医保区划 */
-    private String admVs;//弃用 2025/05/23
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java
deleted file mode 100644
index 9ec1ebed..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * 支付详情
- *
- * @author SunJQ
- * @date 2025-03-29
- */
-@Data
-@Accessors(chain = true)
-public class PaymentDetailDto {
-
-
-    /** 支付类型 */
-    private Integer payEnum;
-
-    /** 支付类型等级 */
-    private Integer payLevelEnum;
-
-    /** 金额 */
-    private BigDecimal amount;
-
-    /** 找零 */
-    private BigDecimal returnAmount;
-
-    /** 交款 */
-    private BigDecimal chargeAmount;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java
deleted file mode 100644
index bef21285..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 付款入参
- *
- * @author SunJQ
- * @date 2025-03-29
- */
-@Data
-@Accessors(chain = true)
-public class PaymentDto {
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /** 收款员 */
-    private Long entererId;
-
-    /** 支付的患者ID */
-    @NotNull
-    private Long patientId;
-
-    /** 应收金额 */
-    private BigDecimal tenderedAmount;
-
-    /** 找零金额 */
-    private BigDecimal returnedAmount;
-
-    /** 付款总额 */
-    private BigDecimal displayAmount;
-
-    /** 就诊ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long encounterId;
-
-    /** 收费项 */
-    private List<Long> chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
-
-    /** 支付详细 */
-    @NotEmpty
-    private List<PaymentDetailDto> paymentDetails;
-
-    /** 支付批次号 */
-    private List<String> chrgBchnoList;//医保预结算时返回，医保结算时必传，否则结算时一直预结算
-
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java
deleted file mode 100644
index eed99e0e..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-@Data
-@Accessors(chain = true)
-public class PaymentSettleDto {
-
-    private Date endTime;
-
-    private Date startTime;
-
-    private Long enterId;
-
-    private String contractNo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java
deleted file mode 100644
index 80af764c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 映射对象
- *
- * @author SunJQ
- * @date 2025-05-06
- */
-@Data
-public class PaymentVO {
-
-    /** ID */
-    private Long id;
-
-    /** 状态 */
-    private Integer statusEnum;
-
-    /** 关联ID */
-    private Long relationId;
-
-    /** 支付的业务标识符 */
-    private String paymentNo;
-
-    /** 付款类别 */
-    private Integer paymentEnum;
-
-    /** 付款实体ID */
-    private Long paymentReconciliationId;
-
-    /** 发起支付的工作流程类别 */
-    private Integer kindEnum;
-
-    /** 收款员 */
-    private Long entererId;
-
-    /** 支付发起人类型 */
-    private Integer issuerEnum;
-
-    /** 支付的患者ID */
-    private Long patientId;
-
-    /** 请求支付责任人ID */
-    private Long practitionerId;
-
-    /** 付款结果 */
-    private Integer outcomeEnum;
-
-    /** 支付位置 */
-    private Long locationId;
-
-    /** 到期时间 */
-    private Date expirationDate;
-
-    /** 应收金额 */
-    private BigDecimal tenderedAmount;
-
-    /** 找零金额 */
-    private BigDecimal returnedAmount;
-
-    /** 付款总额 */
-    private BigDecimal displayAmount;
-
-    /** 打印标识 */
-    private Integer printCount;
-
-    /** 合同编码 */
-    private String contractNo;
-
-    /** 处方号集合 */
-    private String chargeItemIds;
-
-    /** 就诊ID */
-    private Long encounterId;
-
-    /** 结算时间 */
-    private Date billDate;
-
-    /** 发票编号 */
-    private Long invoiceId;
-
-    /** 关联账户Id */
-    private Long accountId;
-
-    /** 医保清算标志 */
-    private Integer ybClearFlag;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java
deleted file mode 100644
index a44b91d4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【25004】人员生育审批撤销
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersBirthApprovalCnl25004Param {
-
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 待遇申报明细流水号
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java
deleted file mode 100644
index 84c5f0b4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【25005】人员生育审批查询
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersBirthApprovalSel25005Param {
-    // 1. 人员编号（既是输入参数也是输出参数）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // --- 输出参数 ---
-
-    // 1. 待遇申报明细流水号（字符型，30位，必填）
-    @JSONField(name = "trtDclaDetlSn")
-    private String trtDclaDetlSn;
-
-    // 2. 险种类型（字符型，6位，必填）
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 人员证件号码（字符型，30位，必填）
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 4. 审批定点医药机构编号（字符型，30位，必填）
-    @JSONField(name = "fixmedinscode")
-    private String fixmedinscode;
-
-    // 5. 审批定点医药机构名称（字符型，200位，必填）
-    @JSONField(name = "fixmedinsname")
-    private String fixmedinsname;
-
-    // 6. 人员姓名（字符型，50位，必填）
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 7. 开始时间（日期型，必填）
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 8. 终止时间（日期型，必填）
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java
deleted file mode 100644
index ae5cbb1d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【25003】人员生育备案
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersBirthRecord25003Param {
-
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 3. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 4. 参保机构医保区划
-    @JSONField(name = "insu_admdvs")
-    private String insuAdmdvs;
-
-    // 5. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 6. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 7. 孕周数
-    @JSONField(name = "esso_val")
-    private Integer essoVal;
-
-    // 8. 生育待遇申报人类别
-    @JSONField(name = "matn_trt_dclaer_type")
-    private String matnTrtDclaerType;
-
-    // 9. 末次月经日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "last_mena_date")
-    private Date lastMenaDate;
-
-    // 10. 预计生育日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "plan_matn_date")
-    private Date planMatnDate;
-
-    // 11. 申报日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "dcla_date")
-    private Date dclaDate;
-
-    // 12. 配偶姓名
-    @JSONField(name = "spus_name")
-    private String spusName;
-
-    // 13. 配偶证件类型
-    @JSONField(name = "spus_cert_type")
-    private String spusCertType;
-
-    // 14. 配偶证件号码
-    @JSONField(name = "spus_certno")
-    private String spusCertno;
-
-    // 15. 生育类别
-    @JSONField(name = "matn_type")
-    private String matnType;
-
-    // 16. 胎次
-    @JSONField(name = "fetts")
-    private BigDecimal fetts;
-
-    // 17. 计划生育服务证号
-    @JSONField(name = "fpsc_no")
-    private String fpscNo;
-
-    // 18. 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 19. 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 20. 联系地址
-    @JSONField(name = "addr")
-    private String addr;
-
-    // --- 输出参数 ---
-
-    // 1. 待遇申报明细流水号
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String outputPsnNo;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java
deleted file mode 100644
index 294edd80..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【2503】人员慢特病备案（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersChrDis2503Param {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 门慢门特病种目录代码
-    @JSONField(name = "opsp_dise_code")
-    private String opspDiseCode;
-
-    // 4. 门慢门特病种名称
-    @JSONField(name = "opsp_dise_name")
-    private String opspDiseName;
-
-    // 5. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 6. 联系地址
-    @JSONField(name = "addr")
-    private String addr;
-
-    // 7. 参保机构医保区划
-    @JSONField(name = "insu_optins")
-    private String insuOptins;
-
-    // 8. 鉴定定点医药机构编号
-    @JSONField(name = "ide_fixmedins_no")
-    private String ideFixmedinsNo;
-
-    // 9. 鉴定定点医药机构名称
-    @JSONField(name = "ide_fixmedins_name")
-    private String ideFixmedinsName;
-
-    // 10. 医院鉴定日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "hosp_ide_date")
-    private Date hospIdeDate;
-
-    // 11. 诊断医师编码
-    @JSONField(name = "diag_dr_codg")
-    private String diagDrCodg;
-
-    // 12. 诊断医师姓名
-    @JSONField(name = "diag_dr_name")
-    private String diagDrName;
-
-    // 13. 开始日期
-    @JSONField(name = "begndate", format = "yyyy-MM-dd")
-    private Date begndate;
-
-    // 15. 结束日期
-    @JSONField(name = "enddate", format = "yyyy-MM-dd")
-    private Date enddate;
-
-    // 16. 待遇申报明细流水号（输出）
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java
deleted file mode 100644
index 0d001129..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【2504】人员慢特病备案撤销（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersChrDisCxl2504Param {
-    // 1. 待遇申报明细流水号
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 备注
-    @JSONField(name = "memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java
deleted file mode 100644
index b32fad03..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【2505】人员定点备案（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersDesigPt2505Param {
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 3. 联系地址
-    @JSONField(name = "addr")
-    private String addr;
-
-    // 4. 业务申请类型
-    @JSONField(name = "biz_appy_type")
-    private String bizAppyType;
-
-    // 5. 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 6. 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 7. 代办人姓名
-    @JSONField(name = "agnter_name")
-    private String agnterName;
-
-    // 8. 代办人证件类型
-    @JSONField(name = "agnter_cert_type")
-    private String agnterCertType;
-
-    // 9. 代办人证件号码
-    @JSONField(name = "agnter_certno")
-    private String agnterCertno;
-
-    // 10. 代办人联系方式
-    @JSONField(name = "agnter_tel")
-    private String agnterTel;
-
-    // 11. 代办人联系地址
-    @JSONField(name = "agnter_addr")
-    private String agnterAddr;
-
-    // 12. 代办人关系
-    @JSONField(name = "agnter_rlts")
-    private String agnterRlts;
-
-    // 13. 定点排序号
-    @JSONField(name = "fix_srt_no")
-    private String fixSrtNo;
-
-    // 14. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 15. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 16. 备注
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 17. 扩展字段
-    @JSONField(name = "extData")
-    private JSONObject extData;
-
-    // 18. 待遇申报明细流水号（输出）
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java
deleted file mode 100644
index 5433db09..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【2506】人员定点备案撤销（输入）
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersDesigPtCxl2506Param {
-    // 1. 待遇申报明细流水号
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 备注（填写撤销原因）
-    @JSONField(name = "memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java
deleted file mode 100644
index f596bda2..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【25006】人员特药审批撤销
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersMedApprovalCnl25006Param {
-    // 1. 人员编号（字符型，30位，必填）
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 待遇申报明细流水号（字符型，30位，必填）
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java
deleted file mode 100644
index 429ae193..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【25001】人员特药备案
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersMedRecord25001Param {
-
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 参保机构医保区划
-    @JSONField(name = "insu_admdv")
-    private String insuAdmdv;
-
-    // 4. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 5. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 6. 目录类别
-    @JSONField(name = "list_type")
-    private String listType;
-
-    // 7. 医保目录编码
-    @JSONField(name = "hilist_code")
-    private String hilistCode;
-
-    // 8. 医保目录名称
-    @JSONField(name = "hilist_name")
-    private String hilistName;
-
-    // 9. 数量
-    @JSONField(name = "cnt")
-    private BigDecimal cnt;
-
-    // 10. 数量单位
-    @JSONField(name = "cnt_prcunt")
-    private String cntPrcunt;
-
-    // 11. 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 12. 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 13. 诊断代码
-    @JSONField(name = "diag_code")
-    private String diagCode;
-
-    // 14. 诊断名称
-    @JSONField(name = "diag_name")
-    private String diagName;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java
deleted file mode 100644
index eacaa84b..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【25002】人员特药备案查询（输入）
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersMedSelect25002Param {
-
-    // 1. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 用作比较的时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "compare_date")
-    private Date compareDate;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java
deleted file mode 100644
index 98ec3dd8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【25002】人员特药备案查询（输出）
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersMedSelect25002Result {
-
-    // 1. 待遇申报明细流水号
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-
-    // 2. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 3. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 4. 参保地医保区划
-    @JSONField(name = "insu_admdv")
-    private String insuAdmdv;
-
-    // 5. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 6. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 7. 目录类别
-    @JSONField(name = "list_type")
-    private String listType;
-
-    // 8. 医保目录编码
-    @JSONField(name = "hilist_code")
-    private String hilistCode;
-
-    // 9. 医保目录名称
-    @JSONField(name = "hilist_name")
-    private String hilistName;
-
-    // 10. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 11. 开始时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 12. 终止时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 13. 经办人id
-    @JSONField(name = "opter_id")
-    private String opterId;
-
-    // 14. 经办人姓名
-    @JSONField(name = "opter_name")
-    private String opterName;
-
-    // 15. 经办时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "opt_time")
-    private Date optTime;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java
deleted file mode 100644
index b46995ba..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 【2507】人员意外伤害备案（输入）
- *
- * @author gaoyy
- * @date 2025-05-09
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class PersUnintInj2507Param {
-    // 1. 申报来源
-    @JSONField(name = "dcla_souc")
-    private String dclaSouc;
-
-    // 2. 险种类型
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 3. 人员编号
-    @JSONField(name = "psn_no")
-    private String psnNo;
-
-    // 4. 人员参保关系ID
-    @JSONField(name = "psn_insu_rlts_id")
-    private String psnInsuRltsId;
-
-    // 5. 人员证件类型
-    @JSONField(name = "psn_cert_type")
-    private String psnCertType;
-
-    // 6. 证件号码
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 7. 人员姓名
-    @JSONField(name = "psn_name")
-    private String psnName;
-
-    // 8. 性别
-    @JSONField(name = "gend")
-    private String gend;
-
-    // 9. 民族
-    @JSONField(name = "naty")
-    private String naty;
-
-    // 10. 出生日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "brdy")
-    private Date brdy;
-
-    // 11. 联系电话
-    @JSONField(name = "tel")
-    private String tel;
-
-    // 12. 联系地址
-    @JSONField(name = "addr")
-    private String addr;
-
-    // 13. 参保所属医保区划
-    @JSONField(name = "insu_admdvs")
-    private String insuAdmdvs;
-
-    // 14. 单位编号
-    @JSONField(name = "emp_no")
-    private String empNo;
-
-    // 15. 单位名称
-    @JSONField(name = "emp_name")
-    private String empName;
-
-    // 16. 就医地医保区划
-    @JSONField(name = "mdtrtarea_admdvs")
-    private String mdtrtareaAdmdvs;
-
-    // 17. 定点医药机构编号
-    @JSONField(name = "fixmedins_code")
-    private String fixmedinsCode;
-
-    // 18. 定点医药机构名称
-    @JSONField(name = "fixmedins_name")
-    private String fixmedinsName;
-
-    // 19. 医院等级
-    @JSONField(name = "hosp_lv")
-    private String hospLv;
-
-    // 20. 入院时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "adm_time")
-    private Date admTime;
-
-    // 21. 受伤时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(name = "trum_time")
-    private Date trumTime;
-
-    // 22. 受伤地点
-    @JSONField(name = "trum_site")
-    private String trumSite;
-
-    // 23. 致伤原因
-    @JSONField(name = "trum_rea")
-    private String trumRea;
-
-    // 24. 审核支付标志
-    @JSONField(name = "chk_pay_flag")
-    private String chkPayFlag;
-
-    // 25. 代办人姓名
-    @JSONField(name = "agnter_name")
-    private String agnterName;
-
-    // 26. 代办人证件类型
-    @JSONField(name = "agnter_cert_type")
-    private String agnterCertType;
-
-    // 27. 代办人证件号码
-    @JSONField(name = "agnter_certno")
-    private String agnterCertno;
-
-    // 28. 代办人联系方式
-    @JSONField(name = "agnter_tel")
-    private String agnterTel;
-
-    // 29. 代办人联系地址
-    @JSONField(name = "agnter_addr")
-    private String agnterAddr;
-
-    // 30. 代办人关系
-    @JSONField(name = "agnter_rlts")
-    private String agnterRlts;
-
-    // 31. 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 32. 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 33. 备注
-    @JSONField(name = "memo")
-    private String memo;
-
-    // 34. 待遇申报明细流水号（输出）
-    @JSONField(name = "trt_dcla_detl_sn")
-    private String trtDclaDetlSn;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java
deleted file mode 100644
index 80e2382c..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * 预结算入参
- *
- * @author SunJQ
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-public class PrePaymentDto {
-
-    /** 收款员 */
-    private Long entererId;
-
-    /** 支付的患者ID */
-    @NotNull
-    private Long patientId;
-
-    /** 就诊ID */
-    private Long encounterId;
-
-    /** 收费项 */
-    @NotEmpty
-    private List<Long> chargeItemIds;//
-
-    private String busiCardInfo;//社保卡号/身份证号/ecToken
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java
deleted file mode 100644
index 7edfbbd1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.openhis.vo;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-
-@Data
-@ApiModel(value="接口返回对象", description="接口返回对象")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class Result<T> implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 成功标志
-	 */
-	@ApiModelProperty(value = "成功标志")
-	private boolean success = true;
-
-	/**
-	 * 返回处理消息
-	 */
-	@ApiModelProperty(value = "返回处理消息")
-	private String message = "操作成功！";
-
-	/**
-	 * 返回代码
-	 */
-	@ApiModelProperty(value = "返回代码")
-	private Integer code = 0;
-	
-	/**
-	 * 返回数据对象 data
-	 */
-	@ApiModelProperty(value = "返回数据对象")
-	private T result;
-	
-	/**
-	 * 时间戳
-	 */
-	@ApiModelProperty(value = "时间戳")
-	private long timestamp ;
-
-	/**
-	 * 创建一个错误响应
-	 * @param message 错误消息
-	 * @return Result 对象
-	 */
-	public static <T> Result<T> error(String message) {
-		Result<T> result = new Result<>();
-		result.setSuccess(false);
-		result.setMessage(message);
-		result.setCode(500); // 通常用非零表示错误
-		result.setTimestamp(System.currentTimeMillis());
-		return result;
-	}
-	/**
-	 * 创建一个错误响应
-	 * @param message 错误消息
-	 * @return Result 对象
-	 */
-	public static <T> Result<T> error(String message,T data) {
-		Result<T> result = new Result<>();
-		result.result = data;
-		result.setSuccess(false);
-		result.setMessage(message);
-		result.setCode(500); // 通常用非零表示错误
-		result.setTimestamp(System.currentTimeMillis());
-		return result;
-	}
-
-	public static <T> Result<T> okMsg(String message) {
-		Result<T> result = new Result<>();
-		result.setSuccess(true);
-		result.setMessage(message);
-		result.setCode(200); // 通常用非零表示错误
-		result.setTimestamp(System.currentTimeMillis());
-		return result;
-	}
-
-	/**
-	 * 创建一个成功响应
-	 * @param result 数据对象
-	 * @return Result 对象
-	 */
-	public static <T> Result<T> success(T result) {
-		Result<T> resultObj = new Result<>();
-		resultObj.result = result;
-		resultObj.setSuccess(true);
-		resultObj.setMessage("操作成功！");
-		resultObj.setCode(200);
-		resultObj.setResult(result);
-		resultObj.setTimestamp(System.currentTimeMillis());
-		return resultObj;
-	}
-
-	/**
-	 * 创建一个成功响应
-	 * @param result 数据对象
-	 * @return Result 对象
-	 */
-	public static <T> Result<T> ok(T result) {
-		Result<T> resultObj = new Result<>();
-		resultObj.result = result;
-		resultObj.setSuccess(true);
-		resultObj.setMessage("操作成功！");
-		resultObj.setCode(200);
-		resultObj.setResult(result);
-		resultObj.setTimestamp(System.currentTimeMillis());
-		return resultObj;
-	}
-
-	/**
-	 * 创建一个成功响应
-	 * @param result 数据对象
-	 * @return Result 对象
-	 */
-	public static <T> Result<T> ok(String msg, T result) {
-		Result<T> resultObj = new Result<>();
-		resultObj.setSuccess(true);
-		resultObj.setMessage(msg);
-		resultObj.setCode(200);
-		resultObj.setResult(result);
-		resultObj.setTimestamp(System.currentTimeMillis());
-		return resultObj;
-	}
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java
deleted file mode 100644
index f7d0faf5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-/**
- * 医保结果
- */
-@Data
-public class ResultBody {
-
-    /** 交易状态码 */
-    @JSONField(name="infcode")
-    private String infcode;
-    /** 发送方报文ID */
-    @JSONField(name="warnMsg")
-    private String warn_msg;
-    /** 数字签名信息 */
-    @JSONField(name="cainfo")
-    private String cainfo;
-    /** 错误信息 */
-    @JSONField(name="err_msg")
-    private String errMsg;
-    /** 接收报文时间 */
-    @JSONField(name="refmsg_time")
-    private String refmsgTime;
-    /** 签名类型 */
-    @JSONField(name="signtype")
-    private String signtype;
-    /** 响应报文时间 */
-    @JSONField(name="respond_time")
-    private String respondTime;
-    /** 接收方报文ID */
-    @JSONField(name="inf_refmsgid")
-    private String infRefmsgid;
-    /** 交易输出 */
-    @JSONField(name="output")
-    private String output;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java
deleted file mode 100644
index b6de1e25..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.openhis.vo;
-
-import java.math.BigDecimal;
-
-public class Settlement3201DetailVO {
-
-    /** 医疗费用总额 */
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-    private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-    private BigDecimal acctGjPay;
-    /** 定点医药机构结算笔数 */
-    private Integer fixMedInsSetlCnt;
-
-    private String contractNo;
-
-    private Integer insutype;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java
deleted file mode 100644
index aaafd7dd..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 【3201】后台计算结果 DB映射实体
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-public class Settlement3201VO {
-    /** 医疗费用总额 */
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-    private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-    private BigDecimal acctGjPay;
-    /** 定点医药机构结算笔数 */
-    private Integer fixMedInsSetlCnt;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java
deleted file mode 100644
index 353b8c2d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 【3201】前台入参
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-public class Settlement3201WebParam {
-
-    /** 险种 */
-    @NotNull
-    private String insuType;
-    /** 清算类别 */
-    @NotNull
-    private String clrType;//住院或门诊
-    /** 合同id */
-    @NotNull
-    private Long contractId;
-    /** 医院id */
-    @NotNull
-    private Long orgId;
-    /** 开始时间 */
-    @NotNull
-    private String stmtBegnDate;
-    /** 结束时间 */
-    @NotNull
-    private String stmtEndDate;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java
deleted file mode 100644
index 955b1456..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 【3201】后台计算结果 DB映射实体
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-public class Settlement3202VO {
-    /** 医疗费用总额 */
-
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-
-    private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-
-    private BigDecimal acctGjPay;
-    /** 现金支付总额 */
-
-    private BigDecimal selfPayCash;
-    /** 微信支付总额 */
-
-    private BigDecimal selfPayVX;
-    /** 阿里支付总额 */
-
-    private BigDecimal selfPayALI;
-    /** 银行卡支付总额 */
-
-    private BigDecimal selfPayUNION;
-    /** 定点医药机构结算笔数 */
-
-    private Integer fixMedInsSetlCnt;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java
deleted file mode 100644
index 033bb8a8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 【3202】前台入参
- *
- * @author SunJQ
- * @date 2025-04-17
- */
-@Data
-public class Settlement3202WebParam {
-    /** 结算经办机构 */
-    @NotNull
-    private String setlOptins;//前台传入,注意:先上传文件后核对明细的
-    /** 清算类别 */
-    private String clrType;
-    /** 文件查询号 */
-    @NotNull
-    private String fileQuryNo;
-    /** 开始时间 */
-    @NotNull
-    private String stmtBegnDate;
-    /** 结束时间 */
-    @NotNull
-    private String stmtEndDate;
-    /** 医院id */
-    private Long orgId;
-//    /** 医疗费用总额 */
-//    @NotNull
-//    private BigDecimal medFeeSumAmt;
-//    /** 基金支付总额 */
-//    @NotNull
-//    private BigDecimal fundPaySumAmt;
-//    /** 现金支付金额 */
-//    @NotNull
-//    private BigDecimal cashPayAmt;
-//    /** 定点医药机构结算笔数 */
-//    @NotNull
-//    private Integer fixMedInsSetlCnt;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java
deleted file mode 100644
index 6974d35a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * [3209A]前台传参
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Settlement3209AWebParam {
-
-    // 清算类别
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 开始日期
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 结束日期
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 清算机构
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java
deleted file mode 100644
index cb42987a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.common.core.domain.HisBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-
-/**
- *【9001】【9002】签到 签退
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Sign extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_UUID)
-    @JSONField(serialize=false)
-    private String id;
-	/**操作员编号*/
-    @JSONField(name="opter_no")
-    private String opterNo;
-	/**签到编号*/
-    @JSONField(name="sign_no")
-    private String signNo;
-	/**签到时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JSONField(serialize=false)
-    private java.util.Date signTime;
-	/**签退时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JSONField(serialize=false)
-    private java.util.Date signOutTime;
-	/**状态，0-新建，1-签到，2-签退*/
-    @JSONField(serialize=false)
-    private String status;
-    /** 签到MAC地址 */
-    @JSONField(name="mac")
-    private String mac;
-    /** 签到IP地址 */
-    @JSONField(name="ip")
-    private String ip;
-//
-//	/**租户ID*/
-//    private String tenantId;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java
deleted file mode 100644
index 08ff0454..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class Sign1101Param {
-    /**操作员编号*/
-    @JSONField(name="opter_no")
-    private String opterNo;
-    /** 签到MAC地址 */
-    @JSONField(name="mac")
-    private String mac;
-    /** 签到IP地址 */
-    @JSONField(name="ip")
-    private String ip;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java
deleted file mode 100644
index 4ea0103a..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class Sign9001Result {
-    /**签到编号*/
-    @JSONField(name="signNo")
-    private String signNo;
-
-    /**操作员编号*/
-    @JSONField(name="opterNo")
-    private String opterNo;
-
-    @JSONField(name="signTime")
-    private java.util.Date signTime;
-
-    @JSONField(name="status")
-    private String status;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java
deleted file mode 100644
index 2ec5d3dc..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 供应单据及供应项相关详细信息 dto
- *
- * @author zwh
- * @date 2025-03-06
- */
-@Data
-@Accessors(chain = true)
-public class SupplyItemDetail3503Dto {
-
-    /** ID */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long supplyId;
-
-    /** 项目 */
-    private String itemTable;
-
-    /** 物品编码 */
-    private Long itemId;
-
-    /** 数量 */
-    private BigDecimal itemQuantity;
-
-    /** 项目单位 */
-    private String itemUnit;
-
-    /** 单价 */
-    private BigDecimal price;
-
-    /** 总价 */
-    private BigDecimal totalPrice;
-
-    /** 审批人 */
-    private Long approverId;
-
-    /** 源仓库 */
-    private Long sourceLocationId;
-
-    /** 源仓位 */
-    private Long sourceLocationStoreId;
-
-    /** 目的仓库 */
-    private Long purposeLocationId;
-
-    /** 目的仓位 */
-    private Long purposeLocationStoreId;
-
-    /** 供应商id */
-    private Long supplierId;
-
-    /** 供应商 */
-    private String supplierName;
-
-    /** 经手人 */
-    private String practitionerName;
-
-    /** 产品批号 */
-    private String lotNumber;
-
-    /** 追溯码 */
-    private String traceNo;
-
-    /** 发票码 */
-    private String invoiceNo;
-
-    /** 项目医保码 */
-    private String ybNo;
-
-    /** 单据号 */
-    private String busNo;
-
-    /** 项目编号 */
-    private String itemBusNo;
-
-    /** 开始时间 */
-    private Date startTime;
-
-    /** 结束时间 */
-    private Date endTime;
-
-    /** 服务id */
-    private Long serviceId;
-
-    /** 项目名称 */
-    private String name;
-
-    /** 拼音码 */
-    private String pyStr;
-
-    /** 五笔码 */
-    private String wbStr;
-
-    /** 常规单位 */
-    private String unitCode;
-
-    /** 最小单位 */
-    private String minUnitCode;
-
-    /** 拆零比 */
-    private BigDecimal partPercent;
-
-    /** 项目类型 */
-    private String itemCategory;
-
-    /** 处方标志 */
-    private Integer rxFlag;
-
-    /** 批准文号 */
-    private String approvalNumber;
-
-    /** 生产厂商文本 */
-    private String manufacturerText;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java
deleted file mode 100644
index a563e7f4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 医保电子处方信息
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Data
-@Accessors(chain = true)
-public class VeriPrescriptionDetailInfoDto {
-
-    /** 处方号 */
-    private String prescriptionNo;
-    /** 门诊号 */
-    private String iptOtpNo;
-    /** 请求数量 */
-    private Integer quantity;
-    /** 请求单位 */
-    @Dict(dictCode = "unit_code")
-    private String unitCode;
-    private String unitCode_dictText;
-    /** 审核状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-
-    /* --处方信息-- */
-    /** 药品名 */
-    private String medicationName;
-    /** 药品规格 */
-    private String drugSpecification;
-    /** 药品剂量 */
-    private BigDecimal medDosage;
-    /** 药品剂量单位 */
-    @Dict(dictCode = "unit_code")
-    private String medDosageUnitCode;
-    private String medDosageUnitCode_dictText;
-    /** 使用频次 */
-    @Dict(dictCode = "rate_code")
-    private String medFrequency;
-    private String medFrequency_dictText;
-    /** 途径 */
-    @Dict(dictCode = "method_code")
-    private String medRoute;
-    private String medRoute_dictText;
-    /** 取药状态 */
-    private String medStatus;
-    /** 处方状态 */
-    private String prescriptionStatus;
-    /** 处方类别 */
-    private Integer rxTypeCode;
-    private String rxTypeCode_enumText;
-    /** 支持用药信息 */
-    private String supportInfo;
-    /** 服药时间(开始) */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effectiveDoseStart;
-    /** 服药时间(结束) */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effectiveDoseEnd;
-    /** 给药间隔 */
-    private String dispenseInterval;
-    /** 单次发药数 */
-    private Integer dispensePerQuantity;
-    /** 每次发药供应天数 */
-    private Integer dispensePerDuration;
-
-    /* --就诊信息-- */
-    /** 患者姓名 */
-    private String patnName;
-    /** 身份证号 */
-    private String certno;
-    /** 开方医生名 */
-    private String practitionerName;
-    /** 挂号科室 */
-    private String mdtrtDeptName;
-    /** 开单科室 */
-    private String prscDeptName;
-    /** 挂号日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date mdtrtTime;
-    /** 处方开立日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /* --诊断信息-- */
-    /** 诊断名 */
-    private String conditionName;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java
deleted file mode 100644
index 920f3f6f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 医保电子处方信息
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Data
-@Accessors(chain = true)
-public class VeriPrescriptionInfoDto {
-
-    /** 处方号 */
-    private String prescriptionNo;
-    /** 门诊号 */
-    private String iptOtpNo;
-    /** 姓名 */
-    private String patientName;
-    /** 证件号 */
-    private String certno;
-    /** 取药状态 */
-    private String medStatus;
-    /** 状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-    /** 开单科室 */
-    private String prscDeptName;
-    /** 挂号日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date mdtrtTime;
-    /** 处方开立日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /** 租户ID */
-    private Integer tenantId;
-    /** 电子凭证线上身份核验流水号 */
-    private String authNo;
-    /** 电子凭证令牌 */
-    private String ecToken;
-    /** 医保处方编号 */
-    private String hiRxno;
-
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java
deleted file mode 100644
index 0ec9554f..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 医保电子处方信息查询条件
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Data
-@Accessors(chain = true)
-public class VeriPrescriptionParam {
-
-    /** 门诊号/姓名 */
-    private String name;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java
deleted file mode 100644
index c470c437..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.openhis.vo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 【吉林省本地化】输入补充字段
- *
- * @author gaoyy
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class extData {
-    // 1. 就医地分中心
-    @JSONField(name = "mdtrtarea_subcent")
-    private String mdtrtareaSubcent;
-
-    // 2. 参保地分中心
-    @JSONField(name = "insuplc_subcent")
-    private String insuplcSubcent;
-
-    // 3. 急诊核定流水号
-    @JSONField(name = "er_crtf_evtsn")
-    private String erCrtfEvtsn;
-
-    // 4. 就诊科室
-    @JSONField(name = "dept_name")
-    private String deptName;
-
-    // 5. 使用方法
-    @JSONField(name = "used_mtd")
-    private String usedMtd;
-
-    // 6. 现病史
-    @JSONField(name = "psndisehis")
-    private String psndisehis;
-
-    // 7. 生命体征
-    @JSONField(name = "life_symptom")
-    private String lifeSymptom;
-
-    // 8. 临床病症
-    @JSONField(name = "clnc_cond")
-    private String clncCond;
-
-    // 9. 门（急）诊诊断
-    @JSONField(name = "disediag")
-    private String disediag;
-
-    // 10. 入院诊断
-    @JSONField(name = "adm_disediag_name")
-    private String admDisediagName;
-
-    // 11. 判定依据
-    @JSONField(name = "evid")
-    private String evid;
-
-    // 12. 首诊医生
-    @JSONField(name = "fst_doctor")
-    private String fstDoctor;
-
-    // 13. 科主任
-    @JSONField(name = "deptort")
-    private String deptort;
-
-    // 14. 就诊时间（入院时间）（表示：YYYYMMDDHH24MISS）
-    @JSONField(name = "adm_date")
-    private String admDate;
-
-    // 15. 姓名
-    @JSONField(name = "name")
-    private String name;
-
-    // 16. 身份证
-    @JSONField(name = "certno")
-    private String certno;
-
-    // 17. 年龄
-    @JSONField(name = "age")
-    private String age;
-
-    // 18. 性别（1：男，2：女）
-    @JSONField(name = "gend")
-    private String gend;
-}
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml
deleted file mode 100644
index e9db5da4..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# 数据源配置
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: org.postgresql.Driver
-    druid:
-      # 主库数据源
-      master:
-        #        url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        #url: jdbc:postgresql://192.168.10.240:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        #        url: jdbc:postgresql://localhost:8020/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        url: jdbc:postgresql://192.168.30.199:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: openhis
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml
deleted file mode 100644
index 59aa507d..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# 数据源配置
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: org.postgresql.Driver
-    druid:
-      # 主库数据源
-      master:
-        url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: openhis
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application.yml
deleted file mode 100644
index 30217665..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/application.yml
+++ /dev/null
@@ -1,159 +0,0 @@
-# 项目相关配置
-core:
-  # 名称
-  name: OpenHis_YB
-  # 版本
-  version: 0.0.1
-  # 版权年份
-  copyrightYear: 2025
-  # 文件路径
-  profile: D:/home/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数字计算 char 字符验证
-  captchaType: math
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为18080
-  port: 18079
-  servlet:
-    # 应用的访问路径
-    context-path: /openhis/yb
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
-
-# 日志配置
-logging:
-  level:
-    com.openhis: debug
-    org.springframework: warn
-
-# 用户配置
-user:
-  password:
-    # 密码最大错误次数
-    maxRetryCount: 5
-    # 密码锁定时间（默认10分钟）
-    lockTime: 10
-
-# Spring配置
-spring:
-  main:
-    allow-circular-references: true
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
-  profiles:
-    active: prod  #生产 prod #本地 druid
-  # 文件上传
-  servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size: 10MB
-      # 设置总上传的文件大小
-      max-request-size: 20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  # redis 配置
-  redis:
-    # 地址
-    #    host: 127.0.0.1
-    host: 127.0.0.1
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 1
-    # 密码
-    password: redis
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-    # 文言
-    messages:
-      basename: i18n/general_message/messages
-      encoding: utf-8
-
-# token配置
-token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 30
-
-# MyBatis配置
-mybatis-plus:
-  # 搜索指定包别名
-  typeAliasesPackage: com.core.**.domain,com.openhis.**.domain
-  # 配置mapper的扫描，找到所有的mapper.xml映射文件
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 加载全局的配置文件
-  configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper:
-  #helperDialect: mysql
-  supportMethodsArguments: true
-  params: count=countSql
-  # 分页插件会自动检测当前的数据库链接，自动选择合适的分页方式
-  auto-dialect: true
-  # 默认值为 false。设置为 true 时，允许在运行时根据多数据源自动识别对应方言的分页
-  auto-runtime-dialect: true
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-  pathMapping: /dev-api
-
-# 防止XSS攻击
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
-
-# flowable相关表
-flowable:
-  # true 会对数据库中所有表进行更新操作。如果表不存在，则自动创建(建议开发时使用)
-  database-schema-update: false
-  # 关闭定时任务JOB
-  async-executor-activate: false
-
-## liteflow配置
-#liteflow:
-#  #规则文件路径
-#  rule-source: config/flow.el.xml
-#  #liteflow是否开启，默认为true
-#  enable: true
-#  #liteflow的banner打印是否开启，默认为true
-#  print-banner: false
-
-
-
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt b/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt
deleted file mode 100644
index f95701d8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-      ::::::::  :::::::::  :::::::::: ::::    :::    :::    ::: ::::::::::: ::::::::
-    :+:    :+: :+:    :+: :+:        :+:+:   :+:    :+:    :+:     :+:    :+:    :+:
-   +:+    +:+ +:+    +:+ +:+        :+:+:+  +:+    +:+    +:+     +:+    +:+
-  +#+    +:+ +#++:++#+  +#++:++#   +#+ +:+ +#+    +#++:++#++     +#+    +#++:++#++
- +#+    +#+ +#+        +#+        +#+  +#+#+#    +#+    +#+     +#+           +#+
-#+#    #+# #+#        #+#        #+#   #+#+#    #+#    #+#     #+#    #+#    #+#
-########  ###        ########## ###    ####    ###    ### ########### ########
-
-Application Version: ${core.version}
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config.properties
deleted file mode 100644
index 747827ca..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/config.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-hospital.fixmedinsCode=
-hospital.fixmedinsName=
-hospital.infVer=
-hospital.mdtrtAreaAdmvs=
-hospital.mdtrtAreaAdmvsName=
-hospital.recerSysCode=
-hospital.caInfo=
-hospital.defaultOpterType=
-hospital.fixmedinsSoftFcty=
-hospital.hospitalLevel=
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml b/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml
deleted file mode 100644
index 049210cf..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow>
-    <chain name="chain1">
-        THEN(a, b, c);
-    </chain>
-</flow>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties
deleted file mode 100644
index e69de29b..00000000
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties
deleted file mode 100644
index b57fd4e8..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# ????????
-dev.address=http://88.9.0.126:8080
-dev.time=600
-dev.isEncrypt=false
-
-# ????????
-prod.address=http://ddjk.jlhs.gov.cn:20215
-prod.time=600
-prod.isEncrypt=true
-
-
-dev.cliPubKey=PubKey
-dev.cliPrvKey=PrvKey
-dev.clientId=Id
-dev.filePath="C:/Users/user/Desktop/"
-
-prod.cliPubKey=PubKey2
-prod.cliPrvKey=PrvKey2
-prod.clientId=Id2
-prod.filePath="C:/Users/user/Desktop/"
-prod.eleAddress=http://10.49.24.194:8080/epc/api/
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties
deleted file mode 100644
index bf3f0cf5..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-pr.cliPrvKey=AIJ6s5v7q54NOBVo5lrO1il+bPQt/m2pHU8GDODQZzG4
-pr.cliPubKey=OvwSdUUS3E9c9DtcEZ87jDTbKiw3k6dEZ9oeS1
-pr.serverPubKey=
-pr.fixmedinsName=吉林农业大学医院
-pr.fixmedinsCode=H22017200667
-pr.admvs=229900
-pr.scope=server
-pr.grantType=password
-pr.password=Pwd1241320!^#F424
-pr.username=XZdd241224004
-pr.clientSecret=ACC10563D7382BF6
-pr.clientId=ACC10563D7382BF6
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml b/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml
deleted file mode 100644
index 3f9706f1..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="/home/openhis/logs"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 用户访问日志输出  -->
-    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-
-    <!-- 新增专用日志Appender -->
-    <appender name="YB_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/yb-app-service.log</file> <!-- 日志文件名 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天一个文件，保留60天 -->
-            <fileNamePattern>${log.path}/yb-app-service.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern> <!-- 使用统一日志格式 -->
-        </encoder>
-    </appender>
-
-    <!-- 在原有logger配置下方添加 -->
-    <logger name="com.openhis.controller.YbController" level="info" additivity="false">
-        <appender-ref ref="YB_LOGS" />
-    </logger>
-    <logger name="com.openhis.service.impl.HandlerServiceImpl" level="info" additivity="false">
-        <appender-ref ref="YB_LOGS" />
-    </logger>
-
-    <!-- 新增专用日志Appender -->
-    <appender name="YB_ELE_LOGS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/yb-app-ele-service.log</file> <!-- 日志文件名 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天一个文件，保留60天 -->
-            <fileNamePattern>${log.path}/yb-app-ele-service.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern> <!-- 使用统一日志格式 -->
-        </encoder>
-    </appender>
-
-    <logger name="com.openhis.service.impl.ElepHandlerServiceImpl" level="info" additivity="false">
-        <appender-ref ref="YB_ELE_LOGS" />
-    </logger>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.core" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-
-    <!--系统用户操作日志-->
-    <logger name="sys-user" level="info">
-        <appender-ref ref="sys-user"/>
-    </logger>
-
-    <logger name="YB_LOGS" level="info">
-        <appender-ref ref="YB_LOGS"/>
-        <appender-ref ref="YB_ELE_LOGS"/>
-    </logger>
-</configuration> 
\ No newline at end of file
diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml
deleted file mode 100644
index c39d4382..00000000
--- a/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-    <!-- 全局参数 -->
-    <settings>
-        <!-- 使全局的映射器启用或禁用缓存 -->
-        <setting name="cacheEnabled" value="true"/>
-        <!-- 允许JDBC 支持自动生成主键 -->
-        <setting name="useGeneratedKeys" value="true"/>
-        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
-        <setting name="defaultExecutorType" value="SIMPLE"/>
-        <!-- 指定 MyBatis 所用日志的具体实现 -->
-                <setting name="logImpl" value="SLF4J"/>
-<!--        <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl"/>-->
-        <!-- 使用驼峰命名法转换字段 -->
-        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
-    </settings>
-
-</configuration>
-- 
Gitee


From cf28642e34d2f66d701c5663956bd5dc42369c26 Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Wed, 3 Sep 2025 11:23:19 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctorStationElepPrescriptionController.java |  14 +-
 .../web/ybmanage/config/YbServiceConfig.java  |  92 --
 .../web/ybmanage/controller/YbController.java | 785 ------------------
 .../web/ybmanage/dto/Catalogue1312Output.java | 118 ---
 .../ybmanage/dto/Clearing3205AWebParam.java   |  28 -
 .../ybmanage/dto/Clinic2207OrderOutput.java   | 114 ---
 .../dto/Clinic2208UnSetlInfoOutput.java       | 109 ---
 .../web/ybmanage/dto/ClinicReg2201Output.java |  67 --
 .../ybmanage/dto/Financial13203WebParam.java  |  49 --
 .../ybmanage/dto/Financial3202WebParam.java   |  10 -
 .../ybmanage/dto/Financial3203AWebParam.java  |  36 -
 .../ybmanage/dto/Financial3203WebParam.java   |  42 -
 .../dto/FinancialHand3203AWebParam.java       |  33 -
 .../web/ybmanage/dto/Info1101Output.java      |  70 --
 .../web/ybmanage/dto/PatientInfoDto.java      |  85 --
 .../com/openhis/web/ybmanage/dto/Result.java  |  48 --
 .../openhis/web/ybmanage/dto/ResultBody.java  |  40 -
 .../ybmanage/dto/Settlement3201WebParam.java  |  39 -
 .../ybmanage/dto/Settlement3202WebParam.java  |  47 --
 .../ybmanage/dto/Settlement3209AWebParam.java |  35 -
 .../dto/VeriPrescriptionDetailInfoDto.java    |  98 ---
 .../ybmanage/dto/VeriPrescriptionInfoDto.java |  55 --
 .../ybmanage/dto/VeriPrescriptionParam.java   |  23 -
 .../ybmanage/dto/Yb2301FeeDetailParam.java    | 196 -----
 .../ybmanage/dto/Yb2301InpatientOutput.java   | 124 ---
 .../ybmanage/dto/Yb2302InpatientParam.java    |  31 -
 .../ybmanage/dto/Yb2303InpatientOutput.java   | 258 ------
 .../web/ybmanage/dto/Yb2303InpatientPram.java | 119 ---
 .../dto/Yb2304InpatientExpContentParam.java   |  31 -
 .../ybmanage/dto/Yb2304InpatientOutput.java   | 279 -------
 .../ybmanage/dto/Yb2304InpatientParam.java    | 111 ---
 .../ybmanage/dto/Yb2305InpatientOutput.java   | 221 -----
 .../ybmanage/dto/Yb2305InpatientParam.java    |  31 -
 .../web/ybmanage/mapper/YbElepMapper.java     |  44 -
 .../openhis/web/ybmanage/mapper/YbMapper.java |  72 --
 .../ybmanage/service/IYbEleBaseService.java   | 227 -----
 .../ybmanage/service/IYbEleHttpService.java   |  64 --
 .../web/ybmanage/service/IYbService.java      |  38 -
 .../service/impl/YbEleHttpServiceImpl.java    | 255 ------
 .../service/impl/YbElepBaseServiceImpl.java   | 701 ----------------
 .../ybmanage/service/impl/YbServiceImpl.java  | 407 ---------
 .../ybmanage/util/YbEleParamBuilderUtil.java  | 657 ---------------
 .../web/ybmanage/vo/Financial3203VO.java      |  40 -
 .../ybmanage/vo/Settlement3201DetailVO.java   |  23 -
 .../web/ybmanage/vo/Settlement3201VO.java     |  30 -
 .../web/ybmanage/vo/Settlement3202VO.java     |  47 --
 46 files changed, 5 insertions(+), 6038 deletions(-)
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
 delete mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
index ead5b4e9..42619971 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
@@ -3,23 +3,19 @@
  */
 package com.openhis.web.doctorstation.controller;
 
-import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
-import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.ybmanage.service.IYbEleHttpService;
-import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.AdviceOpType;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
+import com.openhis.web.doctorstation.dto.DeletePrescriptionInfoParam;
+import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * 医生站-电子处方 controller
  */
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
deleted file mode 100644
index 1a002a06..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-/**
- * 本地部署方案-医保配置类
- *
- * @author SunJQ
- * @date 2025-04-11
- */
-@Configuration
-@ConstructorBinding
-@PropertySource("classpath:properties/yb.properties")
-@ConfigurationProperties(prefix = "ybapp.config")
-@EnableConfigurationProperties
-public class YbServiceConfig {
-
-    private String url;
-
-    private String eleUrl;
-
-    private String key;
-
-    private String timeOut;
-
-    private String clrOptins;// 清算机构；必须是准确的6位编码，可以从3206A交易获取
-
-    private String fixmedinsCode;// 定点医药机构编号,如H22010200XXX
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getEleUrl() {
-        return eleUrl;
-    }
-
-    public void setEleUrl(String eleUrl) {
-        this.eleUrl = eleUrl;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getTimeOut() {
-        return timeOut;
-    }
-
-    public void setTimeOut(String timeOut) {
-        this.timeOut = timeOut;
-    }
-
-    public YbServiceConfig(String url, String key, String timeOut) {
-        this.url = url;
-        this.key = key;
-        this.timeOut = timeOut;
-    }
-
-    public YbServiceConfig() {}
-
-    public String getClrOptins() {
-        return clrOptins;
-    }
-
-    public void setClrOptins(String clrOptins) {
-        this.clrOptins = clrOptins;
-    }
-
-    public String getFixmedinsCode() {
-        return fixmedinsCode;
-    }
-
-    public void setFixmedinsCode(String fixmedinsCode) {
-        this.fixmedinsCode = fixmedinsCode;
-    }
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
deleted file mode 100644
index 795456ca..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.controller;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.core.common.core.domain.R;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.SecurityUtils;
-import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.service.IContractService;
-import com.openhis.web.ybmanage.dto.Financial3202WebParam;
-import com.openhis.web.ybmanage.dto.FinancialHand3203AWebParam;
-import com.openhis.web.ybmanage.service.IYbService;
-import com.openhis.yb.domain.FinancialApplyRecord;
-import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.service.IPerinfoService;
-import com.openhis.yb.service.YbDao;
-import com.openhis.yb.service.YbHttpUtils;
-import com.openhis.yb.util.CommonConstant;
-
-/**
- * 医保接口
- *
- * @author SunJQ
- * @date 2025-04-11
- */
-@RestController
-@RequestMapping("/yb-request")
-public class YbController {
-
-    @Autowired
-    YbDao ybDao;
-    @Autowired
-    YbHttpUtils ybHttpUtils;
-    @Autowired
-    IPatientService patientService;
-    @Autowired
-    IPerinfoService iPerinfoService;
-    @Autowired
-    IEncounterService iEncounterService;
-    @Autowired
-    IContractService iContractService;
-    @Autowired
-    IConditionDefinitionService iConditionDefinitionService;
-    @Autowired
-    ResourceLoader resourceLoader;
-    @Autowired
-    IYbService ybService;
-
-    /**
-     * 【9001】
-     *
-     * @param practitionerId 参与者Id
-     * @param mac 加密后的mac地址
-     * @return 结果
-     */
-    @PostMapping("/sign")
-    public R<?> sign(String practitionerId, String mac, String ip) {
-        Sign signParam = ybDao.getSignParam(practitionerId, mac, ip);
-        if (signParam == null) {
-            throw new ServiceException("未生成签到参数");
-        }
-        List<Contract> contractList = iContractService.getContractListByYb();
-        List<Sign9001Result> signResultList = new ArrayList<>();
-        for (Contract contract : contractList) {
-            Sign9001Result signResult = ybHttpUtils.sign(signParam, contract);
-            if (signResult != null) {
-                ybDao.saveSign(signParam, signResult);
-                signResultList.add(signResult);
-            }
-        }
-        if (contractList.size() == signResultList.size()) {
-            return R.ok("签到成功");
-        } else {
-            return R.fail("签到失败");
-        }
-    }
-
-    /**
-     * 【1101】
-     *
-     * @param certType 就诊id
-     * @param certNo 租户id
-     * @return 结果
-     */
-    @PostMapping("/per-info")
-    public R<?> getPerInfo(String certType, String certNo, String psnCertType) {
-        Info1101ReadcardParam readcard = ybDao.getReadCard(certType, certNo);
-        Info1101Output perInfo = ybHttpUtils.getPerInfo(readcard);
-        if (perInfo != null) {
-            ybDao.saveReadcardAndPerinfo(readcard, perInfo);
-            PatientInfoDto patient = ybDao.getPatent(perInfo);
-            return R.ok(patient);
-        } else {
-            return R.fail("未查询到患者信息");
-        }
-    }
-
-    /**
-     * 【5301】获取人员慢病
-     *
-     * @param encounterId 就诊id
-     * @return 结果
-     */
-    @GetMapping("/getConditionDefinition")
-    public R<?> getSpecialDia(Long encounterId) {
-
-        Encounter encounter = iEncounterService.getById(encounterId);
-        if (encounter == null) {
-            throw new ServiceException("未获取到就诊信息");
-        }
-        Patient patient = patientService.getById(encounter.getPatientId());
-        if (patient == null) {
-            throw new ServiceException("未获取到患者信息");
-        }
-        InfoPerson perinfo =
-            iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
-        if (perinfo == null) {
-            throw new ServiceException("未连接医保获取患者信息");
-        }
-        Info1101Output info1101Output = JSON.parseObject(perinfo.getResult1101(), Info1101Output.class);
-        List<Info5301SpecialConditionResult> feedetail = info1101Output.getFeedetail();
-
-        Date currentDate = new Date();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        List<Info5301SpecialConditionResult> currentRangeResults = new ArrayList<>();
-        for (Info5301SpecialConditionResult info5301SpecialConditionResult : feedetail) {
-            try {
-                Date begndate = dateFormat.parse(info5301SpecialConditionResult.getBegndate());
-                Date enddate = dateFormat.parse(info5301SpecialConditionResult.getEnddate());
-
-                // 检查当前日期是否在 begndate 和 enddate 之间
-                if (currentDate.compareTo(begndate) >= 0 && currentDate.compareTo(enddate) <= 0) {
-                    currentRangeResults.add(info5301SpecialConditionResult);
-                }
-            } catch (ParseException e) {
-                e.printStackTrace(); // 处理日期解析异常
-            }
-        }
-        List<ConditionDefinition> conditionDefinitions = null;
-        if (!currentRangeResults.isEmpty()) {
-            conditionDefinitions = iConditionDefinitionService.list(
-                new LambdaUpdateWrapper<ConditionDefinition>().in(ConditionDefinition::getYbNo, currentRangeResults
-                    .stream().map(Info5301SpecialConditionResult::getOpspDiseCode).collect(Collectors.toList())));
-        }
-        return R.ok(conditionDefinitions);
-    }
-
-    /**
-     * 【3301】目录对照
-     *
-     * @param tableName 就诊id
-     * @param id 付款id
-     * @return 结果
-     */
-    @PostMapping("/directory-cross-check")
-    public R<?> directoryCheck(String tableName, Long id) {
-        MedicalDirectory3301Param medicalDirectory3301Param = ybDao.getMedicalDirectory3301Param(tableName, id);
-        ArrayList<MedicalDirectory3301Param> list = new ArrayList<>();
-        list.add(medicalDirectory3301Param);
-        MedicalDirectory3301ListParam medicalDirectory3301ListParam = new MedicalDirectory3301ListParam();
-        medicalDirectory3301ListParam.setData(list);
-        Result resultInfo = ybHttpUtils.directoryCheck(medicalDirectory3301ListParam);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveDirectoryHistory(tableName, id, 3301, medicalDirectory3301Param);
-        }
-        return R.ok();
-    }
-
-    /**
-     * 【3302】目录对照撤销
-     *
-     * @param tableName 就诊id
-     * @param id 付款id
-     * @return 结果
-     */
-    @PostMapping("/directory-un-check")
-    public R<?> directoryUnCheck(String tableName, Long id) {
-
-        MedicalDirectory3302Param medicalDirectory3302Param = ybDao.getMedicalDirectory3302Param(tableName, id);
-        Result resultInfo = ybHttpUtils.directoryUnCheck(medicalDirectory3302Param);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveDirectoryHistory(tableName, id, 3302, medicalDirectory3302Param);
-        }
-
-        return R.ok();
-    }
-
-    /**
-     * 【3201】对总账
-     *
-     * @param settlement3201WebParam 3201入参条件
-     * @return 结果
-     */
-    @PostMapping("/reconcile")
-    public R<?> reconcileGeneralLedger(@RequestBody Settlement3201WebParam settlement3201WebParam) {
-        Financial3201Param financial3201Param = ybDao.getFinancial3201Param(settlement3201WebParam);
-        Result result = ybHttpUtils.reconcileGeneralLedger(financial3201Param);
-        if (result.getCode().equals(CommonConstant.SC_OK_200)) {
-            // System.out.println(JSON.parseObject(JSON.toJSONString(result.getResult())));
-            Financial3201Output financial3201Output =
-                JSON.parseObject(JSON.toJSONString(result.getResult()), Financial3201Output.class);
-            ybDao.saveReconcileGeneralLedger(financial3201Output, financial3201Param);
-            if ("0".equals(financial3201Output.getStmtRslt())) {
-                return R.ok("OK");
-            }
-            return R.ok(financial3201Output.getStmtRsltDscr());
-        }
-        return R.fail("医保app通讯失败");
-    }
-
-    /**
-     * 【3201】对总账列表
-     *
-     * @param settlement3201WebParam 3201入参条件
-     * @return 结果
-     */
-    @GetMapping("/reconcile-list")
-    public R<?> reconcileGeneralLedgerList(Settlement3201WebParam settlement3201WebParam) {
-        return R.ok(ybDao.reconcileGeneralLedgerDetail(settlement3201WebParam));
-
-    }
-
-    /**
-     * 【3202】对明细账
-     *
-     * @param settlement3202WebParam 3202查询数据
-     * @return 结果
-     */
-    @PostMapping("/reconcile-detail-list")
-    public R<?> reconcileGeneralLedgerDetail(@RequestBody Settlement3202WebParam settlement3202WebParam) {
-        List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlement3202WebParam);
-
-        // FinancialSettlement3202Param financial3202Param =
-        // ybDao.getFinancialSettlement3202Param(settlement3202WebParam);
-        // FinancialSettlement3202Result resultInfo = ybHttpUtils.reconcileGeneralLedgerDetail(financial3202Param);
-
-        return R.ok(financial3202FileParams);
-    }
-
-    /**
-     * 【3202】生成txt文件
-     *
-     * @param financial3202WebParam 3202查询数据
-     * @return 结果
-     */
-    @PostMapping("/reconcile-detail-txt")
-    public void reconcileGeneralLedgerDetailTxt(@RequestBody Financial3202WebParam financial3202WebParam,
-        HttpServletResponse response) throws IOException {
-        List<Financial3202FileParam> financial3202FileParams =
-            ybDao.paymentCompareYbSettle(financial3202WebParam.getSettlementIdList());
-        // String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new
-        // Date().getTime()+".txt";
-        // String filePath = "C:\\Users\\bjbUser\\Desktop\\"+new Date().getTime()+".txt";
-        // try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
-        // for (Financial3202FileParam item : financial3202FileParams) {
-        // // 假设每个实体都有toString()方法返回逗号分隔的属性
-        // // 或者你可以自定义获取属性的方式
-        // System.out.println(item.toString());
-        // String line = item.getTxt();
-        // writer.write(line);
-        // writer.newLine();
-        // }
-        // }
-        // return R.ok("生成txt文件成功，文件路径："+filePath);
-
-        // 2. 设置响应头（强制下载，指定文件名）
-        String fileName = "financial_report_" + System.currentTimeMillis() + ".txt";
-        response.setContentType("application/octet-stream");
-        response.setCharacterEncoding("UTF-8");
-        response.setHeader("Content-Disposition",
-            "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8").replace("+", "%20") + "\"");
-
-        // 3. 直接通过输出流写入数据（避免创建临时文件）
-        try (OutputStream os = response.getOutputStream();
-            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
-
-            for (Financial3202FileParam item : financial3202FileParams) {
-                writer.write(item.getTxt()); // 写入每行数据
-                writer.newLine(); // 换行
-            }
-            writer.flush();
-        }
-        System.out.println(fileName);
-        // return R.ok("生成txt文件成功，文件名称："+fileName);
-    }
-
-    /**
-     *
-     * @param file 文件流
-     * @param filename 文件名
-     * @return
-     */
-    @PostMapping(value = "/file-up")
-    public R<?> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("filename") String filename) {
-        // 1. 基础校验
-        if (file.isEmpty()) {
-            return R.fail("文件不能为空");
-        }
-        if (!file.getOriginalFilename().endsWith(".zip")) {
-            return R.fail("仅支持ZIP格式文件");
-        }
-
-        // 2. 调用Service处理业务逻辑
-        try {
-            ResponseEntity<String> fileResult = ybHttpUtils.upload9101(file, filename);
-            return R.ok(fileResult);
-        } catch (Exception e) {
-            return R.fail("处理失败: " + e.getMessage());
-        }
-    }
-
-    /**
-     * 触发3202接口
-     * 
-     * @param settlementIdList 3202查询数据
-     * @return
-     * @throws IOException
-     */
-    @PostMapping("/reconcile-general")
-    public R<?> reconcileGeneral(List<String> settlementIdList, String filePath, String fileQuryNo, String setlOptins,
-        String clrType) {
-        // todo:这里需要考虑3302接口的参数是后台合计还是由前台传入，因为这个参数还要和txt文件对应（既需要txt中的数据还需要db表中的一些数据），
-        // String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new
-        // Date().getTime()+".txt";
-        List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
-        Resource resource = resourceLoader.getResource(filePath); // 或使用 "file:" 读取绝对路径
-
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.getInputStream()))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (!line.trim().isEmpty()) {
-                    String[] fields = line.split("\t"); // 按 Tab 分割字段
-                    if (fields.length == 7) {
-                        BigDecimal medfeeSumamt = new BigDecimal(fields[3]);
-                        BigDecimal fundPaySumamt = new BigDecimal(fields[4]);
-                        BigDecimal acctPay = new BigDecimal(fields[5]);
-                        Financial3202FileParam person = new Financial3202FileParam(fields[0], fields[1], fields[2],
-                            medfeeSumamt, fundPaySumamt, acctPay, fields[6]);
-                        financial3202FileParamList.add(person);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw new ServiceException("IO异常，异常信息：" + e.getMessage());
-        }
-
-        BigDecimal medfeeSumamt = BigDecimal.ZERO;// 医疗费总额
-        BigDecimal fundPaySumamt = BigDecimal.ZERO;// 基金支付
-        // Integer fixmedinsSetlCnt = 0;//结算笔数
-
-        if (financial3202FileParamList.isEmpty()) {
-            throw new ServiceException("未获取txt文件中实体");
-        }
-        for (Financial3202FileParam financial3202FileParam : financial3202FileParamList) {
-            medfeeSumamt = medfeeSumamt.add(financial3202FileParam.getMedfeeSumamt());
-            fundPaySumamt = fundPaySumamt.add(financial3202FileParam.getFundPaySumamt());
-        }
-
-        FinancialSettlement3202Param financialSettlement3202Param =
-            ybDao.getFinancialSettlement3202Param(settlementIdList, medfeeSumamt, fundPaySumamt);
-        if (financialSettlement3202Param == null) {
-            throw new ServiceException("未生成3202参数");
-        }
-        financialSettlement3202Param.setClrType(clrType).setFileQuryNo(fileQuryNo)
-            .setRefdSetlFlag(financial3202FileParamList.get(0).getRefdSetlFlag()).setSetlOptins(setlOptins);
-
-        FinancialSettlement3202Result financialSettlement3202Result =
-            ybHttpUtils.reconcileGeneralLedgerDetail(financialSettlement3202Param);
-        if (financialSettlement3202Result == null) {
-            throw new ServiceException("未收到3202参数");
-        }
-
-        return R.ok(financialSettlement3202Result);
-    }
-
-    /**
-     * 【3209A】第三方数据查询
-     *
-     * @param settlement3209AWebParam 3209A入参条件
-     * @return 结果
-     */
-    @PostMapping("/three-part-search-err")
-    public R<?> threePartSearch(Settlement3209AWebParam settlement3209AWebParam) {
-
-        FinancialSettlement3209AParam financialSettlement3209AParam =
-            ybDao.getFinancialSettlement3209AParam(settlement3209AWebParam);
-        List<FinancialSettlement3209AResult> list = ybHttpUtils.threePartSearch(financialSettlement3209AParam);
-
-        return R.ok();
-    }
-
-    /**
-     * 【3203A】清算申请(吉林省)
-     *
-     * @param financial3203AWebParam 3203A入参条件
-     * @return 结果
-     */
-    @PostMapping("/apply-financial-clearing")
-    public R<?> applyFinancialClearing(@RequestBody Financial3203AWebParam financial3203AWebParam) {
-        Financial3203AParam financial3203AParam = ybDao.getFinancial3203AParam(financial3203AWebParam);
-        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
-        if (!StringUtils.isEmpty(s)) {
-            Result<?> result = JSON.parseObject(s, Result.class);
-            if (result != null) {
-                if (result.getCode() == 200) {
-                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
-                        String.valueOf(result.getResult()));
-                    return R.ok(result);
-                }
-            }
-        }
-        return R.fail(s);
-    }
-
-    /**
-     * 【3203A】清算申请(吉林省)
-     *
-     * @param financialClearing3203AWebParam 3203A入参条件
-     * @return 结果
-     */
-    @PostMapping("/auto-apply-financial-clearing")
-    public R<?> autoApplyFinancialClearing(@RequestBody FinancialClearing3203AWebParam financialClearing3203AWebParam) {
-
-        Settlement3202WebParam settlement3202WebParam = new Settlement3202WebParam();
-        settlement3202WebParam.setStmtBegnDate(String.valueOf(financialClearing3203AWebParam.getStmtBegnDate()));
-        settlement3202WebParam.setStmtEndDate(String.valueOf(financialClearing3203AWebParam.getStmtEndDate()));
-        settlement3202WebParam.setClrType(financialClearing3203AWebParam.getClrType());
-        settlement3202WebParam.setSetlOptins(financialClearing3203AWebParam.getSetlOptins());
-        List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlement3202WebParam);
-
-        Financial3203AParam financial3203AParam = ybDao.getFinancial3203AParam(financial3202FileParams,
-            String.valueOf(financialClearing3203AWebParam.getStmtBegnDate()),
-            String.valueOf(financialClearing3203AWebParam.getStmtEndDate()),
-            financialClearing3203AWebParam.getClrType(), financialClearing3203AWebParam.getSetlOptins());
-        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
-        if (!StringUtils.isEmpty(s)) {
-            Result<?> result = JSON.parseObject(s, Result.class);
-            if (result != null) {
-                if (result.getCode() == 200) {
-                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
-                        String.valueOf(result.getResult()));
-                    return R.ok(result);
-                }
-            }
-        }
-        return R.fail(s);
-    }
-
-    /**
-     * 【3203A】手动清算申请(吉林省)
-     *
-     * @param financialHand3203AWebParam 3203A入参条件
-     * @return 结果
-     */
-    @PostMapping("/hand-operated-apply-financial-clearing")
-    public R<?> handOperatedApplyFinancialClearing(@RequestBody FinancialHand3203AWebParam financialHand3203AWebParam) {
-
-        Financial3203AParam financial3203AParam = new Financial3203AParam();
-
-        financial3203AParam.setClrType(financialHand3203AWebParam.getClrType());
-        financial3203AParam.setMedfeeSumamt(financialHand3203AWebParam.getMedfeeSumamt());
-        financial3203AParam.setMedSumfee(financialHand3203AWebParam.getMedSumfee());
-        financial3203AParam.setAcctPay(financialHand3203AWebParam.getAcctPay());
-        financial3203AParam.setCashPayamt(financialHand3203AWebParam.getCashPayamt());
-        financial3203AParam.setFundAppySum(financialHand3203AWebParam.getFundAppySum());
-        financial3203AParam.setClrOptins(financialHand3203AWebParam.getClrOptins());
-
-        ybDao.getFinancial3203AParamForTime(financial3203AParam,
-            String.valueOf(financialHand3203AWebParam.getBegndate()),
-            String.valueOf(financialHand3203AWebParam.getEnddate()));
-        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
-        if (!StringUtils.isEmpty(s)) {
-            Result<?> result = JSON.parseObject(s, Result.class);
-            if (result != null) {
-                if (result.getCode() == 200) {
-                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
-                        String.valueOf(result.getResult()));
-                    return R.ok(result);
-                }
-            }
-        }
-        return R.fail(s);
-    }
-
-    /**
-     * 清算申请记录(吉林省)
-     *
-     * @param
-     * @return 结果
-     */
-    @GetMapping("/apply-financial-clearing-list")
-    public R<?> getApplyFinancialClearingList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return R.ok(ybDao.getFinancial3203APage(searchKey, pageNo, pageSize, request));
-    }
-
-    /**
-     * 【3204A】清算申请撤销(吉林省)
-     *
-     * @param clrAppyEvtId 3203A入参条件
-     * @return 结果
-     */
-    @GetMapping("/apply-un-clearing")
-    public R<?> cancelFinancialClearing(String clrAppyEvtId, String clrOptins) {
-        Financial3204Param financial3204Param = new Financial3204Param();
-        FinancialApplyRecord financialApplyRecord = ybDao.getFinancial3204ParamByClrAppyEvtId(clrAppyEvtId);
-        financial3204Param.setClrOptins(clrOptins).setClrAppyEvtId(financialApplyRecord.getOutResult());
-        Result resultInfo = ybHttpUtils.cancelFinancialClearing(financial3204Param);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.save3204AFinancialClearingApplycation(clrAppyEvtId, clrOptins);
-            return R.ok("撤销成功");
-        }
-        return R.fail("撤销失败");
-    }
-
-    /**
-     * 【3205A】清算申请状态查询
-     *
-     * @param clearing3205AWebParma 3205A入参条件
-     * @return 结果
-     */
-    @PostMapping("/get-clearing-status")
-    public R<?> getFinancialClearingStatus(Clearing3205AWebParma clearing3205AWebParma) {
-
-        Clearing3205AParma clearing3205AParma = ybDao.getClearing3205AParma(clearing3205AWebParma);
-        Clearing3205AResult clearing3205AResult = ybHttpUtils.getFinancialClearingStatus(clearing3205AParma);
-
-        return R.ok(clearing3205AResult);
-    }
-
-    /**
-     * 【3501】商品盘存上传
-     *
-     * @param id 供应申请id
-     * @return 结果
-     */
-    @PostMapping("/upload-inventory-count")
-    public R<?> uploadInventoryCount(Long id) {
-
-        MedicalInventory3501Param medicalInventory3501Param =
-            ybDao.getMedicalInventory3501Param(id, SecurityUtils.getLoginUser().getTenantId());
-        Result resultInfo = ybHttpUtils.uploadInventoryCount(medicalInventory3501Param);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveInventoryCheckRecord(medicalInventory3501Param, resultInfo.getMessage());
-            return R.ok();
-        }
-        ybDao.saveInventoryCheckRecord(medicalInventory3501Param, resultInfo.getMessage());
-        return R.fail();
-    }
-
-    /**
-     * 【3502】商品信息变更
-     *
-     * @param id 供应申请id
-     * @param invChgType 变更类型 参考枚举
-     * @return 结果
-     */
-    @PostMapping("/upload-inventory")
-    public R<?> updateInventoryCount(Long id, String invChgType) {
-
-        MedicalInventory3502Param medicalInventory3502Param =
-            ybDao.getMedicalInventory3502Param(id, invChgType, SecurityUtils.getLoginUser().getTenantId());
-        Result resultInfo = ybHttpUtils.updateInventoryCount(medicalInventory3502Param);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveInventoryChangeRecord(medicalInventory3502Param, resultInfo.getMessage());
-            return R.ok();
-        }
-        return R.fail();
-    }
-
-    /**
-     * 【3503】商品采购
-     *
-     * @param id 供应申请id
-     * @return 结果
-     */
-    @PostMapping("/procurement")
-    public R<?> procurement(Long id) {
-
-        Medical3503Param medical3503Param = ybDao.getMedical3503Param(id, SecurityUtils.getLoginUser().getTenantId());
-        Result resultInfo = ybHttpUtils.procurement(medical3503Param);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveInventoryPurchaseRecord(medical3503Param, resultInfo.getMessage());
-            return R.ok();
-        }
-        return R.fail();
-    }
-
-    /**
-     * 【3504】商品采购退货
-     *
-     * @param id 供应申请id
-     * @return 结果
-     */
-    @PostMapping("/procurement-cancel")
-    public R<?> cancelProcurement(Long id) {
-
-        MedicalPurchase3504Param medicalPurchase3504Param =
-            ybDao.getMedicalPurchase3504Param(id, SecurityUtils.getLoginUser().getTenantId());
-        Result resultInfo = ybHttpUtils.cancelProcurement(medicalPurchase3504Param);
-        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveInventoryPurchaseReturnRecord(medicalPurchase3504Param, resultInfo.getMessage());
-            return R.ok();
-        }
-        return R.fail();
-    }
-
-    /**
-     * 【3505】商品销售
-     *
-     * @param id 供应申请id
-     * @return 结果
-     */
-    @PostMapping("/merchandise")
-    public R<?> merchandise(Long id, String ListType) {
-        Medical3505Param medical3505Param =
-            ybDao.getMedical3505Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
-        Result result = ybHttpUtils.merchandise(medical3505Param);
-        Medical3505Result medical3505Result =
-            JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
-        if ("1".equals(medical3505Result.getRetRslt())) {
-            ybDao.saveInventorySaleRecord(medical3505Param, medical3505Result.getMsgRslt());
-            return R.ok();
-        }
-        ybDao.saveInventorySaleRecord(medical3505Param, medical3505Result.getMsgRslt());
-        return R.fail();
-    }
-
-    /**
-     * 【3506】商品销售退货
-     *
-     * @param id 供应申请id
-     * @return 结果
-     */
-    @PostMapping("/cancel-merchandise")
-    public R<?> cancelMerchandise(Long id, String ListType) {
-        Medical3506Param medical3506Param =
-            ybDao.getMedical3506Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
-        Result result = ybHttpUtils.cancelMerchandise(medical3506Param);
-        Medical3505Result medical3505Result =
-            JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
-        if ("1".equals(medical3505Result.getRetRslt())) {
-            ybDao.saveInventorySaleReturnRecord(medical3506Param, medical3505Result.getMsgRslt());
-            return R.ok();
-        }
-        ybDao.saveInventorySaleReturnRecord(medical3506Param, medical3505Result.getMsgRslt());
-        return R.fail();
-    }
-
-    /**
-     * 【3507】商品信息删除
-     *
-     * @param id 供应申请id
-     * @return 结果
-     */
-    @PostMapping("/del-goods")
-    public R<?> deleteGoodsInfo(Long id, String ListType) {
-        Medical3507Param medical3507Param = ybDao.getMedical3507Param(id, ListType);
-        Result resultBody = ybHttpUtils.deleteGoodsInfo(medical3507Param);
-        if (resultBody.getCode().equals(CommonConstant.SC_OK_200)) {
-            ybDao.saveInventoryDelRecord(medical3507Param);
-            return R.ok();
-        }
-        return R.fail();
-    }
-
-    /**
-     * 【3206A】清算机构查询
-     *
-     * @return 结果
-     */
-    @GetMapping("/select-clroptins")
-    public R<?> getClrOptins(String pageNum, String pageSize, String fixmedinsCode) {
-        Clearing3206AParam clearing3206AParam = new Clearing3206AParam();
-        clearing3206AParam.setPageNum(Integer.parseInt(pageNum)).setPageSize(Integer.parseInt(pageSize))
-            .setFixmedinsCode(fixmedinsCode);
-        Result resultBody = ybHttpUtils.getClrOptins(clearing3206AParam);
-        if (resultBody.getCode().equals(CommonConstant.SC_OK_200)) {
-            // ybDao.saveInventoryDelRecord(medical3507Param);
-            // resultBody.
-            return R.ok();
-        }
-        return R.fail(resultBody);
-    }
-
-    /**
-     * 【1312】-医保目录信息查询
-     *
-     * @param hilistCode 医保目录编码
-     * @param dateStr 更新时间
-     * @return 结果
-     */
-    @PostMapping("/query-yb-catalogue")
-    public R<?> queryYbCatalogue(@RequestParam String hilistCode, @RequestParam String dateStr) {
-        Catalogue1312QueryParam catalogue1312QueryParam = new Catalogue1312QueryParam();
-        catalogue1312QueryParam.setHilistCode(hilistCode);
-        catalogue1312QueryParam.setInsuplcAdmdvs(
-            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.INSUPLC_ADMDVS));
-        // 直接解析（默认 ISO 格式）
-        LocalDate localDate = LocalDate.parse(dateStr);
-        // 转换为 Date
-        Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
-        catalogue1312QueryParam.setUpdtTime(date);
-        catalogue1312QueryParam.setPageNum(1);
-        catalogue1312QueryParam.setPageSize(10);
-        catalogue1312QueryParam.setDecryptFlag("0"); // 不需要解密
-        List<Catalogue1312Output> outputList = ybHttpUtils.queryYbCatalogue(catalogue1312QueryParam);
-        return R.ok(outputList);
-    }
-
-    /**
-     * 【3101】明细审核事前事中分析服务
-     *
-     * @param encounterId 就诊ID
-     * @return 结果
-     */
-    @GetMapping("/pre-mid-analysis")
-    public R<?> yb3101PreMidAnalysis(@RequestParam("encounterId") Long encounterId,
-        @RequestParam("trigScen") String trigScen) {
-        return ybService.yb3101PreMidAnalysis(encounterId, trigScen);
-    }
-
-    /**
-     * 【3103】事前事中服务反馈服务
-     *
-     * @param warnRsltId 违规标识
-     * @param dspoWay 处理方式
-     * @param dspoWayRea 处理原因
-     * @return 结果
-     */
-    @GetMapping("/pre-mid-feedback")
-    public R<?> yb3103PreMidFeedback(@RequestParam("warnRsltId") String warnRsltId,
-        @RequestParam("dspoWay") String dspoWay,
-        @RequestParam(value = "dspoWayRea", required = false) String dspoWayRea) {
-        return ybService.yb3103PreMidFeedback(warnRsltId, dspoWay, dspoWayRea);
-    }
-
-    /**
-     * 【4101A】医疗保障基金结算清单信息上传（新）
-     *
-     * @param paymentId 付款ID
-     * @return 结果
-     */
-    @GetMapping("/upload-fund-settle")
-    public R<?> yb4101aUploadFundSettle(@RequestParam("paymentId") Long paymentId) {
-        return ybService.yb4101aUploadFundSettle(paymentId);
-    }
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
deleted file mode 100644
index ac25d3d0..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.core.common.core.domain.HisBaseEntity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * 【1312】医保目录信息查询
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Catalogue1312Output extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-    // 医保目录编码
-    private String hilistCode;
-
-    // 医保目录名称
-    private String hilistName;
-
-    // 参保机构医保区划
-    private String insuAdmdvs;
-
-    // 开始日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date begndate;
-
-    // 结束日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date enddate;
-
-    // 医疗收费项目类别
-    private String medChrgitmType;
-
-    // 收费项目等级
-    private String chrgitmLv;
-
-    // 限制使用标志
-    private String lmtUsedFlag;
-
-    // 目录类别
-    private String listType;
-
-    // 医疗使用标志
-    private String medUseFlag;
-
-    // 生育使用标志
-    private String matnUsedFlag;
-
-    // 医保目录使用类别
-    private String hilistUseType;
-
-    // 限复方使用类型
-    private String lmtCpndType;
-
-    // 五笔助记码
-    private String wubi;
-
-    // 拼音助记码
-    private String pinyin;
-
-    // 备注
-    private String memo;
-
-    // 有效标志
-    private String valiFlag;
-
-    // 唯一记录号
-    private String rid;
-
-    // 更新时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updtTime;
-
-    // 创建人
-    private String crterId;
-
-    // 创建人姓名
-    private String crterName;
-
-    // 创建时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date crteTime;
-
-    // 创建机构
-    private String crteOptinsNo;
-
-    // 经办人
-    private String opterId;
-
-    // 经办人姓名
-    private String opterName;
-
-    // 经办时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date optTime;
-
-    // 经办机构
-    private String optinsNo;
-
-    // 统筹区
-    private String poolareaNo;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
deleted file mode 100644
index 115460aa..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 【3205A】前端入参
- *
- * @author SunJQ
- * @date 2025-04-17
- */
-@Data
-public class Clearing3205AWebParam {
-    // 清算机构
-    @NotNull
-    private String clrOptins;
-
-    // 清算状态
-    private String clrStas;
-
-    // 清算月份 例如：202310
-    private String clrYm;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
deleted file mode 100644
index c357494e..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2207】医保预结算的输出参数
- *
- * @author SunJQ
- * @date 2025-05-08
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2207OrderOutput {
-    // 主键字段
-    private String mdtrtId; // 就诊ID
-
-    private String setlId;// 结算id 2207时有值 2206无值
-
-    private String psnNo; // 人员编号
-
-    private String psnName; // 人员姓名
-
-    private String psnCertType; // 人员证件类型
-
-    private String certno; // 证件号码
-
-    private String gend; // 性别
-
-    private String naty; // 民族
-
-    private Date brdy; // 出生日期
-
-    private BigDecimal age; // 年龄
-
-    private String insutype; // 险种类型
-
-    private String psnType; // 人员类别
-
-    private String cvlservFlag; // 公务员标志
-
-    private Date setlTime; // 结算时间
-
-    private String mdtrtCertType; // 就诊凭证类型
-
-    private String medType; // 医疗类别
-
-    private BigDecimal medfeeSumamt; // 医疗费总额
-
-    private BigDecimal fulamtOwnpayAmt; // 全自费金额
-
-    private BigDecimal overlmtSelfpay; // 超限价自费费用
-
-    private BigDecimal preselfpayAmt; // 先行自付金额
-
-    private BigDecimal inscpScpAmt; // 符合政策范围金额
-
-    private BigDecimal actPayDedc; // 实际支付起付线
-
-    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
-
-    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
-
-    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
-
-    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
-
-    private BigDecimal hifmiPay; // 居民大病保险资金支出
-
-    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
-
-    private BigDecimal mafPay; // 医疗救助基金支出
-
-    private BigDecimal othPay; // 其他支出
-
-    private BigDecimal fundPaySumamt; // 基金支付总额
-
-    private BigDecimal psnPartAmt; // 个人负担总金额
-
-    private BigDecimal acctPay; // 个人账户支出
-
-    private BigDecimal psnCashPay; // 个人现金支出
-
-    private BigDecimal hospPartAmt; // 医院负担金额
-
-    private BigDecimal balc; // 余额
-
-    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
-
-    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
-
-    private String clrOptins; // 清算经办机构
-
-    private String clrWay; // 清算方式
-
-    private String clrType; // 清算类别
-
-    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
-
-    private String expContent; // 字段扩展
-
-    private List<Clinic2206FundPaymentResult> setldetail;// 结算详细信息
-
-    private String chrgBchno; // 收费批次号
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
deleted file mode 100644
index 46338c43..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 【2208】门诊结算撤销
- *
- * @author SunJQ
- * @date 2025-04-21
- */
-@Data
-@Accessors(chain = true)
-public class Clinic2208UnSetlInfoOutput {
-
-    // 1. 就诊ID（字符型，30位，必填）
-    private String mdtrtId;
-
-    // 2. 结算ID（字符型，30位，必填）
-    private String setlId;
-
-    // 3. 清算经办机构（字符型，6位）
-    private String clrOptins;
-
-    // 4. 结算时间（日期时间型，格式：yyyy-MM-dd HH:mm:ss，必填）
-    private Date setlTime;
-
-    // 5. 医疗费总额（数值型，16位含2位小数，必填）
-    private BigDecimal medfeeSumamt;
-
-    // 6. 全自费金额（数值型，16位含2位小数，必填）
-    private BigDecimal fulamtOwnpayAmt;
-
-    // 7. 超限价自费费用（数值型，16位含2位小数，必填）
-    private BigDecimal overlmtSelfpay;
-
-    // 8. 先行自付金额（数值型，16位含2位小数，必填）
-    private BigDecimal preselfpayAmt;
-
-    // 9. 符合政策范围金额（数值型，16位含2位小数，必填）
-    private BigDecimal inscpScpAmt;
-
-    // 10. 实际支付起付线（数值型，16位含2位小数）
-    private BigDecimal actPayDedc;
-
-    // 11. 基本医疗保险统筹基金支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifpPay;
-
-    // 12. 统筹基金支付比例（数值型，5位含4位小数，必填）
-    private BigDecimal poolPropSelfpay;
-
-    // 13. 公务员医疗补助支出（数值型，16位含2位小数，必填）
-    private BigDecimal cvlservPay;
-
-    // 14. 企业补充医保支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifesPay;
-
-    // 15. 居民大病保险支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifmiPay;
-
-    // 16. 职工大额医疗补助支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifobPay;
-
-    // 17. 医疗救助基金支出（数值型，16位含2位小数，必填）
-    private BigDecimal mafPay;
-
-    // 18. 其他支出（数值型，16位含2位小数，必填）
-    private BigDecimal othPay;
-
-    // 19. 基金支付总额（数值型，16位含2位小数，必填）
-    private BigDecimal fundPaySumamt;
-
-    // 20. 个人负担总金额（数值型，16位含2位小数，必填）
-    private BigDecimal psnPartAmt;
-
-    // 21. 个人账户支出（数值型，16位含2位小数，必填）
-    private BigDecimal acctPay;
-
-    // 22. 余额（数值型，16位含2位小数，必填）
-    private BigDecimal balc;
-
-    // 23. 个人账户共济支付（数值型，16位含2位小数，必填）
-    private BigDecimal acctMulaidPay;
-
-    // 24. 医院负担金额（数值型，16位含2位小数，必填）
-    private BigDecimal hospPartAmt;
-
-    // 25. 医药机构结算ID（字符型，30位，必填）
-    private String medinsSetlId;
-
-    // 26. 个人现金支出（数值型，16位含2位小数，必填）
-    private BigDecimal pdnCashPay;
-
-    // 27. 伤残人员医疗补助支出（数值型，16位含2位小数，必填）
-    private BigDecimal hifdmPay;
-
-    //结算详细信息
-    private List<Clinic2206FundPaymentResult> setldetail;//结算详细信息
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
deleted file mode 100644
index 19f03e5e..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@Accessors(chain = true)
-public class ClinicReg2201Output {
-    private static final long serialVersionUID = 1L;
-    //主键
-    @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
-    private String id;
-    //就诊ID
-    private String mdtrtId;
-    //参保地医保区划
-    @JSONField(serialize=false)
-    private String insuplcAdmdvs;
-    //人员编号
-    private String psnNo;
-    //险种类型
-    private String insutype;
-    //医疗类别
-    @JSONField(serialize=false)
-    private String medType;
-    //挂号时间
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date begntime;
-    //就诊凭证类型
-    private String mdtrtCertType;
-    //就诊凭证编号
-    private String mdtrtCertNo;
-    //证件加密串
-    @JSONField(serialize=false)
-    @TableField(exist = false)
-    private String mdtrtCertNoEncrypt;
-    //住院/门诊号
-    private String iptOtpNo;
-    //医师编码
-    private String atddrNo;
-    //医师姓名
-    private String drName;
-    //科室编码
-    private String deptCode;
-    //科室名称
-    private String deptName;
-    //科别
-    private String caty;
-    //挂号费
-    private Double regFee;
-    //检查费
-    private Double checkFee;
-    //应收金额
-    private Double totalFee;
-    //状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算
-    private String status;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
deleted file mode 100644
index c693c24f..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-/**
- * 【13202】前台入参
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Financial13203WebParam {
-
-    // 对账日期，格式：YYYY-MM-DD
-    @JSONField(name = "stmt_date")
-    private String stmtDate;
-
-    // 明细对账结果，1：不平，0：平
-    @JSONField(name = "stmt_rslt")
-    private String stmtRslt;
-
-    // 查询页面数据量，最大100
-    @JSONField(name = "page_size")
-    private String pageSize;
-
-    // 页数，默认1
-    @JSONField(name = "page_num")
-    private String pageNum;
-
-    // 清算机构编码
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-
-    // 清算类别
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 险种
-    @JSONField(name = "insutype")
-    private String insutype;
-
-    // 就医类别，2：本地就医，3：省内异地就医，4：跨省就医
-    @JSONField(name = "clr_pay_loc")
-    private String clrPayLoc;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
deleted file mode 100644
index 9164fe51..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class Financial3202WebParam {
-    List<String> settlementIdList;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
deleted file mode 100644
index 1082e395..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.apache.poi.hssf.record.chart.DatRecord;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3203A】前台入参
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-@Accessors(chain = true)
-public class Financial3203AWebParam {
-
-    /** 清算类别 */
-    @NotNull
-    private String clrType;
-    /** 开始时间 */
-    @NotNull
-    private Date stmtBegnDate;
-    /** 结束时间 */
-    @NotNull
-    private Date stmtEndDate;
-    /** 清算机构 */
-    @NotNull
-    private String clrOptins;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
deleted file mode 100644
index 80cf0dbb..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 【3203】前台入参
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Financial3203WebParam {
-
-    // 清算类别（字符型，30位，必填）
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 清算方式（字符型，30位，必填）
-    @JSONField(name = "clr_way")
-    private String clrWay;
-
-    // 开始日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "begndate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date begndate;
-
-    // 结束日期（日期型，必填，格式：yyyy-MM-dd）
-    @JSONField(name = "enddate")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date enddate;
-
-    // 清算年月
-    @JSONField(name = "setlym")
-    private String setlym;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
deleted file mode 100644
index 25f9c0c3..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class FinancialHand3203AWebParam {
-
-    @NotEmpty
-    private String clrType;//险种类型
-    @NotNull
-    private BigDecimal medfeeSumamt;//医疗费总额
-    @NotNull
-    private BigDecimal medSumfee;//医保认可费用总额（0.00）
-    @NotNull
-    private BigDecimal fundAppySum;//基金支付金额
-    @NotNull
-    private BigDecimal cashPayamt;//现金金额
-    @NotNull
-    private BigDecimal acctPay;//账户金额
-    @NotNull
-    private String begndate;//开始时间
-    @NotNull
-    private String enddate;//结束时间
-    @NotEmpty
-    private String clrOptins; // 必须是准确的6位编码
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
deleted file mode 100644
index f28541c6..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.yb.dto.Info5301SpecialConditionResult;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- *【1101】获取身份信息
- *
- * @author SunJQ
- * @date 2025-04-16
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-public class Info1101Output extends HisBaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-	//人员编号
-    private String psnNo;
-	//人员证件类型
-    private String psnCertType;
-	//证件号码
-    private String certno;
-	//人员姓名
-    private String psnName;
-	//性别
-    private String gend;
-	//民族
-    private String naty;
-	//出生日期
-    private Date brdy;
-	//年龄
-    private Double age;
-	//参保地医保区划
-    private String insuplcAdmdvs;
-    //险种类型
-    private String insutype;
-    //余额
-    private String balc;
-    //人员类别
-    @TableField(exist = false)
-    private String psnType;
-
-    //人员参保状态
-    @TableField(exist = false)
-    private String psnInsuStas;
-
-    //个人参保日期
-    @TableField(exist = false)
-    private String psnInsuDate;
-
-    //公务员标志
-    @TableField(exist = false)
-    private String cvlservFlag;
-
-    //单位名称
-    @TableField(exist = false)
-    private String empName;
-    //特慢病
-    @TableField(exist = false)
-    private List<Info5301SpecialConditionResult> feedetail;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
deleted file mode 100644
index e8e550cd..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.yb.dto.Info5301SpecialConditionResult;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-@Accessors(chain = true)
-public class PatientInfoDto {
-
-    //患者信息
-    /** ID */
-    @TableId(type = IdType.ASSIGN_ID)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /** 活动标记 */
-    private Integer activeFlag;
-
-    /** 临时标识 */
-    private Integer tempFlag;
-
-    /** 患者姓名 */
-    private String name;
-
-    /** 患者院内编码/病历号 */
-    private String busNo;
-
-    /** 性别编码 */
-    private Integer genderEnum;
-
-    /** 生日 */
-    private Date birthDate;
-
-    /** 民族 */
-    private String nationalityCode;
-
-    /** 身份证号 */
-    private String idCard;
-
-    /** 拼音码 */
-    private String pyStr;
-
-    /** 五笔码 */
-    private String wbStr;
-
-    /** 机构Id */
-    private Long organizationId;
-
-    /** 特慢病等 */
-    private List<Info5301SpecialConditionResult> feedetail;
-
-    //医保信息 2025/05/23 弃用，费用性质固定，如农大只有省医保，费用性质只显示省医保和自费即可，由@GetMapping(value = "/contract-list")接口提供数据
-    /** 合同Id */
-    private Long contractId;//弃用 2025/05/23
-
-    /** 合同名称 */
-    private String contractName;//弃用 2025/05/23
-
-    /** 状态 */
-    private Integer statusEnum;//弃用 2025/05/23
-
-    /** 合同的类别 */
-    private Integer categoryEnum;//弃用 2025/05/23
-
-    /** 合同编码 */
-    private String contractBusNo;//弃用 2025/05/23
-
-    /** 机构 */
-    private Long contractOrgId;//弃用 2025/05/23
-
-    /** 是否医保 */
-    private Integer ybFlag;//弃用 2025/05/23
-
-    /** 医保区划 */
-    private String admVs;//弃用 2025/05/23
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
deleted file mode 100644
index c0e5afe5..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-@Data
-@ApiModel(value="接口返回对象", description="接口返回对象")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class Result<T> implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 成功标志
-	 */
-	@ApiModelProperty(value = "成功标志")
-	private boolean success = true;
-
-	/**
-	 * 返回处理消息
-	 */
-	@ApiModelProperty(value = "返回处理消息")
-	private String message = "操作成功！";
-
-	/**
-	 * 返回代码
-	 */
-	@ApiModelProperty(value = "返回代码")
-	private Integer code = 0;
-	
-	/**
-	 * 返回数据对象 data
-	 */
-	@ApiModelProperty(value = "返回数据对象")
-	private T result;
-	
-	/**
-	 * 时间戳
-	 */
-	@ApiModelProperty(value = "时间戳")
-	private long timestamp ;
-
-}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
deleted file mode 100644
index 5a192f00..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import lombok.Data;
-
-/**
- * 医保结果
- */
-@Data
-public class ResultBody {
-
-    /** 交易状态码 */
-    @JSONField(name="infcode")
-    private String infcode;
-    /** 发送方报文ID */
-    @JSONField(name="warnMsg")
-    private String warn_msg;
-    /** 数字签名信息 */
-    @JSONField(name="cainfo")
-    private String cainfo;
-    /** 错误信息 */
-    @JSONField(name="err_msg")
-    private String errMsg;
-    /** 接收报文时间 */
-    @JSONField(name="refmsg_time")
-    private String refmsgTime;
-    /** 签名类型 */
-    @JSONField(name="signtype")
-    private String signtype;
-    /** 响应报文时间 */
-    @JSONField(name="respond_time")
-    private String respondTime;
-    /** 接收方报文ID */
-    @JSONField(name="inf_refmsgid")
-    private String infRefmsgid;
-    /** 交易输出 */
-    @JSONField(name="output")
-    private String output;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
deleted file mode 100644
index 921bbe4b..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 【3201】前台入参
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-public class Settlement3201WebParam {
-
-    /** 险种 */
-    @NotNull
-    private String insuType;
-    /** 清算类别 */
-    @NotNull
-    private String clrType;//住院或门诊
-    /** 合同id */
-    @NotNull
-    private Long contractId;
-    /** 医院id */
-    @NotNull
-    private Long orgId;
-    /** 开始时间 */
-    @NotNull
-    private String stmtBegnDate;
-    /** 结束时间 */
-    @NotNull
-    private String stmtEndDate;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
deleted file mode 100644
index 0e3cbe0d..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-/**
- * 【3202】前台入参
- *
- * @author SunJQ
- * @date 2025-04-17
- */
-@Data
-public class Settlement3202WebParam {
-    /** 结算经办机构 */
-    @NotNull
-    private String setlOptins;//前台传入,注意:先上传文件后核对明细的
-    /** 清算类别 */
-    private String clrType;
-    /** 文件查询号 */
-    @NotNull
-    private String fileQuryNo;
-    /** 开始时间 */
-    @NotNull
-    private String stmtBegnDate;
-    /** 结束时间 */
-    @NotNull
-    private String stmtEndDate;
-    /** 医院id */
-    private Long orgId;
-//    /** 医疗费用总额 */
-//    @NotNull
-//    private BigDecimal medFeeSumAmt;
-//    /** 基金支付总额 */
-//    @NotNull
-//    private BigDecimal fundPaySumAmt;
-//    /** 现金支付金额 */
-//    @NotNull
-//    private BigDecimal cashPayAmt;
-//    /** 定点医药机构结算笔数 */
-//    @NotNull
-//    private Integer fixMedInsSetlCnt;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
deleted file mode 100644
index 97f675fa..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * [3209A]前台传参
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Settlement3209AWebParam {
-
-    // 清算类别
-    @JSONField(name = "clr_type")
-    private String clrType;
-
-    // 开始日期
-    @JSONField(name = "begndate")
-    private Date begndate;
-
-    // 结束日期
-    @JSONField(name = "enddate")
-    private Date enddate;
-
-    // 清算机构
-    @JSONField(name = "clr_optins")
-    private String clrOptins;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
deleted file mode 100644
index dcbb0568..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 医保电子处方信息
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Data
-@Accessors(chain = true)
-public class VeriPrescriptionDetailInfoDto {
-
-    /** 处方号 */
-    private String prescriptionNo;
-    /** 门诊号 */
-    private String iptOtpNo;
-    /** 请求数量 */
-    private Integer quantity;
-    /** 请求单位 */
-    private String unitCode;
-    /** 审核状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-
-    /* --处方信息-- */
-    /** 药品名 */
-    private String medicationName;
-    /** 药品规格 */
-    private String drugSpecification;
-    /** 药品剂量 */
-    private BigDecimal medDosage;
-    /** 药品剂量单位 */
-    private String medDosageUnitCode;
-
-    /** 使用频次 */
-    @Dict(dictCode = "elep_rate_code")
-    private String medFrequency;
-    private String medFrequency_dictText;
-    /** 途径 */
-    @Dict(dictCode = "method_code")
-    private String medRoute;
-    private String medRoute_dictText;
-    /** 取药状态 */
-    private String medStatus;
-    /** 处方状态 */
-    private String prescriptionStatus;
-    /** 处方类别 */
-    private Integer rxTypeCode;
-    private String rxTypeCode_enumText;
-    /** 支持用药信息 */
-    private String supportInfo;
-    /** 服药时间(开始) */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effectiveDoseStart;
-    /** 服药时间(结束) */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effectiveDoseEnd;
-    /** 给药间隔 */
-    private String dispenseInterval;
-    /** 单次发药数 */
-    private Integer dispensePerQuantity;
-    /** 每次发药供应天数 */
-    private Integer dispensePerDuration;
-
-    /* --就诊信息-- */
-    /** 患者姓名 */
-    private String patnName;
-    /** 身份证号 */
-    private String certno;
-    /** 开方医生名 */
-    private String practitionerName;
-    /** 挂号科室 */
-    private String mdtrtDeptName;
-    /** 开单科室 */
-    private String prscDeptName;
-    /** 挂号日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date mdtrtTime;
-    /** 处方开立日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /* --诊断信息-- */
-    /** 诊断名 */
-    private String conditionName;
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
deleted file mode 100644
index 73ebad83..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 医保电子处方信息
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Data
-@Accessors(chain = true)
-public class VeriPrescriptionInfoDto {
-
-    /** 处方号 */
-    private String prescriptionNo;
-    /** 门诊号 */
-    private String iptOtpNo;
-    /** 姓名 */
-    private String patientName;
-    /** 证件号 */
-    private String certno;
-    /** 取药状态 */
-    private String medStatus;
-    /** 状态 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-    /** 开单科室 */
-    private String prscDeptName;
-    /** 挂号日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date mdtrtTime;
-    /** 处方开立日期 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date prscTime;
-
-    /** 租户ID */
-    private Integer tenantId;
-    /** 电子凭证线上身份核验流水号 */
-    private String authNo;
-    /** 电子凭证令牌 */
-    private String ecToken;
-    /** 医保处方编号 */
-    private String hiRxno;
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
deleted file mode 100644
index 4879512c..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.dto;
-
-import java.util.Date;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 医保电子处方信息查询条件
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Data
-@Accessors(chain = true)
-public class VeriPrescriptionParam {
-
-    /** 门诊号/姓名 */
-    private String name;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
deleted file mode 100644
index a65ec867..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Data
-//@TableName("yb_inpatient_fee_detail") // 替换为实际表名
-public class Yb2301FeeDetailParam {
-
-
-        /**
-         * 费用明细流水号
-         * 单次就诊内唯一
-         */
-        @JsonProperty("feedetl_sn")
-        private String feedetlSn;
-
-        /**
-         * 原费用流水号
-         * 退单时传入被退单的费用明细流水号
-         */
-        @JsonProperty("init_feedetl_sn")
-        private String initFeedetlSn;
-
-        /**
-         * 就诊ID
-         */
-        @JsonProperty("mdtrt_id")
-        private String mdtrtId;
-
-        /**
-         * 医嘱号
-         */
-        @JsonProperty("drord_no")
-        private String drordNo;
-
-        /**
-         * 人员编号
-         */
-        @JsonProperty("psn_no")
-        private String psnNo;
-
-        /**
-         * 医疗类别
-         */
-        @JsonProperty("med_type")
-        private String medType;
-
-        /**
-         * 费用发生时间
-         * 格式：yyyy-MM-dd HH:mm:ss
-         */
-        @JsonProperty("fee_ocur_time")
-        private Date feeOcurTime;
-
-        /**
-         * 医保目录编码
-         */
-        @JsonProperty("med_list_codg")
-        private String medListCodg;
-
-        /**
-         * 医药机构目录编码
-         */
-        @JsonProperty("medins_list_codg")
-        private String medinsListCodg;
-
-        /**
-         * 明细项目费用总额
-         */
-        @JsonProperty("det_item_fee_sumamt")
-        private BigDecimal detItemFeeSumamt;
-
-        /**
-         * 数量
-         * 退单时数量填写负数
-         */
-        @JsonProperty("cnt")
-        private BigDecimal cnt;
-
-        /**
-         * 单价
-         */
-        @JsonProperty("pric")
-        private BigDecimal pric;
-
-        /**
-         * 开单科室编码
-         */
-        @JsonProperty("bilg_dept_codg")
-        private String bilgDeptCodg;
-
-        /**
-         * 开单科室名称
-         */
-        @JsonProperty("bilg_dept_name")
-        private String bilgDeptName;
-
-        /**
-         * 开单医生编码
-         */
-        @JsonProperty("bilg_dr_codg")
-        private String bilgDrCodg;
-
-        /**
-         * 开单医师姓名
-         */
-        @JsonProperty("bilg_dr_name")
-        private String bilgDrName;
-
-        /**
-         * 受单科室编码
-         */
-        @JsonProperty("acord_dept_codg")
-        private String acordDeptCodg;
-
-        /**
-         * 受单科室名称
-         */
-        @JsonProperty("acord_dept_name")
-        private String acordDeptName;
-
-        /**
-         * 受单医生编码
-         */
-        @JsonProperty("orders_dr_code")
-        private String ordersDrCode;
-
-        /**
-         * 受单医生姓名
-         */
-        @JsonProperty("orders_dr_name")
-        private String ordersDrName;
-
-        /**
-         * 医院审批标志
-         */
-        @JsonProperty("hosp_appr_flag")
-        private String hospApprFlag;
-
-        /**
-         * 中药使用方式
-         */
-        @JsonProperty("tcmdrug_used_way")
-        private String tcmdrugUsedWay;
-
-        /**
-         * 外检标志
-         */
-        @JsonProperty("etip_flag")
-        private String etipFlag;
-
-        /**
-         * 外检医院编码
-         */
-        @JsonProperty("etip_hosp_code")
-        private String etipHospCode;
-
-        /**
-         * 出院带药标志
-         */
-        @JsonProperty("dscg_tkdrug_flag")
-        private String dscgTkdrugFlag;
-
-        /**
-         * 生育费用标志
-         */
-        @JsonProperty("matn_fee_flag")
-        private String matnFeeFlag;
-
-        /**
-         * 备注
-         */
-        @JsonProperty("memo")
-        private String memo;
-
-        /**
-         * 组套编号
-         */
-        @JsonProperty("comb_no")
-        private String combNo;
-
-        /**
-         * 字段扩展
-         * 格式：JSON
-         */
-        @JsonProperty("exp_content")
-        private String expContent;
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
deleted file mode 100644
index 12e3d594..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class Yb2301InpatientOutput {
-
-    /**
-     * 费用明细流水号
-     */
-    @JsonProperty("feedetl_sn")
-    private String feedetlSn;
-
-    /**
-     * 明细项目费用总额
-     */
-    @JsonProperty("det_item_fee_sumamt")
-    private BigDecimal detItemFeeSumamt;
-
-    /**
-     * 数量
-     */
-    @JsonProperty("cnt")
-    private BigDecimal cnt;
-
-    /**
-     * 单价
-     */
-    @JsonProperty("pric")
-    private BigDecimal pric;
-
-    /**
-     * 定价上限金额
-     */
-    @JsonProperty("pric_uplmt_amt")
-    private BigDecimal pricUplmtAmt;
-
-    /**
-     * 自付比例
-     */
-    @JsonProperty("selfpay_prop")
-    private BigDecimal selfpayProp;
-
-    /**
-     * 全自费金额
-     */
-    @JsonProperty("fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    /**
-     * 超限价金额
-     */
-    @JsonProperty("overlmt_amt")
-    private BigDecimal overlmtAmt;
-
-    /**
-     * 先行自付金额
-     */
-    @JsonProperty("preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    /**
-     * 符合政策范围金额
-     */
-    @JsonProperty("inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    /**
-     * 收费项目等级
-     */
-    @JsonProperty("chrgitm_lv")
-    private String chrgitmLv;
-
-    /**
-     * 医疗收费项目类别
-     */
-    @JsonProperty("med_chrgitm_type")
-    private String medChrgitmType;
-
-    /**
-     * 基本药物标志
-     */
-    @JsonProperty("bas_medn_flag")
-    private String basMednFlag;
-
-    /**
-     * 医保谈判药品标志
-     */
-    @JsonProperty("hi_nego_drug_flag")
-    private String hiNegoDrugFlag;
-
-    /**
-     * 儿童用药标志
-     */
-    @JsonProperty("chld_medc_flag")
-    private String chldMedcFlag;
-
-    /**
-     * 目录特项标志
-     */
-    @JsonProperty("list_sp_item_flag")
-    private String listSpItemFlag;
-
-    /**
-     * 限制使用标志
-     */
-    @JsonProperty("lmt_used_flag")
-    private String lmtUsedFlag;
-
-    /**
-     * 直报标志
-     */
-    @JsonProperty("drt_reim_flag")
-    private String drtReimFlag;
-
-    /**
-     * 备注
-     */
-    @JsonProperty("memo")
-    private String memo;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
deleted file mode 100644
index 65db6495..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class Yb2302InpatientParam {
-    /**
-     * 费用明细流水号
-     * 单次就诊内唯一
-     */
-    @JsonProperty("feedetl_sn")
-    private String feedetlSn;
-
-    /**
-     * 人员编号
-     * 退单时传入被退单的费用明细流水号
-     */
-    @JsonProperty("psn_no")
-    private String psnNo;
-
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private String mdtrtId;
-
-    /**
-     * 字段扩展
-     */
-    @JsonProperty("exp_content")
-    private String expContent;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
deleted file mode 100644
index 5b62a1af..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class Yb2303InpatientOutput {
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private String mdtrtId;
-
-    /**
-     * 人员编号
-     */
-    @JsonProperty("psn_no")
-    private String psnNo;
-
-    /**
-     * 人员姓名
-     */
-    @JsonProperty("psn_name")
-    private String psnName;
-
-    /**
-     * 人员证件类型
-     */
-    @JsonProperty("psn_cert_type")
-    private String psnCertType;
-
-    /**
-     * 证件号码
-     */
-    @JsonProperty("certno")
-    private String certno;
-
-    /**
-     * 性别
-     */
-    @JsonProperty("gend")
-    private String gend;
-
-    /**
-     * 民族
-     */
-    @JsonProperty("naty")
-    private String naty;
-
-    /**
-     * 出生日期
-     * 格式：yyyy-MM-dd
-     */
-    @JsonProperty("brdy")
-    private Date brdy;
-
-    /**
-     * 年龄
-     */
-    @JsonProperty("age")
-    private BigDecimal age;
-
-    /**
-     * 险种类型
-     */
-    @JsonProperty("insutype")
-    private String insutype;
-
-    /**
-     * 人员类别
-     */
-    @JsonProperty("psn_type")
-    private String psnType;
-
-    /**
-     * 公务员标志
-     */
-    @JsonProperty("cvlserv_flag")
-    private String cvlservFlag;
-
-    /**
-     * 结算时间
-     * 格式：yyyy-MM-dd HH:mm:ss
-     */
-    @JsonProperty("setl_time")
-    private Date setlTime;
-
-    /**
-     * 就诊凭证类型
-     */
-    @JsonProperty("mdtrt_cert_type")
-    private String mdtrtCertType;
-
-    /**
-     * 医疗类别
-     */
-    @JsonProperty("med_type")
-    private String medType;
-
-    /**
-     * 医疗费总额
-     */
-    @JsonProperty("medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    /**
-     * 全自费金额
-     */
-    @JsonProperty("fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    /**
-     * 超限价自费费用
-     */
-    @JsonProperty("overlmt_selfpay")
-    private BigDecimal overlmtSelfpay;
-
-    /**
-     * 先行自付金额
-     */
-    @JsonProperty("preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    /**
-     * 符合政策范围金额
-     */
-    @JsonProperty("inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    /**
-     * 实际支付起付线
-     */
-    @JsonProperty("act_pay_dedc")
-    private BigDecimal actPayDedc;
-
-    /**
-     * 基本医疗保险统筹基金支出
-     */
-    @JsonProperty("hifp_pay")
-    private BigDecimal hifpPay;
-
-    /**
-     * 基本医疗保险统筹基金支付比例
-     */
-    @JsonProperty("pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay;
-
-    /**
-     * 公务员医疗补助资金支出
-     */
-    @JsonProperty("cvlserv_pay")
-    private BigDecimal cvlservPay;
-
-    /**
-     * 企业补充医疗保险基金支出
-     */
-    @JsonProperty("hifes_pay")
-    private BigDecimal hifesPay;
-
-    /**
-     * 居民大病保险资金支出
-     */
-    @JsonProperty("hifmi_pay")
-    private BigDecimal hifmiPay;
-
-    /**
-     * 职工大额医疗费用补助基金支出
-     */
-    @JsonProperty("hifob_pay")
-    private BigDecimal hifobPay;
-
-    /**
-     * 医疗救助基金支出
-     */
-    @JsonProperty("maf_pay")
-    private BigDecimal mafPay;
-
-    /**
-     * 其他支出
-     */
-    @JsonProperty("oth_pay")
-    private BigDecimal othPay;
-
-    /**
-     * 基金支付总额
-     */
-    @JsonProperty("fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    /**
-     * 个人负担总金额
-     */
-    @JsonProperty("psn_part_amt")
-    private BigDecimal psnPartAmt;
-
-    /**
-     * 个人账户支出
-     */
-    @JsonProperty("acct_pay")
-    private BigDecimal acctPay;
-
-    /**
-     * 个人现金支出
-     */
-    @JsonProperty("psn_cash_pay")
-    private BigDecimal psnCashPay;
-
-    /**
-     * 医院负担金额
-     */
-    @JsonProperty("hosp_part_amt")
-    private BigDecimal hospPartAmt;
-
-    /**
-     * 余额
-     */
-    @JsonProperty("balc")
-    private BigDecimal balc;
-
-    /**
-     * 个人账户共济支付金额
-     */
-    @JsonProperty("acct_mulaid_pay")
-    private BigDecimal acctMulaidPay;
-
-    /**
-     * 医药机构结算ID
-     * 存放发送方报文ID
-     */
-    @JsonProperty("medins_setl_id")
-    private String medinsSetlId;
-
-    /**
-     * 清算经办机构
-     */
-    @JsonProperty("clr_optins")
-    private String clrOptins;
-
-    /**
-     * 清算方式
-     */
-    @JsonProperty("clr_way")
-    private String clrWay;
-
-    /**
-     * 清算类别
-     */
-    @JsonProperty("clr_type")
-    private String clrType;
-
-    /**
-     * 伤残人员医疗保障基金支出
-     * 1.5.4新增
-     */
-    @JsonProperty("hifdm_pay")
-    private BigDecimal hifdmPay;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
deleted file mode 100644
index 34cc3969..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class Yb2303InpatientPram {
-
-    /**
-     * 人员编号
-     */
-    @JsonProperty("psn_no")
-    private String psnNo;
-
-    /**
-     * 就诊凭证类型
-     */
-    @JsonProperty("mdtrt_cert_type")
-    private String mdtrtCertType;
-
-    /**
-     * 就诊凭证编号
-     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
-     */
-    @JsonProperty("mdtrt_cert_no")
-    private String mdtrtCertNo;
-
-    /**
-     * 医疗费总额
-     */
-    @JsonProperty("medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    /**
-     * 个人结算方式
-     */
-    @JsonProperty("psn_setlway")
-    private String psnSetlway;
-
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private String mdtrtId;
-
-    /**
-     * 个人账户使用标志
-     */
-    @JsonProperty("acct_used_flag")
-    private String acctUsedFlag;
-
-    /**
-     * 险种类型
-     */
-    @JsonProperty("insutype")
-    private String insutype;
-
-    /**
-     * 参保地医保区划
-     */
-    @JsonProperty("insuplc_admdvs")
-    private String insuplcAdmdvs;
-
-    /**
-     * 就医地医保区划
-     */
-    @JsonProperty("mdtrtarea_admvs")
-    private String mdtrtareaAdmvs;
-
-    /**
-     * 发票号
-     */
-    @JsonProperty("invono")
-    private String invono;
-
-    /**
-     * 中途结算标志
-     */
-    @JsonProperty("mid_setl_flag")
-    private String midSetlFlag;
-
-    /**
-     * 全自费金额
-     */
-    @JsonProperty("fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    /**
-     * 超限价金额
-     */
-    @JsonProperty("overlmt_selfpay")
-    private BigDecimal overlmtSelfpay;
-
-    /**
-     * 先行自付金额
-     */
-    @JsonProperty("preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    /**
-     * 符合政策范围金额
-     */
-    @JsonProperty("inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    /**
-     * 出院时间
-     * 格式：yyyy-MM-dd
-     */
-    @JsonProperty("dscgTime")
-    private Date dscgTime;
-
-    /**
-     * 字段扩展
-     */
-    @JsonProperty("exp_content")
-    private String expContent;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
deleted file mode 100644
index e9f25d1b..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-
-public class Yb2304InpatientExpContentParam {
-    /**
-     * 实际就医区划
-     */
-    @JsonProperty("med_admdvs")
-    private BigDecimal medAdmdvs;
-
-    /**
-     * 外报就医医院编号
-     */
-    @JsonProperty("med_hosp_no")
-    private BigDecimal medHospNo;
-
-    /**
-     * 外报就医医院名称
-     */
-    @JsonProperty("med_hosp_name")
-    private BigDecimal medHospName;
-
-    /**
-     * 外报类型
-     */
-    @JsonProperty("out_submit_type")
-    private String outSubmitType;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
deleted file mode 100644
index 7a3c0706..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class Yb2304InpatientOutput {
-
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private String mdtrtId;
-
-    /**
-     * 结算ID
-     */
-    @JsonProperty("setl_id")
-    private String setlId;
-
-    /**
-     * 人员编号
-     */
-    @JsonProperty("psn_no")
-    private String psnNo;
-
-    /**
-     * 人员姓名
-     */
-    @JsonProperty("psn_name")
-    private String psnName;
-
-    /**
-     * 人员证件类型
-     */
-    @JsonProperty("psn_cert_type")
-    private String psnCertType;
-
-    /**
-     * 证件号码
-     */
-    @JsonProperty("certno")
-    private String certno;
-
-    /**
-     * 性别
-     */
-    @JsonProperty("gend")
-    private String gend;
-
-    /**
-     * 民族
-     */
-    @JsonProperty("naty")
-    private String naty;
-
-    /**
-     * 出生日期
-     * 格式：yyyy-MM-dd
-     */
-    @JsonProperty("brdy")
-    private Date brdy;
-
-    /**
-     * 年龄
-     */
-    @JsonProperty("age")
-    private BigDecimal age;
-
-    /**
-     * 险种类型
-     */
-    @JsonProperty("insutype")
-    private String insutype;
-
-    /**
-     * 人员类别
-     */
-    @JsonProperty("psn_type")
-    private String psnType;
-
-    /**
-     * 公务员标志
-     */
-    @JsonProperty("cvlserv_flag")
-    private String cvlservFlag;
-
-    /**
-     * 结算时间
-     * 格式：yyyy-MM-dd HH:mm:ss
-     */
-    @JsonProperty("setl_time")
-    private Date setlTime;
-
-    /**
-     * 就诊凭证类型
-     */
-    @JsonProperty("mdtrt_cert_type")
-    private String mdtrtCertType;
-
-    /**
-     * 医疗类别
-     */
-    @JsonProperty("med_type")
-    private String medType;
-
-    /**
-     * 医疗费总额
-     */
-    @JsonProperty("medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    /**
-     * 全自费金额
-     */
-    @JsonProperty("fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    /**
-     * 超限价自费费用
-     */
-    @JsonProperty("overlmt_selfpay")
-    private BigDecimal overlmtSelfpay;
-
-    /**
-     * 先行自付金额
-     */
-    @JsonProperty("preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    /**
-     * 符合政策范围金额
-     */
-    @JsonProperty("inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    /**
-     * 实际支付起付线
-     */
-    @JsonProperty("act_pay_dedc")
-    private BigDecimal actPayDedc;
-
-    /**
-     * 基本医疗保险统筹基金支出
-     */
-    @JsonProperty("hifp_pay")
-    private BigDecimal hifpPay;
-
-    /**
-     * 基本医疗保险统筹基金支付比例
-     */
-    @JsonProperty("pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay;
-
-    /**
-     * 公务员医疗补助资金支出
-     */
-    @JsonProperty("cvlserv_pay")
-    private BigDecimal cvlservPay;
-
-    /**
-     * 企业补充医疗保险基金支出
-     */
-    @JsonProperty("hifes_pay")
-    private BigDecimal hifesPay;
-
-    /**
-     * 居民大病保险资金支出
-     */
-    @JsonProperty("hifmi_pay")
-    private BigDecimal hifmiPay;
-
-    /**
-     * 职工大额医疗费用补助基金支出
-     */
-    @JsonProperty("hifob_pay")
-    private BigDecimal hifobPay;
-
-    /**
-     * 医疗救助基金支出
-     */
-    @JsonProperty("maf_pay")
-    private BigDecimal mafPay;
-
-    /**
-     * 医院负担金额（原始）
-     */
-    @JsonProperty("hosp_part_amt_old")
-    private BigDecimal hospPartAmtOld;
-
-    /**
-     * 其他支出
-     */
-    @JsonProperty("oth_pay")
-    private BigDecimal othPay;
-
-    /**
-     * 基金支付总额
-     */
-    @JsonProperty("fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    /**
-     * 个人负担总金额
-     */
-    @JsonProperty("psn_part_amt")
-    private BigDecimal psnPartAmt;
-
-    /**
-     * 个人账户支出
-     */
-    @JsonProperty("acct_pay")
-    private BigDecimal acctPay;
-
-    /**
-     * 个人现金支出
-     */
-    @JsonProperty("psn_cash_pay")
-    private BigDecimal psnCashPay;
-
-    /**
-     * 余额
-     */
-    @JsonProperty("balc")
-    private BigDecimal balc;
-
-    /**
-     * 个人账户共济支付金额
-     */
-    @JsonProperty("acct_mulaid_pay")
-    private BigDecimal acctMulaidPay;
-
-    /**
-     * 医药机构结算ID
-     * 存放发送方报文ID
-     */
-    @JsonProperty("medins_setl_id")
-    private String medinsSetlId;
-
-    /**
-     * 清算经办机构
-     */
-    @JsonProperty("clr_optins")
-    private String clrOptins;
-
-    /**
-     * 清算方式
-     */
-    @JsonProperty("clr_way")
-    private String clrWay;
-
-    /**
-     * 清算类别
-     */
-    @JsonProperty("clr_type")
-    private String clrType;
-
-    /**
-     * 字段扩展
-     * 1.5.4新增
-     */
-    @JsonProperty("exp_content")
-    private String expContent;
-
-    /**
-     * 伤残人员医疗保障基金支出
-     * 1.5.4新增
-     */
-    @JsonProperty("hifdm_pay")
-    private BigDecimal hifdmPay;
-
-    /**
-     * 医院负担金额
-     * 1.5.4新增
-     */
-    @JsonProperty("hosp_part_amt")
-    private BigDecimal hospPartAmt;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
deleted file mode 100644
index 2476e190..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-
-public class Yb2304InpatientParam {
-
-    /**
-     * 人员编号
-     */
-    @JsonProperty("psn_no")
-    private String psnNo;
-
-    /**
-     * 就诊凭证类型
-     */
-    @JsonProperty("mdtrt_cert_type")
-    private String mdtrtCertType;
-
-    /**
-     * 就诊凭证编号
-     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
-     */
-    @JsonProperty("mdtrt_cert_no")
-    private String mdtrtCertNo;
-
-    /**
-     * 医疗费总额
-     */
-    @JsonProperty("medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    /**
-     * 个人结算方式
-     */
-    @JsonProperty("psn_setlway")
-    private String psnSetlway;
-
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private String mdtrtId;
-
-    /**
-     * 险种类型
-     */
-    @JsonProperty("insutype")
-    private String insutype;
-
-    /**
-     * 个人账户使用标志
-     */
-    @JsonProperty("acct_used_flag")
-    private String acctUsedFlag;
-
-    /**
-     * 参保地医保区划
-     */
-    @JsonProperty("insuplc_admdvs")
-    private String insuplcAdmdvs;
-
-    /**
-     * 就医地医保区划
-     */
-    @JsonProperty("mdtrtarea_admvs")
-    private String mdtrtareaAdmvs;
-
-    /**
-     * 发票号
-     */
-    @JsonProperty("invono")
-    private String invono;
-
-    /**
-     * 中途结算标志
-     */
-    @JsonProperty("mid_setl_flag")
-    private String midSetlFlag;
-
-    /**
-     * 全自费金额
-     */
-    @JsonProperty("fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    /**
-     * 超限价金额
-     */
-    @JsonProperty("overlmt_selfpay")
-    private BigDecimal overlmtSelfpay;
-
-    /**
-     * 先行自付金额
-     */
-    @JsonProperty("preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    /**
-     * 符合政策范围金额
-     */
-    @JsonProperty("inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    /**
-     * 字段扩展
-     */
-    @JsonProperty("exp_content")
-    private String expContent;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
deleted file mode 100644
index 918888c4..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class Yb2305InpatientOutput {
-
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private String mdtrtId;
-
-    /**
-     * 结算ID
-     */
-    @JsonProperty("setl_id")
-    private String setlId;
-
-    /**
-     * 清算经办机构
-     */
-    @JsonProperty("clr_optins")
-    private String clrOptins;
-
-    /**
-     * 结算时间
-     * 格式：yyyy-MM-dd HH:mm:ss
-     */
-    @JsonProperty("setl_time")
-    private Date setlTime;
-
-    /**
-     * 医疗费总额
-     */
-    @JsonProperty("medfee_sumamt")
-    private BigDecimal medfeeSumamt;
-
-    /**
-     * 全自费金额
-     */
-    @JsonProperty("fulamt_ownpay_amt")
-    private BigDecimal fulamtOwnpayAmt;
-
-    /**
-     * 超限价自费费用
-     */
-    @JsonProperty("overlmt_selfpay")
-    private BigDecimal overlmtSelfpay;
-
-    /**
-     * 先行自付金额
-     */
-    @JsonProperty("preselfpay_amt")
-    private BigDecimal preselfpayAmt;
-
-    /**
-     * 符合政策范围金额
-     */
-    @JsonProperty("inscp_scp_amt")
-    private BigDecimal inscpScpAmt;
-
-    /**
-     * 实际支付起付线
-     */
-    @JsonProperty("act_pay_dedc")
-    private BigDecimal actPayDedc;
-
-    /**
-     * 基本医疗保险统筹基金支出
-     */
-    @JsonProperty("hifp_pay")
-    private BigDecimal hifpPay;
-
-    /**
-     * 基本医疗保险统筹基金支付比例
-     */
-    @JsonProperty("pool_prop_selfpay")
-    private BigDecimal poolPropSelfpay;
-
-    /**
-     * 公务员医疗补助资金支出
-     */
-    @JsonProperty("cvlserv_pay")
-    private BigDecimal cvlservPay;
-
-    /**
-     * 企业补充医疗保险基金支出
-     */
-    @JsonProperty("hifes_pay")
-    private BigDecimal hifesPay;
-
-    /**
-     * 居民大病保险资金支出
-     */
-    @JsonProperty("hifmi_pay")
-    private BigDecimal hifmiPay;
-
-    /**
-     * 职工大额医疗费用补助基金支出
-     */
-    @JsonProperty("hifob_pay")
-    private BigDecimal hifobPay;
-
-    /**
-     * 医疗救助基金支出
-     */
-    @JsonProperty("maf_pay")
-    private BigDecimal mafPay;
-
-    /**
-     * 其他支出
-     */
-    @JsonProperty("oth_pay")
-    private BigDecimal othPay;
-
-    /**
-     * 基金支付总额
-     */
-    @JsonProperty("fund_pay_sumamt")
-    private BigDecimal fundPaySumamt;
-
-    /**
-     * 个人负担总金额
-     */
-    @JsonProperty("psn_part_amt")
-    private BigDecimal psnPartAmt;
-
-    /**
-     * 个人账户支出
-     */
-    @JsonProperty("acct_pay")
-    private BigDecimal acctPay;
-
-    /**
-     * 个人现金支出
-     */
-    @JsonProperty("psn_cash_pay")
-    private BigDecimal psnCashPay;
-
-    /**
-     * 医院负担金额
-     */
-    @JsonProperty("hosp_part_amt")
-    private BigDecimal hospPartAmt;
-
-    /**
-     * 余额
-     */
-    @JsonProperty("balc")
-    private BigDecimal balc;
-
-    /**
-     * 个人账户共济支付金额
-     */
-    @JsonProperty("acct_mulaid_pay")
-    private BigDecimal acctMulaidPay;
-
-    /**
-     * 医药机构结算ID
-     * 存放发送方报文ID
-     */
-    @JsonProperty("medins_setl_id")
-    private String medinsSetlId;
-
-    /**
-     * 伤残人员医疗保障基金支出
-     */
-    @JsonProperty("hifdm_pay")
-    private BigDecimal hifdmPay;
-
-    /**
-     * 人员参保关系ID
-     */
-    @JsonProperty("psn_insu_rlts_id")
-    private String psnInsuRltsId;
-
-    /**
-     * 参保机构行政区划
-     */
-    @JsonProperty("insu_admdvs")
-    private String insuAdmdvs;
-
-    /**
-     * 开始日期
-     */
-    @JsonProperty("begndate")
-    private Date begndate;
-
-    /**
-     * 结算日期
-     */
-    @JsonProperty("enddate")
-    private Date enddate;
-
-    /**
-     * 就诊凭证编号
-     */
-    @JsonProperty("mdtrt_cert_no")
-    private String mdtrtCertNo;
-
-    /**
-     * 结算类别
-     */
-    @JsonProperty("setl_type")
-    private String setlType;
-
-    /**
-     * 本次起付线
-     */
-    @JsonProperty("crt_dedc")
-    private BigDecimal crtDedc;
-
-    /**
-     * 发票号
-     */
-    @JsonProperty("invono")
-    private String invono;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
deleted file mode 100644
index 99bc5924..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.openhis.web.ybmanage.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.math.BigDecimal;
-
-public class Yb2305InpatientParam {
-    /**
-     * 就诊ID
-     */
-    @JsonProperty("mdtrt_id")
-    private BigDecimal mdtrtId;
-
-    /**
-     * 结算ID
-     */
-    @JsonProperty("setl_Id")
-    private BigDecimal setlId;
-
-    /**
-     * 人员编号
-     */
-    @JsonProperty("psn_no")
-    private BigDecimal psnNo;
-
-    /**
-     * 字段扩展
-     */
-    @JsonProperty("exp_content")
-    private String expContent;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
deleted file mode 100644
index b226ad49..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * mapper提供sql服务
- *
- * @author yuxj
- * @date 2025-05-06
- */
-@Repository
-public interface YbElepMapper {
-    /**
-     * 医保电子处方查询
-     *
-     * @param page 分页
-     * @param queryWrapper 查询条件
-     * @return 就诊病人列表
-     */
-    Page<VeriPrescriptionInfoDto> getVeriPrescriptionInfo(@Param("page") Page<VeriPrescriptionInfoDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<VeriPrescriptionParam> queryWrapper);
-
-
-    /**
-     * 处方详细信息获取
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方详细信息
-     */
-    List<VeriPrescriptionDetailInfoDto> getVeriPrescriptionDetailInfo(@Param("prescriptionNo") String prescriptionNo);
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
deleted file mode 100644
index e7050d0b..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.openhis.web.ybmanage.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.openhis.yb.dto.*;
-
-/**
- * 医保Mapper
- *
- * @author GuoRui
- */
-@Repository
-public interface YbMapper {
-
-    /**
-     * 【3101】查询就诊患者信息
-     * 
-     * @param encounterId 就诊ID
-     * @param encounterFlag 是否为就诊登记使用
-     * @param participantType 参与者类型
-     * @param deleteFlag 删除状态
-     * @return 就诊患者信息
-     */
-    Yb3101AdapterEncounterPatientInfo yb3101SelectEncounterPatientInfo(@Param("encounterId") Long encounterId,
-        @Param("encounterFlag") Integer encounterFlag, @Param("participantType") String participantType,
-        @Param("deleteFlag") String deleteFlag);
-
-    /**
-     * 【3101】查询就诊诊断信息
-     *
-     * @param encounterId 就诊ID
-     * @param deleteFlag 删除状态
-     * @return 就诊诊断信息
-     */
-    List<Yb3101AdapterEncounterDiagnoseInfo> yb3101SelectEncounterDiagnoseInfo(@Param("encounterId") Long encounterId,
-        @Param("deleteFlag") String deleteFlag);
-
-    /**
-     * 【3101】查询处方（医嘱）信息
-     *
-     * @param encounterId 就诊ID
-     * @param deleteFlag 删除状态
-     * @param ybMedChrgItmTypeWest 医疗收费项目类别-西药费
-     * @param ybMedChrgItmTypeChineseSlices 医疗收费项目类别-中药饮片费
-     * @param ybMedChrgItmTypeChinese 医疗收费项目类别-中成药费
-     * @return 处方（医嘱）信息
-     */
-    List<Yb3101AdapterOrderInfo> yb3101SelectOrderInfo(@Param("encounterId") Long encounterId,
-        @Param("deleteFlag") String deleteFlag, @Param("ybMedChrgItmTypeWest") String ybMedChrgItmTypeWest,
-        @Param("ybMedChrgItmTypeChineseSlices") String ybMedChrgItmTypeChineseSlices,
-        @Param("ybMedChrgItmTypeChinese") String ybMedChrgItmTypeChinese);
-
-    /**
-     * 【4101A】查询结算清单信息
-     * 
-     * @param paymentId 付款ID
-     * @return 结算清单信息
-     */
-    List<Yb4101AAdapterSettleInfo> yb4101aSelectSettleInfo(@Param("paymentId") Long paymentId);
-
-    /**
-     * 【4101A】查询门诊慢特病诊断信息
-     *
-     * @param paymentId 付款ID
-     * @return 门诊慢特病诊断信息
-     */
-    List<Yb4101AInputOpspdiseinfo> yb4101aSelectOpspdiseinfo(@Param("paymentId") Long paymentId);
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
deleted file mode 100644
index b96e2bad..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.service;
-
-import java.util.Date;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import com.openhis.ybelep.domain.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- *
- * @author yuxj
- * @date 2025-04-17
- */
-public interface IYbEleBaseService {
-
-    /**
-     * 医保电子处方查询
-     *
-     * @param veriPrescriptionParam 查询条件
-     * @param searchKey 模糊查询关键字
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
-     * @param request 请求数据
-     * @return 处方信息
-     */
-    R<?> getVeriPrescriptionInfo(VeriPrescriptionParam veriPrescriptionParam, String searchKey,
-        Integer pageNo, Integer pageSize, HttpServletRequest request);
-
-    /**
-     * 医保电子处方查看
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方详细信息
-     */
-    R<?> getPrescriptionDetailInfo(String prescriptionNo);
-
-    /**
-     * 医保电子处方状态更新（上传）
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方信息
-     */
-    R<?> uploadPrescriptionStatus(String prescriptionNo);
-
-    /**
-     * 医保电子处方拒绝上传
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方信息
-     */
-    R<?> refusePrescriptionStatus(String prescriptionNo);
-
-    /**
-     * 医保电子处方状态更新（撤销）
-     *
-     * @param prescriptionNo 处方号
-     * @param quashReason 撤销原因
-     * @return 处方信息
-     */
-    R<?> quashPrescriptionStatus(String prescriptionNo,String quashReason);
-
-    /**
-     * 做成电子处方上传预核验入参信息
-     *
-     * @param prescriptionNo 处方号
-     * @param tenantId 租户Id
-     * @return 处方信息
-     */
-    PreCheckPrescription makePreCheckPrescription(String prescriptionNo,
-        Integer tenantId);
-
-    /**
-     * 电子处方上传预核验信息保存
-     *
-     * @param pcpResult 电子处方上传预核验信息
-     * @return 电子处方上传预核验信息
-     */
-    void savePreCheckPrescription(PreCheckPrescription pcpResult);
-
-    /**
-     * 电子处方上传预核验响应出参信息保存
-     *
-     * @param pcpResult 电子处方上传预核验响应出参信息
-     * @return
-     */
-    void saveEleVeriPrescriptionOutput(ElepVeriPrescriptionOutput pcpResult);
-
-    /**
-     * 做成电子处方医保电子签名入参
-     *
-     * @param hiRxno 医保处方编号
-     * @param practitionerId 审方药师Id
-     * @param checkDate 审方时间
-     * @param tenantId 租户Id
-     * @return 电子处方医保电子签名入参
-     */
-    ElepSignatureInput makeEleSignature(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId);
-
-    /**
-     * 保存电子处方医保电子签名入参
-     *
-     * @param eSign 电子处方医保电子签名入参信息
-     * @return
-     */
-    void saveEleSignature(ElepSignatureInput eSign);
-
-    /**
-     * 保存电子处方医保电子签名响应出参
-     *
-     * @param esResult 电子处方医保电子签名响应出参信息
-     * @return
-     */
-    void saveEleSignatureOutput(ElepSignatureOutput esResult);
-
-    /**
-     * 做成电子处方上传入参
-     *
-     * @param hiRxno 医保处方编号
-     * @param practitionerId 审方药师Id
-     * @param checkDate 审方时间
-     * @param tenantId 租户Id
-     * @return 电子处方上传入参
-     */
-    ElepUploadInput makeEleUploadInput(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId);
-
-    /**
-     * 保存电子处方上传入参
-     *
-     * @param eleUploadInput 电子处方上传入参信息
-     * @return
-     */
-    void saveEleUploadInput(ElepUploadInput eleUploadInput);
-
-    /**
-     * 保存电子处方上传响应出参
-     *
-     * @param euResult 电子处方上传响应出参信息
-     * @return
-     */
-    void saveEleUploadOutput(ElepUploadOutput euResult);
-
-    /**
-     * 做成电子处方撤销入参
-     *
-     * @param hiRxno 医保处方编号
-     * @param practitionerId 撤销药师Id
-     * @param description 撤销原因
-     * @param checkDate 撤销时间
-     * @param tenantId 租户Id
-     * @return 电子处方撤销入参
-     */
-    ElepRevokeInput makeEleRevokeInput(String hiRxno, Long practitionerId,String description, Date checkDate, Integer tenantId);
-
-    /**
-     * 保存电子处方撤销入参
-     *
-     * @param eleRevokeInput 电子处方撤销入参信息
-     * @return
-     */
-    void saveEleRevokeInput(ElepRevokeInput eleRevokeInput);
-
-    /**
-     * 保存电子处方撤销响应出参
-     *
-     * @param ereResult 电子处方撤销响应出参信息
-     * @return
-     */
-    void saveEleRevokeOutput(ElepRevokeOutput ereResult);
-
-    /**
-     * 做成电子处方信息查询入参
-     *
-     * @param hiRxno 医保处方编号
-     * @return 电子处方信息查询入参
-     */
-    ElepQuerPrescriptionInput makeEleQueryPrescriptionInput(String hiRxno);
-
-    /**
-     * 保存电子处方信息查询入参
-     *
-     * @param eleQueryPreInput 电子处方信息查询入参信息
-     * @return
-     */
-    void saveEleQueryPrescriptionInput(ElepQuerPrescriptionInput eleQueryPreInput);
-
-    /**
-     * 保存电子处方信息查询响应出参信息
-     *
-     * @param emrResult 电子处方信息查询响应出参信息
-     * @return
-     */
-    void saveEleMedResultOut(QueryPrescription emrResult);
-
-    /**
-     * 做成电子处方取药结果查询入参
-     *
-     * @param hiRxno 医保处方编号
-     * @return 电子处方取药结果查询入参
-     */
-    ElepMedresultInput makeEleMedResultInput(String hiRxno);
-
-    /**
-     * 保存电子处方取药结果查询入参
-     *
-     * @param eleMedInput 电子处方取药结果查询入参信息
-     * @return
-     */
-    void saveEleMedResultInput(ElepMedresultInput eleMedInput);
-
-    /**
-     * 保存电子处方取药结果查询响应出参
-     *
-     * @param medResInquiry 电子处方取药结果查询响应出参信息
-     * @return
-     */
-    void saveMedicationResultInquiry(MedicationResultInquiry medResInquiry);
-
-    Map<String,String> getMedTypeAndDoctorName(String prescriptionNo, Integer tenantId);
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
deleted file mode 100644
index 9d81a156..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.service;
-
-import com.core.common.core.domain.R;
-import com.openhis.ybelep.domain.*;
-
-/**
- *
- * @author yuxj
- * @date 2025-04-17
- */
-public interface IYbEleHttpService {
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送医保电子处方注册预核验请求，并处理响应结果
-     *
-     * @param pcp 医保电子处方注册预核验入参实体
-     * @return 医保电子处方注册预核验响应出参实体
-     */
-    R<?> preCheck(PreCheckPrescription pcp, String medType , String dutyDoctorName);
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送电子处方医保电子签名请求，并处理响应结果
-     *
-     * @param eleSign 电子处方医保电子签名入参实体
-     * @return 电子处方医保电子签名响应出参实体
-     */
-    R<?> eleSign(ElepSignatureInput eleSign);
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送电子处方上传请求，并处理响应结果
-     *
-     * @param eleUploadInput 电子处方上传入参实体
-     * @return 电子处方上传响应出参实体
-     */
-    R<?> uploadElePre(ElepUploadInput eleUploadInput);
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送电子处方撤销请求，并处理响应结果
-     *
-     * @param eleRevokeInput 电子处方撤销入参实体
-     * @return 电子处方撤销响应出参实体
-     */
-    R<?> revokePre(ElepRevokeInput eleRevokeInput);
-
-    /**
-     * 采用HTTP协议中的 POST 方法，电子处方信息查询请求，并处理响应结果
-     *
-     * @param eleQueryPreInput 电子处方信息查询入参实体
-     * @return 电子处方信息查询出参实体
-     */
-    R<?> queryPre(ElepQuerPrescriptionInput eleQueryPreInput);
-
-    /**
-     * 采用HTTP协议中的 POST 方法，电子处方取药结果查询请求，并处理响应结果
-     *
-     * @param eleMedInput 电子处方取药结果查询入参实体
-     * @return 电子处方取药结果查询出参实体
-     */
-    R<?> queryMedPre(ElepMedresultInput eleMedInput);
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
deleted file mode 100644
index f5fc7ab7..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.openhis.web.ybmanage.service;
-
-import com.core.common.core.domain.R;
-
-/**
- * 医保Service
- *
- * @author GuoRui
- */
-public interface IYbService {
-
-    /**
-     * 【3101】明细审核事前事中分析服务
-     * 
-     * @param encounterId 就诊ID
-     * @param trigScen 触发场景
-     * @return 结果
-     */
-    R<?> yb3101PreMidAnalysis(Long encounterId, String trigScen);
-
-    /**
-     * 【3103】事前事中服务反馈服务
-     *
-     * @param warnRsltId 违规标识
-     * @param dspoWay 处理方式
-     * @param dspoWayRea 处理原因
-     * @return 结果
-     */
-    R<?> yb3103PreMidFeedback(String warnRsltId, String dspoWay, String dspoWayRea);
-
-    /**
-     * 【4101A】医疗保障基金结算清单信息上传（新）
-     *
-     * @param paymentId 付款ID
-     * @return 结果
-     */
-    R<?> yb4101aUploadFundSettle(Long paymentId);
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
deleted file mode 100644
index 5ad26d5e..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.service.impl;
-
-import com.core.common.core.domain.R;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.yb.dto.BaseInfo;
-import com.openhis.yb.dto.BaseParam;
-import com.openhis.yb.util.YbParamBuilderUtil;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson2.JSON;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.web.ybmanage.config.YbServiceConfig;
-import com.openhis.web.ybmanage.dto.Result;
-import com.openhis.web.ybmanage.service.IYbEleHttpService;
-import com.openhis.ybelep.domain.*;
-
-import java.io.IOException;
-
-/**
- * http请求接口
- *
- * @author yuxj
- * @date 2025-04-17
- */
-@Service
-public class YbEleHttpServiceImpl implements IYbEleHttpService {
-
-    @Autowired
-    YbServiceConfig ybServiceConfig;
-
-    @Autowired
-    YbParamBuilderUtil ybParamBuilderUtil;
-    /**
-     * 采用HTTP协议中的 POST 方法，发送医保电子处方注册预核验请求，并处理响应结果
-     *
-     * @param pcp 医保电子处方注册预核验入参实体
-     * @return 医保电子处方注册预核验响应出参实体
-     */
-    @Override
-    public R<?> preCheck(PreCheckPrescription pcp, String medType , String dutyDoctorName) {
-        ElepVeriPrescriptionOutput pcpResult = new ElepVeriPrescriptionOutput();
-        BaseInfo baseInfo = ybParamBuilderUtil.getBaseInfo(medType, dutyDoctorName);
-        // 发送请求
-        String s = httpPost( SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/preCheckPrescription", pcp,baseInfo);
-        // 参数处理
-        ObjectMapper mapper = new ObjectMapper();
-        Result result = null;
-        try {
-            result = mapper.readValue(s, Result.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (result != null && result.isSuccess()) {
-            pcpResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepVeriPrescriptionOutput.class);;
-            pcpResult.setPrescriptionNo(pcp.getHospRxno());
-            return  R.ok(pcpResult);
-        }else{
-            return  R.fail(result.getMessage());
-        }
-    }
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送电子处方医保电子签名请求，并处理响应结果
-     *
-     * @param eleSign 电子处方医保电子签名入参实体
-     * @return 电子处方医保电子签名响应出参实体
-     */
-    public R<?> eleSign(ElepSignatureInput eleSign) {
-
-        ElepSignatureOutput esResult = new ElepSignatureOutput();
-        // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/signature", eleSign,ybParamBuilderUtil.getBaseInfo("",""));
-        // 参数处理
-        ObjectMapper mapper = new ObjectMapper();
-        Result result = null;
-        try {
-            result = mapper.readValue(s, Result.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (result != null && result.isSuccess()) {
-            esResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepSignatureOutput.class);
-            return  R.ok(esResult);
-        }else{
-            return  R.fail(result.getMessage());
-        }
-    }
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送电子处方上传请求，并处理响应结果
-     *
-     * @param eleUploadInput 电子处方上传入参实体
-     * @return 电子处方上传响应出参实体
-     */
-    @Override
-    public R<?> uploadElePre(ElepUploadInput eleUploadInput) {
-
-        ElepUploadOutput euResult = new ElepUploadOutput();
-        // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/upload", eleUploadInput,ybParamBuilderUtil.getBaseInfo("",""));
-        // 参数处理
-        ObjectMapper mapper = new ObjectMapper();
-        Result result = null;
-        try {
-            result = mapper.readValue(s, Result.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (result != null && result.isSuccess()) {
-            euResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepUploadOutput.class);
-            return  R.ok(euResult);
-        }else{
-            return  R.fail(result.getMessage());
-        }
-    }
-
-    /**
-     * 采用HTTP协议中的 POST 方法，发送电子处方撤销请求，并处理响应结果
-     *
-     * @param eleRevokeInput 电子处方撤销入参实体
-     * @return 电子处方撤销响应出参实体
-     */
-    @Override
-    public R<?> revokePre(ElepRevokeInput eleRevokeInput) {
-
-        ElepRevokeOutput ereResult = new ElepRevokeOutput();
-        // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/revoke", eleRevokeInput,ybParamBuilderUtil.getBaseInfo("",""));
-        // 参数处理
-        ObjectMapper mapper = new ObjectMapper();
-        Result result = null;
-        try {
-            result = mapper.readValue(s, Result.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (result != null && result.isSuccess()) {
-            ereResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepRevokeOutput.class);
-            return  R.ok(ereResult);
-        }else{
-            return  R.fail(result.getMessage());
-        }
-    }
-
-    /**
-     * 采用HTTP协议中的 POST 方法，电子处方信息查询请求，并处理响应结果
-     *
-     * @param eleQueryPreInput 电子处方信息查询入参实体
-     * @return 电子处方信息查询出参实体
-     */
-    @Override
-    public R<?> queryPre(ElepQuerPrescriptionInput eleQueryPreInput) {
-        //拼参数
-//        BaseParam baseParam = new BaseParam();
-//        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(eleQueryPreInput);
-//        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(o);
-        QueryPrescription emrResult = new QueryPrescription();
-        // 发送请求
-        String s =
-                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/querPrescription", eleQueryPreInput,ybParamBuilderUtil.getBaseInfo("",""));
-        // 参数处理
-        ObjectMapper mapper = new ObjectMapper();
-        Result result = null;
-        try {
-            result = mapper.readValue(s, Result.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (result != null && result.isSuccess()) {
-            emrResult = JSON.parseObject(JSON.toJSONString(result.getResult()), QueryPrescription.class);
-            return  R.ok(emrResult);
-        }else{
-            return  R.fail(result.getMessage());
-        }
-    }
-
-    /**
-     * 采用HTTP协议中的 POST 方法，电子处方取药结果查询请求，并处理响应结果
-     *
-     * @param eleMedInput 电子处方取药结果查询入参实体
-     * @return 电子处方取药结果查询出参实体
-     */
-    public R<?> queryMedPre(ElepMedresultInput eleMedInput){
-
-        MedicationResultInquiry medResult = new MedicationResultInquiry();
-        // 发送请求
-        String s =
-                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/medresult", eleMedInput,ybParamBuilderUtil.getBaseInfo("",""));
-        // 参数处理
-        ObjectMapper mapper = new ObjectMapper();
-        Result result = null;
-        try {
-            result = mapper.readValue(s, Result.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (result != null && result.isSuccess()) {
-            medResult = JSON.parseObject(JSON.toJSONString(result.getResult()), MedicationResultInquiry.class);
-            return  R.ok(medResult);
-        }else{
-            return  R.fail(result.getMessage());
-        }
-    }
-    /**
-     * 发送http请求（2025/05/02经测试，若以自带的工具类发送请求失败，故使用原peis系统中成功调用的写法重新封装）
-     * @param url 路径
-     * @param o 参数
-     * @return
-     */
-    private String httpPost(String url, Object o, BaseInfo baseInfo){
-        String resultString = "";
-//        //拼参数
-        BaseParam baseParam = new BaseParam();
-        baseParam.setBaseInfo(baseInfo).setData(o);
-        //创建Http请求
-        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000).setConnectionRequestTimeout(30000)
-                .setSocketTimeout(30000).build();
-        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
-        CloseableHttpResponse response = null;
-        //发送请求
-        try {
-            HttpPost httpPost = new HttpPost(url);
-            StringEntity stringEntity = new StringEntity(JSON.toJSONString(baseParam), ContentType.APPLICATION_JSON);
-            httpPost.setEntity(stringEntity);
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            throw new ServiceException("Http请求异常，请稍后再试。");
-        }
-        finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return resultString;
-    }
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
deleted file mode 100644
index 68ea55c4..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
+++ /dev/null
@@ -1,701 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.service.impl;
-
-import java.util.*;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.core.common.core.domain.R;
-import com.core.common.core.domain.model.LoginUser;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.PrescriptionType;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.service.IContractService;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import com.openhis.web.ybmanage.mapper.YbElepMapper;
-import com.openhis.workflow.domain.ElepMedicationRequest;
-import com.openhis.workflow.service.IElepMedicationRequestService;
-import com.openhis.yb.service.IPerinfoService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.openhis.web.ybmanage.service.IYbEleBaseService;
-import com.openhis.web.ybmanage.util.YbEleParamBuilderUtil;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.service.IRegService;
-import com.openhis.ybelep.domain.*;
-import com.openhis.ybelep.service.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 医保表的增删改查接口
- *
- * @author yuxj
- * @date 2025-04-17
- */
-@Service
-public class YbElepBaseServiceImpl implements IYbEleBaseService {
-
-    @Autowired
-    IRegService iRegService;
-    @Autowired
-    IPerinfoService perinfoService;
-    @Autowired
-    IContractService contractService;
-    @Autowired
-    IPractitionerService iPractitionerService;
-    @Autowired
-    YbEleParamBuilderUtil ybEleUtil;
-    @Autowired
-    IElepVeriPrescriptionInfoService eleVeriPrescriptionInfoService;
-    @Autowired
-    IElepVeriPrescriptionDetailService eleVeriPrescriptionDetailService;
-    @Autowired
-    IElepVeriVisitInfoService eleVeriVisitInfoService;
-    @Autowired
-    IElepVeriDiagnosisInfoService eleVeriDiagnosisInfoService;
-    @Autowired
-    IElepVeriPrescriptionOutputService elePresOutputService;
-    @Autowired
-    IElepSignatureInputService eleSignInfoService;
-    @Autowired
-    IElepSignatureOutputService eleSignOutService;
-    @Autowired
-    IElepUploadInputService eleUploadInputService;
-    @Autowired
-    IElepUploadOutputService eleUploadOutputService;
-    @Autowired
-    IElepRevokeInputService eleRevokeInputService;
-    @Autowired
-    IElepRevokeOutputService eleRevokeOutputService;
-    @Autowired
-    IElepMedresultInputService eleMedResultInputService;
-    @Autowired
-    IElepQuerPrescriptionInputService eleQueryPreInputService;
-    @Autowired
-    IElepMedresultInfoService eleMedResInfoService;
-    @Autowired
-    IElepMedresultInputService eleMedResInputService;
-    @Autowired
-    IElepMedresultDetailService eleMedDetailService;
-    @Autowired
-    YbElepMapper ybElepMapper;
-    @Autowired
-    IElepMedicationRequestService elepMedicationRequestService;
-    @Autowired
-    IElepQuerPrescriptionInfoService eleQuerPrescriptionInfoService;
-    @Autowired
-    IElepQuerPrescriptionDetailService eleQuerPrescriptionDetailService;
-    @Autowired
-    IElepQuerVisitInfoService eleQuerVisitInfoService;
-    @Autowired
-    IElepQuerDiagnosisInfoService eleQuerDiagnosisInfoService;
-    @Resource
-    IPractitionerService practitionerService;
-    @Resource
-    IEncounterService encounterService;
-    @Resource
-    IPatientService patientService;
-
-    /**
-     * 医保电子处方查询
-     *
-     * @param veriPrescriptionParam 查询条件
-     * @param searchKey             模糊查询关键字
-     * @param pageNo                当前页
-     * @param pageSize              每页多少条
-     * @param request               请求数据
-     * @return 处方信息
-     */
-    @Override
-    public R<?> getVeriPrescriptionInfo(VeriPrescriptionParam veriPrescriptionParam, String searchKey, Integer pageNo,
-                                        Integer pageSize, HttpServletRequest request) {
-
-        // 构建查询条件
-        QueryWrapper<VeriPrescriptionParam> queryWrapper =
-                HisQueryUtils.buildQueryWrapper(veriPrescriptionParam, searchKey,
-                        new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.IptOtpNo)),
-                        request);
-
-        // 医保电子处方查询
-        IPage<VeriPrescriptionInfoDto> veriPrescriptionInfo =
-                ybElepMapper.getVeriPrescriptionInfo(new Page<>(pageNo, pageSize), queryWrapper);
-        // 状态转换
-        veriPrescriptionInfo.getRecords().forEach(prescriptionInfoDto -> {
-            prescriptionInfoDto.setStatusEnum_enumText(
-                    EnumUtils.getInfoByValue(RequestStatus.class, prescriptionInfoDto.getStatusEnum()));
-        });
-
-        return R.ok(veriPrescriptionInfo);
-    }
-
-    /**
-     * 医保电子处方查看
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方详细信息
-     */
-    @Override
-    public R<?> getPrescriptionDetailInfo(String prescriptionNo) {
-        // 处方详细查询
-        List<VeriPrescriptionDetailInfoDto> prescriptionDetailInfo =
-                ybElepMapper.getVeriPrescriptionDetailInfo(prescriptionNo);
-        // 状态转换
-        for (VeriPrescriptionDetailInfoDto item : prescriptionDetailInfo) {
-            item.setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, item.getStatusEnum()));
-            item.setRxTypeCode_enumText(EnumUtils.getInfoByValue(PrescriptionType.class, item.getRxTypeCode()));
-        }
-        return R.ok(prescriptionDetailInfo);
-    }
-
-    /**
-     * 医保电子处方状态更新(上传)
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方信息
-     */
-    @Override
-    public R<?> uploadPrescriptionStatus(String prescriptionNo) {
-        // 获取当前登陆用户信息
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 获取医保处方号
-        List<ElepVeriPrescriptionOutput> prescriptionOutput =
-                elePresOutputService.list(new LambdaQueryWrapper<ElepVeriPrescriptionOutput>()
-                        .eq(ElepVeriPrescriptionOutput::getPrescriptionNo, prescriptionNo)
-                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-        if (prescriptionOutput == null) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-        }
-        // 获取电子处方信息
-        List<ElepMedicationRequest> elepMedicationRequest =
-                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionNo);
-        if (elepMedicationRequest == null) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-        }
-        boolean flg;
-        // 更改处方信息
-        for (ElepMedicationRequest item : elepMedicationRequest) {
-            // 医保处方编号
-            item.setHiRxno(prescriptionOutput.get(0).getHiRxno());
-            // 电子处方追溯码
-            item.setRxTraceCode(prescriptionOutput.get(0).getRxTraceCode());
-            // 处方状态
-            item.setStatusEnum(RequestStatus.COMPLETED.getValue());
-            // 审核药师
-            item.setReviewDrId(user.getId());
-            // 审核时间
-            item.setReviewTime(now);
-            flg = elepMedicationRequestService.updateById(item);
-            if (!flg) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-        }
-
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
-    }
-
-    /**
-     * 医保电子处方拒绝上传
-     *
-     * @param prescriptionNo 处方号
-     * @return 处方信息
-     */
-    @Override
-    public R<?> refusePrescriptionStatus(String prescriptionNo) {
-        // 获取当前登陆用户信息
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 获取电子处方信息
-        List<ElepMedicationRequest> elepMedicationRequest =
-                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionNo);
-        if (elepMedicationRequest == null) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-        }
-        boolean flg;
-        // 更改处方信息
-        for (ElepMedicationRequest item : elepMedicationRequest) {
-            // 处方状态
-            item.setStatusEnum(RequestStatus.ENDED.getValue());
-            flg = elepMedicationRequestService.updateById(item);
-            if (!flg) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-        }
-
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
-    }
-
-    /**
-     * 医保电子处方状态更新（撤销）
-     *
-     * @param prescriptionNo 处方号
-     * @param quashReason    撤销原因
-     * @return 处方信息
-     */
-    @Override
-    public R<?> quashPrescriptionStatus(String prescriptionNo, String quashReason) {
-        // 获取当前登陆用户信息
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 获取电子处方信息
-        List<ElepMedicationRequest> elepMedicationRequest =
-                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionNo);
-        if (elepMedicationRequest == null) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
-        }
-        boolean flg;
-        // 更改处方信息
-        for (ElepMedicationRequest item : elepMedicationRequest) {
-            // 处方状态
-            item.setStatusEnum(RequestStatus.STOPPED.getValue());
-            // 撤销药师
-            item.setQuashDrId(user.getId());
-            // 撤销时间
-            item.setQuashTime(now);
-            // 撤销原因
-            item.setQuashReason(quashReason);
-            flg = elepMedicationRequestService.updateById(item);
-            if (!flg) {
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-            }
-        }
-
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
-    }
-
-    /**
-     * 做成电子处方上传预核验入参信息
-     *
-     * @param prescriptionNo 处方号
-     * @param tenantId       租户Id
-     * @return 处方信息
-     */
-    @Override
-    public PreCheckPrescription makePreCheckPrescription(String prescriptionNo,
-                                                         Integer tenantId) {
-
-        // 获取药品请求信息(处方表)
-        List<ElepMedicationRequest> medicationRequestList = elepMedicationRequestService.list(
-                new LambdaQueryWrapper<ElepMedicationRequest>().eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)
-                        .eq(ElepMedicationRequest::getTenantId, tenantId));
-        if (medicationRequestList == null) {
-            return null;
-        }
-        ElepMedicationRequest medicationRequest = medicationRequestList.get(0);
-
-        // 就诊信息
-        Encounter encounter = encounterService.getById(medicationRequest.getEncounterId());
-        //患者信息
-        Patient patient = patientService.getById(encounter.getPatientId());
-        // 获取医保挂号信息     todo  clinicReg可能改成一对多
-        ClinicReg clinicReg = iRegService.getByBusNo(encounter.getBusNo());
-        if (clinicReg == null) {
-            return null;
-        }
-
-        // 获取处方信息
-        PreCheckPrescription prescriptionInfo =
-                ybEleUtil.getEleVeriPrescriptionInfo(medicationRequest, patient, tenantId);
-        // 获取处方明细信息
-        List<ElepVeriPrescriptionDetail> rxdrugdetail =
-                ybEleUtil.getEleVeriPrescriptionDetail(prescriptionNo, tenantId);
-
-        // 获取就诊信息和诊断信息
-        PreCheckPrescription eleVisAndDisInfo =
-                ybEleUtil.getEleVeriVisitAndDiagnosisInfo(medicationRequest, clinicReg, tenantId);
-
-        // 电子处方上传预核验实体赋值
-
-        prescriptionInfo.setRxdrugdetail(rxdrugdetail)
-                .setMdtrtinfo(eleVisAndDisInfo.getMdtrtinfo()).setDiseinfo(eleVisAndDisInfo.getDiseinfo());
-
-        return prescriptionInfo;
-    }
-
-    /**
-     * 电子处方上传预核验信息保存
-     *
-     * @param pcpResult 电子处方上传预核验信息
-     * @return
-     */
-    @Override
-    public void savePreCheckPrescription(PreCheckPrescription pcpResult) {
-
-        //todo dto和表的字段类型不一致
-        ElepVeriPrescriptionInfo prescriptionInfo = new ElepVeriPrescriptionInfo();
-        BeanUtils.copyProperties(pcpResult, prescriptionInfo);
-
-        // 保存处方信息
-        eleVeriPrescriptionInfoService.save(prescriptionInfo);
-        // 保存处方明细信息
-        eleVeriPrescriptionDetailService.saveBatch(pcpResult.getRxdrugdetail());
-        // 保存就诊信息
-        eleVeriVisitInfoService.save(pcpResult.getMdtrtinfo());
-        // 保存诊断信息
-        eleVeriDiagnosisInfoService.save(pcpResult.getDiseinfo());
-    }
-
-
-    /**
-     * 电子处方上传预核验响应出参信息保存
-     *
-     * @param pcpResult 电子处方上传预核验响应出参信息
-     * @return
-     */
-    @Override
-    public void saveEleVeriPrescriptionOutput(ElepVeriPrescriptionOutput pcpResult) {
-        elePresOutputService.save(pcpResult);
-    }
-
-    /**
-     * 做成电子处方医保电子签名入参
-     *
-     * @param hiRxno         医保处方编号
-     * @param practitionerId 审方药师Id
-     * @param checkDate      审方时间
-     * @param tenantId       租户Id
-     * @return 处方信息
-     */
-    @Override
-    public ElepSignatureInput makeEleSignature(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId) {
-
-        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
-                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-        if (pcpResult == null) {
-            return null;
-        }
-        return ybEleUtil.getEleSignatureInput(pcpResult.get(0), practitionerId, checkDate, tenantId);
-    }
-
-    /**
-     * 保存电子处方医保电子签名入参
-     *
-     * @param eSign 电子处方医保电子签名入参信息
-     * @return
-     */
-    @Override
-    public void saveEleSignature(ElepSignatureInput eSign) {
-        eleSignInfoService.save(eSign);
-    }
-
-    /**
-     * 保存电子处方医保电子签名响应出参
-     *
-     * @param esResult 电子处方医保电子签名响应出参信息
-     * @return
-     */
-    @Override
-    public void saveEleSignatureOutput(ElepSignatureOutput esResult) {
-        eleSignOutService.save(esResult);
-    }
-
-    /**
-     * 做成电子处方上传入参
-     *
-     * @param hiRxno         医保处方编号
-     * @param practitionerId 审方药师Id
-     * @param checkDate      审方时间
-     * @param tenantId       租户Id
-     * @return 电子处方上传入参
-     */
-    @Override
-    public ElepUploadInput makeEleUploadInput(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId) {
-
-        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
-                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        List<ElepSignatureOutput> esResult = eleSignOutService
-                .list(new LambdaQueryWrapper<ElepSignatureOutput>().eq(ElepSignatureOutput::getHiRxno, hiRxno)
-                        .orderByDesc(ElepSignatureOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (pcpResult == null || esResult == null) {
-            return null;
-        }
-        return ybEleUtil.getEleUploadInput(pcpResult.get(0), esResult.get(0), practitionerId, checkDate, tenantId);
-    }
-
-    /**
-     * 保存电子处方上传入参
-     *
-     * @param eleUploadInput 电子处方上传入参信息
-     * @return
-     */
-    @Override
-    public void saveEleUploadInput(ElepUploadInput eleUploadInput) {
-        eleUploadInputService.save(eleUploadInput);
-    }
-
-    /**
-     * 保存电子处方上传响应出参
-     *
-     * @param euResult 电子处方上传响应出参信息
-     * @return
-     */
-    @Override
-    public void saveEleUploadOutput(ElepUploadOutput euResult) {
-        eleUploadOutputService.save(euResult);
-    }
-
-    /**
-     * 做成电子处方撤销入参
-     *
-     * @param hiRxno         医保处方编号
-     * @param practitionerId 撤销药师Id
-     * @param description    撤销原因
-     * @param revokeDate     撤销时间
-     * @param tenantId       租户Id
-     * @return 电子处方撤销入参
-     */
-    @Override
-    public ElepRevokeInput makeEleRevokeInput(String hiRxno, Long practitionerId, String description, Date revokeDate,
-                                              Integer tenantId) {
-
-        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
-                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-        if (pcpResult == null) {
-            return null;
-        }
-        List<ElepUploadOutput> euResult = eleUploadOutputService
-                .list(new LambdaQueryWrapper<ElepUploadOutput>().eq(ElepUploadOutput::getHiRxno, pcpResult.get(0).getHiRxno())
-                        .orderByDesc(ElepUploadOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (euResult == null) {
-            return null;
-        }
-
-        return ybEleUtil.getElepRevokeInput(pcpResult.get(0), euResult.get(0), practitionerId, description, revokeDate, tenantId);
-    }
-
-    /**
-     * 保存电子处方撤销入参
-     *
-     * @param eleRevokeInput 电子处方撤销入参信息
-     * @return
-     */
-    @Override
-    public void saveEleRevokeInput(ElepRevokeInput eleRevokeInput) {
-        eleRevokeInputService.save(eleRevokeInput);
-    }
-
-    /**
-     * 保存电子处方撤销响应出参
-     *
-     * @param ereResult 电子处方撤销响应出参信息
-     * @return
-     */
-    @Override
-    public void saveEleRevokeOutput(ElepRevokeOutput ereResult) {
-
-        eleRevokeOutputService.save(ereResult);
-    }
-
-    /**
-     * 做成电子处方信息查询入参
-     *
-     * @param hiRxno 医保处方编号
-     * @return 电子处方信息查询入参
-     */
-    @Override
-    public ElepQuerPrescriptionInput makeEleQueryPrescriptionInput(String hiRxno) {
-
-        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
-                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (pcpResult == null) {
-            return null;
-        }
-        return ybEleUtil.getEleQueryPrescriptionInput(pcpResult.get(0));
-    }
-
-    /**
-     * 保存电子处方信息查询入参
-     *
-     * @param eleQueryPreInput 电子处方信息查询入参信息
-     * @return
-     */
-    @Override
-    public void saveEleQueryPrescriptionInput(ElepQuerPrescriptionInput eleQueryPreInput) {
-        eleQueryPreInputService.save(eleQueryPreInput);
-    }
-
-    /**
-     * 保存电子处方信息查询响应出参信息
-     *
-     * @param emrResult 电子处方信息查询响应出参信息
-     * @return
-     */
-    @Override
-    public void saveEleMedResultOut(QueryPrescription emrResult) {
-
-        ElepQuerPrescriptionInfo prescriptionInfo = new ElepQuerPrescriptionInfo();
-        BeanUtils.copyProperties(emrResult, prescriptionInfo);
-
-        // 保存处方信息
-        eleQuerPrescriptionInfoService.save(prescriptionInfo);
-        // 保存处方明细信息
-        eleQuerPrescriptionDetailService.saveBatch(emrResult.getRxDetlList());
-        // 保存就诊信息
-        eleQuerVisitInfoService.save(emrResult.getRxOtpinfo());
-        // 保存诊断信息
-        eleQuerDiagnosisInfoService.saveBatch(emrResult.getRxDiseList());
-
-    }
-
-    /**
-     * 做成电子处方取药结果查询入参
-     *
-     * @param hiRxno 医保处方编号
-     * @return 电子处方取药结果查询入参
-     */
-    @Override
-    public ElepMedresultInput makeEleMedResultInput(String hiRxno) {
-
-        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
-                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
-                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (pcpResult == null) {
-            return null;
-        }
-
-        return ybEleUtil.getEleMedResultInput(pcpResult.get(0));
-    }
-
-    /**
-     * 保存电子处方取药结果查询入参
-     *
-     * @param eleMedInput 电子处方取药结果查询入参信息
-     * @return
-     */
-    @Override
-    public void saveEleMedResultInput(ElepMedresultInput eleMedInput) {
-        eleMedResInputService.save(eleMedInput);
-    }
-
-    /**
-     * 保存电子处方取药结果查询响应出参
-     *
-     * @param medResInquiry 电子处方取药结果查询响应出参信息
-     * @return
-     */
-    @Override
-    public void saveMedicationResultInquiry(MedicationResultInquiry medResInquiry) {
-        ElepMedresultInfo medresultInfo = new ElepMedresultInfo();
-        BeanUtils.copyProperties(medResInquiry, medresultInfo);
-
-        // 保存处方信息
-        eleMedResInfoService.save(medresultInfo);
-        eleMedDetailService.saveBatch(medResInquiry.getSeltdelts());
-    }
-
-    @Override
-    public Map<String, String> getMedTypeAndDoctorName(String prescriptionNo, Integer tenantId) {
-
-        HashMap<String, String> map = new HashMap<>();
-        // 获取药品请求信息(处方表)
-        List<ElepMedicationRequest> medicationRequestList = elepMedicationRequestService.list(
-                new LambdaQueryWrapper<ElepMedicationRequest>().eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)
-                        .eq(ElepMedicationRequest::getTenantId, tenantId));
-        if (medicationRequestList == null) {
-            return null;
-        }
-        ElepMedicationRequest medicationRequest = medicationRequestList.get(0);
-
-        // 就诊信息
-        Encounter encounter = encounterService.getById(medicationRequest.getEncounterId());
-        //患者信息
-        Patient patient = patientService.getById(encounter.getPatientId());
-        // 获取医保挂号信息     todo  clinicReg可能改成一对多
-        ClinicReg clinicReg = iRegService.getByBusNo(encounter.getBusNo());
-        if (clinicReg == null) {
-            return null;
-        }
-
-        String medicalContractName = "";
-        String insuplcAdmdvs = clinicReg.getInsuplcAdmdvs();
-        if (insuplcAdmdvs.equals("229900") ) {
-            medicalContractName = "省";
-        } else if (insuplcAdmdvs.startsWith("2201")) {
-            medicalContractName = "市";
-        } else {
-            medicalContractName = "省异地";
-        }
-//        List<Contract> contractListByYb = contractService.getContractListByYb();
-//        for (Contract contract : contractListByYb) {
-//            if(insuplcAdmdvs.equals(contract.getAdmVs())){
-//                medicalContractName = contract.getContractName();
-//            }
-//        }
-
-        String insutype = clinicReg.getInsutype();
-
-        String medicalCareType = "";
-        switch (insutype) {
-            case "310":
-            case "320":
-            case "330":
-            case "370":
-                medicalCareType = "职工医保";
-                break;
-            case "340":
-            case "360":
-                medicalCareType = "全公费";
-                break;
-            case "390":
-            case "392":
-            case "391":
-            case "380":
-                medicalCareType = "居民医保";
-                break;
-            case "350":
-            case "410":
-            case "399":
-                medicalCareType = "其他";
-                break;
-            default:
-                medicalCareType = "全自费";
-                break;
-        }
-
-        Practitioner practitioner = iPractitionerService.getById(SecurityUtils.getLoginUser().getPractitionerId());
-
-        map.put("doctorName", practitioner.getName());
-        map.put("medType", medicalContractName + medicalCareType);
-
-        return map;
-    }
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
deleted file mode 100644
index 20e20120..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
+++ /dev/null
@@ -1,407 +0,0 @@
-package com.openhis.web.ybmanage.service.impl;
-
-import java.math.BigDecimal;
-import java.time.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.core.common.core.domain.R;
-import com.core.common.enums.DeleteFlag;
-import com.core.common.enums.TenantOptionDict;
-import com.core.common.exception.ServiceException;
-import com.core.common.utils.StringUtils;
-import com.core.web.util.TenantOptionUtil;
-import com.openhis.common.enums.ParticipantType;
-import com.openhis.common.enums.TherapyTimeType;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.*;
-import com.openhis.web.ybmanage.mapper.YbMapper;
-import com.openhis.web.ybmanage.service.IYbService;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.service.YbHttpUtils;
-
-/**
- * 医保ServiceImpl
- *
- * @author GuoRui
- */
-@Service
-public class YbServiceImpl implements IYbService {
-
-    @Autowired
-    private YbMapper ybMapper;
-    @Autowired
-    private YbHttpUtils ybHttpUtils;
-
-    /**
-     * 【3101】明细审核事前事中分析服务
-     *
-     * @param encounterId 就诊ID
-     * @param trigScen 触发场景
-     * @return 结果
-     */
-    @Override
-    public R<?> yb3101PreMidAnalysis(Long encounterId, String trigScen) {
-        // 验证触发场景
-        if (YbTrigScen.getByValue(trigScen) == null) {
-            throw new ServiceException("请指定触发场景");
-        }
-
-        // 查询就诊患者信息
-        Yb3101AdapterEncounterPatientInfo encounterPatientInfo = ybMapper.yb3101SelectEncounterPatientInfo(encounterId,
-            Whether.YES.getValue(), ParticipantType.REGISTRATION_DOCTOR.getCode(), DeleteFlag.NOT_DELETED.getCode());
-        if (encounterPatientInfo == null) {
-            throw new ServiceException("患者信息不存在");
-        }
-
-        // 查询就诊诊断信息
-        List<Yb3101AdapterEncounterDiagnoseInfo> encounterDiagnoseInfoList =
-            ybMapper.yb3101SelectEncounterDiagnoseInfo(encounterId, DeleteFlag.NOT_DELETED.getCode());
-        if (encounterDiagnoseInfoList.isEmpty()) {
-            throw new ServiceException("诊断信息不存在");
-        }
-
-        // 查询处方（医嘱）信息
-        List<Yb3101AdapterOrderInfo> orderInfoList = ybMapper.yb3101SelectOrderInfo(encounterId,
-            DeleteFlag.NOT_DELETED.getCode(), YbMedChrgItmType.WEST_MEDICINE.getValue(),
-            YbMedChrgItmType.CHINESE_MEDICINE_SLICES_FEE.getValue(), YbMedChrgItmType.CHINESE_MEDICINE_FEE.getValue());
-        if (encounterDiagnoseInfoList.isEmpty()) {
-            throw new ServiceException("处方信息不存在");
-        }
-
-        // 作成诊断信息集合
-        List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos =
-            encounterDiagnoseInfoList.stream().map(this::createYb3101FsiDiagnoseDto).collect(Collectors.toList());
-
-        // 作成处方(医嘱)信息集合
-        List<Yb3101InputFsiOrderDto> fsiOrderDtos =
-            orderInfoList.stream().map(this::createYb3101InputFsiOrderDto).collect(Collectors.toList());
-
-        // 作成就诊信息
-        Yb3101InputFsiEncounterDto fsiEncounterDto =
-            createYb3101InputFsiEncounterDto(encounterPatientInfo, fsiDiagnoseDtos, fsiOrderDtos);
-
-        // 作成参保人信息
-        Yb3101InputPatientDto patientDto = createYb3101InputPatientDto(encounterPatientInfo, fsiEncounterDto);
-
-        // 作成规则分析信息
-        Yb3101InputData data = createYb3101InputData(patientDto, trigScen);
-
-        // 向医保服务发起HTTP请求，获取返回结果
-        Yb3101OutputResult result = ybHttpUtils.yb3101PreMidAnalysis(data);
-
-        // TODO:后续处理需等待门诊住院开发完全后
-
-        return R.ok();
-    }
-
-    /**
-     * 【3103】事前事中服务反馈服务
-     *
-     * @param warnRsltId 违规标识
-     * @param dspoWay 处理方式
-     * @param dspoWayRea 处理原因
-     * @return 结果
-     */
-    @Override
-    public R<?> yb3103PreMidFeedback(String warnRsltId, String dspoWay, String dspoWayRea) {
-        // 验证处理方式
-        if (YbDspoWay.getByValue(dspoWay) == null) {
-            throw new ServiceException("请指定处理方式");
-        }
-
-        // 继续执行医嘱时，处理原因必填
-        if (YbDspoWay.CONTINUE.getValue().equals(dspoWay) && StringUtils.isEmpty(dspoWayRea)) {
-            throw new ServiceException("请填写处理原因");
-        }
-
-        // 作成处理数据
-        Yb3103InputWarn warn =
-            new Yb3103InputWarn().setWarnRsltId(warnRsltId).setDspoWay(dspoWay).setDspoWayRea(dspoWayRea);
-
-        // 作成输入
-        Yb3103InputData data = new Yb3103InputData().setWarnType(YbWarnType.PRE.getValue()).setWarns(List.of(warn));
-
-        // 向医保服务发起HTTP请求
-        ybHttpUtils.yb3103PreMidFeedback(data);
-
-        return R.ok();
-    }
-
-    /**
-     * 【4101A】医疗保障基金结算清单信息上传（新）
-     *
-     * @param paymentId 付款ID
-     * @return 结果
-     */
-    @Override
-    public R<?> yb4101aUploadFundSettle(Long paymentId) {
-        // 查询结算清单信息
-        List<Yb4101AAdapterSettleInfo> settleInfoList = ybMapper.yb4101aSelectSettleInfo(paymentId);
-
-        return R.ok();
-    }
-
-    /**
-     * 【3101】创建诊断信息
-     * 
-     * @param encounterDiagnoseInfo 就诊诊断信息
-     * @return 诊断信息
-     */
-    private Yb3101InputFsiDiagnoseDto
-        createYb3101FsiDiagnoseDto(Yb3101AdapterEncounterDiagnoseInfo encounterDiagnoseInfo) {
-        // 根据住院患者疾病诊断类型代码，判断出入诊断类别，非入院诊断，视为出院诊断
-        String inoutDiseType;
-        if (YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getCode().equals(encounterDiagnoseInfo.getIptDiseTypeCode())) {
-            inoutDiseType = YbInOutDiagType.YB_IN_DIAG_TYPE.getValue();
-        } else {
-            inoutDiseType = YbInOutDiagType.YB_OUT_DIAG_TYPE.getValue();
-        }
-        // 返回诊断信息
-        return new Yb3101InputFsiDiagnoseDto()
-            // 诊断标识：诊断记录唯一标识
-            .setDiseId(encounterDiagnoseInfo.getDiseId())
-            // 出入诊断类别：参考字典表
-            .setInoutDiseType(inoutDiseType)
-            // 主诊断标志：参考字典表
-            .setMaindiseFlag(encounterDiagnoseInfo.getMaindiseFlag())
-            // 诊断排序号：例如：1,2,3…
-            .setDiasSrtNo(encounterDiagnoseInfo.getDiasSrtNo())
-            // 诊断(疾病)编码
-            .setDiseCodg(encounterDiagnoseInfo.getDiseCodg())
-            // 诊断(疾病)名称
-            .setDiseName(encounterDiagnoseInfo.getDiseName())
-            // 诊断日期：格式：yyyy-MM-dd HH:mm:ss
-            .setDiseDate(encounterDiagnoseInfo.getDiseDate());
-    }
-
-    /**
-     * 【3101】创建处方（医嘱）信息
-     *
-     * @param orderInfo 处方（医嘱）信息
-     * @return 处方（医嘱）信息
-     */
-    private Yb3101InputFsiOrderDto createYb3101InputFsiOrderDto(Yb3101AdapterOrderInfo orderInfo) {
-        // 根据治疗类型，判断是否为长期医嘱
-        String longDrordFlag;
-        if (TherapyTimeType.LONG_TERM.getValue().equals(orderInfo.getTherapyEnum())) {
-            longDrordFlag = Whether.YES.getCode();
-        } else {
-            longDrordFlag = Whether.NO.getCode();
-        }
-        // 根据医保类别，判断目录类别
-        String hilistType = null;
-        if (YbMedChrgItmType.WEST_MEDICINE.getValue().equals(orderInfo.getYbType())
-            || YbMedChrgItmType.CHINESE_MEDICINE_FEE.getValue().equals(orderInfo.getYbType())) {
-            hilistType = YbListType.WESTERN_AND_CHINESE_PATENT_MEDICINE.getValue();
-        } else if (YbMedChrgItmType.CHINESE_MEDICINE_SLICES_FEE.getValue().equals(orderInfo.getYbType())) {
-            hilistType = YbListType.IMPORTANT_HERBAL_SLICES.getValue();
-        }
-        return new Yb3101InputFsiOrderDto()
-            // 处方(医嘱)标识：处方(医嘱)记录唯一ID
-            .setRxId(orderInfo.getRxId())
-            // 处方号
-            .setRxno(orderInfo.getRxno())
-            // 组编号
-            .setGrpno(orderInfo.getGrpno())
-            // 是否为长期医嘱：[1=是,0=否]
-            .setLongDrordFlag(longDrordFlag)
-            // 目录类别：参考字典表
-            .setHilistType(hilistType)
-            // 收费类别：参考字典表
-            .setChrgType(orderInfo.getYbType())
-            // 医嘱行为：参考字典表
-            .setDrordBhvr(YbDrordBhvr.OTHER.getValue())
-            // 医保目录代码：国家统一标准编码
-            .setHilistCode(orderInfo.getHilistCode())
-            // 医保目录名称：国家统一标准名称
-            .setHilistName(orderInfo.getHilistName())
-            // 医保目录(药品)剂型：国家统一标准药品剂型
-            .setHilistDosform(orderInfo.getHilistDosform())
-            // 医保目录等级
-            .setHilistLv(orderInfo.getHilistLv())
-            // 医保目录价格，暂时取本系统单价
-            .setHilistPric(orderInfo.getPric())
-            // 医院目录代码
-            .setHosplistCode(orderInfo.getHilistCode())
-            // 医院目录名称
-            .setHosplistName(orderInfo.getHilistName())
-            // 医院目录(药品)剂型
-            .setHosplistDosform(orderInfo.getHilistDosform())
-            // 数量
-            .setCnt(BigDecimal.valueOf(orderInfo.getCnt()))
-            // 单价
-            .setPric(orderInfo.getPric())
-            // 总费用
-            .setSumamt(orderInfo.getSumamt())
-            // 自费金额
-            .setOwnpayAmt(BigDecimal.ZERO) // TODO:从哪取啊，住院有（但表还没建），门诊没有
-            // 自付金额
-            .setSelfpayAmt(BigDecimal.ZERO) // TODO:从哪取啊，住院有（但表还没建），门诊没有
-            // 规格：例如：0.25g×12片/盒
-            .setSpec(orderInfo.getSpec())
-            // 数量单位：例如：盒
-            .setSpecUnt(orderInfo.getSpecUnt())
-            // 医嘱开始日期：格式：yyyy-MM-dd HH:mm:ss
-            .setDrordBegnDate(orderInfo.getDrordBegnDate())
-            // 下达医嘱的科室标识
-            .setDrordDeptCodg(orderInfo.getDrordDeptCodg())
-            // 下达医嘱科室名称
-            .setDrordDeptName(orderInfo.getDrordDeptName())
-            // 开处方(医嘱)医生标识
-            .setDrordDrCodg(orderInfo.getDrordDrCodg())
-            // 开处方(医嘱)医生姓名
-            .setDrordDrName(orderInfo.getDrordDrName())
-            // 开处方(医嘱)医职称：参考字典表
-            .setDrordDrProfttl(orderInfo.getDrordDrProfttl())
-            // 是否当前处方(医嘱)：本次处方(医嘱)标记[1=是,0=否]
-            .setCurrDrordFlag(Whether.YES.getCode());
-    }
-
-    /**
-     * 【3101】创建就诊信息
-     * 
-     * @param encounterPatientInfo 就诊患者信息
-     * @param fsiDiagnoseDtos 诊断信息集合
-     * @param fsiOrderDtos 处方(医嘱)信息集合
-     * @return 就诊信息
-     */
-    private Yb3101InputFsiEncounterDto createYb3101InputFsiEncounterDto(
-        Yb3101AdapterEncounterPatientInfo encounterPatientInfo, List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos,
-        List<Yb3101InputFsiOrderDto> fsiOrderDtos) {
-        // 判断出院时间，如果为空，默认当天下午四点
-        if (encounterPatientInfo.getDscgDate() == null) {
-            encounterPatientInfo.setDscgDate(getFourPmDate(encounterPatientInfo.getAdmDate()));
-        }
-        // 提取主诊断
-        Yb3101InputFsiDiagnoseDto mainDiagnose =
-            fsiDiagnoseDtos.stream().filter(e -> Whether.YES.getCode().equals(e.getMaindiseFlag())).findFirst()
-                .orElse(new Yb3101InputFsiDiagnoseDto());
-        // 计算总费用
-        BigDecimal medfeeSumamt =
-            fsiOrderDtos.stream().map(Yb3101InputFsiOrderDto::getSumamt).reduce(BigDecimal.ZERO, BigDecimal::add);
-        // 作成就诊信息
-        return new Yb3101InputFsiEncounterDto()
-            // 就诊标识：就诊记录唯一ID
-            .setMdtrtId(encounterPatientInfo.getMdtrtId())
-            // 医疗服务机构标识：定点医疗机构ID
-            .setMedinsId(encounterPatientInfo.getMedinsId())
-            // 医疗机构名称
-            .setMedinsName(encounterPatientInfo.getMedinsName())
-            // 医疗机构行政区划编码
-            .setMedinsAdmdvs(encounterPatientInfo.getMedinsAdmdvs())
-            // 医疗服务机构类型：参考字典表
-            .setMedinsType(YbMedinsType.FIXMEDINS_TYPE1.getValue())
-            // 医疗机构等级：参考字典表
-            .setMedinsLv(TenantOptionUtil.getOptionContent(TenantOptionDict.MEDINS_LV))
-            // 入院日期
-            .setAdmDate(encounterPatientInfo.getAdmDate())
-            // 出院日期
-            .setDscgDate(encounterPatientInfo.getDscgDate())
-            // 主诊断编码：例如：I63.9
-            .setDscgMainDiseCodg(mainDiagnose.getDiseCodg())
-            // 主诊断名称：例如：脑梗塞
-            .setDscgMainDiseName(mainDiagnose.getDiseName())
-            // 诊断信息集合
-            .setFsiDiagnoseDtos(fsiDiagnoseDtos)
-            // 医师标识：医生唯一ID
-            .setDrCodg(encounterPatientInfo.getDrCodg())
-            // 入院科室标识：科室唯一ID
-            .setAdmDeptCodg(encounterPatientInfo.getAdmDeptCodg())
-            // 入院科室名称
-            .setAdmDeptName(encounterPatientInfo.getAdmDeptName())
-            // 出院科室标识：科室唯一ID
-            .setDscgDeptCodg(encounterPatientInfo.getDscgDeptCodg())
-            // 出院科室名称
-            .setDscgDeptName(encounterPatientInfo.getDscgDeptName())
-            // 就诊类型：参考字典表
-            .setMedMdtrtType(Optional.ofNullable(YbMedType.getByValue(encounterPatientInfo.getMedType()))
-                .orElse(YbMedType.GENERAL_OUTPATIENT).getYbMedMdtrtType().getValue())
-            // 医疗类别：参考字典表
-            .setMedType(encounterPatientInfo.getMedType())
-            // 处方(医嘱)信息集合
-            .setFsiOrderDtos(fsiOrderDtos)
-            // 生育状态：参考字典表
-            .setMatnStas(YbMatnStas.UNKNOWN.getValue())
-            // 总费用
-            .setMedfeeSumamt(medfeeSumamt)
-            // 自费金额
-            .setOwnpayAmt(encounterPatientInfo.getOwnpayAmt())
-            // 自付金额
-            .setSelfpayAmt(encounterPatientInfo.getSelfpayAmt())
-            // 结算总次数
-            .setSetlTotlnum(encounterPatientInfo.getSetlTotlnum())
-            // 险种：参考字典表
-            .setInsutype(encounterPatientInfo.getInsutype())
-            // 报销标志：参考字典表
-            .setReimFlag(YbPayLoc.PAY_LOC1.getValue())
-            // 异地结算标志：参考字典表
-            .setOutSetlFlag(Whether.NO.getCode());
-    }
-
-    /**
-     * 【3101】创建参保人信息
-     * 
-     * @param encounterPatientInfo 就诊患者信息
-     * @param fsiEncounterDto 就诊信息
-     * @return 参保人信息
-     */
-    private Yb3101InputPatientDto createYb3101InputPatientDto(Yb3101AdapterEncounterPatientInfo encounterPatientInfo,
-        Yb3101InputFsiEncounterDto fsiEncounterDto) {
-        // 作成参保人信息
-        return new Yb3101InputPatientDto()
-            // 参保人标识：参保人唯一ID
-            .setPatnId(encounterPatientInfo.getPatnId())
-            // 姓名
-            .setPatnName(encounterPatientInfo.getPatnName())
-            // 性别：参考字典表
-            .setGend(encounterPatientInfo.getGend())
-            // 出生日期：格式：yyyy-MM-dd
-            .setBrdy(encounterPatientInfo.getBrdy())
-            // 统筹区编码：参保人所属统筹区
-            .setPoolarea(encounterPatientInfo.getPoolarea())
-            // 当前就诊标识：本次就诊记录唯一ID
-            .setCurrMdtrtId(encounterPatientInfo.getMdtrtId())
-            // 就诊信息集合
-            .setFsiEncounterDtos(List.of(fsiEncounterDto));
-    }
-
-    /**
-     * 创建规则分析信息
-     * 
-     * @param patientDto 参保人信息
-     * @param trigScen 触发场景
-     * @return 规则分析信息
-     */
-    private Yb3101InputData createYb3101InputData(Yb3101InputPatientDto patientDto, String trigScen) {
-        // 作成规则分析信息
-        return new Yb3101InputData()
-            // 系统编码：调用方系统简码标识
-            .setSyscode("sys01")
-            // 参保人信息
-            .setPatientDtos(List.of(patientDto))
-            // 触发场景：此值与ruleIds指定其一即可,请优先指定此值
-            .setTrigScen(trigScen);
-
-    }
-
-    /**
-     * 获取指定日期当天的下午四点（16:00）的日期
-     * 
-     * @param inputDate 指定日期
-     * @return 当天的下午四点（16:00）的日期
-     */
-    private Date getFourPmDate(Date inputDate) {
-        ZonedDateTime inputZdt = inputDate.toInstant().atZone(ZoneId.systemDefault());
-        LocalDate datePart = inputZdt.toLocalDate();
-        LocalTime fourPm = LocalTime.of(16, 0);
-        LocalDateTime fourPmLocalDateTime = LocalDateTime.of(datePart, fourPm);
-        ZonedDateTime fourPmZdt = fourPmLocalDateTime.atZone(ZoneId.systemDefault());
-        return Date.from(fourPmZdt.toInstant());
-    }
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
deleted file mode 100644
index 0cf769e4..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.Period;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import com.core.common.enums.DeleteFlag;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.workflow.domain.ElepMedicationRequest;
-import com.openhis.workflow.service.IElepMedicationRequestService;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
-import com.openhis.ybcatalog.service.ICatalogDrugInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.core.common.utils.DateUtils;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.*;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationService;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.service.IRegService;
-import com.openhis.ybelep.domain.*;
-import com.openhis.ybelep.service.IElepVeriPrescriptionInfoService;
-import com.openhis.ybelep.service.IElepVeriVisitInfoService;
-
-/**
- * 医保接口调用工具
- *
- * @author yuxj
- * @date 2025-04-17
- */
-@Component
-public class YbEleParamBuilderUtil {
-
-    /********************* 业务实体服务 *******************/
-
-    // 就诊管理服务
-    @Autowired
-    IEncounterService iEncounterService;
-    @Autowired
-    IElepMedicationRequestService elepMedicationRequestService;
-    // 就诊管理
-    @Autowired
-    IAccountService accountService;
-    @Autowired
-    IMedicationDefinitionService medicationDefinitionService;
-    @Autowired
-    ICatalogDrugInfoService catalogDrugInfoService;
-    @Autowired
-    IEncounterDiagnosisService encounterDiagnosisService;
-    @Autowired
-    IEncounterService encounterService;
-    @Autowired
-    IPatientService patientService;
-    @Autowired
-    IOrganizationService organizationService;
-    @Autowired
-    IPractitionerService practitionerService;
-    @Autowired
-    IPractitionerRoleService practitionerRoleService;
-    @Autowired
-    IConditionService conditionService;
-    @Autowired
-    IConditionDefinitionService conditionDefinitionService;
-
-    /********************* 医保实体服务 *******************/
-    @Autowired
-    IRegService iRegService;
-    @Autowired
-    IElepVeriPrescriptionInfoService eleVerPreInfoService;
-    @Autowired
-    IElepVeriVisitInfoService eleVerVisInfoService;
-
-    /**
-     * 获取处方信息
-     *
-     * @param medicationRequest 处方信息
-     * @param patient           患者信息
-     * @param tenantId          租户Id
-     * @return 处方信息
-     */
-    public PreCheckPrescription getEleVeriPrescriptionInfo(ElepMedicationRequest medicationRequest, Patient patient,
-                                                           Integer tenantId) {
-
-        // 声明处方信息对象
-        PreCheckPrescription elepVeriPrescriptionInfo = new PreCheckPrescription();
-        elepVeriPrescriptionInfo.setMdtrtCertType("02")
-                .setMdtrtCertNo(patient.getIdCard())
-                // 01-定点医疗机构就诊
-                .setBizTypeCode("01").setHospRxno(medicationRequest.getPrescriptionNo())
-                .setRxTypeCode(medicationRequest.getRxTypeCode().toString()).setPrscTime(medicationRequest.getIssueTime())
-                // 处方有效天数
-                .setValiDays(medicationRequest.getValidityDays().toString())
-                // 计算截止时间
-                .setValiEndTime(DateUtils.addDays(medicationRequest.getIssueTime(), medicationRequest.getValidityDays()));
-
-        // 就诊凭证类型为03”时,填写社会保障卡卡号
-        if (elepVeriPrescriptionInfo.getMdtrtCertType() == YbMdtrtCertType.MDTRT_CERT_TYPE03.getValue()) {
-
-            Account account = accountService.getOne(
-                    new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, medicationRequest.getEncounterId())
-                            .eq(Account::getTypeCode, AccountType.SOCIAL_SECURITY_CARD.getValue())
-                            .eq(Account::getTenantId, tenantId));
-            if (account == null) {
-                return null;
-            }
-            // 设置社会保障卡号
-            elepVeriPrescriptionInfo.setCardSn(account.getNo());
-        }
-
-        // todo 药品类目数（剂数）：西药、中成药时为药品的类目数量
-        // 西药、中成药对应的处方类别list
-        List<Integer> westernOrChineseList = new ArrayList<>();
-        westernOrChineseList.add(Integer.parseInt(YbRxItemTypeCode.WESTERN_MEDICINE.getValue()));
-        westernOrChineseList.add(Integer.parseInt(YbRxItemTypeCode.CHINESE_PATENT_MEDICINE.getValue()));
-
-        // 调用 count 方法
-        Long countWesternOrChinese = elepMedicationRequestService
-                .selectWesternOrChineseCount(medicationRequest.getPrescriptionNo(), westernOrChineseList, tenantId);
-        // 西药、中成药时为药品的类目数量
-        elepVeriPrescriptionInfo.setRxDrugCnt(countWesternOrChinese.toString())
-                .setRxUsedWayCodg(medicationRequest.getMedRoute())
-                .setRxUsedWayName(YbDrugMedWay.getByValue(medicationRequest.getMedRoute()).getDescription());
-
-        return elepVeriPrescriptionInfo;
-    }
-
-    /**
-     * 获取处方明细信息
-     *
-     * @param prescriptionNo 处方号
-     * @param tenantId       租户Id
-     * @return 处方明细信息
-     */
-    public List<ElepVeriPrescriptionDetail> getEleVeriPrescriptionDetail(String prescriptionNo, Integer tenantId) {
-
-        // 查询该处方所有中药饮片
-        List<ElepMedicationRequest> materialObjs = elepMedicationRequestService.list(new LambdaQueryWrapper<ElepMedicationRequest>()
-                .eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo).eq(ElepMedicationRequest::getTenantId, tenantId));
-        // 未查到返回空
-        if (materialObjs == null) {
-            return null;
-        }
-
-        List<ElepVeriPrescriptionDetail> eleDetList = new ArrayList<>();
-
-        // 遍历 materialObjs 列表
-        for (ElepMedicationRequest materialObj : materialObjs) {
-            CatalogDrugInfo mObj = catalogDrugInfoService.getOne(new LambdaQueryWrapper<CatalogDrugInfo>()
-                    .eq(CatalogDrugInfo::getMedicalCatalogCode, materialObj.getMedicationId()).orderByDesc(CatalogDrugInfo::getCreatedAt).last("LIMIT 1"));
-            // 未查到返回空
-            if (mObj == null) {
-                return null;
-            }
-
-            ElepVeriPrescriptionDetail eleObj = new ElepVeriPrescriptionDetail();
-            eleObj.setMedListCodg(mObj.getMedicalCatalogCode())
-                    .setDrugGenname(mObj.getRegisteredName()).setDrugDosform(mObj.getDrugForm())
-                    .setDrugSpec(mObj.getDrugSpecification()).setMedcBegntime(materialObj.getEffectiveDoseStart())
-                    .setMedcEndtime(materialObj.getEffectiveDoseEnd())
-                    .setMedcDays(materialObj.getDispensePerDuration().toString())
-                    .setDrugDosunt(materialObj.getUnitCode()).setDrugCnt(materialObj.getQuantity().toString())
-                    // todo 医院审批标志，配合目录的限制使用标志使用（目前吉林省不启用）,暂时先写死
-                    .setHospApprFlag("0")
-                    // 院内内部处方号
-                    .setPrescriptionNo(prescriptionNo)
-                    .setRxItemTypeCode(materialObj.getRxItemTypeCode().toString())
-                    .setRxItemTypeName(YbRxItemTypeCode.getByValue(materialObj.getRxItemTypeCode().toString()).getDescription())
-                    .setMedcWayCodg(materialObj.getMedRoute())
-                    .setMedcWayDscr(YbDrugMedWay.getByValue(materialObj.getMedRoute()).getDescription())
-                    .setSinDoscnt(materialObj.getMedDosage().stripTrailingZeros().toPlainString()).setSinDosunt(materialObj.getMedDosageUnitCode())
-                    .setUsedFrquCodg(materialObj.getMedFrequency())
-                    .setUsedFrquName(YbUsedFrqu.getByValue(materialObj.getMedFrequency()).getDescription());
-
-            eleDetList.add(eleObj);
-        }
-
-        return eleDetList;
-    }
-
-    /**
-     * 获取就诊信息和诊断信息
-     *
-     * @param medicationRequest 处方信息
-     * @param clinicReg         医保挂号保存的信息
-     * @param tenantId          租户Id
-     * @return 处方明细信息
-     */
-    public PreCheckPrescription getEleVeriVisitAndDiagnosisInfo(ElepMedicationRequest medicationRequest,
-                                                                ClinicReg clinicReg, Integer tenantId) {
-        // 电子处方上传预核验信息
-        PreCheckPrescription preCheckPrescription = new PreCheckPrescription();
-
-        // 获取就诊诊断信息
-        EncounterDiagnosis encDiagObjs =
-                encounterDiagnosisService.getOne(new LambdaQueryWrapper<EncounterDiagnosis>()
-                        .eq(EncounterDiagnosis::getEncounterId, medicationRequest.getEncounterId())
-                        .eq(EncounterDiagnosis::getTenantId, tenantId).eq(EncounterDiagnosis::getConditionId,medicationRequest.getConditionId())
-                        .eq(EncounterDiagnosis::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
-        // 就诊管理
-        Encounter encounter = encounterService.getOne(new LambdaQueryWrapper<Encounter>()
-                .eq(Encounter::getId, medicationRequest.getEncounterId()));
-        // 患者信息
-        Patient patient = patientService.getOne(new LambdaQueryWrapper<Patient>()
-                .eq(Patient::getId, encounter.getPatientId()).eq(Patient::getTenantId, tenantId));
-        // 医生所属科室
-        Organization organization = organizationService.getOne(new LambdaQueryWrapper<Organization>()
-                .eq(Organization::getId, medicationRequest.getOrgId()).eq(Organization::getTenantId, tenantId));
-        // 就诊诊断所属科室
-        Organization orgDis = organizationService.getOne(new LambdaQueryWrapper<Organization>()
-                .eq(Organization::getId, encounter.getOrganizationId()).eq(Organization::getTenantId, tenantId));
-        // 医生信息
-        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
-                .eq(Practitioner::getId, medicationRequest.getPrescribingDrId()).eq(Practitioner::getTenantId, tenantId));
-        // 医生详细信息
-        Practitioner praRole = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
-                .eq(Practitioner::getId, medicationRequest.getPrescribingDrId())
-                .eq(Practitioner::getTenantId, tenantId));
-        // 医生所属科室信息
-        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
-                .eq(Organization::getId, praRole.getOrgId()).eq(Organization::getTenantId, tenantId));
-        if (encDiagObjs == null || encounter == null || patient == null || organization == null || orgDis == null
-                || practitioner == null || praRole == null || orgDor == null) {
-            return null;
-        }
-        // 门诊/住院判断
-        String otpIptFlag = "";
-        if (encounter.getClassEnum() == EncounterClass.AMB.getValue()) {
-            otpIptFlag = YbEncounterClass.AMB.getValue();
-        } else if (encounter.getClassEnum() == EncounterClass.IMP.getValue()) {
-            otpIptFlag = YbEncounterClass.IMP.getValue();
-        }
-
-        String fixmedinsCode = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
-        String fixmedinsName = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_NAME);
-
-        // 1-输入-就诊信息
-        ElepVeriVisitInfo eleInfo = new ElepVeriVisitInfo();
-        // 诊断信息
-        Condition condition = conditionService.getOne(new LambdaQueryWrapper<Condition>()
-                .eq(Condition::getId, encDiagObjs.getConditionId()).eq(Condition::getTenantId, tenantId));
-        // 诊断定义
-        ConditionDefinition cdObj = conditionDefinitionService.getOne(new LambdaQueryWrapper<ConditionDefinition>()
-                .eq(ConditionDefinition::getId, condition.getDefinitionId())
-                .eq(ConditionDefinition::getTenantId, tenantId));
-        if (condition == null || cdObj == null) {
-            return null;
-        }
-        // 以挂号时间为截至时间，计算年龄
-        BigDecimal age = calculateAge(patient.getBirthDate(), clinicReg.getBegntime());
-        eleInfo.setFixmedinsCode(fixmedinsCode).setFixmedinsName(fixmedinsName).setMdtrtId(clinicReg.getMdtrtId())
-                .setIptOtpNo(clinicReg.getIptOtpNo()).setOtpIptFlag(otpIptFlag)
-                .setPsnNo(clinicReg.getPsnNo()).setPatnName(patient.getName()).setCertno(patient.getIdCard())
-                // todo 目前默认都是身份证:01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setPatnAge(age.toString())
-                .setPrscDeptName(organization.getName()).setPrscDeptCode(organization.getYbNo())
-                .setDrCode(practitioner.getYbNo()).setPrscDrName(praRole.getName())
-                .setDrProfttlCodg(practitioner.getDrProfttlCode())
-                .setDrProfttlName(YbDoctorTitle.getByValue(practitioner.getDrProfttlCode()).getDescription())
-                .setDrDeptCode(orgDor.getYbNo()).setDrDeptName(orgDor.getName()).setMdtrtTime(encounter.getReceptionTime())
-                // 院内内部处方号
-                .setPrescriptionNo(medicationRequest.getPrescriptionNo());
-        if (clinicReg.getMedType() == null) {
-            eleInfo.setMedType("11");
-        } else {
-
-            eleInfo.setMedType(clinicReg.getMedType());
-        }
-
-        // 性别
-        if (patient.getGenderEnum() == AdministrativeGender.FEMALE.getValue()) {
-            eleInfo.setGend(YbGender.FEMALE.getValue());
-        } else if (patient.getGenderEnum() == AdministrativeGender.MALE.getValue()) {
-            eleInfo.setGend(YbGender.MALE.getValue());
-        } else {
-            eleInfo.setGend(YbGender.UNKNOWN.getValue());
-        }
-        // 特殊病种标志 2025/05/24 该字段不为空是，特殊病种给yes
-        if (encDiagObjs.getMedTypeCode() != null) {
-            eleInfo.setSpDiseFlag(Whether.YES.getCode());
-        } else {
-            eleInfo.setSpDiseFlag(Whether.NO.getCode());
-        }
-        // 主诊断标记
-//        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
-            eleInfo.setMaindiagCode(cdObj.getYbNo()).setMaindiagName(cdObj.getName());
-//        }
-
-        // 2-输入-诊断信息
-        ElepVeriDiagnosisInfo eleVerDisInfo = new ElepVeriDiagnosisInfo();
-
-        eleVerDisInfo.setDiagType(cdObj.getTypeCode()).setDiagSrtNo(encDiagObjs.getDiagSrtNo().toString())
-                .setDiagCode(cdObj.getYbNo()).setDiagName(cdObj.getName()).setDiagDept(orgDis.getName())
-                .setDiagDrNo(practitioner.getYbNo()).setDiagDrName(praRole.getName())
-                .setDiagTime(encounter.getReceptionTime())
-                // 院内内部处方号
-                .setPrescriptionNo(medicationRequest.getPrescriptionNo());
-        // 主诊断标记
-//        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
-        eleVerDisInfo.setMaindiagFlag(Whether.YES.getValue().toString());
-//        } else {
-//            eleVerDisInfo.setMaindiagFlag(Whether.NO.getValue().toString());
-//        }
-
-        preCheckPrescription.setMdtrtinfo(eleInfo).setDiseinfo(eleVerDisInfo);
-
-        return preCheckPrescription;
-
-    }
-
-    /**
-     * 做成电子处方医保电子签名入参
-     *
-     * @param pcpResult      电子处方上传预核验的相响应参数
-     * @param practitionerId 审方药师Id
-     * @param checkDate      审方时间
-     * @param tenantId       租户Id
-     * @return 处方信息
-     */
-    public ElepSignatureInput getEleSignatureInput(ElepVeriPrescriptionOutput pcpResult, Long practitionerId,
-                                                   Date checkDate, Integer tenantId) {
-
-        SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String targetDateStr = targetFormat.format(checkDate);
-
-        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String outputPath = optionJson.getString(CommonConstants.Option.OUTPUT_PATH);
-        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
-        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
-
-        // 审方药师信息
-        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
-                .eq(Practitioner::getUserId, practitionerId).eq(Practitioner::getTenantId, tenantId));
-        // 审方药师所属科室信息
-        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
-                .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
-
-        // 电子处方上传预核验-输入-输入-就诊信息
-        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
-                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
-            return null;
-        }
-        // 原始待签名处方信息
-        JSONObject cpdata = new JSONObject();
-        // 1 rxTraceCode 处方追溯码 字符型 20 Y
-        cpdata.put("rxTraceCode", pcpResult.getRxTraceCode());
-        // 2 hiRxno 医保处方编号 字符型 30 Y
-        cpdata.put("hiRxno", pcpResult.getHiRxno());
-        // 3 mdtrtId 医保就诊 ID 字符型 30 Y
-        cpdata.put("mdtrtId", eleVerVisInfo.get(0).getMdtrtId());
-        // 4 patnName 患者姓名 字符型 40 Y
-        cpdata.put("patnName", eleVerVisInfo.get(0).getPatnName());
-        // 5 psnCertType 人员证件类型 字符型 6 Y Y //todo 默认身份证:01
-        cpdata.put("psnCertType", YbIdDocumentType.RESIDENT_ID_CARD.getValue());
-        // 6 certno 证件号码 字符型 50 Y
-        cpdata.put("certno", eleVerVisInfo.get(0).getCertno());
-        // 7 fixmedinsName 定点医疗机构名称 字符型 200 Y
-        cpdata.put("fixmedinsName", fixmedinsName);
-        // 8 fixmedinsCode 定点医疗机构编号 字符型 20 Y
-        cpdata.put("fixmedinsCode", fixmedinsCode);
-        // 9 drCode 开方医保医师代码 字符型 20 Y
-        cpdata.put("drCode", eleVerVisInfo.get(0).getDrCode());
-        // 10 prscDrName 开方医师姓名 字符型 50 Y
-        cpdata.put("prscDrName", eleVerVisInfo.get(0).getPrscDrName());
-        // 11 pharDeptName 审方药师科室名称 字符型 50 Y
-        cpdata.put("pharDeptName", orgDor.getName());
-        // 12 pharDeptCode 审方药师科室编号 字符型 30 Y
-        cpdata.put("pharDeptCode", orgDor.getYbNo());
-        // 13 pharProfttlCodg 审方药师职称编码 字符型 20 Y N
-        cpdata.put("pharProfttlCodg", practitioner.getDrProfttlCode() == null ? "" : practitioner.getDrProfttlCode());
-        // 14 pharProfttlName 审方药师职称名称 字符型 20
-        cpdata.put("pharProfttlName", practitioner.getDrProfttlCode() == null ? ""
-                : YbPharmacistTitle.getByValue(practitioner.getDrProfttlCode()).getDescription());
-        // 15 pharCode 审方医保药师代码 字符型 20 Y
-        cpdata.put("pharCode", practitioner.getYbNo());
-        // 16 pharCertType 审方药师证件类型 字符型 6 Y N
-        cpdata.put("pharCertType", "");
-        // 17 pharCertno 审方药师证件号码 字符型 50 N
-        cpdata.put("pharCertno", "");
-        // 18 pharName 审方药师姓名 字符型 50 Y
-        cpdata.put("pharName", practitioner.getName());
-        // 19 pharPracCertNo 审方药师执业资格证号 字符型 50
-        cpdata.put("pharPracCertNo", "");
-        // 20 pharChkTime 医疗机构药师审方时间 日期时间型 Y yyyy-MM-dd HH:mm:ss
-        cpdata.put("pharChkTime", targetDateStr);
-        // 使用 TreeMap 对键进行排序
-        TreeMap<String, Object> sortedMap = new TreeMap<>();
-        for (String key : cpdata.keySet()) {
-            sortedMap.put(key, cpdata.get(key));
-        }
-        // 重新构建排序后的 JSONObject
-        JSONObject sortedCpdata = new JSONObject(sortedMap);
-
-        // 将 cpdata 转换为 JSON 字符串
-        String jsonString = sortedCpdata.toString();
-
-        // 将 JSON 字符串编码为 Base64 字符串
-        String base64EncodedString = Base64.getEncoder().encodeToString(jsonString.getBytes());
-
-        // 获取当前日期
-        LocalDate currentDate = LocalDate.now();
-        // 定义格式（yyyyMMdd）
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        // 格式化日期
-        String formattedDate = currentDate.format(formatter);
-
-
-        String folderPath = outputPath + formattedDate + "\\"; // Windows 绝对路径，注意末尾的反斜杠
-        String fileName = pcpResult.getPrescriptionNo() + ".pdf"; // 文件名由处方号拼接而成
-        // 拼接完整的文件路径
-        String filePath = folderPath + fileName;
-        // 调用方法读取文件内容并获取 Base64 字符值
-        String base64Content = fileToBase64(filePath);
-
-        ElepSignatureInput eleSinIn = new ElepSignatureInput();
-        eleSinIn.setFixmedinsCode(fixmedinsCode).setOriginalValue(base64EncodedString).setOriginalRxFile(base64Content)
-                // 医保处方编号
-                .setHiRxno(pcpResult.getHiRxno()).setPrescriptionNo(pcpResult.getPrescriptionNo());
-
-        return eleSinIn;
-
-    }
-
-    /**
-     * 做成电子处方上传入参
-     *
-     * @param pcpResult      电子处方上传预核验的相响应参数
-     * @param esResult       电子处方医保电子签名响应出参
-     * @param practitionerId 审方药师Id
-     * @param checkDate      审方时间
-     * @param tenantId       租户Id
-     * @return 电子处方上传入参
-     */
-    public ElepUploadInput getEleUploadInput(ElepVeriPrescriptionOutput pcpResult, ElepSignatureOutput esResult,
-                                             Long practitionerId, Date checkDate, Integer tenantId) {
-        SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String targetDateStr = targetFormat.format(checkDate);
-
-        // 审方药师信息
-        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
-                .eq(Practitioner::getUserId, practitionerId).eq(Practitioner::getTenantId, tenantId));
-        // 审方药师所属科室信息
-        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
-                .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
-
-        // 电子处方上传预核验-输入-输入-就诊信息
-        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
-                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
-            return null;
-        }
-
-        ElepUploadInput eleUploadInput = new ElepUploadInput();
-        eleUploadInput.setRxTraceCode(pcpResult.getRxTraceCode()).setHiRxno(pcpResult.getHiRxno())
-                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPatnName(eleVerVisInfo.get(0).getPatnName())
-                // todo 默认身份类型是身份证：01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno()).setPatnName(eleVerVisInfo.get(0).getPatnName())
-                .setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode()).setFixmedinsName(eleVerVisInfo.get(0).getFixmedinsName())
-                .setDrCode(eleVerVisInfo.get(0).getDrCode()).setPrscDrName(eleVerVisInfo.get(0).getPrscDrName())
-                .setPharDeptCode(orgDor.getYbNo()).setPharDeptName(orgDor.getName()).setPharCode(practitioner.getYbNo())
-                .setPharName(practitioner.getName()).setPharChkTime(targetDateStr).setRxFile(esResult.getRxFile())
-                .setSignDigest(esResult.getSignDigest()).setPharProfttlCodg(practitioner.getDrProfttlCode()).setPharProfttlName(YbPharmacistTitle.getByValue(practitioner.getDrProfttlCode()).getDescription());
-
-        return eleUploadInput;
-
-    }
-
-    /**
-     * 做成电子处方撤销入参
-     *
-     * @param pcpResult      电子处方上传预核验的相响应参数
-     * @param euResult       电子处方上传响应出参
-     * @param practitionerId 撤销药师Id
-     * @param description    撤销原因
-     * @param revokeDate     撤销时间
-     * @param tenantId       租户Id
-     * @return 电子处方撤销入参
-     */
-    public ElepRevokeInput getElepRevokeInput(ElepVeriPrescriptionOutput pcpResult, ElepUploadOutput euResult,
-                                              Long practitionerId, String description, Date revokeDate, Integer tenantId) {
-
-        // 撤销时药师信息
-        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
-                .eq(Practitioner::getUserId, practitionerId).eq(Practitioner::getTenantId, tenantId));
-        // 撤销时药师所属科室信息
-        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
-                .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
-
-        // 电子处方上传预核验-输入-输入-就诊信息
-        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
-                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
-            return null;
-        }
-
-        ElepRevokeInput eleRevokeInput = new ElepRevokeInput();
-        eleRevokeInput.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode())
-                .setDrCode(practitioner.getYbNo()).setUndoDrName(practitioner.getName())
-                // todo 默认身份类型是身份证：01
-                .setUndoDrCertno(practitioner.getPharPracCertNo())
-                .setUndoDrCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setUndoRea(description).setUndoTime(revokeDate);
-
-        return eleRevokeInput;
-    }
-
-    /**
-     * 做成电子处方信息查询入参
-     *
-     * @param pcpResult 电子处方上传预核验的相响应参数
-     * @return 电子处方信息查询入参
-     */
-    public ElepQuerPrescriptionInput getEleQueryPrescriptionInput(ElepVeriPrescriptionOutput pcpResult) {
-
-        // 电子处方上传预核验-输入-输入-就诊信息
-        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
-                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (eleVerVisInfo == null) {
-            return null;
-        }
-
-        ElepQuerPrescriptionInput eleQueryPreObj = new ElepQuerPrescriptionInput();
-        eleQueryPreObj.setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode()).setHiRxno(pcpResult.getHiRxno())
-                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPsnName(eleVerVisInfo.get(0).getPatnName())
-                // todo 默认身份类型是身份证：01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno());
-
-        return eleQueryPreObj;
-    }
-
-    /**
-     * 做成电子处方信息查询入参
-     *
-     * @param pcpResult 电子处方上传预核验的相响应参数
-     * @return 电子处方信息查询入参
-     */
-    public ElepMedresultInput getEleMedResultInput(ElepVeriPrescriptionOutput pcpResult) {
-
-        // 电子处方上传预核验-输入-输入-就诊信息
-        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
-                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
-                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
-
-        if (eleVerVisInfo == null) {
-            return null;
-        }
-
-        ElepMedresultInput eleQueryPreObj = new ElepMedresultInput();
-        eleQueryPreObj.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode())
-                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPsnName(eleVerVisInfo.get(0).getPatnName())
-                // todo 默认身份类型是身份证：01
-                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno());
-
-        return eleQueryPreObj;
-    }
-
-    /**
-     * 获取BigDecimal类型的年龄
-     *
-     * @param birthDate 出生日期
-     * @param beginTime 计算起始日期
-     * @return 年龄
-     */
-    public static BigDecimal calculateAge(Date birthDate, Date beginTime) {
-        // 验证输入参数是否为空
-        if (Objects.isNull(birthDate)) {
-            System.out.println("出生年月日不能为空！");
-            return null;
-        }
-        // 验证输入参数是否为空
-        if (Objects.isNull(beginTime)) {
-            beginTime = DateUtils.getNowDate();
-        }
-
-        // 将 Date 转换为 LocalDate
-        LocalDate localBirthDate = birthDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        LocalDate localBeginTime = beginTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-
-        // 计算出生日期到起始日期之间的年份差异
-        Period period = Period.between(localBirthDate, localBeginTime);
-
-        int years = period.getYears();
-
-        // 检查是否已经过了生日，如果没有过，则年份减一
-        boolean hasBirthdayPassed = !localBirthDate.plusYears(years).isAfter(localBeginTime);
-        if (!hasBirthdayPassed) {
-            years--;
-        }
-
-        return BigDecimal.valueOf(years);
-    }
-
-    /**
-     * 读取文件内容并获取其 Base64 字符值
-     *
-     * @param filePath 文件路径
-     * @return 文件内容的 Base64 字符值
-     */
-    public static String fileToBase64(String filePath) {
-        File file = new File(filePath);
-        if (!file.exists()) {
-            System.out.println("文件不存在！");
-            return null;
-        }
-
-        FileInputStream fileInputStream = null;
-        try {
-            fileInputStream = new FileInputStream(file);
-            byte[] fileContent = new byte[(int) file.length()];
-            fileInputStream.read(fileContent);
-            return Base64.getEncoder().encodeToString(fileContent);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (fileInputStream != null) {
-                try {
-                    fileInputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
deleted file mode 100644
index e4fa81d3..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.vo;
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 【3203】后台计算结果  DB映射实体
- *
- * @author SunJQ
- * @date 2025-04-29
- */
-@Data
-public class Financial3203VO {
-    // 清算人次
-    private Long psntime;
-    // 医保认可费用总额（数值型，16位含2位小数，必填）
-    private BigDecimal medSumfee;
-    // 现金支付金额（数值型，16位含2位小数，必填）
-    private BigDecimal cashPayamt;
-    // 个人账户支出（数值型，16位含2位小数，必填）
-    private BigDecimal acctPay;
-    /** 医疗费用总额 */
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-    private BigDecimal acctGjPay;
-    /** 现金支付总额 */
-    private BigDecimal selfPayCash;
-    /** 微信支付总额 */
-    private BigDecimal selfPayVx;
-    /** 阿里支付总额 */
-    private BigDecimal selfPayAli;
-    /** 银行卡支付总额 */
-    private BigDecimal selfPayUnion;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
deleted file mode 100644
index 9eacbafa..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.openhis.web.ybmanage.vo;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-public class Settlement3201DetailVO {
-
-    /** 医疗费用总额 */
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-    private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-    private BigDecimal acctGjPay;
-    /** 定点医药机构结算笔数 */
-    private Integer fixMedInsSetlCnt;
-
-    private String contractNo;
-
-    private Integer insutype;
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
deleted file mode 100644
index 7f867de1..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.vo;
-
-import java.math.BigDecimal;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-/**
- * 【3201】后台计算结果 DB映射实体
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-public class Settlement3201VO {
-    /** 医疗费用总额 */
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-    private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-    private BigDecimal acctGjPay;
-    /** 定点医药机构结算笔数 */
-    private Integer fixMedInsSetlCnt;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
deleted file mode 100644
index a075dcfc..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.ybmanage.vo;
-
-import java.math.BigDecimal;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-/**
- * 【3201】后台计算结果 DB映射实体
- *
- * @author SunJQ
- * @date 2025-04-15
- */
-@Data
-public class Settlement3202VO {
-    /** 医疗费用总额 */
-
-    private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-
-    private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-
-    private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-
-    private BigDecimal acctGjPay;
-    /** 现金支付总额 */
-
-    private BigDecimal selfPayCash;
-    /** 微信支付总额 */
-
-    private BigDecimal selfPayVx;
-    /** 阿里支付总额 */
-
-    private BigDecimal selfPayAli;
-    /** 银行卡支付总额 */
-
-    private BigDecimal selfPayUnion;
-    /** 定点医药机构结算笔数 */
-
-    private Integer fixMedInsSetlCnt;
-}
-- 
Gitee


From b77fd8cc9d42538709bbc1fa576d31ec52b1babe Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Wed, 3 Sep 2025 11:27:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctorStationElepPrescriptionController.java |  14 +-
 .../web/ybmanage/config/YbServiceConfig.java  |  92 ++
 .../web/ybmanage/controller/YbController.java | 785 ++++++++++++++++++
 .../web/ybmanage/dto/Catalogue1312Output.java | 118 +++
 .../ybmanage/dto/Clearing3205AWebParam.java   |  28 +
 .../ybmanage/dto/Clinic2207OrderOutput.java   | 114 +++
 .../dto/Clinic2208UnSetlInfoOutput.java       | 109 +++
 .../web/ybmanage/dto/ClinicReg2201Output.java |  67 ++
 .../ybmanage/dto/Financial13203WebParam.java  |  49 ++
 .../ybmanage/dto/Financial3202WebParam.java   |  10 +
 .../ybmanage/dto/Financial3203AWebParam.java  |  36 +
 .../ybmanage/dto/Financial3203WebParam.java   |  42 +
 .../dto/FinancialHand3203AWebParam.java       |  33 +
 .../web/ybmanage/dto/Info1101Output.java      |  70 ++
 .../web/ybmanage/dto/PatientInfoDto.java      |  85 ++
 .../com/openhis/web/ybmanage/dto/Result.java  |  48 ++
 .../openhis/web/ybmanage/dto/ResultBody.java  |  40 +
 .../ybmanage/dto/Settlement3201WebParam.java  |  39 +
 .../ybmanage/dto/Settlement3202WebParam.java  |  47 ++
 .../ybmanage/dto/Settlement3209AWebParam.java |  35 +
 .../dto/VeriPrescriptionDetailInfoDto.java    |  98 +++
 .../ybmanage/dto/VeriPrescriptionInfoDto.java |  55 ++
 .../ybmanage/dto/VeriPrescriptionParam.java   |  23 +
 .../ybmanage/dto/Yb2301FeeDetailParam.java    | 196 +++++
 .../ybmanage/dto/Yb2301InpatientOutput.java   | 124 +++
 .../ybmanage/dto/Yb2302InpatientParam.java    |  31 +
 .../ybmanage/dto/Yb2303InpatientOutput.java   | 258 ++++++
 .../web/ybmanage/dto/Yb2303InpatientPram.java | 119 +++
 .../dto/Yb2304InpatientExpContentParam.java   |  31 +
 .../ybmanage/dto/Yb2304InpatientOutput.java   | 279 +++++++
 .../ybmanage/dto/Yb2304InpatientParam.java    | 111 +++
 .../ybmanage/dto/Yb2305InpatientOutput.java   | 221 +++++
 .../ybmanage/dto/Yb2305InpatientParam.java    |  31 +
 .../web/ybmanage/mapper/YbElepMapper.java     |  44 +
 .../openhis/web/ybmanage/mapper/YbMapper.java |  72 ++
 .../ybmanage/service/IYbEleBaseService.java   | 227 +++++
 .../ybmanage/service/IYbEleHttpService.java   |  64 ++
 .../web/ybmanage/service/IYbService.java      |  38 +
 .../service/impl/YbEleHttpServiceImpl.java    | 255 ++++++
 .../service/impl/YbElepBaseServiceImpl.java   | 701 ++++++++++++++++
 .../ybmanage/service/impl/YbServiceImpl.java  | 407 +++++++++
 .../ybmanage/util/YbEleParamBuilderUtil.java  | 657 +++++++++++++++
 .../web/ybmanage/vo/Financial3203VO.java      |  40 +
 .../ybmanage/vo/Settlement3201DetailVO.java   |  23 +
 .../web/ybmanage/vo/Settlement3201VO.java     |  30 +
 .../web/ybmanage/vo/Settlement3202VO.java     |  47 ++
 46 files changed, 6038 insertions(+), 5 deletions(-)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
index 42619971..ead5b4e9 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
@@ -3,19 +3,23 @@
  */
 package com.openhis.web.doctorstation.controller;
 
-import java.util.List;
-
+import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
+import com.openhis.web.doctorstation.dto.*;
+import com.openhis.web.ybmanage.service.IYbEleHttpService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
-import com.openhis.web.doctorstation.dto.DeletePrescriptionInfoParam;
-import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam;
+import com.openhis.common.enums.AdviceOpType;
+import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.List;
+
 /**
  * 医生站-电子处方 controller
  */
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
new file mode 100644
index 00000000..1a002a06
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * 本地部署方案-医保配置类
+ *
+ * @author SunJQ
+ * @date 2025-04-11
+ */
+@Configuration
+@ConstructorBinding
+@PropertySource("classpath:properties/yb.properties")
+@ConfigurationProperties(prefix = "ybapp.config")
+@EnableConfigurationProperties
+public class YbServiceConfig {
+
+    private String url;
+
+    private String eleUrl;
+
+    private String key;
+
+    private String timeOut;
+
+    private String clrOptins;// 清算机构；必须是准确的6位编码，可以从3206A交易获取
+
+    private String fixmedinsCode;// 定点医药机构编号,如H22010200XXX
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getEleUrl() {
+        return eleUrl;
+    }
+
+    public void setEleUrl(String eleUrl) {
+        this.eleUrl = eleUrl;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getTimeOut() {
+        return timeOut;
+    }
+
+    public void setTimeOut(String timeOut) {
+        this.timeOut = timeOut;
+    }
+
+    public YbServiceConfig(String url, String key, String timeOut) {
+        this.url = url;
+        this.key = key;
+        this.timeOut = timeOut;
+    }
+
+    public YbServiceConfig() {}
+
+    public String getClrOptins() {
+        return clrOptins;
+    }
+
+    public void setClrOptins(String clrOptins) {
+        this.clrOptins = clrOptins;
+    }
+
+    public String getFixmedinsCode() {
+        return fixmedinsCode;
+    }
+
+    public void setFixmedinsCode(String fixmedinsCode) {
+        this.fixmedinsCode = fixmedinsCode;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
new file mode 100644
index 00000000..795456ca
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
@@ -0,0 +1,785 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.controller;
+
+import java.io.*;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.IPatientService;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.service.IContractService;
+import com.openhis.web.ybmanage.dto.Financial3202WebParam;
+import com.openhis.web.ybmanage.dto.FinancialHand3203AWebParam;
+import com.openhis.web.ybmanage.service.IYbService;
+import com.openhis.yb.domain.FinancialApplyRecord;
+import com.openhis.yb.domain.InfoPerson;
+import com.openhis.yb.dto.*;
+import com.openhis.yb.service.IPerinfoService;
+import com.openhis.yb.service.YbDao;
+import com.openhis.yb.service.YbHttpUtils;
+import com.openhis.yb.util.CommonConstant;
+
+/**
+ * 医保接口
+ *
+ * @author SunJQ
+ * @date 2025-04-11
+ */
+@RestController
+@RequestMapping("/yb-request")
+public class YbController {
+
+    @Autowired
+    YbDao ybDao;
+    @Autowired
+    YbHttpUtils ybHttpUtils;
+    @Autowired
+    IPatientService patientService;
+    @Autowired
+    IPerinfoService iPerinfoService;
+    @Autowired
+    IEncounterService iEncounterService;
+    @Autowired
+    IContractService iContractService;
+    @Autowired
+    IConditionDefinitionService iConditionDefinitionService;
+    @Autowired
+    ResourceLoader resourceLoader;
+    @Autowired
+    IYbService ybService;
+
+    /**
+     * 【9001】
+     *
+     * @param practitionerId 参与者Id
+     * @param mac 加密后的mac地址
+     * @return 结果
+     */
+    @PostMapping("/sign")
+    public R<?> sign(String practitionerId, String mac, String ip) {
+        Sign signParam = ybDao.getSignParam(practitionerId, mac, ip);
+        if (signParam == null) {
+            throw new ServiceException("未生成签到参数");
+        }
+        List<Contract> contractList = iContractService.getContractListByYb();
+        List<Sign9001Result> signResultList = new ArrayList<>();
+        for (Contract contract : contractList) {
+            Sign9001Result signResult = ybHttpUtils.sign(signParam, contract);
+            if (signResult != null) {
+                ybDao.saveSign(signParam, signResult);
+                signResultList.add(signResult);
+            }
+        }
+        if (contractList.size() == signResultList.size()) {
+            return R.ok("签到成功");
+        } else {
+            return R.fail("签到失败");
+        }
+    }
+
+    /**
+     * 【1101】
+     *
+     * @param certType 就诊id
+     * @param certNo 租户id
+     * @return 结果
+     */
+    @PostMapping("/per-info")
+    public R<?> getPerInfo(String certType, String certNo, String psnCertType) {
+        Info1101ReadcardParam readcard = ybDao.getReadCard(certType, certNo);
+        Info1101Output perInfo = ybHttpUtils.getPerInfo(readcard);
+        if (perInfo != null) {
+            ybDao.saveReadcardAndPerinfo(readcard, perInfo);
+            PatientInfoDto patient = ybDao.getPatent(perInfo);
+            return R.ok(patient);
+        } else {
+            return R.fail("未查询到患者信息");
+        }
+    }
+
+    /**
+     * 【5301】获取人员慢病
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    @GetMapping("/getConditionDefinition")
+    public R<?> getSpecialDia(Long encounterId) {
+
+        Encounter encounter = iEncounterService.getById(encounterId);
+        if (encounter == null) {
+            throw new ServiceException("未获取到就诊信息");
+        }
+        Patient patient = patientService.getById(encounter.getPatientId());
+        if (patient == null) {
+            throw new ServiceException("未获取到患者信息");
+        }
+        InfoPerson perinfo =
+            iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), SecurityUtils.getLoginUser().getTenantId());
+        if (perinfo == null) {
+            throw new ServiceException("未连接医保获取患者信息");
+        }
+        Info1101Output info1101Output = JSON.parseObject(perinfo.getResult1101(), Info1101Output.class);
+        List<Info5301SpecialConditionResult> feedetail = info1101Output.getFeedetail();
+
+        Date currentDate = new Date();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        List<Info5301SpecialConditionResult> currentRangeResults = new ArrayList<>();
+        for (Info5301SpecialConditionResult info5301SpecialConditionResult : feedetail) {
+            try {
+                Date begndate = dateFormat.parse(info5301SpecialConditionResult.getBegndate());
+                Date enddate = dateFormat.parse(info5301SpecialConditionResult.getEnddate());
+
+                // 检查当前日期是否在 begndate 和 enddate 之间
+                if (currentDate.compareTo(begndate) >= 0 && currentDate.compareTo(enddate) <= 0) {
+                    currentRangeResults.add(info5301SpecialConditionResult);
+                }
+            } catch (ParseException e) {
+                e.printStackTrace(); // 处理日期解析异常
+            }
+        }
+        List<ConditionDefinition> conditionDefinitions = null;
+        if (!currentRangeResults.isEmpty()) {
+            conditionDefinitions = iConditionDefinitionService.list(
+                new LambdaUpdateWrapper<ConditionDefinition>().in(ConditionDefinition::getYbNo, currentRangeResults
+                    .stream().map(Info5301SpecialConditionResult::getOpspDiseCode).collect(Collectors.toList())));
+        }
+        return R.ok(conditionDefinitions);
+    }
+
+    /**
+     * 【3301】目录对照
+     *
+     * @param tableName 就诊id
+     * @param id 付款id
+     * @return 结果
+     */
+    @PostMapping("/directory-cross-check")
+    public R<?> directoryCheck(String tableName, Long id) {
+        MedicalDirectory3301Param medicalDirectory3301Param = ybDao.getMedicalDirectory3301Param(tableName, id);
+        ArrayList<MedicalDirectory3301Param> list = new ArrayList<>();
+        list.add(medicalDirectory3301Param);
+        MedicalDirectory3301ListParam medicalDirectory3301ListParam = new MedicalDirectory3301ListParam();
+        medicalDirectory3301ListParam.setData(list);
+        Result resultInfo = ybHttpUtils.directoryCheck(medicalDirectory3301ListParam);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveDirectoryHistory(tableName, id, 3301, medicalDirectory3301Param);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 【3302】目录对照撤销
+     *
+     * @param tableName 就诊id
+     * @param id 付款id
+     * @return 结果
+     */
+    @PostMapping("/directory-un-check")
+    public R<?> directoryUnCheck(String tableName, Long id) {
+
+        MedicalDirectory3302Param medicalDirectory3302Param = ybDao.getMedicalDirectory3302Param(tableName, id);
+        Result resultInfo = ybHttpUtils.directoryUnCheck(medicalDirectory3302Param);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveDirectoryHistory(tableName, id, 3302, medicalDirectory3302Param);
+        }
+
+        return R.ok();
+    }
+
+    /**
+     * 【3201】对总账
+     *
+     * @param settlement3201WebParam 3201入参条件
+     * @return 结果
+     */
+    @PostMapping("/reconcile")
+    public R<?> reconcileGeneralLedger(@RequestBody Settlement3201WebParam settlement3201WebParam) {
+        Financial3201Param financial3201Param = ybDao.getFinancial3201Param(settlement3201WebParam);
+        Result result = ybHttpUtils.reconcileGeneralLedger(financial3201Param);
+        if (result.getCode().equals(CommonConstant.SC_OK_200)) {
+            // System.out.println(JSON.parseObject(JSON.toJSONString(result.getResult())));
+            Financial3201Output financial3201Output =
+                JSON.parseObject(JSON.toJSONString(result.getResult()), Financial3201Output.class);
+            ybDao.saveReconcileGeneralLedger(financial3201Output, financial3201Param);
+            if ("0".equals(financial3201Output.getStmtRslt())) {
+                return R.ok("OK");
+            }
+            return R.ok(financial3201Output.getStmtRsltDscr());
+        }
+        return R.fail("医保app通讯失败");
+    }
+
+    /**
+     * 【3201】对总账列表
+     *
+     * @param settlement3201WebParam 3201入参条件
+     * @return 结果
+     */
+    @GetMapping("/reconcile-list")
+    public R<?> reconcileGeneralLedgerList(Settlement3201WebParam settlement3201WebParam) {
+        return R.ok(ybDao.reconcileGeneralLedgerDetail(settlement3201WebParam));
+
+    }
+
+    /**
+     * 【3202】对明细账
+     *
+     * @param settlement3202WebParam 3202查询数据
+     * @return 结果
+     */
+    @PostMapping("/reconcile-detail-list")
+    public R<?> reconcileGeneralLedgerDetail(@RequestBody Settlement3202WebParam settlement3202WebParam) {
+        List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlement3202WebParam);
+
+        // FinancialSettlement3202Param financial3202Param =
+        // ybDao.getFinancialSettlement3202Param(settlement3202WebParam);
+        // FinancialSettlement3202Result resultInfo = ybHttpUtils.reconcileGeneralLedgerDetail(financial3202Param);
+
+        return R.ok(financial3202FileParams);
+    }
+
+    /**
+     * 【3202】生成txt文件
+     *
+     * @param financial3202WebParam 3202查询数据
+     * @return 结果
+     */
+    @PostMapping("/reconcile-detail-txt")
+    public void reconcileGeneralLedgerDetailTxt(@RequestBody Financial3202WebParam financial3202WebParam,
+        HttpServletResponse response) throws IOException {
+        List<Financial3202FileParam> financial3202FileParams =
+            ybDao.paymentCompareYbSettle(financial3202WebParam.getSettlementIdList());
+        // String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new
+        // Date().getTime()+".txt";
+        // String filePath = "C:\\Users\\bjbUser\\Desktop\\"+new Date().getTime()+".txt";
+        // try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
+        // for (Financial3202FileParam item : financial3202FileParams) {
+        // // 假设每个实体都有toString()方法返回逗号分隔的属性
+        // // 或者你可以自定义获取属性的方式
+        // System.out.println(item.toString());
+        // String line = item.getTxt();
+        // writer.write(line);
+        // writer.newLine();
+        // }
+        // }
+        // return R.ok("生成txt文件成功，文件路径："+filePath);
+
+        // 2. 设置响应头（强制下载，指定文件名）
+        String fileName = "financial_report_" + System.currentTimeMillis() + ".txt";
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Disposition",
+            "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8").replace("+", "%20") + "\"");
+
+        // 3. 直接通过输出流写入数据（避免创建临时文件）
+        try (OutputStream os = response.getOutputStream();
+            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
+
+            for (Financial3202FileParam item : financial3202FileParams) {
+                writer.write(item.getTxt()); // 写入每行数据
+                writer.newLine(); // 换行
+            }
+            writer.flush();
+        }
+        System.out.println(fileName);
+        // return R.ok("生成txt文件成功，文件名称："+fileName);
+    }
+
+    /**
+     *
+     * @param file 文件流
+     * @param filename 文件名
+     * @return
+     */
+    @PostMapping(value = "/file-up")
+    public R<?> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("filename") String filename) {
+        // 1. 基础校验
+        if (file.isEmpty()) {
+            return R.fail("文件不能为空");
+        }
+        if (!file.getOriginalFilename().endsWith(".zip")) {
+            return R.fail("仅支持ZIP格式文件");
+        }
+
+        // 2. 调用Service处理业务逻辑
+        try {
+            ResponseEntity<String> fileResult = ybHttpUtils.upload9101(file, filename);
+            return R.ok(fileResult);
+        } catch (Exception e) {
+            return R.fail("处理失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 触发3202接口
+     * 
+     * @param settlementIdList 3202查询数据
+     * @return
+     * @throws IOException
+     */
+    @PostMapping("/reconcile-general")
+    public R<?> reconcileGeneral(List<String> settlementIdList, String filePath, String fileQuryNo, String setlOptins,
+        String clrType) {
+        // todo:这里需要考虑3302接口的参数是后台合计还是由前台传入，因为这个参数还要和txt文件对应（既需要txt中的数据还需要db表中的一些数据），
+        // String filePath = SecurityUtils.getLoginUser().getOptionJson().getString("filePath")+new
+        // Date().getTime()+".txt";
+        List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
+        Resource resource = resourceLoader.getResource(filePath); // 或使用 "file:" 读取绝对路径
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.getInputStream()))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (!line.trim().isEmpty()) {
+                    String[] fields = line.split("\t"); // 按 Tab 分割字段
+                    if (fields.length == 7) {
+                        BigDecimal medfeeSumamt = new BigDecimal(fields[3]);
+                        BigDecimal fundPaySumamt = new BigDecimal(fields[4]);
+                        BigDecimal acctPay = new BigDecimal(fields[5]);
+                        Financial3202FileParam person = new Financial3202FileParam(fields[0], fields[1], fields[2],
+                            medfeeSumamt, fundPaySumamt, acctPay, fields[6]);
+                        financial3202FileParamList.add(person);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new ServiceException("IO异常，异常信息：" + e.getMessage());
+        }
+
+        BigDecimal medfeeSumamt = BigDecimal.ZERO;// 医疗费总额
+        BigDecimal fundPaySumamt = BigDecimal.ZERO;// 基金支付
+        // Integer fixmedinsSetlCnt = 0;//结算笔数
+
+        if (financial3202FileParamList.isEmpty()) {
+            throw new ServiceException("未获取txt文件中实体");
+        }
+        for (Financial3202FileParam financial3202FileParam : financial3202FileParamList) {
+            medfeeSumamt = medfeeSumamt.add(financial3202FileParam.getMedfeeSumamt());
+            fundPaySumamt = fundPaySumamt.add(financial3202FileParam.getFundPaySumamt());
+        }
+
+        FinancialSettlement3202Param financialSettlement3202Param =
+            ybDao.getFinancialSettlement3202Param(settlementIdList, medfeeSumamt, fundPaySumamt);
+        if (financialSettlement3202Param == null) {
+            throw new ServiceException("未生成3202参数");
+        }
+        financialSettlement3202Param.setClrType(clrType).setFileQuryNo(fileQuryNo)
+            .setRefdSetlFlag(financial3202FileParamList.get(0).getRefdSetlFlag()).setSetlOptins(setlOptins);
+
+        FinancialSettlement3202Result financialSettlement3202Result =
+            ybHttpUtils.reconcileGeneralLedgerDetail(financialSettlement3202Param);
+        if (financialSettlement3202Result == null) {
+            throw new ServiceException("未收到3202参数");
+        }
+
+        return R.ok(financialSettlement3202Result);
+    }
+
+    /**
+     * 【3209A】第三方数据查询
+     *
+     * @param settlement3209AWebParam 3209A入参条件
+     * @return 结果
+     */
+    @PostMapping("/three-part-search-err")
+    public R<?> threePartSearch(Settlement3209AWebParam settlement3209AWebParam) {
+
+        FinancialSettlement3209AParam financialSettlement3209AParam =
+            ybDao.getFinancialSettlement3209AParam(settlement3209AWebParam);
+        List<FinancialSettlement3209AResult> list = ybHttpUtils.threePartSearch(financialSettlement3209AParam);
+
+        return R.ok();
+    }
+
+    /**
+     * 【3203A】清算申请(吉林省)
+     *
+     * @param financial3203AWebParam 3203A入参条件
+     * @return 结果
+     */
+    @PostMapping("/apply-financial-clearing")
+    public R<?> applyFinancialClearing(@RequestBody Financial3203AWebParam financial3203AWebParam) {
+        Financial3203AParam financial3203AParam = ybDao.getFinancial3203AParam(financial3203AWebParam);
+        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
+        if (!StringUtils.isEmpty(s)) {
+            Result<?> result = JSON.parseObject(s, Result.class);
+            if (result != null) {
+                if (result.getCode() == 200) {
+                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
+                        String.valueOf(result.getResult()));
+                    return R.ok(result);
+                }
+            }
+        }
+        return R.fail(s);
+    }
+
+    /**
+     * 【3203A】清算申请(吉林省)
+     *
+     * @param financialClearing3203AWebParam 3203A入参条件
+     * @return 结果
+     */
+    @PostMapping("/auto-apply-financial-clearing")
+    public R<?> autoApplyFinancialClearing(@RequestBody FinancialClearing3203AWebParam financialClearing3203AWebParam) {
+
+        Settlement3202WebParam settlement3202WebParam = new Settlement3202WebParam();
+        settlement3202WebParam.setStmtBegnDate(String.valueOf(financialClearing3203AWebParam.getStmtBegnDate()));
+        settlement3202WebParam.setStmtEndDate(String.valueOf(financialClearing3203AWebParam.getStmtEndDate()));
+        settlement3202WebParam.setClrType(financialClearing3203AWebParam.getClrType());
+        settlement3202WebParam.setSetlOptins(financialClearing3203AWebParam.getSetlOptins());
+        List<Financial3202FileParam> financial3202FileParams = ybDao.paymentCompareYbSettle(settlement3202WebParam);
+
+        Financial3203AParam financial3203AParam = ybDao.getFinancial3203AParam(financial3202FileParams,
+            String.valueOf(financialClearing3203AWebParam.getStmtBegnDate()),
+            String.valueOf(financialClearing3203AWebParam.getStmtEndDate()),
+            financialClearing3203AWebParam.getClrType(), financialClearing3203AWebParam.getSetlOptins());
+        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
+        if (!StringUtils.isEmpty(s)) {
+            Result<?> result = JSON.parseObject(s, Result.class);
+            if (result != null) {
+                if (result.getCode() == 200) {
+                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
+                        String.valueOf(result.getResult()));
+                    return R.ok(result);
+                }
+            }
+        }
+        return R.fail(s);
+    }
+
+    /**
+     * 【3203A】手动清算申请(吉林省)
+     *
+     * @param financialHand3203AWebParam 3203A入参条件
+     * @return 结果
+     */
+    @PostMapping("/hand-operated-apply-financial-clearing")
+    public R<?> handOperatedApplyFinancialClearing(@RequestBody FinancialHand3203AWebParam financialHand3203AWebParam) {
+
+        Financial3203AParam financial3203AParam = new Financial3203AParam();
+
+        financial3203AParam.setClrType(financialHand3203AWebParam.getClrType());
+        financial3203AParam.setMedfeeSumamt(financialHand3203AWebParam.getMedfeeSumamt());
+        financial3203AParam.setMedSumfee(financialHand3203AWebParam.getMedSumfee());
+        financial3203AParam.setAcctPay(financialHand3203AWebParam.getAcctPay());
+        financial3203AParam.setCashPayamt(financialHand3203AWebParam.getCashPayamt());
+        financial3203AParam.setFundAppySum(financialHand3203AWebParam.getFundAppySum());
+        financial3203AParam.setClrOptins(financialHand3203AWebParam.getClrOptins());
+
+        ybDao.getFinancial3203AParamForTime(financial3203AParam,
+            String.valueOf(financialHand3203AWebParam.getBegndate()),
+            String.valueOf(financialHand3203AWebParam.getEnddate()));
+        String s = ybHttpUtils.applyFinancialClearing(financial3203AParam);
+        if (!StringUtils.isEmpty(s)) {
+            Result<?> result = JSON.parseObject(s, Result.class);
+            if (result != null) {
+                if (result.getCode() == 200) {
+                    ybDao.save3203AFinancialClearingApplycation(financial3203AParam,
+                        String.valueOf(result.getResult()));
+                    return R.ok(result);
+                }
+            }
+        }
+        return R.fail(s);
+    }
+
+    /**
+     * 清算申请记录(吉林省)
+     *
+     * @param
+     * @return 结果
+     */
+    @GetMapping("/apply-financial-clearing-list")
+    public R<?> getApplyFinancialClearingList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return R.ok(ybDao.getFinancial3203APage(searchKey, pageNo, pageSize, request));
+    }
+
+    /**
+     * 【3204A】清算申请撤销(吉林省)
+     *
+     * @param clrAppyEvtId 3203A入参条件
+     * @return 结果
+     */
+    @GetMapping("/apply-un-clearing")
+    public R<?> cancelFinancialClearing(String clrAppyEvtId, String clrOptins) {
+        Financial3204Param financial3204Param = new Financial3204Param();
+        FinancialApplyRecord financialApplyRecord = ybDao.getFinancial3204ParamByClrAppyEvtId(clrAppyEvtId);
+        financial3204Param.setClrOptins(clrOptins).setClrAppyEvtId(financialApplyRecord.getOutResult());
+        Result resultInfo = ybHttpUtils.cancelFinancialClearing(financial3204Param);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.save3204AFinancialClearingApplycation(clrAppyEvtId, clrOptins);
+            return R.ok("撤销成功");
+        }
+        return R.fail("撤销失败");
+    }
+
+    /**
+     * 【3205A】清算申请状态查询
+     *
+     * @param clearing3205AWebParma 3205A入参条件
+     * @return 结果
+     */
+    @PostMapping("/get-clearing-status")
+    public R<?> getFinancialClearingStatus(Clearing3205AWebParma clearing3205AWebParma) {
+
+        Clearing3205AParma clearing3205AParma = ybDao.getClearing3205AParma(clearing3205AWebParma);
+        Clearing3205AResult clearing3205AResult = ybHttpUtils.getFinancialClearingStatus(clearing3205AParma);
+
+        return R.ok(clearing3205AResult);
+    }
+
+    /**
+     * 【3501】商品盘存上传
+     *
+     * @param id 供应申请id
+     * @return 结果
+     */
+    @PostMapping("/upload-inventory-count")
+    public R<?> uploadInventoryCount(Long id) {
+
+        MedicalInventory3501Param medicalInventory3501Param =
+            ybDao.getMedicalInventory3501Param(id, SecurityUtils.getLoginUser().getTenantId());
+        Result resultInfo = ybHttpUtils.uploadInventoryCount(medicalInventory3501Param);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveInventoryCheckRecord(medicalInventory3501Param, resultInfo.getMessage());
+            return R.ok();
+        }
+        ybDao.saveInventoryCheckRecord(medicalInventory3501Param, resultInfo.getMessage());
+        return R.fail();
+    }
+
+    /**
+     * 【3502】商品信息变更
+     *
+     * @param id 供应申请id
+     * @param invChgType 变更类型 参考枚举
+     * @return 结果
+     */
+    @PostMapping("/upload-inventory")
+    public R<?> updateInventoryCount(Long id, String invChgType) {
+
+        MedicalInventory3502Param medicalInventory3502Param =
+            ybDao.getMedicalInventory3502Param(id, invChgType, SecurityUtils.getLoginUser().getTenantId());
+        Result resultInfo = ybHttpUtils.updateInventoryCount(medicalInventory3502Param);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveInventoryChangeRecord(medicalInventory3502Param, resultInfo.getMessage());
+            return R.ok();
+        }
+        return R.fail();
+    }
+
+    /**
+     * 【3503】商品采购
+     *
+     * @param id 供应申请id
+     * @return 结果
+     */
+    @PostMapping("/procurement")
+    public R<?> procurement(Long id) {
+
+        Medical3503Param medical3503Param = ybDao.getMedical3503Param(id, SecurityUtils.getLoginUser().getTenantId());
+        Result resultInfo = ybHttpUtils.procurement(medical3503Param);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveInventoryPurchaseRecord(medical3503Param, resultInfo.getMessage());
+            return R.ok();
+        }
+        return R.fail();
+    }
+
+    /**
+     * 【3504】商品采购退货
+     *
+     * @param id 供应申请id
+     * @return 结果
+     */
+    @PostMapping("/procurement-cancel")
+    public R<?> cancelProcurement(Long id) {
+
+        MedicalPurchase3504Param medicalPurchase3504Param =
+            ybDao.getMedicalPurchase3504Param(id, SecurityUtils.getLoginUser().getTenantId());
+        Result resultInfo = ybHttpUtils.cancelProcurement(medicalPurchase3504Param);
+        if (resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveInventoryPurchaseReturnRecord(medicalPurchase3504Param, resultInfo.getMessage());
+            return R.ok();
+        }
+        return R.fail();
+    }
+
+    /**
+     * 【3505】商品销售
+     *
+     * @param id 供应申请id
+     * @return 结果
+     */
+    @PostMapping("/merchandise")
+    public R<?> merchandise(Long id, String ListType) {
+        Medical3505Param medical3505Param =
+            ybDao.getMedical3505Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
+        Result result = ybHttpUtils.merchandise(medical3505Param);
+        Medical3505Result medical3505Result =
+            JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
+        if ("1".equals(medical3505Result.getRetRslt())) {
+            ybDao.saveInventorySaleRecord(medical3505Param, medical3505Result.getMsgRslt());
+            return R.ok();
+        }
+        ybDao.saveInventorySaleRecord(medical3505Param, medical3505Result.getMsgRslt());
+        return R.fail();
+    }
+
+    /**
+     * 【3506】商品销售退货
+     *
+     * @param id 供应申请id
+     * @return 结果
+     */
+    @PostMapping("/cancel-merchandise")
+    public R<?> cancelMerchandise(Long id, String ListType) {
+        Medical3506Param medical3506Param =
+            ybDao.getMedical3506Param(id, ListType, SecurityUtils.getLoginUser().getTenantId());
+        Result result = ybHttpUtils.cancelMerchandise(medical3506Param);
+        Medical3505Result medical3505Result =
+            JSON.parseObject(JSON.toJSONString(result.getMessage()), Medical3505Result.class);
+        if ("1".equals(medical3505Result.getRetRslt())) {
+            ybDao.saveInventorySaleReturnRecord(medical3506Param, medical3505Result.getMsgRslt());
+            return R.ok();
+        }
+        ybDao.saveInventorySaleReturnRecord(medical3506Param, medical3505Result.getMsgRslt());
+        return R.fail();
+    }
+
+    /**
+     * 【3507】商品信息删除
+     *
+     * @param id 供应申请id
+     * @return 结果
+     */
+    @PostMapping("/del-goods")
+    public R<?> deleteGoodsInfo(Long id, String ListType) {
+        Medical3507Param medical3507Param = ybDao.getMedical3507Param(id, ListType);
+        Result resultBody = ybHttpUtils.deleteGoodsInfo(medical3507Param);
+        if (resultBody.getCode().equals(CommonConstant.SC_OK_200)) {
+            ybDao.saveInventoryDelRecord(medical3507Param);
+            return R.ok();
+        }
+        return R.fail();
+    }
+
+    /**
+     * 【3206A】清算机构查询
+     *
+     * @return 结果
+     */
+    @GetMapping("/select-clroptins")
+    public R<?> getClrOptins(String pageNum, String pageSize, String fixmedinsCode) {
+        Clearing3206AParam clearing3206AParam = new Clearing3206AParam();
+        clearing3206AParam.setPageNum(Integer.parseInt(pageNum)).setPageSize(Integer.parseInt(pageSize))
+            .setFixmedinsCode(fixmedinsCode);
+        Result resultBody = ybHttpUtils.getClrOptins(clearing3206AParam);
+        if (resultBody.getCode().equals(CommonConstant.SC_OK_200)) {
+            // ybDao.saveInventoryDelRecord(medical3507Param);
+            // resultBody.
+            return R.ok();
+        }
+        return R.fail(resultBody);
+    }
+
+    /**
+     * 【1312】-医保目录信息查询
+     *
+     * @param hilistCode 医保目录编码
+     * @param dateStr 更新时间
+     * @return 结果
+     */
+    @PostMapping("/query-yb-catalogue")
+    public R<?> queryYbCatalogue(@RequestParam String hilistCode, @RequestParam String dateStr) {
+        Catalogue1312QueryParam catalogue1312QueryParam = new Catalogue1312QueryParam();
+        catalogue1312QueryParam.setHilistCode(hilistCode);
+        catalogue1312QueryParam.setInsuplcAdmdvs(
+            SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.INSUPLC_ADMDVS));
+        // 直接解析（默认 ISO 格式）
+        LocalDate localDate = LocalDate.parse(dateStr);
+        // 转换为 Date
+        Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        catalogue1312QueryParam.setUpdtTime(date);
+        catalogue1312QueryParam.setPageNum(1);
+        catalogue1312QueryParam.setPageSize(10);
+        catalogue1312QueryParam.setDecryptFlag("0"); // 不需要解密
+        List<Catalogue1312Output> outputList = ybHttpUtils.queryYbCatalogue(catalogue1312QueryParam);
+        return R.ok(outputList);
+    }
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param encounterId 就诊ID
+     * @return 结果
+     */
+    @GetMapping("/pre-mid-analysis")
+    public R<?> yb3101PreMidAnalysis(@RequestParam("encounterId") Long encounterId,
+        @RequestParam("trigScen") String trigScen) {
+        return ybService.yb3101PreMidAnalysis(encounterId, trigScen);
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param warnRsltId 违规标识
+     * @param dspoWay 处理方式
+     * @param dspoWayRea 处理原因
+     * @return 结果
+     */
+    @GetMapping("/pre-mid-feedback")
+    public R<?> yb3103PreMidFeedback(@RequestParam("warnRsltId") String warnRsltId,
+        @RequestParam("dspoWay") String dspoWay,
+        @RequestParam(value = "dspoWayRea", required = false) String dspoWayRea) {
+        return ybService.yb3103PreMidFeedback(warnRsltId, dspoWay, dspoWayRea);
+    }
+
+    /**
+     * 【4101A】医疗保障基金结算清单信息上传（新）
+     *
+     * @param paymentId 付款ID
+     * @return 结果
+     */
+    @GetMapping("/upload-fund-settle")
+    public R<?> yb4101aUploadFundSettle(@RequestParam("paymentId") Long paymentId) {
+        return ybService.yb4101aUploadFundSettle(paymentId);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
new file mode 100644
index 00000000..ac25d3d0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
@@ -0,0 +1,118 @@
+package com.openhis.web.ybmanage.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.core.common.core.domain.HisBaseEntity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 【1312】医保目录信息查询
+ *
+ * @author SunJQ
+ * @date 2025-04-16
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Catalogue1312Output extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    // 医保目录编码
+    private String hilistCode;
+
+    // 医保目录名称
+    private String hilistName;
+
+    // 参保机构医保区划
+    private String insuAdmdvs;
+
+    // 开始日期
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date begndate;
+
+    // 结束日期
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date enddate;
+
+    // 医疗收费项目类别
+    private String medChrgitmType;
+
+    // 收费项目等级
+    private String chrgitmLv;
+
+    // 限制使用标志
+    private String lmtUsedFlag;
+
+    // 目录类别
+    private String listType;
+
+    // 医疗使用标志
+    private String medUseFlag;
+
+    // 生育使用标志
+    private String matnUsedFlag;
+
+    // 医保目录使用类别
+    private String hilistUseType;
+
+    // 限复方使用类型
+    private String lmtCpndType;
+
+    // 五笔助记码
+    private String wubi;
+
+    // 拼音助记码
+    private String pinyin;
+
+    // 备注
+    private String memo;
+
+    // 有效标志
+    private String valiFlag;
+
+    // 唯一记录号
+    private String rid;
+
+    // 更新时间
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updtTime;
+
+    // 创建人
+    private String crterId;
+
+    // 创建人姓名
+    private String crterName;
+
+    // 创建时间
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date crteTime;
+
+    // 创建机构
+    private String crteOptinsNo;
+
+    // 经办人
+    private String opterId;
+
+    // 经办人姓名
+    private String opterName;
+
+    // 经办时间
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date optTime;
+
+    // 经办机构
+    private String optinsNo;
+
+    // 统筹区
+    private String poolareaNo;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
new file mode 100644
index 00000000..115460aa
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 【3205A】前端入参
+ *
+ * @author SunJQ
+ * @date 2025-04-17
+ */
+@Data
+public class Clearing3205AWebParam {
+    // 清算机构
+    @NotNull
+    private String clrOptins;
+
+    // 清算状态
+    private String clrStas;
+
+    // 清算月份 例如：202310
+    private String clrYm;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
new file mode 100644
index 00000000..c357494e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 【2207】医保预结算的输出参数
+ *
+ * @author SunJQ
+ * @date 2025-05-08
+ */
+@Data
+@Accessors(chain = true)
+public class Clinic2207OrderOutput {
+    // 主键字段
+    private String mdtrtId; // 就诊ID
+
+    private String setlId;// 结算id 2207时有值 2206无值
+
+    private String psnNo; // 人员编号
+
+    private String psnName; // 人员姓名
+
+    private String psnCertType; // 人员证件类型
+
+    private String certno; // 证件号码
+
+    private String gend; // 性别
+
+    private String naty; // 民族
+
+    private Date brdy; // 出生日期
+
+    private BigDecimal age; // 年龄
+
+    private String insutype; // 险种类型
+
+    private String psnType; // 人员类别
+
+    private String cvlservFlag; // 公务员标志
+
+    private Date setlTime; // 结算时间
+
+    private String mdtrtCertType; // 就诊凭证类型
+
+    private String medType; // 医疗类别
+
+    private BigDecimal medfeeSumamt; // 医疗费总额
+
+    private BigDecimal fulamtOwnpayAmt; // 全自费金额
+
+    private BigDecimal overlmtSelfpay; // 超限价自费费用
+
+    private BigDecimal preselfpayAmt; // 先行自付金额
+
+    private BigDecimal inscpScpAmt; // 符合政策范围金额
+
+    private BigDecimal actPayDedc; // 实际支付起付线
+
+    private BigDecimal hifpPay; // 基本医疗保险统筹基金支出
+
+    private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例
+
+    private BigDecimal cvlservPay; // 公务员医疗补助资金支出
+
+    private BigDecimal hifesPay; // 企业补充医疗保险基金支出
+
+    private BigDecimal hifmiPay; // 居民大病保险资金支出
+
+    private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出
+
+    private BigDecimal mafPay; // 医疗救助基金支出
+
+    private BigDecimal othPay; // 其他支出
+
+    private BigDecimal fundPaySumamt; // 基金支付总额
+
+    private BigDecimal psnPartAmt; // 个人负担总金额
+
+    private BigDecimal acctPay; // 个人账户支出
+
+    private BigDecimal psnCashPay; // 个人现金支出
+
+    private BigDecimal hospPartAmt; // 医院负担金额
+
+    private BigDecimal balc; // 余额
+
+    private BigDecimal acctMulaidPay; // 个人账户共济支付金额
+
+    private String medinsSetlId; // 医药机构结算ID  存放发送方报文ID
+
+    private String clrOptins; // 清算经办机构
+
+    private String clrWay; // 清算方式
+
+    private String clrType; // 清算类别
+
+    private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
+
+    private String expContent; // 字段扩展
+
+    private List<Clinic2206FundPaymentResult> setldetail;// 结算详细信息
+
+    private String chrgBchno; // 收费批次号
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
new file mode 100644
index 00000000..46338c43
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 【2208】门诊结算撤销
+ *
+ * @author SunJQ
+ * @date 2025-04-21
+ */
+@Data
+@Accessors(chain = true)
+public class Clinic2208UnSetlInfoOutput {
+
+    // 1. 就诊ID（字符型，30位，必填）
+    private String mdtrtId;
+
+    // 2. 结算ID（字符型，30位，必填）
+    private String setlId;
+
+    // 3. 清算经办机构（字符型，6位）
+    private String clrOptins;
+
+    // 4. 结算时间（日期时间型，格式：yyyy-MM-dd HH:mm:ss，必填）
+    private Date setlTime;
+
+    // 5. 医疗费总额（数值型，16位含2位小数，必填）
+    private BigDecimal medfeeSumamt;
+
+    // 6. 全自费金额（数值型，16位含2位小数，必填）
+    private BigDecimal fulamtOwnpayAmt;
+
+    // 7. 超限价自费费用（数值型，16位含2位小数，必填）
+    private BigDecimal overlmtSelfpay;
+
+    // 8. 先行自付金额（数值型，16位含2位小数，必填）
+    private BigDecimal preselfpayAmt;
+
+    // 9. 符合政策范围金额（数值型，16位含2位小数，必填）
+    private BigDecimal inscpScpAmt;
+
+    // 10. 实际支付起付线（数值型，16位含2位小数）
+    private BigDecimal actPayDedc;
+
+    // 11. 基本医疗保险统筹基金支出（数值型，16位含2位小数，必填）
+    private BigDecimal hifpPay;
+
+    // 12. 统筹基金支付比例（数值型，5位含4位小数，必填）
+    private BigDecimal poolPropSelfpay;
+
+    // 13. 公务员医疗补助支出（数值型，16位含2位小数，必填）
+    private BigDecimal cvlservPay;
+
+    // 14. 企业补充医保支出（数值型，16位含2位小数，必填）
+    private BigDecimal hifesPay;
+
+    // 15. 居民大病保险支出（数值型，16位含2位小数，必填）
+    private BigDecimal hifmiPay;
+
+    // 16. 职工大额医疗补助支出（数值型，16位含2位小数，必填）
+    private BigDecimal hifobPay;
+
+    // 17. 医疗救助基金支出（数值型，16位含2位小数，必填）
+    private BigDecimal mafPay;
+
+    // 18. 其他支出（数值型，16位含2位小数，必填）
+    private BigDecimal othPay;
+
+    // 19. 基金支付总额（数值型，16位含2位小数，必填）
+    private BigDecimal fundPaySumamt;
+
+    // 20. 个人负担总金额（数值型，16位含2位小数，必填）
+    private BigDecimal psnPartAmt;
+
+    // 21. 个人账户支出（数值型，16位含2位小数，必填）
+    private BigDecimal acctPay;
+
+    // 22. 余额（数值型，16位含2位小数，必填）
+    private BigDecimal balc;
+
+    // 23. 个人账户共济支付（数值型，16位含2位小数，必填）
+    private BigDecimal acctMulaidPay;
+
+    // 24. 医院负担金额（数值型，16位含2位小数，必填）
+    private BigDecimal hospPartAmt;
+
+    // 25. 医药机构结算ID（字符型，30位，必填）
+    private String medinsSetlId;
+
+    // 26. 个人现金支出（数值型，16位含2位小数，必填）
+    private BigDecimal pdnCashPay;
+
+    // 27. 伤残人员医疗补助支出（数值型，16位含2位小数，必填）
+    private BigDecimal hifdmPay;
+
+    //结算详细信息
+    private List<Clinic2206FundPaymentResult> setldetail;//结算详细信息
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
new file mode 100644
index 00000000..19f03e5e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
@@ -0,0 +1,67 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class ClinicReg2201Output {
+    private static final long serialVersionUID = 1L;
+    //主键
+    @TableId(type = IdType.ASSIGN_ID)
+    @JSONField(serialize=false)
+    private String id;
+    //就诊ID
+    private String mdtrtId;
+    //参保地医保区划
+    @JSONField(serialize=false)
+    private String insuplcAdmdvs;
+    //人员编号
+    private String psnNo;
+    //险种类型
+    private String insutype;
+    //医疗类别
+    @JSONField(serialize=false)
+    private String medType;
+    //挂号时间
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date begntime;
+    //就诊凭证类型
+    private String mdtrtCertType;
+    //就诊凭证编号
+    private String mdtrtCertNo;
+    //证件加密串
+    @JSONField(serialize=false)
+    @TableField(exist = false)
+    private String mdtrtCertNoEncrypt;
+    //住院/门诊号
+    private String iptOtpNo;
+    //医师编码
+    private String atddrNo;
+    //医师姓名
+    private String drName;
+    //科室编码
+    private String deptCode;
+    //科室名称
+    private String deptName;
+    //科别
+    private String caty;
+    //挂号费
+    private Double regFee;
+    //检查费
+    private Double checkFee;
+    //应收金额
+    private Double totalFee;
+    //状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算
+    private String status;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
new file mode 100644
index 00000000..c693c24f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * 【13202】前台入参
+ *
+ * @author SunJQ
+ * @date 2025-04-29
+ */
+@Data
+public class Financial13203WebParam {
+
+    // 对账日期，格式：YYYY-MM-DD
+    @JSONField(name = "stmt_date")
+    private String stmtDate;
+
+    // 明细对账结果，1：不平，0：平
+    @JSONField(name = "stmt_rslt")
+    private String stmtRslt;
+
+    // 查询页面数据量，最大100
+    @JSONField(name = "page_size")
+    private String pageSize;
+
+    // 页数，默认1
+    @JSONField(name = "page_num")
+    private String pageNum;
+
+    // 清算机构编码
+    @JSONField(name = "clr_optins")
+    private String clrOptins;
+
+    // 清算类别
+    @JSONField(name = "clr_type")
+    private String clrType;
+
+    // 险种
+    @JSONField(name = "insutype")
+    private String insutype;
+
+    // 就医类别，2：本地就医，3：省内异地就医，4：跨省就医
+    @JSONField(name = "clr_pay_loc")
+    private String clrPayLoc;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
new file mode 100644
index 00000000..9164fe51
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
@@ -0,0 +1,10 @@
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Financial3202WebParam {
+    List<String> settlementIdList;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
new file mode 100644
index 00000000..1082e395
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.poi.hssf.record.chart.DatRecord;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 【3203A】前台入参
+ *
+ * @author SunJQ
+ * @date 2025-04-15
+ */
+@Data
+@Accessors(chain = true)
+public class Financial3203AWebParam {
+
+    /** 清算类别 */
+    @NotNull
+    private String clrType;
+    /** 开始时间 */
+    @NotNull
+    private Date stmtBegnDate;
+    /** 结束时间 */
+    @NotNull
+    private Date stmtEndDate;
+    /** 清算机构 */
+    @NotNull
+    private String clrOptins;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
new file mode 100644
index 00000000..80cf0dbb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 【3203】前台入参
+ *
+ * @author SunJQ
+ * @date 2025-04-29
+ */
+@Data
+public class Financial3203WebParam {
+
+    // 清算类别（字符型，30位，必填）
+    @JSONField(name = "clr_type")
+    private String clrType;
+
+    // 清算方式（字符型，30位，必填）
+    @JSONField(name = "clr_way")
+    private String clrWay;
+
+    // 开始日期（日期型，必填，格式：yyyy-MM-dd）
+    @JSONField(name = "begndate")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date begndate;
+
+    // 结束日期（日期型，必填，格式：yyyy-MM-dd）
+    @JSONField(name = "enddate")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date enddate;
+
+    // 清算年月
+    @JSONField(name = "setlym")
+    private String setlym;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
new file mode 100644
index 00000000..25f9c0c3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
@@ -0,0 +1,33 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FinancialHand3203AWebParam {
+
+    @NotEmpty
+    private String clrType;//险种类型
+    @NotNull
+    private BigDecimal medfeeSumamt;//医疗费总额
+    @NotNull
+    private BigDecimal medSumfee;//医保认可费用总额（0.00）
+    @NotNull
+    private BigDecimal fundAppySum;//基金支付金额
+    @NotNull
+    private BigDecimal cashPayamt;//现金金额
+    @NotNull
+    private BigDecimal acctPay;//账户金额
+    @NotNull
+    private String begndate;//开始时间
+    @NotNull
+    private String enddate;//结束时间
+    @NotEmpty
+    private String clrOptins; // 必须是准确的6位编码
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
new file mode 100644
index 00000000..f28541c6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
@@ -0,0 +1,70 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.yb.dto.Info5301SpecialConditionResult;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *【1101】获取身份信息
+ *
+ * @author SunJQ
+ * @date 2025-04-16
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Info1101Output extends HisBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+	//人员编号
+    private String psnNo;
+	//人员证件类型
+    private String psnCertType;
+	//证件号码
+    private String certno;
+	//人员姓名
+    private String psnName;
+	//性别
+    private String gend;
+	//民族
+    private String naty;
+	//出生日期
+    private Date brdy;
+	//年龄
+    private Double age;
+	//参保地医保区划
+    private String insuplcAdmdvs;
+    //险种类型
+    private String insutype;
+    //余额
+    private String balc;
+    //人员类别
+    @TableField(exist = false)
+    private String psnType;
+
+    //人员参保状态
+    @TableField(exist = false)
+    private String psnInsuStas;
+
+    //个人参保日期
+    @TableField(exist = false)
+    private String psnInsuDate;
+
+    //公务员标志
+    @TableField(exist = false)
+    private String cvlservFlag;
+
+    //单位名称
+    @TableField(exist = false)
+    private String empName;
+    //特慢病
+    @TableField(exist = false)
+    private List<Info5301SpecialConditionResult> feedetail;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
new file mode 100644
index 00000000..e8e550cd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
@@ -0,0 +1,85 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.yb.dto.Info5301SpecialConditionResult;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class PatientInfoDto {
+
+    //患者信息
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 活动标记 */
+    private Integer activeFlag;
+
+    /** 临时标识 */
+    private Integer tempFlag;
+
+    /** 患者姓名 */
+    private String name;
+
+    /** 患者院内编码/病历号 */
+    private String busNo;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+
+    /** 生日 */
+    private Date birthDate;
+
+    /** 民族 */
+    private String nationalityCode;
+
+    /** 身份证号 */
+    private String idCard;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 机构Id */
+    private Long organizationId;
+
+    /** 特慢病等 */
+    private List<Info5301SpecialConditionResult> feedetail;
+
+    //医保信息 2025/05/23 弃用，费用性质固定，如农大只有省医保，费用性质只显示省医保和自费即可，由@GetMapping(value = "/contract-list")接口提供数据
+    /** 合同Id */
+    private Long contractId;//弃用 2025/05/23
+
+    /** 合同名称 */
+    private String contractName;//弃用 2025/05/23
+
+    /** 状态 */
+    private Integer statusEnum;//弃用 2025/05/23
+
+    /** 合同的类别 */
+    private Integer categoryEnum;//弃用 2025/05/23
+
+    /** 合同编码 */
+    private String contractBusNo;//弃用 2025/05/23
+
+    /** 机构 */
+    private Long contractOrgId;//弃用 2025/05/23
+
+    /** 是否医保 */
+    private Integer ybFlag;//弃用 2025/05/23
+
+    /** 医保区划 */
+    private String admVs;//弃用 2025/05/23
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
new file mode 100644
index 00000000..c0e5afe5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
@@ -0,0 +1,48 @@
+package com.openhis.web.ybmanage.dto;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value="接口返回对象", description="接口返回对象")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Result<T> implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 成功标志
+	 */
+	@ApiModelProperty(value = "成功标志")
+	private boolean success = true;
+
+	/**
+	 * 返回处理消息
+	 */
+	@ApiModelProperty(value = "返回处理消息")
+	private String message = "操作成功！";
+
+	/**
+	 * 返回代码
+	 */
+	@ApiModelProperty(value = "返回代码")
+	private Integer code = 0;
+	
+	/**
+	 * 返回数据对象 data
+	 */
+	@ApiModelProperty(value = "返回数据对象")
+	private T result;
+	
+	/**
+	 * 时间戳
+	 */
+	@ApiModelProperty(value = "时间戳")
+	private long timestamp ;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
new file mode 100644
index 00000000..5a192f00
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
@@ -0,0 +1,40 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import lombok.Data;
+
+/**
+ * 医保结果
+ */
+@Data
+public class ResultBody {
+
+    /** 交易状态码 */
+    @JSONField(name="infcode")
+    private String infcode;
+    /** 发送方报文ID */
+    @JSONField(name="warnMsg")
+    private String warn_msg;
+    /** 数字签名信息 */
+    @JSONField(name="cainfo")
+    private String cainfo;
+    /** 错误信息 */
+    @JSONField(name="err_msg")
+    private String errMsg;
+    /** 接收报文时间 */
+    @JSONField(name="refmsg_time")
+    private String refmsgTime;
+    /** 签名类型 */
+    @JSONField(name="signtype")
+    private String signtype;
+    /** 响应报文时间 */
+    @JSONField(name="respond_time")
+    private String respondTime;
+    /** 接收方报文ID */
+    @JSONField(name="inf_refmsgid")
+    private String infRefmsgid;
+    /** 交易输出 */
+    @JSONField(name="output")
+    private String output;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
new file mode 100644
index 00000000..921bbe4b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 【3201】前台入参
+ *
+ * @author SunJQ
+ * @date 2025-04-15
+ */
+@Data
+public class Settlement3201WebParam {
+
+    /** 险种 */
+    @NotNull
+    private String insuType;
+    /** 清算类别 */
+    @NotNull
+    private String clrType;//住院或门诊
+    /** 合同id */
+    @NotNull
+    private Long contractId;
+    /** 医院id */
+    @NotNull
+    private Long orgId;
+    /** 开始时间 */
+    @NotNull
+    private String stmtBegnDate;
+    /** 结束时间 */
+    @NotNull
+    private String stmtEndDate;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
new file mode 100644
index 00000000..0e3cbe0d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 【3202】前台入参
+ *
+ * @author SunJQ
+ * @date 2025-04-17
+ */
+@Data
+public class Settlement3202WebParam {
+    /** 结算经办机构 */
+    @NotNull
+    private String setlOptins;//前台传入,注意:先上传文件后核对明细的
+    /** 清算类别 */
+    private String clrType;
+    /** 文件查询号 */
+    @NotNull
+    private String fileQuryNo;
+    /** 开始时间 */
+    @NotNull
+    private String stmtBegnDate;
+    /** 结束时间 */
+    @NotNull
+    private String stmtEndDate;
+    /** 医院id */
+    private Long orgId;
+//    /** 医疗费用总额 */
+//    @NotNull
+//    private BigDecimal medFeeSumAmt;
+//    /** 基金支付总额 */
+//    @NotNull
+//    private BigDecimal fundPaySumAmt;
+//    /** 现金支付金额 */
+//    @NotNull
+//    private BigDecimal cashPayAmt;
+//    /** 定点医药机构结算笔数 */
+//    @NotNull
+//    private Integer fixMedInsSetlCnt;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
new file mode 100644
index 00000000..97f675fa
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * [3209A]前台传参
+ *
+ * @author SunJQ
+ * @date 2025-04-29
+ */
+@Data
+public class Settlement3209AWebParam {
+
+    // 清算类别
+    @JSONField(name = "clr_type")
+    private String clrType;
+
+    // 开始日期
+    @JSONField(name = "begndate")
+    private Date begndate;
+
+    // 结束日期
+    @JSONField(name = "enddate")
+    private Date enddate;
+
+    // 清算机构
+    @JSONField(name = "clr_optins")
+    private String clrOptins;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
new file mode 100644
index 00000000..dcbb0568
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医保电子处方信息
+ *
+ * @author yuxj
+ * @date 2025-05-06
+ */
+@Data
+@Accessors(chain = true)
+public class VeriPrescriptionDetailInfoDto {
+
+    /** 处方号 */
+    private String prescriptionNo;
+    /** 门诊号 */
+    private String iptOtpNo;
+    /** 请求数量 */
+    private Integer quantity;
+    /** 请求单位 */
+    private String unitCode;
+    /** 审核状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /* --处方信息-- */
+    /** 药品名 */
+    private String medicationName;
+    /** 药品规格 */
+    private String drugSpecification;
+    /** 药品剂量 */
+    private BigDecimal medDosage;
+    /** 药品剂量单位 */
+    private String medDosageUnitCode;
+
+    /** 使用频次 */
+    @Dict(dictCode = "elep_rate_code")
+    private String medFrequency;
+    private String medFrequency_dictText;
+    /** 途径 */
+    @Dict(dictCode = "method_code")
+    private String medRoute;
+    private String medRoute_dictText;
+    /** 取药状态 */
+    private String medStatus;
+    /** 处方状态 */
+    private String prescriptionStatus;
+    /** 处方类别 */
+    private Integer rxTypeCode;
+    private String rxTypeCode_enumText;
+    /** 支持用药信息 */
+    private String supportInfo;
+    /** 服药时间(开始) */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date effectiveDoseStart;
+    /** 服药时间(结束) */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date effectiveDoseEnd;
+    /** 给药间隔 */
+    private String dispenseInterval;
+    /** 单次发药数 */
+    private Integer dispensePerQuantity;
+    /** 每次发药供应天数 */
+    private Integer dispensePerDuration;
+
+    /* --就诊信息-- */
+    /** 患者姓名 */
+    private String patnName;
+    /** 身份证号 */
+    private String certno;
+    /** 开方医生名 */
+    private String practitionerName;
+    /** 挂号科室 */
+    private String mdtrtDeptName;
+    /** 开单科室 */
+    private String prscDeptName;
+    /** 挂号日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date mdtrtTime;
+    /** 处方开立日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date prscTime;
+
+    /* --诊断信息-- */
+    /** 诊断名 */
+    private String conditionName;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
new file mode 100644
index 00000000..73ebad83
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医保电子处方信息
+ *
+ * @author yuxj
+ * @date 2025-05-06
+ */
+@Data
+@Accessors(chain = true)
+public class VeriPrescriptionInfoDto {
+
+    /** 处方号 */
+    private String prescriptionNo;
+    /** 门诊号 */
+    private String iptOtpNo;
+    /** 姓名 */
+    private String patientName;
+    /** 证件号 */
+    private String certno;
+    /** 取药状态 */
+    private String medStatus;
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+    /** 开单科室 */
+    private String prscDeptName;
+    /** 挂号日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date mdtrtTime;
+    /** 处方开立日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date prscTime;
+
+    /** 租户ID */
+    private Integer tenantId;
+    /** 电子凭证线上身份核验流水号 */
+    private String authNo;
+    /** 电子凭证令牌 */
+    private String ecToken;
+    /** 医保处方编号 */
+    private String hiRxno;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
new file mode 100644
index 00000000..4879512c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.dto;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医保电子处方信息查询条件
+ *
+ * @author yuxj
+ * @date 2025-05-06
+ */
+@Data
+@Accessors(chain = true)
+public class VeriPrescriptionParam {
+
+    /** 门诊号/姓名 */
+    private String name;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
new file mode 100644
index 00000000..a65ec867
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
@@ -0,0 +1,196 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+//@TableName("yb_inpatient_fee_detail") // 替换为实际表名
+public class Yb2301FeeDetailParam {
+
+
+        /**
+         * 费用明细流水号
+         * 单次就诊内唯一
+         */
+        @JsonProperty("feedetl_sn")
+        private String feedetlSn;
+
+        /**
+         * 原费用流水号
+         * 退单时传入被退单的费用明细流水号
+         */
+        @JsonProperty("init_feedetl_sn")
+        private String initFeedetlSn;
+
+        /**
+         * 就诊ID
+         */
+        @JsonProperty("mdtrt_id")
+        private String mdtrtId;
+
+        /**
+         * 医嘱号
+         */
+        @JsonProperty("drord_no")
+        private String drordNo;
+
+        /**
+         * 人员编号
+         */
+        @JsonProperty("psn_no")
+        private String psnNo;
+
+        /**
+         * 医疗类别
+         */
+        @JsonProperty("med_type")
+        private String medType;
+
+        /**
+         * 费用发生时间
+         * 格式：yyyy-MM-dd HH:mm:ss
+         */
+        @JsonProperty("fee_ocur_time")
+        private Date feeOcurTime;
+
+        /**
+         * 医保目录编码
+         */
+        @JsonProperty("med_list_codg")
+        private String medListCodg;
+
+        /**
+         * 医药机构目录编码
+         */
+        @JsonProperty("medins_list_codg")
+        private String medinsListCodg;
+
+        /**
+         * 明细项目费用总额
+         */
+        @JsonProperty("det_item_fee_sumamt")
+        private BigDecimal detItemFeeSumamt;
+
+        /**
+         * 数量
+         * 退单时数量填写负数
+         */
+        @JsonProperty("cnt")
+        private BigDecimal cnt;
+
+        /**
+         * 单价
+         */
+        @JsonProperty("pric")
+        private BigDecimal pric;
+
+        /**
+         * 开单科室编码
+         */
+        @JsonProperty("bilg_dept_codg")
+        private String bilgDeptCodg;
+
+        /**
+         * 开单科室名称
+         */
+        @JsonProperty("bilg_dept_name")
+        private String bilgDeptName;
+
+        /**
+         * 开单医生编码
+         */
+        @JsonProperty("bilg_dr_codg")
+        private String bilgDrCodg;
+
+        /**
+         * 开单医师姓名
+         */
+        @JsonProperty("bilg_dr_name")
+        private String bilgDrName;
+
+        /**
+         * 受单科室编码
+         */
+        @JsonProperty("acord_dept_codg")
+        private String acordDeptCodg;
+
+        /**
+         * 受单科室名称
+         */
+        @JsonProperty("acord_dept_name")
+        private String acordDeptName;
+
+        /**
+         * 受单医生编码
+         */
+        @JsonProperty("orders_dr_code")
+        private String ordersDrCode;
+
+        /**
+         * 受单医生姓名
+         */
+        @JsonProperty("orders_dr_name")
+        private String ordersDrName;
+
+        /**
+         * 医院审批标志
+         */
+        @JsonProperty("hosp_appr_flag")
+        private String hospApprFlag;
+
+        /**
+         * 中药使用方式
+         */
+        @JsonProperty("tcmdrug_used_way")
+        private String tcmdrugUsedWay;
+
+        /**
+         * 外检标志
+         */
+        @JsonProperty("etip_flag")
+        private String etipFlag;
+
+        /**
+         * 外检医院编码
+         */
+        @JsonProperty("etip_hosp_code")
+        private String etipHospCode;
+
+        /**
+         * 出院带药标志
+         */
+        @JsonProperty("dscg_tkdrug_flag")
+        private String dscgTkdrugFlag;
+
+        /**
+         * 生育费用标志
+         */
+        @JsonProperty("matn_fee_flag")
+        private String matnFeeFlag;
+
+        /**
+         * 备注
+         */
+        @JsonProperty("memo")
+        private String memo;
+
+        /**
+         * 组套编号
+         */
+        @JsonProperty("comb_no")
+        private String combNo;
+
+        /**
+         * 字段扩展
+         * 格式：JSON
+         */
+        @JsonProperty("exp_content")
+        private String expContent;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
new file mode 100644
index 00000000..12e3d594
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
@@ -0,0 +1,124 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class Yb2301InpatientOutput {
+
+    /**
+     * 费用明细流水号
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 明细项目费用总额
+     */
+    @JsonProperty("det_item_fee_sumamt")
+    private BigDecimal detItemFeeSumamt;
+
+    /**
+     * 数量
+     */
+    @JsonProperty("cnt")
+    private BigDecimal cnt;
+
+    /**
+     * 单价
+     */
+    @JsonProperty("pric")
+    private BigDecimal pric;
+
+    /**
+     * 定价上限金额
+     */
+    @JsonProperty("pric_uplmt_amt")
+    private BigDecimal pricUplmtAmt;
+
+    /**
+     * 自付比例
+     */
+    @JsonProperty("selfpay_prop")
+    private BigDecimal selfpayProp;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_amt")
+    private BigDecimal overlmtAmt;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 收费项目等级
+     */
+    @JsonProperty("chrgitm_lv")
+    private String chrgitmLv;
+
+    /**
+     * 医疗收费项目类别
+     */
+    @JsonProperty("med_chrgitm_type")
+    private String medChrgitmType;
+
+    /**
+     * 基本药物标志
+     */
+    @JsonProperty("bas_medn_flag")
+    private String basMednFlag;
+
+    /**
+     * 医保谈判药品标志
+     */
+    @JsonProperty("hi_nego_drug_flag")
+    private String hiNegoDrugFlag;
+
+    /**
+     * 儿童用药标志
+     */
+    @JsonProperty("chld_medc_flag")
+    private String chldMedcFlag;
+
+    /**
+     * 目录特项标志
+     */
+    @JsonProperty("list_sp_item_flag")
+    private String listSpItemFlag;
+
+    /**
+     * 限制使用标志
+     */
+    @JsonProperty("lmt_used_flag")
+    private String lmtUsedFlag;
+
+    /**
+     * 直报标志
+     */
+    @JsonProperty("drt_reim_flag")
+    private String drtReimFlag;
+
+    /**
+     * 备注
+     */
+    @JsonProperty("memo")
+    private String memo;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
new file mode 100644
index 00000000..65db6495
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2302InpatientParam.java
@@ -0,0 +1,31 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Yb2302InpatientParam {
+    /**
+     * 费用明细流水号
+     * 单次就诊内唯一
+     */
+    @JsonProperty("feedetl_sn")
+    private String feedetlSn;
+
+    /**
+     * 人员编号
+     * 退单时传入被退单的费用明细流水号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
new file mode 100644
index 00000000..5b62a1af
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
@@ -0,0 +1,258 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2303InpatientOutput {
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     * 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
new file mode 100644
index 00000000..34cc3969
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
@@ -0,0 +1,119 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2303InpatientPram {
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号
+     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 出院时间
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("dscgTime")
+    private Date dscgTime;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
new file mode 100644
index 00000000..e9f25d1b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
@@ -0,0 +1,31 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2304InpatientExpContentParam {
+    /**
+     * 实际就医区划
+     */
+    @JsonProperty("med_admdvs")
+    private BigDecimal medAdmdvs;
+
+    /**
+     * 外报就医医院编号
+     */
+    @JsonProperty("med_hosp_no")
+    private BigDecimal medHospNo;
+
+    /**
+     * 外报就医医院名称
+     */
+    @JsonProperty("med_hosp_name")
+    private BigDecimal medHospName;
+
+    /**
+     * 外报类型
+     */
+    @JsonProperty("out_submit_type")
+    private String outSubmitType;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
new file mode 100644
index 00000000..7a3c0706
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
@@ -0,0 +1,279 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2304InpatientOutput {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_id")
+    private String setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 人员姓名
+     */
+    @JsonProperty("psn_name")
+    private String psnName;
+
+    /**
+     * 人员证件类型
+     */
+    @JsonProperty("psn_cert_type")
+    private String psnCertType;
+
+    /**
+     * 证件号码
+     */
+    @JsonProperty("certno")
+    private String certno;
+
+    /**
+     * 性别
+     */
+    @JsonProperty("gend")
+    private String gend;
+
+    /**
+     * 民族
+     */
+    @JsonProperty("naty")
+    private String naty;
+
+    /**
+     * 出生日期
+     * 格式：yyyy-MM-dd
+     */
+    @JsonProperty("brdy")
+    private Date brdy;
+
+    /**
+     * 年龄
+     */
+    @JsonProperty("age")
+    private BigDecimal age;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 人员类别
+     */
+    @JsonProperty("psn_type")
+    private String psnType;
+
+    /**
+     * 公务员标志
+     */
+    @JsonProperty("cvlserv_flag")
+    private String cvlservFlag;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 医疗类别
+     */
+    @JsonProperty("med_type")
+    private String medType;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 医院负担金额（原始）
+     */
+    @JsonProperty("hosp_part_amt_old")
+    private BigDecimal hospPartAmtOld;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 清算方式
+     */
+    @JsonProperty("clr_way")
+    private String clrWay;
+
+    /**
+     * 清算类别
+     */
+    @JsonProperty("clr_type")
+    private String clrType;
+
+    /**
+     * 字段扩展
+     * 1.5.4新增
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     * 1.5.4新增
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 医院负担金额
+     * 1.5.4新增
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
new file mode 100644
index 00000000..2476e190
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
@@ -0,0 +1,111 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2304InpatientParam {
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private String psnNo;
+
+    /**
+     * 就诊凭证类型
+     */
+    @JsonProperty("mdtrt_cert_type")
+    private String mdtrtCertType;
+
+    /**
+     * 就诊凭证编号
+     * 就诊凭证类型为“01”时填写电子凭证令牌，为“02”时填写身份证号，为“03”时填写社会保障卡卡号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 个人结算方式
+     */
+    @JsonProperty("psn_setlway")
+    private String psnSetlway;
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 险种类型
+     */
+    @JsonProperty("insutype")
+    private String insutype;
+
+    /**
+     * 个人账户使用标志
+     */
+    @JsonProperty("acct_used_flag")
+    private String acctUsedFlag;
+
+    /**
+     * 参保地医保区划
+     */
+    @JsonProperty("insuplc_admdvs")
+    private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     */
+    @JsonProperty("mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+
+    /**
+     * 中途结算标志
+     */
+    @JsonProperty("mid_setl_flag")
+    private String midSetlFlag;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价金额
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
new file mode 100644
index 00000000..918888c4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
@@ -0,0 +1,221 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Yb2305InpatientOutput {
+
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private String mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_id")
+    private String setlId;
+
+    /**
+     * 清算经办机构
+     */
+    @JsonProperty("clr_optins")
+    private String clrOptins;
+
+    /**
+     * 结算时间
+     * 格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonProperty("setl_time")
+    private Date setlTime;
+
+    /**
+     * 医疗费总额
+     */
+    @JsonProperty("medfee_sumamt")
+    private BigDecimal medfeeSumamt;
+
+    /**
+     * 全自费金额
+     */
+    @JsonProperty("fulamt_ownpay_amt")
+    private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 超限价自费费用
+     */
+    @JsonProperty("overlmt_selfpay")
+    private BigDecimal overlmtSelfpay;
+
+    /**
+     * 先行自付金额
+     */
+    @JsonProperty("preselfpay_amt")
+    private BigDecimal preselfpayAmt;
+
+    /**
+     * 符合政策范围金额
+     */
+    @JsonProperty("inscp_scp_amt")
+    private BigDecimal inscpScpAmt;
+
+    /**
+     * 实际支付起付线
+     */
+    @JsonProperty("act_pay_dedc")
+    private BigDecimal actPayDedc;
+
+    /**
+     * 基本医疗保险统筹基金支出
+     */
+    @JsonProperty("hifp_pay")
+    private BigDecimal hifpPay;
+
+    /**
+     * 基本医疗保险统筹基金支付比例
+     */
+    @JsonProperty("pool_prop_selfpay")
+    private BigDecimal poolPropSelfpay;
+
+    /**
+     * 公务员医疗补助资金支出
+     */
+    @JsonProperty("cvlserv_pay")
+    private BigDecimal cvlservPay;
+
+    /**
+     * 企业补充医疗保险基金支出
+     */
+    @JsonProperty("hifes_pay")
+    private BigDecimal hifesPay;
+
+    /**
+     * 居民大病保险资金支出
+     */
+    @JsonProperty("hifmi_pay")
+    private BigDecimal hifmiPay;
+
+    /**
+     * 职工大额医疗费用补助基金支出
+     */
+    @JsonProperty("hifob_pay")
+    private BigDecimal hifobPay;
+
+    /**
+     * 医疗救助基金支出
+     */
+    @JsonProperty("maf_pay")
+    private BigDecimal mafPay;
+
+    /**
+     * 其他支出
+     */
+    @JsonProperty("oth_pay")
+    private BigDecimal othPay;
+
+    /**
+     * 基金支付总额
+     */
+    @JsonProperty("fund_pay_sumamt")
+    private BigDecimal fundPaySumamt;
+
+    /**
+     * 个人负担总金额
+     */
+    @JsonProperty("psn_part_amt")
+    private BigDecimal psnPartAmt;
+
+    /**
+     * 个人账户支出
+     */
+    @JsonProperty("acct_pay")
+    private BigDecimal acctPay;
+
+    /**
+     * 个人现金支出
+     */
+    @JsonProperty("psn_cash_pay")
+    private BigDecimal psnCashPay;
+
+    /**
+     * 医院负担金额
+     */
+    @JsonProperty("hosp_part_amt")
+    private BigDecimal hospPartAmt;
+
+    /**
+     * 余额
+     */
+    @JsonProperty("balc")
+    private BigDecimal balc;
+
+    /**
+     * 个人账户共济支付金额
+     */
+    @JsonProperty("acct_mulaid_pay")
+    private BigDecimal acctMulaidPay;
+
+    /**
+     * 医药机构结算ID
+     * 存放发送方报文ID
+     */
+    @JsonProperty("medins_setl_id")
+    private String medinsSetlId;
+
+    /**
+     * 伤残人员医疗保障基金支出
+     */
+    @JsonProperty("hifdm_pay")
+    private BigDecimal hifdmPay;
+
+    /**
+     * 人员参保关系ID
+     */
+    @JsonProperty("psn_insu_rlts_id")
+    private String psnInsuRltsId;
+
+    /**
+     * 参保机构行政区划
+     */
+    @JsonProperty("insu_admdvs")
+    private String insuAdmdvs;
+
+    /**
+     * 开始日期
+     */
+    @JsonProperty("begndate")
+    private Date begndate;
+
+    /**
+     * 结算日期
+     */
+    @JsonProperty("enddate")
+    private Date enddate;
+
+    /**
+     * 就诊凭证编号
+     */
+    @JsonProperty("mdtrt_cert_no")
+    private String mdtrtCertNo;
+
+    /**
+     * 结算类别
+     */
+    @JsonProperty("setl_type")
+    private String setlType;
+
+    /**
+     * 本次起付线
+     */
+    @JsonProperty("crt_dedc")
+    private BigDecimal crtDedc;
+
+    /**
+     * 发票号
+     */
+    @JsonProperty("invono")
+    private String invono;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
new file mode 100644
index 00000000..99bc5924
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
@@ -0,0 +1,31 @@
+package com.openhis.web.ybmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+public class Yb2305InpatientParam {
+    /**
+     * 就诊ID
+     */
+    @JsonProperty("mdtrt_id")
+    private BigDecimal mdtrtId;
+
+    /**
+     * 结算ID
+     */
+    @JsonProperty("setl_Id")
+    private BigDecimal setlId;
+
+    /**
+     * 人员编号
+     */
+    @JsonProperty("psn_no")
+    private BigDecimal psnNo;
+
+    /**
+     * 字段扩展
+     */
+    @JsonProperty("exp_content")
+    private String expContent;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
new file mode 100644
index 00000000..b226ad49
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * mapper提供sql服务
+ *
+ * @author yuxj
+ * @date 2025-05-06
+ */
+@Repository
+public interface YbElepMapper {
+    /**
+     * 医保电子处方查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @return 就诊病人列表
+     */
+    Page<VeriPrescriptionInfoDto> getVeriPrescriptionInfo(@Param("page") Page<VeriPrescriptionInfoDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<VeriPrescriptionParam> queryWrapper);
+
+
+    /**
+     * 处方详细信息获取
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方详细信息
+     */
+    List<VeriPrescriptionDetailInfoDto> getVeriPrescriptionDetailInfo(@Param("prescriptionNo") String prescriptionNo);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
new file mode 100644
index 00000000..e7050d0b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
@@ -0,0 +1,72 @@
+package com.openhis.web.ybmanage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.openhis.yb.dto.*;
+
+/**
+ * 医保Mapper
+ *
+ * @author GuoRui
+ */
+@Repository
+public interface YbMapper {
+
+    /**
+     * 【3101】查询就诊患者信息
+     * 
+     * @param encounterId 就诊ID
+     * @param encounterFlag 是否为就诊登记使用
+     * @param participantType 参与者类型
+     * @param deleteFlag 删除状态
+     * @return 就诊患者信息
+     */
+    Yb3101AdapterEncounterPatientInfo yb3101SelectEncounterPatientInfo(@Param("encounterId") Long encounterId,
+        @Param("encounterFlag") Integer encounterFlag, @Param("participantType") String participantType,
+        @Param("deleteFlag") String deleteFlag);
+
+    /**
+     * 【3101】查询就诊诊断信息
+     *
+     * @param encounterId 就诊ID
+     * @param deleteFlag 删除状态
+     * @return 就诊诊断信息
+     */
+    List<Yb3101AdapterEncounterDiagnoseInfo> yb3101SelectEncounterDiagnoseInfo(@Param("encounterId") Long encounterId,
+        @Param("deleteFlag") String deleteFlag);
+
+    /**
+     * 【3101】查询处方（医嘱）信息
+     *
+     * @param encounterId 就诊ID
+     * @param deleteFlag 删除状态
+     * @param ybMedChrgItmTypeWest 医疗收费项目类别-西药费
+     * @param ybMedChrgItmTypeChineseSlices 医疗收费项目类别-中药饮片费
+     * @param ybMedChrgItmTypeChinese 医疗收费项目类别-中成药费
+     * @return 处方（医嘱）信息
+     */
+    List<Yb3101AdapterOrderInfo> yb3101SelectOrderInfo(@Param("encounterId") Long encounterId,
+        @Param("deleteFlag") String deleteFlag, @Param("ybMedChrgItmTypeWest") String ybMedChrgItmTypeWest,
+        @Param("ybMedChrgItmTypeChineseSlices") String ybMedChrgItmTypeChineseSlices,
+        @Param("ybMedChrgItmTypeChinese") String ybMedChrgItmTypeChinese);
+
+    /**
+     * 【4101A】查询结算清单信息
+     * 
+     * @param paymentId 付款ID
+     * @return 结算清单信息
+     */
+    List<Yb4101AAdapterSettleInfo> yb4101aSelectSettleInfo(@Param("paymentId") Long paymentId);
+
+    /**
+     * 【4101A】查询门诊慢特病诊断信息
+     *
+     * @param paymentId 付款ID
+     * @return 门诊慢特病诊断信息
+     */
+    List<Yb4101AInputOpspdiseinfo> yb4101aSelectOpspdiseinfo(@Param("paymentId") Long paymentId);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
new file mode 100644
index 00000000..b96e2bad
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.service;
+
+import java.util.Date;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
+import com.openhis.ybelep.domain.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ * @author yuxj
+ * @date 2025-04-17
+ */
+public interface IYbEleBaseService {
+
+    /**
+     * 医保电子处方查询
+     *
+     * @param veriPrescriptionParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求数据
+     * @return 处方信息
+     */
+    R<?> getVeriPrescriptionInfo(VeriPrescriptionParam veriPrescriptionParam, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 医保电子处方查看
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方详细信息
+     */
+    R<?> getPrescriptionDetailInfo(String prescriptionNo);
+
+    /**
+     * 医保电子处方状态更新（上传）
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方信息
+     */
+    R<?> uploadPrescriptionStatus(String prescriptionNo);
+
+    /**
+     * 医保电子处方拒绝上传
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方信息
+     */
+    R<?> refusePrescriptionStatus(String prescriptionNo);
+
+    /**
+     * 医保电子处方状态更新（撤销）
+     *
+     * @param prescriptionNo 处方号
+     * @param quashReason 撤销原因
+     * @return 处方信息
+     */
+    R<?> quashPrescriptionStatus(String prescriptionNo,String quashReason);
+
+    /**
+     * 做成电子处方上传预核验入参信息
+     *
+     * @param prescriptionNo 处方号
+     * @param tenantId 租户Id
+     * @return 处方信息
+     */
+    PreCheckPrescription makePreCheckPrescription(String prescriptionNo,
+        Integer tenantId);
+
+    /**
+     * 电子处方上传预核验信息保存
+     *
+     * @param pcpResult 电子处方上传预核验信息
+     * @return 电子处方上传预核验信息
+     */
+    void savePreCheckPrescription(PreCheckPrescription pcpResult);
+
+    /**
+     * 电子处方上传预核验响应出参信息保存
+     *
+     * @param pcpResult 电子处方上传预核验响应出参信息
+     * @return
+     */
+    void saveEleVeriPrescriptionOutput(ElepVeriPrescriptionOutput pcpResult);
+
+    /**
+     * 做成电子处方医保电子签名入参
+     *
+     * @param hiRxno 医保处方编号
+     * @param practitionerId 审方药师Id
+     * @param checkDate 审方时间
+     * @param tenantId 租户Id
+     * @return 电子处方医保电子签名入参
+     */
+    ElepSignatureInput makeEleSignature(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId);
+
+    /**
+     * 保存电子处方医保电子签名入参
+     *
+     * @param eSign 电子处方医保电子签名入参信息
+     * @return
+     */
+    void saveEleSignature(ElepSignatureInput eSign);
+
+    /**
+     * 保存电子处方医保电子签名响应出参
+     *
+     * @param esResult 电子处方医保电子签名响应出参信息
+     * @return
+     */
+    void saveEleSignatureOutput(ElepSignatureOutput esResult);
+
+    /**
+     * 做成电子处方上传入参
+     *
+     * @param hiRxno 医保处方编号
+     * @param practitionerId 审方药师Id
+     * @param checkDate 审方时间
+     * @param tenantId 租户Id
+     * @return 电子处方上传入参
+     */
+    ElepUploadInput makeEleUploadInput(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId);
+
+    /**
+     * 保存电子处方上传入参
+     *
+     * @param eleUploadInput 电子处方上传入参信息
+     * @return
+     */
+    void saveEleUploadInput(ElepUploadInput eleUploadInput);
+
+    /**
+     * 保存电子处方上传响应出参
+     *
+     * @param euResult 电子处方上传响应出参信息
+     * @return
+     */
+    void saveEleUploadOutput(ElepUploadOutput euResult);
+
+    /**
+     * 做成电子处方撤销入参
+     *
+     * @param hiRxno 医保处方编号
+     * @param practitionerId 撤销药师Id
+     * @param description 撤销原因
+     * @param checkDate 撤销时间
+     * @param tenantId 租户Id
+     * @return 电子处方撤销入参
+     */
+    ElepRevokeInput makeEleRevokeInput(String hiRxno, Long practitionerId,String description, Date checkDate, Integer tenantId);
+
+    /**
+     * 保存电子处方撤销入参
+     *
+     * @param eleRevokeInput 电子处方撤销入参信息
+     * @return
+     */
+    void saveEleRevokeInput(ElepRevokeInput eleRevokeInput);
+
+    /**
+     * 保存电子处方撤销响应出参
+     *
+     * @param ereResult 电子处方撤销响应出参信息
+     * @return
+     */
+    void saveEleRevokeOutput(ElepRevokeOutput ereResult);
+
+    /**
+     * 做成电子处方信息查询入参
+     *
+     * @param hiRxno 医保处方编号
+     * @return 电子处方信息查询入参
+     */
+    ElepQuerPrescriptionInput makeEleQueryPrescriptionInput(String hiRxno);
+
+    /**
+     * 保存电子处方信息查询入参
+     *
+     * @param eleQueryPreInput 电子处方信息查询入参信息
+     * @return
+     */
+    void saveEleQueryPrescriptionInput(ElepQuerPrescriptionInput eleQueryPreInput);
+
+    /**
+     * 保存电子处方信息查询响应出参信息
+     *
+     * @param emrResult 电子处方信息查询响应出参信息
+     * @return
+     */
+    void saveEleMedResultOut(QueryPrescription emrResult);
+
+    /**
+     * 做成电子处方取药结果查询入参
+     *
+     * @param hiRxno 医保处方编号
+     * @return 电子处方取药结果查询入参
+     */
+    ElepMedresultInput makeEleMedResultInput(String hiRxno);
+
+    /**
+     * 保存电子处方取药结果查询入参
+     *
+     * @param eleMedInput 电子处方取药结果查询入参信息
+     * @return
+     */
+    void saveEleMedResultInput(ElepMedresultInput eleMedInput);
+
+    /**
+     * 保存电子处方取药结果查询响应出参
+     *
+     * @param medResInquiry 电子处方取药结果查询响应出参信息
+     * @return
+     */
+    void saveMedicationResultInquiry(MedicationResultInquiry medResInquiry);
+
+    Map<String,String> getMedTypeAndDoctorName(String prescriptionNo, Integer tenantId);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
new file mode 100644
index 00000000..9d81a156
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.service;
+
+import com.core.common.core.domain.R;
+import com.openhis.ybelep.domain.*;
+
+/**
+ *
+ * @author yuxj
+ * @date 2025-04-17
+ */
+public interface IYbEleHttpService {
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送医保电子处方注册预核验请求，并处理响应结果
+     *
+     * @param pcp 医保电子处方注册预核验入参实体
+     * @return 医保电子处方注册预核验响应出参实体
+     */
+    R<?> preCheck(PreCheckPrescription pcp, String medType , String dutyDoctorName);
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送电子处方医保电子签名请求，并处理响应结果
+     *
+     * @param eleSign 电子处方医保电子签名入参实体
+     * @return 电子处方医保电子签名响应出参实体
+     */
+    R<?> eleSign(ElepSignatureInput eleSign);
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送电子处方上传请求，并处理响应结果
+     *
+     * @param eleUploadInput 电子处方上传入参实体
+     * @return 电子处方上传响应出参实体
+     */
+    R<?> uploadElePre(ElepUploadInput eleUploadInput);
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送电子处方撤销请求，并处理响应结果
+     *
+     * @param eleRevokeInput 电子处方撤销入参实体
+     * @return 电子处方撤销响应出参实体
+     */
+    R<?> revokePre(ElepRevokeInput eleRevokeInput);
+
+    /**
+     * 采用HTTP协议中的 POST 方法，电子处方信息查询请求，并处理响应结果
+     *
+     * @param eleQueryPreInput 电子处方信息查询入参实体
+     * @return 电子处方信息查询出参实体
+     */
+    R<?> queryPre(ElepQuerPrescriptionInput eleQueryPreInput);
+
+    /**
+     * 采用HTTP协议中的 POST 方法，电子处方取药结果查询请求，并处理响应结果
+     *
+     * @param eleMedInput 电子处方取药结果查询入参实体
+     * @return 电子处方取药结果查询出参实体
+     */
+    R<?> queryMedPre(ElepMedresultInput eleMedInput);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
new file mode 100644
index 00000000..f5fc7ab7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
@@ -0,0 +1,38 @@
+package com.openhis.web.ybmanage.service;
+
+import com.core.common.core.domain.R;
+
+/**
+ * 医保Service
+ *
+ * @author GuoRui
+ */
+public interface IYbService {
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     * 
+     * @param encounterId 就诊ID
+     * @param trigScen 触发场景
+     * @return 结果
+     */
+    R<?> yb3101PreMidAnalysis(Long encounterId, String trigScen);
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param warnRsltId 违规标识
+     * @param dspoWay 处理方式
+     * @param dspoWayRea 处理原因
+     * @return 结果
+     */
+    R<?> yb3103PreMidFeedback(String warnRsltId, String dspoWay, String dspoWayRea);
+
+    /**
+     * 【4101A】医疗保障基金结算清单信息上传（新）
+     *
+     * @param paymentId 付款ID
+     * @return 结果
+     */
+    R<?> yb4101aUploadFundSettle(Long paymentId);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
new file mode 100644
index 00000000..5ad26d5e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.service.impl;
+
+import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.yb.dto.BaseInfo;
+import com.openhis.yb.dto.BaseParam;
+import com.openhis.yb.util.YbParamBuilderUtil;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.openhis.web.ybmanage.config.YbServiceConfig;
+import com.openhis.web.ybmanage.dto.Result;
+import com.openhis.web.ybmanage.service.IYbEleHttpService;
+import com.openhis.ybelep.domain.*;
+
+import java.io.IOException;
+
+/**
+ * http请求接口
+ *
+ * @author yuxj
+ * @date 2025-04-17
+ */
+@Service
+public class YbEleHttpServiceImpl implements IYbEleHttpService {
+
+    @Autowired
+    YbServiceConfig ybServiceConfig;
+
+    @Autowired
+    YbParamBuilderUtil ybParamBuilderUtil;
+    /**
+     * 采用HTTP协议中的 POST 方法，发送医保电子处方注册预核验请求，并处理响应结果
+     *
+     * @param pcp 医保电子处方注册预核验入参实体
+     * @return 医保电子处方注册预核验响应出参实体
+     */
+    @Override
+    public R<?> preCheck(PreCheckPrescription pcp, String medType , String dutyDoctorName) {
+        ElepVeriPrescriptionOutput pcpResult = new ElepVeriPrescriptionOutput();
+        BaseInfo baseInfo = ybParamBuilderUtil.getBaseInfo(medType, dutyDoctorName);
+        // 发送请求
+        String s = httpPost( SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/preCheckPrescription", pcp,baseInfo);
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(s, Result.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result != null && result.isSuccess()) {
+            pcpResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepVeriPrescriptionOutput.class);;
+            pcpResult.setPrescriptionNo(pcp.getHospRxno());
+            return  R.ok(pcpResult);
+        }else{
+            return  R.fail(result.getMessage());
+        }
+    }
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送电子处方医保电子签名请求，并处理响应结果
+     *
+     * @param eleSign 电子处方医保电子签名入参实体
+     * @return 电子处方医保电子签名响应出参实体
+     */
+    public R<?> eleSign(ElepSignatureInput eleSign) {
+
+        ElepSignatureOutput esResult = new ElepSignatureOutput();
+        // 发送请求
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/signature", eleSign,ybParamBuilderUtil.getBaseInfo("",""));
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(s, Result.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result != null && result.isSuccess()) {
+            esResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepSignatureOutput.class);
+            return  R.ok(esResult);
+        }else{
+            return  R.fail(result.getMessage());
+        }
+    }
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送电子处方上传请求，并处理响应结果
+     *
+     * @param eleUploadInput 电子处方上传入参实体
+     * @return 电子处方上传响应出参实体
+     */
+    @Override
+    public R<?> uploadElePre(ElepUploadInput eleUploadInput) {
+
+        ElepUploadOutput euResult = new ElepUploadOutput();
+        // 发送请求
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/upload", eleUploadInput,ybParamBuilderUtil.getBaseInfo("",""));
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(s, Result.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result != null && result.isSuccess()) {
+            euResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepUploadOutput.class);
+            return  R.ok(euResult);
+        }else{
+            return  R.fail(result.getMessage());
+        }
+    }
+
+    /**
+     * 采用HTTP协议中的 POST 方法，发送电子处方撤销请求，并处理响应结果
+     *
+     * @param eleRevokeInput 电子处方撤销入参实体
+     * @return 电子处方撤销响应出参实体
+     */
+    @Override
+    public R<?> revokePre(ElepRevokeInput eleRevokeInput) {
+
+        ElepRevokeOutput ereResult = new ElepRevokeOutput();
+        // 发送请求
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/revoke", eleRevokeInput,ybParamBuilderUtil.getBaseInfo("",""));
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(s, Result.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result != null && result.isSuccess()) {
+            ereResult = JSON.parseObject(JSON.toJSONString(result.getResult()), ElepRevokeOutput.class);
+            return  R.ok(ereResult);
+        }else{
+            return  R.fail(result.getMessage());
+        }
+    }
+
+    /**
+     * 采用HTTP协议中的 POST 方法，电子处方信息查询请求，并处理响应结果
+     *
+     * @param eleQueryPreInput 电子处方信息查询入参实体
+     * @return 电子处方信息查询出参实体
+     */
+    @Override
+    public R<?> queryPre(ElepQuerPrescriptionInput eleQueryPreInput) {
+        //拼参数
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(eleQueryPreInput);
+//        baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(o);
+        QueryPrescription emrResult = new QueryPrescription();
+        // 发送请求
+        String s =
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/querPrescription", eleQueryPreInput,ybParamBuilderUtil.getBaseInfo("",""));
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(s, Result.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result != null && result.isSuccess()) {
+            emrResult = JSON.parseObject(JSON.toJSONString(result.getResult()), QueryPrescription.class);
+            return  R.ok(emrResult);
+        }else{
+            return  R.fail(result.getMessage());
+        }
+    }
+
+    /**
+     * 采用HTTP协议中的 POST 方法，电子处方取药结果查询请求，并处理响应结果
+     *
+     * @param eleMedInput 电子处方取药结果查询入参实体
+     * @return 电子处方取药结果查询出参实体
+     */
+    public R<?> queryMedPre(ElepMedresultInput eleMedInput){
+
+        MedicationResultInquiry medResult = new MedicationResultInquiry();
+        // 发送请求
+        String s =
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("eleUrl") + "/medresult", eleMedInput,ybParamBuilderUtil.getBaseInfo("",""));
+        // 参数处理
+        ObjectMapper mapper = new ObjectMapper();
+        Result result = null;
+        try {
+            result = mapper.readValue(s, Result.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result != null && result.isSuccess()) {
+            medResult = JSON.parseObject(JSON.toJSONString(result.getResult()), MedicationResultInquiry.class);
+            return  R.ok(medResult);
+        }else{
+            return  R.fail(result.getMessage());
+        }
+    }
+    /**
+     * 发送http请求（2025/05/02经测试，若以自带的工具类发送请求失败，故使用原peis系统中成功调用的写法重新封装）
+     * @param url 路径
+     * @param o 参数
+     * @return
+     */
+    private String httpPost(String url, Object o, BaseInfo baseInfo){
+        String resultString = "";
+//        //拼参数
+        BaseParam baseParam = new BaseParam();
+        baseParam.setBaseInfo(baseInfo).setData(o);
+        //创建Http请求
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000).setConnectionRequestTimeout(30000)
+                .setSocketTimeout(30000).build();
+        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
+        CloseableHttpResponse response = null;
+        //发送请求
+        try {
+            HttpPost httpPost = new HttpPost(url);
+            StringEntity stringEntity = new StringEntity(JSON.toJSONString(baseParam), ContentType.APPLICATION_JSON);
+            httpPost.setEntity(stringEntity);
+            // 执行http请求
+            response = httpClient.execute(httpPost);
+            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException("Http请求异常，请稍后再试。");
+        }
+        finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return resultString;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
new file mode 100644
index 00000000..68ea55c4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
@@ -0,0 +1,701 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.service.impl;
+
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.core.domain.model.LoginUser;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.IPatientService;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.common.enums.PrescriptionType;
+import com.openhis.common.enums.RequestStatus;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.financial.domain.Contract;
+import com.openhis.financial.service.IContractService;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
+import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
+import com.openhis.web.ybmanage.mapper.YbElepMapper;
+import com.openhis.workflow.domain.ElepMedicationRequest;
+import com.openhis.workflow.service.IElepMedicationRequestService;
+import com.openhis.yb.service.IPerinfoService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.openhis.web.ybmanage.service.IYbEleBaseService;
+import com.openhis.web.ybmanage.util.YbEleParamBuilderUtil;
+import com.openhis.yb.domain.ClinicReg;
+import com.openhis.yb.service.IRegService;
+import com.openhis.ybelep.domain.*;
+import com.openhis.ybelep.service.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 医保表的增删改查接口
+ *
+ * @author yuxj
+ * @date 2025-04-17
+ */
+@Service
+public class YbElepBaseServiceImpl implements IYbEleBaseService {
+
+    @Autowired
+    IRegService iRegService;
+    @Autowired
+    IPerinfoService perinfoService;
+    @Autowired
+    IContractService contractService;
+    @Autowired
+    IPractitionerService iPractitionerService;
+    @Autowired
+    YbEleParamBuilderUtil ybEleUtil;
+    @Autowired
+    IElepVeriPrescriptionInfoService eleVeriPrescriptionInfoService;
+    @Autowired
+    IElepVeriPrescriptionDetailService eleVeriPrescriptionDetailService;
+    @Autowired
+    IElepVeriVisitInfoService eleVeriVisitInfoService;
+    @Autowired
+    IElepVeriDiagnosisInfoService eleVeriDiagnosisInfoService;
+    @Autowired
+    IElepVeriPrescriptionOutputService elePresOutputService;
+    @Autowired
+    IElepSignatureInputService eleSignInfoService;
+    @Autowired
+    IElepSignatureOutputService eleSignOutService;
+    @Autowired
+    IElepUploadInputService eleUploadInputService;
+    @Autowired
+    IElepUploadOutputService eleUploadOutputService;
+    @Autowired
+    IElepRevokeInputService eleRevokeInputService;
+    @Autowired
+    IElepRevokeOutputService eleRevokeOutputService;
+    @Autowired
+    IElepMedresultInputService eleMedResultInputService;
+    @Autowired
+    IElepQuerPrescriptionInputService eleQueryPreInputService;
+    @Autowired
+    IElepMedresultInfoService eleMedResInfoService;
+    @Autowired
+    IElepMedresultInputService eleMedResInputService;
+    @Autowired
+    IElepMedresultDetailService eleMedDetailService;
+    @Autowired
+    YbElepMapper ybElepMapper;
+    @Autowired
+    IElepMedicationRequestService elepMedicationRequestService;
+    @Autowired
+    IElepQuerPrescriptionInfoService eleQuerPrescriptionInfoService;
+    @Autowired
+    IElepQuerPrescriptionDetailService eleQuerPrescriptionDetailService;
+    @Autowired
+    IElepQuerVisitInfoService eleQuerVisitInfoService;
+    @Autowired
+    IElepQuerDiagnosisInfoService eleQuerDiagnosisInfoService;
+    @Resource
+    IPractitionerService practitionerService;
+    @Resource
+    IEncounterService encounterService;
+    @Resource
+    IPatientService patientService;
+
+    /**
+     * 医保电子处方查询
+     *
+     * @param veriPrescriptionParam 查询条件
+     * @param searchKey             模糊查询关键字
+     * @param pageNo                当前页
+     * @param pageSize              每页多少条
+     * @param request               请求数据
+     * @return 处方信息
+     */
+    @Override
+    public R<?> getVeriPrescriptionInfo(VeriPrescriptionParam veriPrescriptionParam, String searchKey, Integer pageNo,
+                                        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<VeriPrescriptionParam> queryWrapper =
+                HisQueryUtils.buildQueryWrapper(veriPrescriptionParam, searchKey,
+                        new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.IptOtpNo)),
+                        request);
+
+        // 医保电子处方查询
+        IPage<VeriPrescriptionInfoDto> veriPrescriptionInfo =
+                ybElepMapper.getVeriPrescriptionInfo(new Page<>(pageNo, pageSize), queryWrapper);
+        // 状态转换
+        veriPrescriptionInfo.getRecords().forEach(prescriptionInfoDto -> {
+            prescriptionInfoDto.setStatusEnum_enumText(
+                    EnumUtils.getInfoByValue(RequestStatus.class, prescriptionInfoDto.getStatusEnum()));
+        });
+
+        return R.ok(veriPrescriptionInfo);
+    }
+
+    /**
+     * 医保电子处方查看
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方详细信息
+     */
+    @Override
+    public R<?> getPrescriptionDetailInfo(String prescriptionNo) {
+        // 处方详细查询
+        List<VeriPrescriptionDetailInfoDto> prescriptionDetailInfo =
+                ybElepMapper.getVeriPrescriptionDetailInfo(prescriptionNo);
+        // 状态转换
+        for (VeriPrescriptionDetailInfoDto item : prescriptionDetailInfo) {
+            item.setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, item.getStatusEnum()));
+            item.setRxTypeCode_enumText(EnumUtils.getInfoByValue(PrescriptionType.class, item.getRxTypeCode()));
+        }
+        return R.ok(prescriptionDetailInfo);
+    }
+
+    /**
+     * 医保电子处方状态更新(上传)
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方信息
+     */
+    @Override
+    public R<?> uploadPrescriptionStatus(String prescriptionNo) {
+        // 获取当前登陆用户信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 获取医保处方号
+        List<ElepVeriPrescriptionOutput> prescriptionOutput =
+                elePresOutputService.list(new LambdaQueryWrapper<ElepVeriPrescriptionOutput>()
+                        .eq(ElepVeriPrescriptionOutput::getPrescriptionNo, prescriptionNo)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (prescriptionOutput == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+        }
+        // 获取电子处方信息
+        List<ElepMedicationRequest> elepMedicationRequest =
+                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionNo);
+        if (elepMedicationRequest == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+        }
+        boolean flg;
+        // 更改处方信息
+        for (ElepMedicationRequest item : elepMedicationRequest) {
+            // 医保处方编号
+            item.setHiRxno(prescriptionOutput.get(0).getHiRxno());
+            // 电子处方追溯码
+            item.setRxTraceCode(prescriptionOutput.get(0).getRxTraceCode());
+            // 处方状态
+            item.setStatusEnum(RequestStatus.COMPLETED.getValue());
+            // 审核药师
+            item.setReviewDrId(user.getId());
+            // 审核时间
+            item.setReviewTime(now);
+            flg = elepMedicationRequestService.updateById(item);
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 医保电子处方拒绝上传
+     *
+     * @param prescriptionNo 处方号
+     * @return 处方信息
+     */
+    @Override
+    public R<?> refusePrescriptionStatus(String prescriptionNo) {
+        // 获取当前登陆用户信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 获取电子处方信息
+        List<ElepMedicationRequest> elepMedicationRequest =
+                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionNo);
+        if (elepMedicationRequest == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+        }
+        boolean flg;
+        // 更改处方信息
+        for (ElepMedicationRequest item : elepMedicationRequest) {
+            // 处方状态
+            item.setStatusEnum(RequestStatus.ENDED.getValue());
+            flg = elepMedicationRequestService.updateById(item);
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 医保电子处方状态更新（撤销）
+     *
+     * @param prescriptionNo 处方号
+     * @param quashReason    撤销原因
+     * @return 处方信息
+     */
+    @Override
+    public R<?> quashPrescriptionStatus(String prescriptionNo, String quashReason) {
+        // 获取当前登陆用户信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 获取电子处方信息
+        List<ElepMedicationRequest> elepMedicationRequest =
+                elepMedicationRequestService.selectElepMedicationRequestByPrescriptionNo(prescriptionNo);
+        if (elepMedicationRequest == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
+        }
+        boolean flg;
+        // 更改处方信息
+        for (ElepMedicationRequest item : elepMedicationRequest) {
+            // 处方状态
+            item.setStatusEnum(RequestStatus.STOPPED.getValue());
+            // 撤销药师
+            item.setQuashDrId(user.getId());
+            // 撤销时间
+            item.setQuashTime(now);
+            // 撤销原因
+            item.setQuashReason(quashReason);
+            flg = elepMedicationRequestService.updateById(item);
+            if (!flg) {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+    }
+
+    /**
+     * 做成电子处方上传预核验入参信息
+     *
+     * @param prescriptionNo 处方号
+     * @param tenantId       租户Id
+     * @return 处方信息
+     */
+    @Override
+    public PreCheckPrescription makePreCheckPrescription(String prescriptionNo,
+                                                         Integer tenantId) {
+
+        // 获取药品请求信息(处方表)
+        List<ElepMedicationRequest> medicationRequestList = elepMedicationRequestService.list(
+                new LambdaQueryWrapper<ElepMedicationRequest>().eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)
+                        .eq(ElepMedicationRequest::getTenantId, tenantId));
+        if (medicationRequestList == null) {
+            return null;
+        }
+        ElepMedicationRequest medicationRequest = medicationRequestList.get(0);
+
+        // 就诊信息
+        Encounter encounter = encounterService.getById(medicationRequest.getEncounterId());
+        //患者信息
+        Patient patient = patientService.getById(encounter.getPatientId());
+        // 获取医保挂号信息     todo  clinicReg可能改成一对多
+        ClinicReg clinicReg = iRegService.getByBusNo(encounter.getBusNo());
+        if (clinicReg == null) {
+            return null;
+        }
+
+        // 获取处方信息
+        PreCheckPrescription prescriptionInfo =
+                ybEleUtil.getEleVeriPrescriptionInfo(medicationRequest, patient, tenantId);
+        // 获取处方明细信息
+        List<ElepVeriPrescriptionDetail> rxdrugdetail =
+                ybEleUtil.getEleVeriPrescriptionDetail(prescriptionNo, tenantId);
+
+        // 获取就诊信息和诊断信息
+        PreCheckPrescription eleVisAndDisInfo =
+                ybEleUtil.getEleVeriVisitAndDiagnosisInfo(medicationRequest, clinicReg, tenantId);
+
+        // 电子处方上传预核验实体赋值
+
+        prescriptionInfo.setRxdrugdetail(rxdrugdetail)
+                .setMdtrtinfo(eleVisAndDisInfo.getMdtrtinfo()).setDiseinfo(eleVisAndDisInfo.getDiseinfo());
+
+        return prescriptionInfo;
+    }
+
+    /**
+     * 电子处方上传预核验信息保存
+     *
+     * @param pcpResult 电子处方上传预核验信息
+     * @return
+     */
+    @Override
+    public void savePreCheckPrescription(PreCheckPrescription pcpResult) {
+
+        //todo dto和表的字段类型不一致
+        ElepVeriPrescriptionInfo prescriptionInfo = new ElepVeriPrescriptionInfo();
+        BeanUtils.copyProperties(pcpResult, prescriptionInfo);
+
+        // 保存处方信息
+        eleVeriPrescriptionInfoService.save(prescriptionInfo);
+        // 保存处方明细信息
+        eleVeriPrescriptionDetailService.saveBatch(pcpResult.getRxdrugdetail());
+        // 保存就诊信息
+        eleVeriVisitInfoService.save(pcpResult.getMdtrtinfo());
+        // 保存诊断信息
+        eleVeriDiagnosisInfoService.save(pcpResult.getDiseinfo());
+    }
+
+
+    /**
+     * 电子处方上传预核验响应出参信息保存
+     *
+     * @param pcpResult 电子处方上传预核验响应出参信息
+     * @return
+     */
+    @Override
+    public void saveEleVeriPrescriptionOutput(ElepVeriPrescriptionOutput pcpResult) {
+        elePresOutputService.save(pcpResult);
+    }
+
+    /**
+     * 做成电子处方医保电子签名入参
+     *
+     * @param hiRxno         医保处方编号
+     * @param practitionerId 审方药师Id
+     * @param checkDate      审方时间
+     * @param tenantId       租户Id
+     * @return 处方信息
+     */
+    @Override
+    public ElepSignatureInput makeEleSignature(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId) {
+
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (pcpResult == null) {
+            return null;
+        }
+        return ybEleUtil.getEleSignatureInput(pcpResult.get(0), practitionerId, checkDate, tenantId);
+    }
+
+    /**
+     * 保存电子处方医保电子签名入参
+     *
+     * @param eSign 电子处方医保电子签名入参信息
+     * @return
+     */
+    @Override
+    public void saveEleSignature(ElepSignatureInput eSign) {
+        eleSignInfoService.save(eSign);
+    }
+
+    /**
+     * 保存电子处方医保电子签名响应出参
+     *
+     * @param esResult 电子处方医保电子签名响应出参信息
+     * @return
+     */
+    @Override
+    public void saveEleSignatureOutput(ElepSignatureOutput esResult) {
+        eleSignOutService.save(esResult);
+    }
+
+    /**
+     * 做成电子处方上传入参
+     *
+     * @param hiRxno         医保处方编号
+     * @param practitionerId 审方药师Id
+     * @param checkDate      审方时间
+     * @param tenantId       租户Id
+     * @return 电子处方上传入参
+     */
+    @Override
+    public ElepUploadInput makeEleUploadInput(String hiRxno, Long practitionerId, Date checkDate, Integer tenantId) {
+
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        List<ElepSignatureOutput> esResult = eleSignOutService
+                .list(new LambdaQueryWrapper<ElepSignatureOutput>().eq(ElepSignatureOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepSignatureOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (pcpResult == null || esResult == null) {
+            return null;
+        }
+        return ybEleUtil.getEleUploadInput(pcpResult.get(0), esResult.get(0), practitionerId, checkDate, tenantId);
+    }
+
+    /**
+     * 保存电子处方上传入参
+     *
+     * @param eleUploadInput 电子处方上传入参信息
+     * @return
+     */
+    @Override
+    public void saveEleUploadInput(ElepUploadInput eleUploadInput) {
+        eleUploadInputService.save(eleUploadInput);
+    }
+
+    /**
+     * 保存电子处方上传响应出参
+     *
+     * @param euResult 电子处方上传响应出参信息
+     * @return
+     */
+    @Override
+    public void saveEleUploadOutput(ElepUploadOutput euResult) {
+        eleUploadOutputService.save(euResult);
+    }
+
+    /**
+     * 做成电子处方撤销入参
+     *
+     * @param hiRxno         医保处方编号
+     * @param practitionerId 撤销药师Id
+     * @param description    撤销原因
+     * @param revokeDate     撤销时间
+     * @param tenantId       租户Id
+     * @return 电子处方撤销入参
+     */
+    @Override
+    public ElepRevokeInput makeEleRevokeInput(String hiRxno, Long practitionerId, String description, Date revokeDate,
+                                              Integer tenantId) {
+
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+        if (pcpResult == null) {
+            return null;
+        }
+        List<ElepUploadOutput> euResult = eleUploadOutputService
+                .list(new LambdaQueryWrapper<ElepUploadOutput>().eq(ElepUploadOutput::getHiRxno, pcpResult.get(0).getHiRxno())
+                        .orderByDesc(ElepUploadOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (euResult == null) {
+            return null;
+        }
+
+        return ybEleUtil.getElepRevokeInput(pcpResult.get(0), euResult.get(0), practitionerId, description, revokeDate, tenantId);
+    }
+
+    /**
+     * 保存电子处方撤销入参
+     *
+     * @param eleRevokeInput 电子处方撤销入参信息
+     * @return
+     */
+    @Override
+    public void saveEleRevokeInput(ElepRevokeInput eleRevokeInput) {
+        eleRevokeInputService.save(eleRevokeInput);
+    }
+
+    /**
+     * 保存电子处方撤销响应出参
+     *
+     * @param ereResult 电子处方撤销响应出参信息
+     * @return
+     */
+    @Override
+    public void saveEleRevokeOutput(ElepRevokeOutput ereResult) {
+
+        eleRevokeOutputService.save(ereResult);
+    }
+
+    /**
+     * 做成电子处方信息查询入参
+     *
+     * @param hiRxno 医保处方编号
+     * @return 电子处方信息查询入参
+     */
+    @Override
+    public ElepQuerPrescriptionInput makeEleQueryPrescriptionInput(String hiRxno) {
+
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (pcpResult == null) {
+            return null;
+        }
+        return ybEleUtil.getEleQueryPrescriptionInput(pcpResult.get(0));
+    }
+
+    /**
+     * 保存电子处方信息查询入参
+     *
+     * @param eleQueryPreInput 电子处方信息查询入参信息
+     * @return
+     */
+    @Override
+    public void saveEleQueryPrescriptionInput(ElepQuerPrescriptionInput eleQueryPreInput) {
+        eleQueryPreInputService.save(eleQueryPreInput);
+    }
+
+    /**
+     * 保存电子处方信息查询响应出参信息
+     *
+     * @param emrResult 电子处方信息查询响应出参信息
+     * @return
+     */
+    @Override
+    public void saveEleMedResultOut(QueryPrescription emrResult) {
+
+        ElepQuerPrescriptionInfo prescriptionInfo = new ElepQuerPrescriptionInfo();
+        BeanUtils.copyProperties(emrResult, prescriptionInfo);
+
+        // 保存处方信息
+        eleQuerPrescriptionInfoService.save(prescriptionInfo);
+        // 保存处方明细信息
+        eleQuerPrescriptionDetailService.saveBatch(emrResult.getRxDetlList());
+        // 保存就诊信息
+        eleQuerVisitInfoService.save(emrResult.getRxOtpinfo());
+        // 保存诊断信息
+        eleQuerDiagnosisInfoService.saveBatch(emrResult.getRxDiseList());
+
+    }
+
+    /**
+     * 做成电子处方取药结果查询入参
+     *
+     * @param hiRxno 医保处方编号
+     * @return 电子处方取药结果查询入参
+     */
+    @Override
+    public ElepMedresultInput makeEleMedResultInput(String hiRxno) {
+
+        List<ElepVeriPrescriptionOutput> pcpResult = elePresOutputService.list(
+                new LambdaQueryWrapper<ElepVeriPrescriptionOutput>().eq(ElepVeriPrescriptionOutput::getHiRxno, hiRxno)
+                        .orderByDesc(ElepVeriPrescriptionOutput::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (pcpResult == null) {
+            return null;
+        }
+
+        return ybEleUtil.getEleMedResultInput(pcpResult.get(0));
+    }
+
+    /**
+     * 保存电子处方取药结果查询入参
+     *
+     * @param eleMedInput 电子处方取药结果查询入参信息
+     * @return
+     */
+    @Override
+    public void saveEleMedResultInput(ElepMedresultInput eleMedInput) {
+        eleMedResInputService.save(eleMedInput);
+    }
+
+    /**
+     * 保存电子处方取药结果查询响应出参
+     *
+     * @param medResInquiry 电子处方取药结果查询响应出参信息
+     * @return
+     */
+    @Override
+    public void saveMedicationResultInquiry(MedicationResultInquiry medResInquiry) {
+        ElepMedresultInfo medresultInfo = new ElepMedresultInfo();
+        BeanUtils.copyProperties(medResInquiry, medresultInfo);
+
+        // 保存处方信息
+        eleMedResInfoService.save(medresultInfo);
+        eleMedDetailService.saveBatch(medResInquiry.getSeltdelts());
+    }
+
+    @Override
+    public Map<String, String> getMedTypeAndDoctorName(String prescriptionNo, Integer tenantId) {
+
+        HashMap<String, String> map = new HashMap<>();
+        // 获取药品请求信息(处方表)
+        List<ElepMedicationRequest> medicationRequestList = elepMedicationRequestService.list(
+                new LambdaQueryWrapper<ElepMedicationRequest>().eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo)
+                        .eq(ElepMedicationRequest::getTenantId, tenantId));
+        if (medicationRequestList == null) {
+            return null;
+        }
+        ElepMedicationRequest medicationRequest = medicationRequestList.get(0);
+
+        // 就诊信息
+        Encounter encounter = encounterService.getById(medicationRequest.getEncounterId());
+        //患者信息
+        Patient patient = patientService.getById(encounter.getPatientId());
+        // 获取医保挂号信息     todo  clinicReg可能改成一对多
+        ClinicReg clinicReg = iRegService.getByBusNo(encounter.getBusNo());
+        if (clinicReg == null) {
+            return null;
+        }
+
+        String medicalContractName = "";
+        String insuplcAdmdvs = clinicReg.getInsuplcAdmdvs();
+        if (insuplcAdmdvs.equals("229900") ) {
+            medicalContractName = "省";
+        } else if (insuplcAdmdvs.startsWith("2201")) {
+            medicalContractName = "市";
+        } else {
+            medicalContractName = "省异地";
+        }
+//        List<Contract> contractListByYb = contractService.getContractListByYb();
+//        for (Contract contract : contractListByYb) {
+//            if(insuplcAdmdvs.equals(contract.getAdmVs())){
+//                medicalContractName = contract.getContractName();
+//            }
+//        }
+
+        String insutype = clinicReg.getInsutype();
+
+        String medicalCareType = "";
+        switch (insutype) {
+            case "310":
+            case "320":
+            case "330":
+            case "370":
+                medicalCareType = "职工医保";
+                break;
+            case "340":
+            case "360":
+                medicalCareType = "全公费";
+                break;
+            case "390":
+            case "392":
+            case "391":
+            case "380":
+                medicalCareType = "居民医保";
+                break;
+            case "350":
+            case "410":
+            case "399":
+                medicalCareType = "其他";
+                break;
+            default:
+                medicalCareType = "全自费";
+                break;
+        }
+
+        Practitioner practitioner = iPractitionerService.getById(SecurityUtils.getLoginUser().getPractitionerId());
+
+        map.put("doctorName", practitioner.getName());
+        map.put("medType", medicalContractName + medicalCareType);
+
+        return map;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
new file mode 100644
index 00000000..20e20120
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
@@ -0,0 +1,407 @@
+package com.openhis.web.ybmanage.service.impl;
+
+import java.math.BigDecimal;
+import java.time.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.core.common.enums.DeleteFlag;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.StringUtils;
+import com.core.web.util.TenantOptionUtil;
+import com.openhis.common.enums.ParticipantType;
+import com.openhis.common.enums.TherapyTimeType;
+import com.openhis.common.enums.Whether;
+import com.openhis.common.enums.ybenums.*;
+import com.openhis.web.ybmanage.mapper.YbMapper;
+import com.openhis.web.ybmanage.service.IYbService;
+import com.openhis.yb.dto.*;
+import com.openhis.yb.service.YbHttpUtils;
+
+/**
+ * 医保ServiceImpl
+ *
+ * @author GuoRui
+ */
+@Service
+public class YbServiceImpl implements IYbService {
+
+    @Autowired
+    private YbMapper ybMapper;
+    @Autowired
+    private YbHttpUtils ybHttpUtils;
+
+    /**
+     * 【3101】明细审核事前事中分析服务
+     *
+     * @param encounterId 就诊ID
+     * @param trigScen 触发场景
+     * @return 结果
+     */
+    @Override
+    public R<?> yb3101PreMidAnalysis(Long encounterId, String trigScen) {
+        // 验证触发场景
+        if (YbTrigScen.getByValue(trigScen) == null) {
+            throw new ServiceException("请指定触发场景");
+        }
+
+        // 查询就诊患者信息
+        Yb3101AdapterEncounterPatientInfo encounterPatientInfo = ybMapper.yb3101SelectEncounterPatientInfo(encounterId,
+            Whether.YES.getValue(), ParticipantType.REGISTRATION_DOCTOR.getCode(), DeleteFlag.NOT_DELETED.getCode());
+        if (encounterPatientInfo == null) {
+            throw new ServiceException("患者信息不存在");
+        }
+
+        // 查询就诊诊断信息
+        List<Yb3101AdapterEncounterDiagnoseInfo> encounterDiagnoseInfoList =
+            ybMapper.yb3101SelectEncounterDiagnoseInfo(encounterId, DeleteFlag.NOT_DELETED.getCode());
+        if (encounterDiagnoseInfoList.isEmpty()) {
+            throw new ServiceException("诊断信息不存在");
+        }
+
+        // 查询处方（医嘱）信息
+        List<Yb3101AdapterOrderInfo> orderInfoList = ybMapper.yb3101SelectOrderInfo(encounterId,
+            DeleteFlag.NOT_DELETED.getCode(), YbMedChrgItmType.WEST_MEDICINE.getValue(),
+            YbMedChrgItmType.CHINESE_MEDICINE_SLICES_FEE.getValue(), YbMedChrgItmType.CHINESE_MEDICINE_FEE.getValue());
+        if (encounterDiagnoseInfoList.isEmpty()) {
+            throw new ServiceException("处方信息不存在");
+        }
+
+        // 作成诊断信息集合
+        List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos =
+            encounterDiagnoseInfoList.stream().map(this::createYb3101FsiDiagnoseDto).collect(Collectors.toList());
+
+        // 作成处方(医嘱)信息集合
+        List<Yb3101InputFsiOrderDto> fsiOrderDtos =
+            orderInfoList.stream().map(this::createYb3101InputFsiOrderDto).collect(Collectors.toList());
+
+        // 作成就诊信息
+        Yb3101InputFsiEncounterDto fsiEncounterDto =
+            createYb3101InputFsiEncounterDto(encounterPatientInfo, fsiDiagnoseDtos, fsiOrderDtos);
+
+        // 作成参保人信息
+        Yb3101InputPatientDto patientDto = createYb3101InputPatientDto(encounterPatientInfo, fsiEncounterDto);
+
+        // 作成规则分析信息
+        Yb3101InputData data = createYb3101InputData(patientDto, trigScen);
+
+        // 向医保服务发起HTTP请求，获取返回结果
+        Yb3101OutputResult result = ybHttpUtils.yb3101PreMidAnalysis(data);
+
+        // TODO:后续处理需等待门诊住院开发完全后
+
+        return R.ok();
+    }
+
+    /**
+     * 【3103】事前事中服务反馈服务
+     *
+     * @param warnRsltId 违规标识
+     * @param dspoWay 处理方式
+     * @param dspoWayRea 处理原因
+     * @return 结果
+     */
+    @Override
+    public R<?> yb3103PreMidFeedback(String warnRsltId, String dspoWay, String dspoWayRea) {
+        // 验证处理方式
+        if (YbDspoWay.getByValue(dspoWay) == null) {
+            throw new ServiceException("请指定处理方式");
+        }
+
+        // 继续执行医嘱时，处理原因必填
+        if (YbDspoWay.CONTINUE.getValue().equals(dspoWay) && StringUtils.isEmpty(dspoWayRea)) {
+            throw new ServiceException("请填写处理原因");
+        }
+
+        // 作成处理数据
+        Yb3103InputWarn warn =
+            new Yb3103InputWarn().setWarnRsltId(warnRsltId).setDspoWay(dspoWay).setDspoWayRea(dspoWayRea);
+
+        // 作成输入
+        Yb3103InputData data = new Yb3103InputData().setWarnType(YbWarnType.PRE.getValue()).setWarns(List.of(warn));
+
+        // 向医保服务发起HTTP请求
+        ybHttpUtils.yb3103PreMidFeedback(data);
+
+        return R.ok();
+    }
+
+    /**
+     * 【4101A】医疗保障基金结算清单信息上传（新）
+     *
+     * @param paymentId 付款ID
+     * @return 结果
+     */
+    @Override
+    public R<?> yb4101aUploadFundSettle(Long paymentId) {
+        // 查询结算清单信息
+        List<Yb4101AAdapterSettleInfo> settleInfoList = ybMapper.yb4101aSelectSettleInfo(paymentId);
+
+        return R.ok();
+    }
+
+    /**
+     * 【3101】创建诊断信息
+     * 
+     * @param encounterDiagnoseInfo 就诊诊断信息
+     * @return 诊断信息
+     */
+    private Yb3101InputFsiDiagnoseDto
+        createYb3101FsiDiagnoseDto(Yb3101AdapterEncounterDiagnoseInfo encounterDiagnoseInfo) {
+        // 根据住院患者疾病诊断类型代码，判断出入诊断类别，非入院诊断，视为出院诊断
+        String inoutDiseType;
+        if (YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getCode().equals(encounterDiagnoseInfo.getIptDiseTypeCode())) {
+            inoutDiseType = YbInOutDiagType.YB_IN_DIAG_TYPE.getValue();
+        } else {
+            inoutDiseType = YbInOutDiagType.YB_OUT_DIAG_TYPE.getValue();
+        }
+        // 返回诊断信息
+        return new Yb3101InputFsiDiagnoseDto()
+            // 诊断标识：诊断记录唯一标识
+            .setDiseId(encounterDiagnoseInfo.getDiseId())
+            // 出入诊断类别：参考字典表
+            .setInoutDiseType(inoutDiseType)
+            // 主诊断标志：参考字典表
+            .setMaindiseFlag(encounterDiagnoseInfo.getMaindiseFlag())
+            // 诊断排序号：例如：1,2,3…
+            .setDiasSrtNo(encounterDiagnoseInfo.getDiasSrtNo())
+            // 诊断(疾病)编码
+            .setDiseCodg(encounterDiagnoseInfo.getDiseCodg())
+            // 诊断(疾病)名称
+            .setDiseName(encounterDiagnoseInfo.getDiseName())
+            // 诊断日期：格式：yyyy-MM-dd HH:mm:ss
+            .setDiseDate(encounterDiagnoseInfo.getDiseDate());
+    }
+
+    /**
+     * 【3101】创建处方（医嘱）信息
+     *
+     * @param orderInfo 处方（医嘱）信息
+     * @return 处方（医嘱）信息
+     */
+    private Yb3101InputFsiOrderDto createYb3101InputFsiOrderDto(Yb3101AdapterOrderInfo orderInfo) {
+        // 根据治疗类型，判断是否为长期医嘱
+        String longDrordFlag;
+        if (TherapyTimeType.LONG_TERM.getValue().equals(orderInfo.getTherapyEnum())) {
+            longDrordFlag = Whether.YES.getCode();
+        } else {
+            longDrordFlag = Whether.NO.getCode();
+        }
+        // 根据医保类别，判断目录类别
+        String hilistType = null;
+        if (YbMedChrgItmType.WEST_MEDICINE.getValue().equals(orderInfo.getYbType())
+            || YbMedChrgItmType.CHINESE_MEDICINE_FEE.getValue().equals(orderInfo.getYbType())) {
+            hilistType = YbListType.WESTERN_AND_CHINESE_PATENT_MEDICINE.getValue();
+        } else if (YbMedChrgItmType.CHINESE_MEDICINE_SLICES_FEE.getValue().equals(orderInfo.getYbType())) {
+            hilistType = YbListType.IMPORTANT_HERBAL_SLICES.getValue();
+        }
+        return new Yb3101InputFsiOrderDto()
+            // 处方(医嘱)标识：处方(医嘱)记录唯一ID
+            .setRxId(orderInfo.getRxId())
+            // 处方号
+            .setRxno(orderInfo.getRxno())
+            // 组编号
+            .setGrpno(orderInfo.getGrpno())
+            // 是否为长期医嘱：[1=是,0=否]
+            .setLongDrordFlag(longDrordFlag)
+            // 目录类别：参考字典表
+            .setHilistType(hilistType)
+            // 收费类别：参考字典表
+            .setChrgType(orderInfo.getYbType())
+            // 医嘱行为：参考字典表
+            .setDrordBhvr(YbDrordBhvr.OTHER.getValue())
+            // 医保目录代码：国家统一标准编码
+            .setHilistCode(orderInfo.getHilistCode())
+            // 医保目录名称：国家统一标准名称
+            .setHilistName(orderInfo.getHilistName())
+            // 医保目录(药品)剂型：国家统一标准药品剂型
+            .setHilistDosform(orderInfo.getHilistDosform())
+            // 医保目录等级
+            .setHilistLv(orderInfo.getHilistLv())
+            // 医保目录价格，暂时取本系统单价
+            .setHilistPric(orderInfo.getPric())
+            // 医院目录代码
+            .setHosplistCode(orderInfo.getHilistCode())
+            // 医院目录名称
+            .setHosplistName(orderInfo.getHilistName())
+            // 医院目录(药品)剂型
+            .setHosplistDosform(orderInfo.getHilistDosform())
+            // 数量
+            .setCnt(BigDecimal.valueOf(orderInfo.getCnt()))
+            // 单价
+            .setPric(orderInfo.getPric())
+            // 总费用
+            .setSumamt(orderInfo.getSumamt())
+            // 自费金额
+            .setOwnpayAmt(BigDecimal.ZERO) // TODO:从哪取啊，住院有（但表还没建），门诊没有
+            // 自付金额
+            .setSelfpayAmt(BigDecimal.ZERO) // TODO:从哪取啊，住院有（但表还没建），门诊没有
+            // 规格：例如：0.25g×12片/盒
+            .setSpec(orderInfo.getSpec())
+            // 数量单位：例如：盒
+            .setSpecUnt(orderInfo.getSpecUnt())
+            // 医嘱开始日期：格式：yyyy-MM-dd HH:mm:ss
+            .setDrordBegnDate(orderInfo.getDrordBegnDate())
+            // 下达医嘱的科室标识
+            .setDrordDeptCodg(orderInfo.getDrordDeptCodg())
+            // 下达医嘱科室名称
+            .setDrordDeptName(orderInfo.getDrordDeptName())
+            // 开处方(医嘱)医生标识
+            .setDrordDrCodg(orderInfo.getDrordDrCodg())
+            // 开处方(医嘱)医生姓名
+            .setDrordDrName(orderInfo.getDrordDrName())
+            // 开处方(医嘱)医职称：参考字典表
+            .setDrordDrProfttl(orderInfo.getDrordDrProfttl())
+            // 是否当前处方(医嘱)：本次处方(医嘱)标记[1=是,0=否]
+            .setCurrDrordFlag(Whether.YES.getCode());
+    }
+
+    /**
+     * 【3101】创建就诊信息
+     * 
+     * @param encounterPatientInfo 就诊患者信息
+     * @param fsiDiagnoseDtos 诊断信息集合
+     * @param fsiOrderDtos 处方(医嘱)信息集合
+     * @return 就诊信息
+     */
+    private Yb3101InputFsiEncounterDto createYb3101InputFsiEncounterDto(
+        Yb3101AdapterEncounterPatientInfo encounterPatientInfo, List<Yb3101InputFsiDiagnoseDto> fsiDiagnoseDtos,
+        List<Yb3101InputFsiOrderDto> fsiOrderDtos) {
+        // 判断出院时间，如果为空，默认当天下午四点
+        if (encounterPatientInfo.getDscgDate() == null) {
+            encounterPatientInfo.setDscgDate(getFourPmDate(encounterPatientInfo.getAdmDate()));
+        }
+        // 提取主诊断
+        Yb3101InputFsiDiagnoseDto mainDiagnose =
+            fsiDiagnoseDtos.stream().filter(e -> Whether.YES.getCode().equals(e.getMaindiseFlag())).findFirst()
+                .orElse(new Yb3101InputFsiDiagnoseDto());
+        // 计算总费用
+        BigDecimal medfeeSumamt =
+            fsiOrderDtos.stream().map(Yb3101InputFsiOrderDto::getSumamt).reduce(BigDecimal.ZERO, BigDecimal::add);
+        // 作成就诊信息
+        return new Yb3101InputFsiEncounterDto()
+            // 就诊标识：就诊记录唯一ID
+            .setMdtrtId(encounterPatientInfo.getMdtrtId())
+            // 医疗服务机构标识：定点医疗机构ID
+            .setMedinsId(encounterPatientInfo.getMedinsId())
+            // 医疗机构名称
+            .setMedinsName(encounterPatientInfo.getMedinsName())
+            // 医疗机构行政区划编码
+            .setMedinsAdmdvs(encounterPatientInfo.getMedinsAdmdvs())
+            // 医疗服务机构类型：参考字典表
+            .setMedinsType(YbMedinsType.FIXMEDINS_TYPE1.getValue())
+            // 医疗机构等级：参考字典表
+            .setMedinsLv(TenantOptionUtil.getOptionContent(TenantOptionDict.MEDINS_LV))
+            // 入院日期
+            .setAdmDate(encounterPatientInfo.getAdmDate())
+            // 出院日期
+            .setDscgDate(encounterPatientInfo.getDscgDate())
+            // 主诊断编码：例如：I63.9
+            .setDscgMainDiseCodg(mainDiagnose.getDiseCodg())
+            // 主诊断名称：例如：脑梗塞
+            .setDscgMainDiseName(mainDiagnose.getDiseName())
+            // 诊断信息集合
+            .setFsiDiagnoseDtos(fsiDiagnoseDtos)
+            // 医师标识：医生唯一ID
+            .setDrCodg(encounterPatientInfo.getDrCodg())
+            // 入院科室标识：科室唯一ID
+            .setAdmDeptCodg(encounterPatientInfo.getAdmDeptCodg())
+            // 入院科室名称
+            .setAdmDeptName(encounterPatientInfo.getAdmDeptName())
+            // 出院科室标识：科室唯一ID
+            .setDscgDeptCodg(encounterPatientInfo.getDscgDeptCodg())
+            // 出院科室名称
+            .setDscgDeptName(encounterPatientInfo.getDscgDeptName())
+            // 就诊类型：参考字典表
+            .setMedMdtrtType(Optional.ofNullable(YbMedType.getByValue(encounterPatientInfo.getMedType()))
+                .orElse(YbMedType.GENERAL_OUTPATIENT).getYbMedMdtrtType().getValue())
+            // 医疗类别：参考字典表
+            .setMedType(encounterPatientInfo.getMedType())
+            // 处方(医嘱)信息集合
+            .setFsiOrderDtos(fsiOrderDtos)
+            // 生育状态：参考字典表
+            .setMatnStas(YbMatnStas.UNKNOWN.getValue())
+            // 总费用
+            .setMedfeeSumamt(medfeeSumamt)
+            // 自费金额
+            .setOwnpayAmt(encounterPatientInfo.getOwnpayAmt())
+            // 自付金额
+            .setSelfpayAmt(encounterPatientInfo.getSelfpayAmt())
+            // 结算总次数
+            .setSetlTotlnum(encounterPatientInfo.getSetlTotlnum())
+            // 险种：参考字典表
+            .setInsutype(encounterPatientInfo.getInsutype())
+            // 报销标志：参考字典表
+            .setReimFlag(YbPayLoc.PAY_LOC1.getValue())
+            // 异地结算标志：参考字典表
+            .setOutSetlFlag(Whether.NO.getCode());
+    }
+
+    /**
+     * 【3101】创建参保人信息
+     * 
+     * @param encounterPatientInfo 就诊患者信息
+     * @param fsiEncounterDto 就诊信息
+     * @return 参保人信息
+     */
+    private Yb3101InputPatientDto createYb3101InputPatientDto(Yb3101AdapterEncounterPatientInfo encounterPatientInfo,
+        Yb3101InputFsiEncounterDto fsiEncounterDto) {
+        // 作成参保人信息
+        return new Yb3101InputPatientDto()
+            // 参保人标识：参保人唯一ID
+            .setPatnId(encounterPatientInfo.getPatnId())
+            // 姓名
+            .setPatnName(encounterPatientInfo.getPatnName())
+            // 性别：参考字典表
+            .setGend(encounterPatientInfo.getGend())
+            // 出生日期：格式：yyyy-MM-dd
+            .setBrdy(encounterPatientInfo.getBrdy())
+            // 统筹区编码：参保人所属统筹区
+            .setPoolarea(encounterPatientInfo.getPoolarea())
+            // 当前就诊标识：本次就诊记录唯一ID
+            .setCurrMdtrtId(encounterPatientInfo.getMdtrtId())
+            // 就诊信息集合
+            .setFsiEncounterDtos(List.of(fsiEncounterDto));
+    }
+
+    /**
+     * 创建规则分析信息
+     * 
+     * @param patientDto 参保人信息
+     * @param trigScen 触发场景
+     * @return 规则分析信息
+     */
+    private Yb3101InputData createYb3101InputData(Yb3101InputPatientDto patientDto, String trigScen) {
+        // 作成规则分析信息
+        return new Yb3101InputData()
+            // 系统编码：调用方系统简码标识
+            .setSyscode("sys01")
+            // 参保人信息
+            .setPatientDtos(List.of(patientDto))
+            // 触发场景：此值与ruleIds指定其一即可,请优先指定此值
+            .setTrigScen(trigScen);
+
+    }
+
+    /**
+     * 获取指定日期当天的下午四点（16:00）的日期
+     * 
+     * @param inputDate 指定日期
+     * @return 当天的下午四点（16:00）的日期
+     */
+    private Date getFourPmDate(Date inputDate) {
+        ZonedDateTime inputZdt = inputDate.toInstant().atZone(ZoneId.systemDefault());
+        LocalDate datePart = inputZdt.toLocalDate();
+        LocalTime fourPm = LocalTime.of(16, 0);
+        LocalDateTime fourPmLocalDateTime = LocalDateTime.of(datePart, fourPm);
+        ZonedDateTime fourPmZdt = fourPmLocalDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(fourPmZdt.toInstant());
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
new file mode 100644
index 00000000..0cf769e4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
@@ -0,0 +1,657 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+import com.core.common.enums.DeleteFlag;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.YbCommonConstants;
+import com.openhis.workflow.domain.ElepMedicationRequest;
+import com.openhis.workflow.service.IElepMedicationRequestService;
+import com.openhis.ybcatalog.domain.CatalogDrugInfo;
+import com.openhis.ybcatalog.service.ICatalogDrugInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.utils.DateUtils;
+import com.openhis.administration.domain.*;
+import com.openhis.administration.service.*;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.clinical.service.IConditionService;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.*;
+import com.openhis.medication.domain.Medication;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.medication.service.IMedicationDefinitionService;
+import com.openhis.medication.service.IMedicationService;
+import com.openhis.yb.domain.ClinicReg;
+import com.openhis.yb.service.IRegService;
+import com.openhis.ybelep.domain.*;
+import com.openhis.ybelep.service.IElepVeriPrescriptionInfoService;
+import com.openhis.ybelep.service.IElepVeriVisitInfoService;
+
+/**
+ * 医保接口调用工具
+ *
+ * @author yuxj
+ * @date 2025-04-17
+ */
+@Component
+public class YbEleParamBuilderUtil {
+
+    /********************* 业务实体服务 *******************/
+
+    // 就诊管理服务
+    @Autowired
+    IEncounterService iEncounterService;
+    @Autowired
+    IElepMedicationRequestService elepMedicationRequestService;
+    // 就诊管理
+    @Autowired
+    IAccountService accountService;
+    @Autowired
+    IMedicationDefinitionService medicationDefinitionService;
+    @Autowired
+    ICatalogDrugInfoService catalogDrugInfoService;
+    @Autowired
+    IEncounterDiagnosisService encounterDiagnosisService;
+    @Autowired
+    IEncounterService encounterService;
+    @Autowired
+    IPatientService patientService;
+    @Autowired
+    IOrganizationService organizationService;
+    @Autowired
+    IPractitionerService practitionerService;
+    @Autowired
+    IPractitionerRoleService practitionerRoleService;
+    @Autowired
+    IConditionService conditionService;
+    @Autowired
+    IConditionDefinitionService conditionDefinitionService;
+
+    /********************* 医保实体服务 *******************/
+    @Autowired
+    IRegService iRegService;
+    @Autowired
+    IElepVeriPrescriptionInfoService eleVerPreInfoService;
+    @Autowired
+    IElepVeriVisitInfoService eleVerVisInfoService;
+
+    /**
+     * 获取处方信息
+     *
+     * @param medicationRequest 处方信息
+     * @param patient           患者信息
+     * @param tenantId          租户Id
+     * @return 处方信息
+     */
+    public PreCheckPrescription getEleVeriPrescriptionInfo(ElepMedicationRequest medicationRequest, Patient patient,
+                                                           Integer tenantId) {
+
+        // 声明处方信息对象
+        PreCheckPrescription elepVeriPrescriptionInfo = new PreCheckPrescription();
+        elepVeriPrescriptionInfo.setMdtrtCertType("02")
+                .setMdtrtCertNo(patient.getIdCard())
+                // 01-定点医疗机构就诊
+                .setBizTypeCode("01").setHospRxno(medicationRequest.getPrescriptionNo())
+                .setRxTypeCode(medicationRequest.getRxTypeCode().toString()).setPrscTime(medicationRequest.getIssueTime())
+                // 处方有效天数
+                .setValiDays(medicationRequest.getValidityDays().toString())
+                // 计算截止时间
+                .setValiEndTime(DateUtils.addDays(medicationRequest.getIssueTime(), medicationRequest.getValidityDays()));
+
+        // 就诊凭证类型为03”时,填写社会保障卡卡号
+        if (elepVeriPrescriptionInfo.getMdtrtCertType() == YbMdtrtCertType.MDTRT_CERT_TYPE03.getValue()) {
+
+            Account account = accountService.getOne(
+                    new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, medicationRequest.getEncounterId())
+                            .eq(Account::getTypeCode, AccountType.SOCIAL_SECURITY_CARD.getValue())
+                            .eq(Account::getTenantId, tenantId));
+            if (account == null) {
+                return null;
+            }
+            // 设置社会保障卡号
+            elepVeriPrescriptionInfo.setCardSn(account.getNo());
+        }
+
+        // todo 药品类目数（剂数）：西药、中成药时为药品的类目数量
+        // 西药、中成药对应的处方类别list
+        List<Integer> westernOrChineseList = new ArrayList<>();
+        westernOrChineseList.add(Integer.parseInt(YbRxItemTypeCode.WESTERN_MEDICINE.getValue()));
+        westernOrChineseList.add(Integer.parseInt(YbRxItemTypeCode.CHINESE_PATENT_MEDICINE.getValue()));
+
+        // 调用 count 方法
+        Long countWesternOrChinese = elepMedicationRequestService
+                .selectWesternOrChineseCount(medicationRequest.getPrescriptionNo(), westernOrChineseList, tenantId);
+        // 西药、中成药时为药品的类目数量
+        elepVeriPrescriptionInfo.setRxDrugCnt(countWesternOrChinese.toString())
+                .setRxUsedWayCodg(medicationRequest.getMedRoute())
+                .setRxUsedWayName(YbDrugMedWay.getByValue(medicationRequest.getMedRoute()).getDescription());
+
+        return elepVeriPrescriptionInfo;
+    }
+
+    /**
+     * 获取处方明细信息
+     *
+     * @param prescriptionNo 处方号
+     * @param tenantId       租户Id
+     * @return 处方明细信息
+     */
+    public List<ElepVeriPrescriptionDetail> getEleVeriPrescriptionDetail(String prescriptionNo, Integer tenantId) {
+
+        // 查询该处方所有中药饮片
+        List<ElepMedicationRequest> materialObjs = elepMedicationRequestService.list(new LambdaQueryWrapper<ElepMedicationRequest>()
+                .eq(ElepMedicationRequest::getPrescriptionNo, prescriptionNo).eq(ElepMedicationRequest::getTenantId, tenantId));
+        // 未查到返回空
+        if (materialObjs == null) {
+            return null;
+        }
+
+        List<ElepVeriPrescriptionDetail> eleDetList = new ArrayList<>();
+
+        // 遍历 materialObjs 列表
+        for (ElepMedicationRequest materialObj : materialObjs) {
+            CatalogDrugInfo mObj = catalogDrugInfoService.getOne(new LambdaQueryWrapper<CatalogDrugInfo>()
+                    .eq(CatalogDrugInfo::getMedicalCatalogCode, materialObj.getMedicationId()).orderByDesc(CatalogDrugInfo::getCreatedAt).last("LIMIT 1"));
+            // 未查到返回空
+            if (mObj == null) {
+                return null;
+            }
+
+            ElepVeriPrescriptionDetail eleObj = new ElepVeriPrescriptionDetail();
+            eleObj.setMedListCodg(mObj.getMedicalCatalogCode())
+                    .setDrugGenname(mObj.getRegisteredName()).setDrugDosform(mObj.getDrugForm())
+                    .setDrugSpec(mObj.getDrugSpecification()).setMedcBegntime(materialObj.getEffectiveDoseStart())
+                    .setMedcEndtime(materialObj.getEffectiveDoseEnd())
+                    .setMedcDays(materialObj.getDispensePerDuration().toString())
+                    .setDrugDosunt(materialObj.getUnitCode()).setDrugCnt(materialObj.getQuantity().toString())
+                    // todo 医院审批标志，配合目录的限制使用标志使用（目前吉林省不启用）,暂时先写死
+                    .setHospApprFlag("0")
+                    // 院内内部处方号
+                    .setPrescriptionNo(prescriptionNo)
+                    .setRxItemTypeCode(materialObj.getRxItemTypeCode().toString())
+                    .setRxItemTypeName(YbRxItemTypeCode.getByValue(materialObj.getRxItemTypeCode().toString()).getDescription())
+                    .setMedcWayCodg(materialObj.getMedRoute())
+                    .setMedcWayDscr(YbDrugMedWay.getByValue(materialObj.getMedRoute()).getDescription())
+                    .setSinDoscnt(materialObj.getMedDosage().stripTrailingZeros().toPlainString()).setSinDosunt(materialObj.getMedDosageUnitCode())
+                    .setUsedFrquCodg(materialObj.getMedFrequency())
+                    .setUsedFrquName(YbUsedFrqu.getByValue(materialObj.getMedFrequency()).getDescription());
+
+            eleDetList.add(eleObj);
+        }
+
+        return eleDetList;
+    }
+
+    /**
+     * 获取就诊信息和诊断信息
+     *
+     * @param medicationRequest 处方信息
+     * @param clinicReg         医保挂号保存的信息
+     * @param tenantId          租户Id
+     * @return 处方明细信息
+     */
+    public PreCheckPrescription getEleVeriVisitAndDiagnosisInfo(ElepMedicationRequest medicationRequest,
+                                                                ClinicReg clinicReg, Integer tenantId) {
+        // 电子处方上传预核验信息
+        PreCheckPrescription preCheckPrescription = new PreCheckPrescription();
+
+        // 获取就诊诊断信息
+        EncounterDiagnosis encDiagObjs =
+                encounterDiagnosisService.getOne(new LambdaQueryWrapper<EncounterDiagnosis>()
+                        .eq(EncounterDiagnosis::getEncounterId, medicationRequest.getEncounterId())
+                        .eq(EncounterDiagnosis::getTenantId, tenantId).eq(EncounterDiagnosis::getConditionId,medicationRequest.getConditionId())
+                        .eq(EncounterDiagnosis::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+        // 就诊管理
+        Encounter encounter = encounterService.getOne(new LambdaQueryWrapper<Encounter>()
+                .eq(Encounter::getId, medicationRequest.getEncounterId()));
+        // 患者信息
+        Patient patient = patientService.getOne(new LambdaQueryWrapper<Patient>()
+                .eq(Patient::getId, encounter.getPatientId()).eq(Patient::getTenantId, tenantId));
+        // 医生所属科室
+        Organization organization = organizationService.getOne(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getId, medicationRequest.getOrgId()).eq(Organization::getTenantId, tenantId));
+        // 就诊诊断所属科室
+        Organization orgDis = organizationService.getOne(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getId, encounter.getOrganizationId()).eq(Organization::getTenantId, tenantId));
+        // 医生信息
+        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
+                .eq(Practitioner::getId, medicationRequest.getPrescribingDrId()).eq(Practitioner::getTenantId, tenantId));
+        // 医生详细信息
+        Practitioner praRole = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
+                .eq(Practitioner::getId, medicationRequest.getPrescribingDrId())
+                .eq(Practitioner::getTenantId, tenantId));
+        // 医生所属科室信息
+        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getId, praRole.getOrgId()).eq(Organization::getTenantId, tenantId));
+        if (encDiagObjs == null || encounter == null || patient == null || organization == null || orgDis == null
+                || practitioner == null || praRole == null || orgDor == null) {
+            return null;
+        }
+        // 门诊/住院判断
+        String otpIptFlag = "";
+        if (encounter.getClassEnum() == EncounterClass.AMB.getValue()) {
+            otpIptFlag = YbEncounterClass.AMB.getValue();
+        } else if (encounter.getClassEnum() == EncounterClass.IMP.getValue()) {
+            otpIptFlag = YbEncounterClass.IMP.getValue();
+        }
+
+        String fixmedinsCode = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
+        String fixmedinsName = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_NAME);
+
+        // 1-输入-就诊信息
+        ElepVeriVisitInfo eleInfo = new ElepVeriVisitInfo();
+        // 诊断信息
+        Condition condition = conditionService.getOne(new LambdaQueryWrapper<Condition>()
+                .eq(Condition::getId, encDiagObjs.getConditionId()).eq(Condition::getTenantId, tenantId));
+        // 诊断定义
+        ConditionDefinition cdObj = conditionDefinitionService.getOne(new LambdaQueryWrapper<ConditionDefinition>()
+                .eq(ConditionDefinition::getId, condition.getDefinitionId())
+                .eq(ConditionDefinition::getTenantId, tenantId));
+        if (condition == null || cdObj == null) {
+            return null;
+        }
+        // 以挂号时间为截至时间，计算年龄
+        BigDecimal age = calculateAge(patient.getBirthDate(), clinicReg.getBegntime());
+        eleInfo.setFixmedinsCode(fixmedinsCode).setFixmedinsName(fixmedinsName).setMdtrtId(clinicReg.getMdtrtId())
+                .setIptOtpNo(clinicReg.getIptOtpNo()).setOtpIptFlag(otpIptFlag)
+                .setPsnNo(clinicReg.getPsnNo()).setPatnName(patient.getName()).setCertno(patient.getIdCard())
+                // todo 目前默认都是身份证:01
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setPatnAge(age.toString())
+                .setPrscDeptName(organization.getName()).setPrscDeptCode(organization.getYbNo())
+                .setDrCode(practitioner.getYbNo()).setPrscDrName(praRole.getName())
+                .setDrProfttlCodg(practitioner.getDrProfttlCode())
+                .setDrProfttlName(YbDoctorTitle.getByValue(practitioner.getDrProfttlCode()).getDescription())
+                .setDrDeptCode(orgDor.getYbNo()).setDrDeptName(orgDor.getName()).setMdtrtTime(encounter.getReceptionTime())
+                // 院内内部处方号
+                .setPrescriptionNo(medicationRequest.getPrescriptionNo());
+        if (clinicReg.getMedType() == null) {
+            eleInfo.setMedType("11");
+        } else {
+
+            eleInfo.setMedType(clinicReg.getMedType());
+        }
+
+        // 性别
+        if (patient.getGenderEnum() == AdministrativeGender.FEMALE.getValue()) {
+            eleInfo.setGend(YbGender.FEMALE.getValue());
+        } else if (patient.getGenderEnum() == AdministrativeGender.MALE.getValue()) {
+            eleInfo.setGend(YbGender.MALE.getValue());
+        } else {
+            eleInfo.setGend(YbGender.UNKNOWN.getValue());
+        }
+        // 特殊病种标志 2025/05/24 该字段不为空是，特殊病种给yes
+        if (encDiagObjs.getMedTypeCode() != null) {
+            eleInfo.setSpDiseFlag(Whether.YES.getCode());
+        } else {
+            eleInfo.setSpDiseFlag(Whether.NO.getCode());
+        }
+        // 主诊断标记
+//        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
+            eleInfo.setMaindiagCode(cdObj.getYbNo()).setMaindiagName(cdObj.getName());
+//        }
+
+        // 2-输入-诊断信息
+        ElepVeriDiagnosisInfo eleVerDisInfo = new ElepVeriDiagnosisInfo();
+
+        eleVerDisInfo.setDiagType(cdObj.getTypeCode()).setDiagSrtNo(encDiagObjs.getDiagSrtNo().toString())
+                .setDiagCode(cdObj.getYbNo()).setDiagName(cdObj.getName()).setDiagDept(orgDis.getName())
+                .setDiagDrNo(practitioner.getYbNo()).setDiagDrName(praRole.getName())
+                .setDiagTime(encounter.getReceptionTime())
+                // 院内内部处方号
+                .setPrescriptionNo(medicationRequest.getPrescriptionNo());
+        // 主诊断标记
+//        if (encDiagObjs.getMaindiseFlag() == Whether.YES.getValue()) {
+        eleVerDisInfo.setMaindiagFlag(Whether.YES.getValue().toString());
+//        } else {
+//            eleVerDisInfo.setMaindiagFlag(Whether.NO.getValue().toString());
+//        }
+
+        preCheckPrescription.setMdtrtinfo(eleInfo).setDiseinfo(eleVerDisInfo);
+
+        return preCheckPrescription;
+
+    }
+
+    /**
+     * 做成电子处方医保电子签名入参
+     *
+     * @param pcpResult      电子处方上传预核验的相响应参数
+     * @param practitionerId 审方药师Id
+     * @param checkDate      审方时间
+     * @param tenantId       租户Id
+     * @return 处方信息
+     */
+    public ElepSignatureInput getEleSignatureInput(ElepVeriPrescriptionOutput pcpResult, Long practitionerId,
+                                                   Date checkDate, Integer tenantId) {
+
+        SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String targetDateStr = targetFormat.format(checkDate);
+
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String outputPath = optionJson.getString(CommonConstants.Option.OUTPUT_PATH);
+        String fixmedinsCode = optionJson.getString(CommonConstants.Option.FIXMEDINS_CODE);
+        String fixmedinsName = optionJson.getString(CommonConstants.Option.FIXMEDINS_NAME);
+
+        // 审方药师信息
+        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
+                .eq(Practitioner::getUserId, practitionerId).eq(Practitioner::getTenantId, tenantId));
+        // 审方药师所属科室信息
+        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
+
+        // 电子处方上传预核验-输入-输入-就诊信息
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
+            return null;
+        }
+        // 原始待签名处方信息
+        JSONObject cpdata = new JSONObject();
+        // 1 rxTraceCode 处方追溯码 字符型 20 Y
+        cpdata.put("rxTraceCode", pcpResult.getRxTraceCode());
+        // 2 hiRxno 医保处方编号 字符型 30 Y
+        cpdata.put("hiRxno", pcpResult.getHiRxno());
+        // 3 mdtrtId 医保就诊 ID 字符型 30 Y
+        cpdata.put("mdtrtId", eleVerVisInfo.get(0).getMdtrtId());
+        // 4 patnName 患者姓名 字符型 40 Y
+        cpdata.put("patnName", eleVerVisInfo.get(0).getPatnName());
+        // 5 psnCertType 人员证件类型 字符型 6 Y Y //todo 默认身份证:01
+        cpdata.put("psnCertType", YbIdDocumentType.RESIDENT_ID_CARD.getValue());
+        // 6 certno 证件号码 字符型 50 Y
+        cpdata.put("certno", eleVerVisInfo.get(0).getCertno());
+        // 7 fixmedinsName 定点医疗机构名称 字符型 200 Y
+        cpdata.put("fixmedinsName", fixmedinsName);
+        // 8 fixmedinsCode 定点医疗机构编号 字符型 20 Y
+        cpdata.put("fixmedinsCode", fixmedinsCode);
+        // 9 drCode 开方医保医师代码 字符型 20 Y
+        cpdata.put("drCode", eleVerVisInfo.get(0).getDrCode());
+        // 10 prscDrName 开方医师姓名 字符型 50 Y
+        cpdata.put("prscDrName", eleVerVisInfo.get(0).getPrscDrName());
+        // 11 pharDeptName 审方药师科室名称 字符型 50 Y
+        cpdata.put("pharDeptName", orgDor.getName());
+        // 12 pharDeptCode 审方药师科室编号 字符型 30 Y
+        cpdata.put("pharDeptCode", orgDor.getYbNo());
+        // 13 pharProfttlCodg 审方药师职称编码 字符型 20 Y N
+        cpdata.put("pharProfttlCodg", practitioner.getDrProfttlCode() == null ? "" : practitioner.getDrProfttlCode());
+        // 14 pharProfttlName 审方药师职称名称 字符型 20
+        cpdata.put("pharProfttlName", practitioner.getDrProfttlCode() == null ? ""
+                : YbPharmacistTitle.getByValue(practitioner.getDrProfttlCode()).getDescription());
+        // 15 pharCode 审方医保药师代码 字符型 20 Y
+        cpdata.put("pharCode", practitioner.getYbNo());
+        // 16 pharCertType 审方药师证件类型 字符型 6 Y N
+        cpdata.put("pharCertType", "");
+        // 17 pharCertno 审方药师证件号码 字符型 50 N
+        cpdata.put("pharCertno", "");
+        // 18 pharName 审方药师姓名 字符型 50 Y
+        cpdata.put("pharName", practitioner.getName());
+        // 19 pharPracCertNo 审方药师执业资格证号 字符型 50
+        cpdata.put("pharPracCertNo", "");
+        // 20 pharChkTime 医疗机构药师审方时间 日期时间型 Y yyyy-MM-dd HH:mm:ss
+        cpdata.put("pharChkTime", targetDateStr);
+        // 使用 TreeMap 对键进行排序
+        TreeMap<String, Object> sortedMap = new TreeMap<>();
+        for (String key : cpdata.keySet()) {
+            sortedMap.put(key, cpdata.get(key));
+        }
+        // 重新构建排序后的 JSONObject
+        JSONObject sortedCpdata = new JSONObject(sortedMap);
+
+        // 将 cpdata 转换为 JSON 字符串
+        String jsonString = sortedCpdata.toString();
+
+        // 将 JSON 字符串编码为 Base64 字符串
+        String base64EncodedString = Base64.getEncoder().encodeToString(jsonString.getBytes());
+
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 定义格式（yyyyMMdd）
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        // 格式化日期
+        String formattedDate = currentDate.format(formatter);
+
+
+        String folderPath = outputPath + formattedDate + "\\"; // Windows 绝对路径，注意末尾的反斜杠
+        String fileName = pcpResult.getPrescriptionNo() + ".pdf"; // 文件名由处方号拼接而成
+        // 拼接完整的文件路径
+        String filePath = folderPath + fileName;
+        // 调用方法读取文件内容并获取 Base64 字符值
+        String base64Content = fileToBase64(filePath);
+
+        ElepSignatureInput eleSinIn = new ElepSignatureInput();
+        eleSinIn.setFixmedinsCode(fixmedinsCode).setOriginalValue(base64EncodedString).setOriginalRxFile(base64Content)
+                // 医保处方编号
+                .setHiRxno(pcpResult.getHiRxno()).setPrescriptionNo(pcpResult.getPrescriptionNo());
+
+        return eleSinIn;
+
+    }
+
+    /**
+     * 做成电子处方上传入参
+     *
+     * @param pcpResult      电子处方上传预核验的相响应参数
+     * @param esResult       电子处方医保电子签名响应出参
+     * @param practitionerId 审方药师Id
+     * @param checkDate      审方时间
+     * @param tenantId       租户Id
+     * @return 电子处方上传入参
+     */
+    public ElepUploadInput getEleUploadInput(ElepVeriPrescriptionOutput pcpResult, ElepSignatureOutput esResult,
+                                             Long practitionerId, Date checkDate, Integer tenantId) {
+        SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String targetDateStr = targetFormat.format(checkDate);
+
+        // 审方药师信息
+        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
+                .eq(Practitioner::getUserId, practitionerId).eq(Practitioner::getTenantId, tenantId));
+        // 审方药师所属科室信息
+        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
+
+        // 电子处方上传预核验-输入-输入-就诊信息
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
+            return null;
+        }
+
+        ElepUploadInput eleUploadInput = new ElepUploadInput();
+        eleUploadInput.setRxTraceCode(pcpResult.getRxTraceCode()).setHiRxno(pcpResult.getHiRxno())
+                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPatnName(eleVerVisInfo.get(0).getPatnName())
+                // todo 默认身份类型是身份证：01
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno()).setPatnName(eleVerVisInfo.get(0).getPatnName())
+                .setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode()).setFixmedinsName(eleVerVisInfo.get(0).getFixmedinsName())
+                .setDrCode(eleVerVisInfo.get(0).getDrCode()).setPrscDrName(eleVerVisInfo.get(0).getPrscDrName())
+                .setPharDeptCode(orgDor.getYbNo()).setPharDeptName(orgDor.getName()).setPharCode(practitioner.getYbNo())
+                .setPharName(practitioner.getName()).setPharChkTime(targetDateStr).setRxFile(esResult.getRxFile())
+                .setSignDigest(esResult.getSignDigest()).setPharProfttlCodg(practitioner.getDrProfttlCode()).setPharProfttlName(YbPharmacistTitle.getByValue(practitioner.getDrProfttlCode()).getDescription());
+
+        return eleUploadInput;
+
+    }
+
+    /**
+     * 做成电子处方撤销入参
+     *
+     * @param pcpResult      电子处方上传预核验的相响应参数
+     * @param euResult       电子处方上传响应出参
+     * @param practitionerId 撤销药师Id
+     * @param description    撤销原因
+     * @param revokeDate     撤销时间
+     * @param tenantId       租户Id
+     * @return 电子处方撤销入参
+     */
+    public ElepRevokeInput getElepRevokeInput(ElepVeriPrescriptionOutput pcpResult, ElepUploadOutput euResult,
+                                              Long practitionerId, String description, Date revokeDate, Integer tenantId) {
+
+        // 撤销时药师信息
+        Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
+                .eq(Practitioner::getUserId, practitionerId).eq(Practitioner::getTenantId, tenantId));
+        // 撤销时药师所属科室信息
+        Organization orgDor = organizationService.getOne(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getId, practitioner.getOrgId()).eq(Organization::getTenantId, tenantId));
+
+        // 电子处方上传预核验-输入-输入-就诊信息
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (practitioner == null || orgDor == null || eleVerVisInfo == null) {
+            return null;
+        }
+
+        ElepRevokeInput eleRevokeInput = new ElepRevokeInput();
+        eleRevokeInput.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode())
+                .setDrCode(practitioner.getYbNo()).setUndoDrName(practitioner.getName())
+                // todo 默认身份类型是身份证：01
+                .setUndoDrCertno(practitioner.getPharPracCertNo())
+                .setUndoDrCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setUndoRea(description).setUndoTime(revokeDate);
+
+        return eleRevokeInput;
+    }
+
+    /**
+     * 做成电子处方信息查询入参
+     *
+     * @param pcpResult 电子处方上传预核验的相响应参数
+     * @return 电子处方信息查询入参
+     */
+    public ElepQuerPrescriptionInput getEleQueryPrescriptionInput(ElepVeriPrescriptionOutput pcpResult) {
+
+        // 电子处方上传预核验-输入-输入-就诊信息
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (eleVerVisInfo == null) {
+            return null;
+        }
+
+        ElepQuerPrescriptionInput eleQueryPreObj = new ElepQuerPrescriptionInput();
+        eleQueryPreObj.setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode()).setHiRxno(pcpResult.getHiRxno())
+                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPsnName(eleVerVisInfo.get(0).getPatnName())
+                // todo 默认身份类型是身份证：01
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno());
+
+        return eleQueryPreObj;
+    }
+
+    /**
+     * 做成电子处方信息查询入参
+     *
+     * @param pcpResult 电子处方上传预核验的相响应参数
+     * @return 电子处方信息查询入参
+     */
+    public ElepMedresultInput getEleMedResultInput(ElepVeriPrescriptionOutput pcpResult) {
+
+        // 电子处方上传预核验-输入-输入-就诊信息
+        List<ElepVeriVisitInfo> eleVerVisInfo = eleVerVisInfoService.list(new LambdaQueryWrapper<ElepVeriVisitInfo>()
+                .eq(ElepVeriVisitInfo::getPrescriptionNo, pcpResult.getPrescriptionNo())
+                .orderByDesc(ElepVeriVisitInfo::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
+
+        if (eleVerVisInfo == null) {
+            return null;
+        }
+
+        ElepMedresultInput eleQueryPreObj = new ElepMedresultInput();
+        eleQueryPreObj.setHiRxno(pcpResult.getHiRxno()).setFixmedinsCode(eleVerVisInfo.get(0).getFixmedinsCode())
+                .setMdtrtId(eleVerVisInfo.get(0).getMdtrtId()).setPsnName(eleVerVisInfo.get(0).getPatnName())
+                // todo 默认身份类型是身份证：01
+                .setPsnCertType(YbIdDocumentType.RESIDENT_ID_CARD.getValue()).setCertno(eleVerVisInfo.get(0).getCertno());
+
+        return eleQueryPreObj;
+    }
+
+    /**
+     * 获取BigDecimal类型的年龄
+     *
+     * @param birthDate 出生日期
+     * @param beginTime 计算起始日期
+     * @return 年龄
+     */
+    public static BigDecimal calculateAge(Date birthDate, Date beginTime) {
+        // 验证输入参数是否为空
+        if (Objects.isNull(birthDate)) {
+            System.out.println("出生年月日不能为空！");
+            return null;
+        }
+        // 验证输入参数是否为空
+        if (Objects.isNull(beginTime)) {
+            beginTime = DateUtils.getNowDate();
+        }
+
+        // 将 Date 转换为 LocalDate
+        LocalDate localBirthDate = birthDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        LocalDate localBeginTime = beginTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+        // 计算出生日期到起始日期之间的年份差异
+        Period period = Period.between(localBirthDate, localBeginTime);
+
+        int years = period.getYears();
+
+        // 检查是否已经过了生日，如果没有过，则年份减一
+        boolean hasBirthdayPassed = !localBirthDate.plusYears(years).isAfter(localBeginTime);
+        if (!hasBirthdayPassed) {
+            years--;
+        }
+
+        return BigDecimal.valueOf(years);
+    }
+
+    /**
+     * 读取文件内容并获取其 Base64 字符值
+     *
+     * @param filePath 文件路径
+     * @return 文件内容的 Base64 字符值
+     */
+    public static String fileToBase64(String filePath) {
+        File file = new File(filePath);
+        if (!file.exists()) {
+            System.out.println("文件不存在！");
+            return null;
+        }
+
+        FileInputStream fileInputStream = null;
+        try {
+            fileInputStream = new FileInputStream(file);
+            byte[] fileContent = new byte[(int) file.length()];
+            fileInputStream.read(fileContent);
+            return Base64.getEncoder().encodeToString(fileContent);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (fileInputStream != null) {
+                try {
+                    fileInputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
new file mode 100644
index 00000000..e4fa81d3
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.vo;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 【3203】后台计算结果  DB映射实体
+ *
+ * @author SunJQ
+ * @date 2025-04-29
+ */
+@Data
+public class Financial3203VO {
+    // 清算人次
+    private Long psntime;
+    // 医保认可费用总额（数值型，16位含2位小数，必填）
+    private BigDecimal medSumfee;
+    // 现金支付金额（数值型，16位含2位小数，必填）
+    private BigDecimal cashPayamt;
+    // 个人账户支出（数值型，16位含2位小数，必填）
+    private BigDecimal acctPay;
+    /** 医疗费用总额 */
+    private BigDecimal medFeeSumAmt;
+    /** 基金支付总额 */
+    private BigDecimal fundPaySumAmt;
+    /** 个人账户支付总额 */
+    private BigDecimal acctGjPay;
+    /** 现金支付总额 */
+    private BigDecimal selfPayCash;
+    /** 微信支付总额 */
+    private BigDecimal selfPayVx;
+    /** 阿里支付总额 */
+    private BigDecimal selfPayAli;
+    /** 银行卡支付总额 */
+    private BigDecimal selfPayUnion;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
new file mode 100644
index 00000000..9eacbafa
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
@@ -0,0 +1,23 @@
+package com.openhis.web.ybmanage.vo;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public class Settlement3201DetailVO {
+
+    /** 医疗费用总额 */
+    private BigDecimal medFeeSumAmt;
+    /** 基金支付总额 */
+    private BigDecimal fundPaySumAmt;
+    /** 个人账户支付总额 */
+    private BigDecimal acctPay;
+    /** 个人账户支付总额 */
+    private BigDecimal acctGjPay;
+    /** 定点医药机构结算笔数 */
+    private Integer fixMedInsSetlCnt;
+
+    private String contractNo;
+
+    private Integer insutype;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
new file mode 100644
index 00000000..7f867de1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.vo;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+/**
+ * 【3201】后台计算结果 DB映射实体
+ *
+ * @author SunJQ
+ * @date 2025-04-15
+ */
+@Data
+public class Settlement3201VO {
+    /** 医疗费用总额 */
+    private BigDecimal medFeeSumAmt;
+    /** 基金支付总额 */
+    private BigDecimal fundPaySumAmt;
+    /** 个人账户支付总额 */
+    private BigDecimal acctPay;
+    /** 个人账户支付总额 */
+    private BigDecimal acctGjPay;
+    /** 定点医药机构结算笔数 */
+    private Integer fixMedInsSetlCnt;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
new file mode 100644
index 00000000..a075dcfc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.ybmanage.vo;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+/**
+ * 【3201】后台计算结果 DB映射实体
+ *
+ * @author SunJQ
+ * @date 2025-04-15
+ */
+@Data
+public class Settlement3202VO {
+    /** 医疗费用总额 */
+
+    private BigDecimal medFeeSumAmt;
+    /** 基金支付总额 */
+
+    private BigDecimal fundPaySumAmt;
+    /** 个人账户支付总额 */
+
+    private BigDecimal acctPay;
+    /** 个人账户支付总额 */
+
+    private BigDecimal acctGjPay;
+    /** 现金支付总额 */
+
+    private BigDecimal selfPayCash;
+    /** 微信支付总额 */
+
+    private BigDecimal selfPayVx;
+    /** 阿里支付总额 */
+
+    private BigDecimal selfPayAli;
+    /** 银行卡支付总额 */
+
+    private BigDecimal selfPayUnion;
+    /** 定点医药机构结算笔数 */
+
+    private Integer fixMedInsSetlCnt;
+}
-- 
Gitee


From 850cce66a507f4d0aa19d7510023acf7521180dc Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Wed, 3 Sep 2025 13:23:44 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-cd.yml     | 86 -----------------
 .../src/main/resources/application-cloud.yml  | 87 -----------------
 .../src/main/resources/application-local.yml  |  4 +-
 .../src/main/resources/application-nd.yml     | 87 -----------------
 .../src/main/resources/application-test.yml   | 93 -------------------
 5 files changed, 2 insertions(+), 355 deletions(-)
 delete mode 100644 openhis-server-new/openhis-application/src/main/resources/application-cd.yml
 delete mode 100644 openhis-server-new/openhis-application/src/main/resources/application-cloud.yml
 delete mode 100644 openhis-server-new/openhis-application/src/main/resources/application-nd.yml
 delete mode 100644 openhis-server-new/openhis-application/src/main/resources/application-test.yml

diff --git a/openhis-server-new/openhis-application/src/main/resources/application-cd.yml b/openhis-server-new/openhis-application/src/main/resources/application-cd.yml
deleted file mode 100644
index 83bb7009..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/application-cd.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-# 数据源配置
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: org.postgresql.Driver
-    druid:
-      # 主库数据源
-      master:
-        url: jdbc:postgresql://192.168.10.240:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: openhis
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  # redis 配置
-  redis:
-    # 地址
-    host: 192.168.10.240
-    port: 6379
-    # 数据库索引
-    database: 1
-    # 密码
-    password: redis
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-    # 文言
-    messages:
-      basename: i18n/general_message/messages
-      encoding: utf-8
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-cloud.yml b/openhis-server-new/openhis-application/src/main/resources/application-cloud.yml
deleted file mode 100644
index 596c0770..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/application-cloud.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# 数据源配置
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: org.postgresql.Driver
-    druid:
-      # 主库数据源
-      master:
-        url: jdbc:postgresql://60.188.247.175:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: openhis
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  # redis 配置
-  redis:
-    # 地址
-    host: 60.188.247.175
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 0
-    # 密码
-    password: redis
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-    # 文言
-    messages:
-      basename: i18n/general_message/messages
-      encoding: utf-8
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-local.yml b/openhis-server-new/openhis-application/src/main/resources/application-local.yml
index 9c375796..b80f54be 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application-local.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-local.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.30.199:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql:/localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgres
         password: root
       # 从库数据源
@@ -62,7 +62,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.30.199
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-nd.yml b/openhis-server-new/openhis-application/src/main/resources/application-nd.yml
deleted file mode 100644
index 19375d6c..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/application-nd.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# 数据源配置
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: org.postgresql.Driver
-    druid:
-      # 主库数据源
-      master:
-        url: jdbc:postgresql://192.168.1.123:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: openhis
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  # redis 配置
-  redis:
-    # 地址
-    host: 192.168.1.123
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 1
-    # 密码
-    password: redis
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-    # 文言
-    messages:
-      basename: i18n/general_message/messages
-      encoding: utf-8
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-test.yml b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
deleted file mode 100644
index d4370287..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-# 数据源配置
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: org.postgresql.Driver
-    druid:
-      # 主库数据源
-      #      master:
-      #        url: jdbc:postgresql://192.168.1.123:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-      #        username: postgres
-      #        password: root
-
-      master:
-        url: jdbc:postgresql://192.168.30.199:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: openhis
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  # redis 配置
-  redis:
-    # 地址
-    #    host: 192.168.1.123
-    host: 192.168.30.199
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 1
-    # 密码
-    password: redis
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-    # 文言
-    messages:
-      basename: i18n/general_message/messages
-      encoding: utf-8
\ No newline at end of file
-- 
Gitee